From 537fab0f5f899de8680390100c10f26dee38b7c2 Mon Sep 17 00:00:00 2001
From: zkwip
Date: Wed, 10 Jun 2015 22:50:27 +0200
Subject: image clean up
shitty cover art is gone now
---
app/src/main/res/drawable-hdpi/image1.png | Bin 776320 -> 0 bytes
app/src/main/res/drawable-hdpi/image2.png | Bin 561697 -> 0 bytes
app/src/main/res/drawable-hdpi/image3.png | Bin 478748 -> 0 bytes
app/src/main/res/drawable-hdpi/image4.png | Bin 75454 -> 0 bytes
app/src/main/res/drawable-hdpi/image5.png | Bin 174967 -> 0 bytes
app/src/main/res/drawable-mdpi/image1.png | Bin 776320 -> 0 bytes
app/src/main/res/drawable-mdpi/image2.png | Bin 561697 -> 0 bytes
app/src/main/res/drawable-mdpi/image3.png | Bin 478748 -> 0 bytes
app/src/main/res/drawable-mdpi/image4.png | Bin 75454 -> 0 bytes
app/src/main/res/drawable-mdpi/image5.png | Bin 174967 -> 0 bytes
app/src/main/res/drawable-xhdpi/image1.png | Bin 776320 -> 0 bytes
app/src/main/res/drawable-xhdpi/image2.png | Bin 561697 -> 0 bytes
app/src/main/res/drawable-xhdpi/image3.png | Bin 478748 -> 0 bytes
app/src/main/res/drawable-xhdpi/image4.png | Bin 75454 -> 0 bytes
app/src/main/res/drawable-xhdpi/image5.png | Bin 174967 -> 0 bytes
app/src/main/res/drawable-xxhdpi/image1.png | Bin 776320 -> 0 bytes
app/src/main/res/drawable-xxhdpi/image2.png | Bin 561697 -> 0 bytes
app/src/main/res/drawable-xxhdpi/image3.png | Bin 478748 -> 0 bytes
app/src/main/res/drawable-xxhdpi/image4.png | Bin 75454 -> 0 bytes
app/src/main/res/drawable-xxhdpi/image5.png | Bin 174967 -> 0 bytes
app/src/main/res/drawable-xxxhdpi/image1.png | Bin 776320 -> 0 bytes
app/src/main/res/drawable-xxxhdpi/image2.png | Bin 561697 -> 0 bytes
app/src/main/res/drawable-xxxhdpi/image3.png | Bin 478748 -> 0 bytes
app/src/main/res/drawable-xxxhdpi/image4.png | Bin 75454 -> 0 bytes
app/src/main/res/drawable-xxxhdpi/image5.png | Bin 174967 -> 0 bytes
25 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 app/src/main/res/drawable-hdpi/image1.png
delete mode 100644 app/src/main/res/drawable-hdpi/image2.png
delete mode 100644 app/src/main/res/drawable-hdpi/image3.png
delete mode 100644 app/src/main/res/drawable-hdpi/image4.png
delete mode 100644 app/src/main/res/drawable-hdpi/image5.png
delete mode 100644 app/src/main/res/drawable-mdpi/image1.png
delete mode 100644 app/src/main/res/drawable-mdpi/image2.png
delete mode 100644 app/src/main/res/drawable-mdpi/image3.png
delete mode 100644 app/src/main/res/drawable-mdpi/image4.png
delete mode 100644 app/src/main/res/drawable-mdpi/image5.png
delete mode 100644 app/src/main/res/drawable-xhdpi/image1.png
delete mode 100644 app/src/main/res/drawable-xhdpi/image2.png
delete mode 100644 app/src/main/res/drawable-xhdpi/image3.png
delete mode 100644 app/src/main/res/drawable-xhdpi/image4.png
delete mode 100644 app/src/main/res/drawable-xhdpi/image5.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/image1.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/image2.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/image3.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/image4.png
delete mode 100644 app/src/main/res/drawable-xxhdpi/image5.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/image1.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/image2.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/image3.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/image4.png
delete mode 100644 app/src/main/res/drawable-xxxhdpi/image5.png
(limited to 'app/src/main')
diff --git a/app/src/main/res/drawable-hdpi/image1.png b/app/src/main/res/drawable-hdpi/image1.png
deleted file mode 100644
index a1811d3..0000000
Binary files a/app/src/main/res/drawable-hdpi/image1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/image2.png b/app/src/main/res/drawable-hdpi/image2.png
deleted file mode 100644
index 243f396..0000000
Binary files a/app/src/main/res/drawable-hdpi/image2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/image3.png b/app/src/main/res/drawable-hdpi/image3.png
deleted file mode 100644
index 47547ff..0000000
Binary files a/app/src/main/res/drawable-hdpi/image3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/image4.png b/app/src/main/res/drawable-hdpi/image4.png
deleted file mode 100644
index 77fe64e..0000000
Binary files a/app/src/main/res/drawable-hdpi/image4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/image5.png b/app/src/main/res/drawable-hdpi/image5.png
deleted file mode 100644
index 0214f5e..0000000
Binary files a/app/src/main/res/drawable-hdpi/image5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/image1.png b/app/src/main/res/drawable-mdpi/image1.png
deleted file mode 100644
index a1811d3..0000000
Binary files a/app/src/main/res/drawable-mdpi/image1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/image2.png b/app/src/main/res/drawable-mdpi/image2.png
deleted file mode 100644
index 243f396..0000000
Binary files a/app/src/main/res/drawable-mdpi/image2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/image3.png b/app/src/main/res/drawable-mdpi/image3.png
deleted file mode 100644
index 47547ff..0000000
Binary files a/app/src/main/res/drawable-mdpi/image3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/image4.png b/app/src/main/res/drawable-mdpi/image4.png
deleted file mode 100644
index 77fe64e..0000000
Binary files a/app/src/main/res/drawable-mdpi/image4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/image5.png b/app/src/main/res/drawable-mdpi/image5.png
deleted file mode 100644
index 0214f5e..0000000
Binary files a/app/src/main/res/drawable-mdpi/image5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/image1.png b/app/src/main/res/drawable-xhdpi/image1.png
deleted file mode 100644
index a1811d3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/image1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/image2.png b/app/src/main/res/drawable-xhdpi/image2.png
deleted file mode 100644
index 243f396..0000000
Binary files a/app/src/main/res/drawable-xhdpi/image2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/image3.png b/app/src/main/res/drawable-xhdpi/image3.png
deleted file mode 100644
index 47547ff..0000000
Binary files a/app/src/main/res/drawable-xhdpi/image3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/image4.png b/app/src/main/res/drawable-xhdpi/image4.png
deleted file mode 100644
index 77fe64e..0000000
Binary files a/app/src/main/res/drawable-xhdpi/image4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/image5.png b/app/src/main/res/drawable-xhdpi/image5.png
deleted file mode 100644
index 0214f5e..0000000
Binary files a/app/src/main/res/drawable-xhdpi/image5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/image1.png b/app/src/main/res/drawable-xxhdpi/image1.png
deleted file mode 100644
index a1811d3..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/image1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/image2.png b/app/src/main/res/drawable-xxhdpi/image2.png
deleted file mode 100644
index 243f396..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/image2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/image3.png b/app/src/main/res/drawable-xxhdpi/image3.png
deleted file mode 100644
index 47547ff..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/image3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/image4.png b/app/src/main/res/drawable-xxhdpi/image4.png
deleted file mode 100644
index 77fe64e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/image4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/image5.png b/app/src/main/res/drawable-xxhdpi/image5.png
deleted file mode 100644
index 0214f5e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/image5.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/image1.png b/app/src/main/res/drawable-xxxhdpi/image1.png
deleted file mode 100644
index a1811d3..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/image1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/image2.png b/app/src/main/res/drawable-xxxhdpi/image2.png
deleted file mode 100644
index 243f396..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/image2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/image3.png b/app/src/main/res/drawable-xxxhdpi/image3.png
deleted file mode 100644
index 47547ff..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/image3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/image4.png b/app/src/main/res/drawable-xxxhdpi/image4.png
deleted file mode 100644
index 77fe64e..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/image4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/image5.png b/app/src/main/res/drawable-xxxhdpi/image5.png
deleted file mode 100644
index 0214f5e..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/image5.png and /dev/null differ
--
cgit v1.2.3
From 40a93c7df72b93460345c8adfa5fa97e74b18a8c Mon Sep 17 00:00:00 2001
From: Size43
Date: Wed, 10 Jun 2015 22:53:13 +0200
Subject: Removing [OBJ] from summaries / descriptions
---
.../java/org/rssin/android/ArticleActivity.java | 26 +++++++++++++++++++++-
.../java/org/rssin/android/FeedItemAdapter.java | 9 +++++++-
.../org/rssin/android/SortedFeedItemContainer.java | 2 +-
app/src/main/java/org/rssin/rssin/Feed.java | 5 ++++-
.../java/org/rssin/rssin/FeedLoaderAndSorter.java | 4 +++-
app/src/main/res/values/feeds.xml | 5 +----
6 files changed, 42 insertions(+), 9 deletions(-)
mode change 100644 => 100755 app/src/main/java/org/rssin/android/ArticleActivity.java
mode change 100644 => 100755 app/src/main/java/org/rssin/android/FeedItemAdapter.java
mode change 100644 => 100755 app/src/main/java/org/rssin/android/SortedFeedItemContainer.java
mode change 100644 => 100755 app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
mode change 100644 => 100755 app/src/main/res/values/feeds.xml
(limited to 'app/src/main')
diff --git a/app/src/main/java/org/rssin/android/ArticleActivity.java b/app/src/main/java/org/rssin/android/ArticleActivity.java
old mode 100644
new mode 100755
index 6c80fb6..0951a48
--- a/app/src/main/java/org/rssin/android/ArticleActivity.java
+++ b/app/src/main/java/org/rssin/android/ArticleActivity.java
@@ -22,6 +22,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.text.Html;
+import android.text.method.LinkMovementMethod;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.TextView;
@@ -32,6 +33,9 @@ import org.rssin.rss.FeedSorterProvider;
import org.rssin.rss.FeedSorterTrainer;
import org.rssin.rssin.R;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import static org.rssin.neurons.Feedback.Dislike;
import static org.rssin.neurons.Feedback.Like;
@@ -55,8 +59,28 @@ public class ArticleActivity extends ActionBarActivity {
title.setText(item.getTitle());
setTitle(item.getTitle());
+ String descriptionStr = item.getDescription();
+
+ try
+ {
+ // Transform <a> tags into absolute URLs.
+ // This may add a double slash after the domain name, but most - if not all - webservers will still
+ // parse the URL the same way.
+ URL url = new URL(item.getLink());
+ descriptionStr = descriptionStr.replaceAll("href=\"(((?!http).)*)\"", "href=\"http://" + url.getHost() + "/$1\"");
+ }catch(MalformedURLException e)
+ {
+ e.printStackTrace();
+ }
+
+ // Remove <img> & <media> tags
+ descriptionStr = descriptionStr.replaceAll("(<img.*\\/>|<img.*><\\/img>|<img.*>)", "");
+ descriptionStr = descriptionStr.replaceAll("(<media.*\\/>|<media.*><\\/media>)", "");
+
TextView description = (TextView) findViewById(R.id.article_description);
- description.setText(Html.fromHtml(item.getDescription()));
+ description.setText(Html.fromHtml(descriptionStr));
+ description.setLinksClickable(true);
+ description.setMovementMethod(LinkMovementMethod.getInstance());
TextView author = (TextView) findViewById(R.id.article_author);
if (item.getAuthor() != null) {
diff --git a/app/src/main/java/org/rssin/android/FeedItemAdapter.java b/app/src/main/java/org/rssin/android/FeedItemAdapter.java
old mode 100644
new mode 100755
index 2d2e582..8124861
--- a/app/src/main/java/org/rssin/android/FeedItemAdapter.java
+++ b/app/src/main/java/org/rssin/android/FeedItemAdapter.java
@@ -20,6 +20,7 @@ package org.rssin.android;
import android.content.Intent;
import android.support.v7.widget.RecyclerView;
+import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -71,7 +72,13 @@ class FeedItemAdapter extends RecyclerView.Adapter<FeedItemAdapter.FeedItemHolde
SortedFeedItemContainer item = feedItems.get(position);
holder.title.setText(item.getFeeditem().getTitle());
- holder.summary.setText(sapInterface.getSummary(item.getFeeditem()).getText());
+ String summaryText = sapInterface.getSummary(item.getFeeditem()).getText();
+ // Remove img and media tags
+ summaryText = summaryText.replaceAll("(<img.*\\/>|<img.*><\\/img>|<img.*>)", "");
+ summaryText = summaryText.replaceAll("(<media.*\\/>|<media.*><\\/media>)", "");
+ summaryText = summaryText.replace((char) 160, (char) 32).replace((char) 65532, (char) 32).trim();
+
+ holder.summary.setText(Html.fromHtml(summaryText));
holder.date.setText(item.getFeeditem().getPubDate().toString());
holder.item = item;
}
diff --git a/app/src/main/java/org/rssin/android/SortedFeedItemContainer.java b/app/src/main/java/org/rssin/android/SortedFeedItemContainer.java
old mode 100644
new mode 100755
index fd2777c..8a5a576
--- a/app/src/main/java/org/rssin/android/SortedFeedItemContainer.java
+++ b/app/src/main/java/org/rssin/android/SortedFeedItemContainer.java
@@ -46,7 +46,7 @@ public class SortedFeedItemContainer implements Comparable<SortedFeedItemContain
}
public boolean hasScore() {
- return score != 0;
+ return score != -1;
}
public long getScore() {
diff --git a/app/src/main/java/org/rssin/rssin/Feed.java b/app/src/main/java/org/rssin/rssin/Feed.java
index 36e5672..75b5616 100755
--- a/app/src/main/java/org/rssin/rssin/Feed.java
+++ b/app/src/main/java/org/rssin/rssin/Feed.java
@@ -151,7 +151,10 @@ public class Feed implements Storable, Comparable<Feed>, Jsonable {
@Override
public void onReceive(Object data) {
title = loader.getFeed().getTitle();
- titlehasChanged.onReceive(title);
+ if(titlehasChanged != null)
+ {
+ titlehasChanged.onReceive(title);
+ }
try {
store(storageProvider);
} catch (Exception e) {
diff --git a/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java b/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
old mode 100644
new mode 100755
index 6244d2e..9c4ad2f
--- a/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
+++ b/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
@@ -108,7 +108,9 @@ public class FeedLoaderAndSorter {
List<FeedItem> feedItems = loader.getFeed().getPosts();
synchronized (resultingItems) {
for (FeedItem item : feedItems) {
- resultingItems.add(new SortedFeedItemContainer(item));
+ if(item != null) {
+ resultingItems.add(new SortedFeedItemContainer(item));
+ }
}
feedSorter.sortItems(resultingItems);
}
diff --git a/app/src/main/res/values/feeds.xml b/app/src/main/res/values/feeds.xml
old mode 100644
new mode 100755
index 1838092..efd3f58
--- a/app/src/main/res/values/feeds.xml
+++ b/app/src/main/res/values/feeds.xml
@@ -24,10 +24,7 @@
<item>http://feeds.bbci.co.uk/news/technology/rss.xml</item>
<item>http://feeds.bbci.co.uk/news/world/rss.xml</item>
<item>http://feeds.bbci.co.uk/sport/0/rss.xml</item>
- <item>http://feeds.foxnews.com/foxnews/politics</item>
- <item>http://feeds.foxnews.com/foxnews/science</item>
- <item>http://feeds.foxnews.com/foxnews/sports</item>
- <item>http://feeds.foxnews.com/foxnews/tech</item>
+ <item>http://pcworld.com/index.rss</item>
<item>http://feeds.reuters.com/reuters/environment</item>
<item>http://feeds.reuters.com/reuters/financialsNews</item>
<item>http://feeds.reuters.com/reuters/worldNews</item>
--
cgit v1.2.3