Merge

24 files changed, 33 insertions, 85 deletions

diff --git a/app/src/main/res/drawable-hdpi/ic_action_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..9449c35
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_action_delete.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..116e9a0
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_action_settings.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..b044320
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_action_delete.png b/app/src/main/res/drawable-mdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..eb03dce
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_action_delete.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..1a8017b
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_action_settings.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..6216372
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..a0b397e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..b764d9c
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..a754a2d
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..c1fbf46
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..a68f6f9
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..ef5e602
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..d152354
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..f18ff96
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..a57ae9b
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png
diff --git a/app/src/main/res/layout/separator_navigation_drawer.xml b/app/src/main/res/layout/separator_navigation_drawer.xml
index 81a9d0a..a3031a0 100755
--- a/app/src/main/res/layout/separator_navigation_drawer.xml
+++ b/app/src/main/res/layout/separator_navigation_drawer.xml
@@ -10,7 +10,7 @@ android:layout_marginTop="0dp"
 android:background="#252525"

     >

 

-    <LinearLayout

+    <RelativeLayout

         android:layout_width="fill_parent"

         android:layout_height="wrap_content"

         android:minHeight="35dp"

@@ -24,7 +24,19 @@ android:background="#252525"
             android:textAppearance="?android:attr/textAppearanceSmall"

             android:textColor="#FFFFFF"

             />

-    </LinearLayout>

+

+        <TextView

+            android:id="@+id/separator_navigation_drawer_edit"

+            android:layout_alignParentRight="true"

+            android:layout_gravity="right"

+            android:layout_marginRight="8dp"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_margin="4dp"

+            android:textAppearance="?android:attr/textAppearanceSmall"

+            android:textColor="#FFFFFF"

+            />

+    </RelativeLayout>

 

     <View

         android:layout_width="match_parent"

diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
index 86959a3..c4ae1a3 100755
--- a/app/src/main/res/menu/global.xml
+++ b/app/src/main/res/menu/global.xml
@@ -1,5 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"

 xmlns:app="http://schemas.android.com/apk/res-auto">

 <item android:id="@+id/action_settings" android:title="@string/action_settings"

-    android:orderInCategory="100" app:showAsAction="never" />

+    android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />

 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/home_screen.xml b/app/src/main/res/menu/home_screen.xml
index a894d92..bf901df 100755
--- a/app/src/main/res/menu/home_screen.xml
+++ b/app/src/main/res/menu/home_screen.xml
@@ -3,5 +3,5 @@
     xmlns:tools="http://schemas.android.com/tools"

     tools:context="org.rssin.android.HomeScreenActivity">

     <item android:id="@+id/action_settings" android:title="@string/action_settings"

-        android:orderInCategory="100" app:showAsAction="ifRoom" />

+        android:orderInCategory="100"  app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />

 </menu>

diff --git a/app/src/main/res/menu/menu_article.xml b/app/src/main/res/menu/menu_article.xml
index 064831b..80ef7a7 100755
--- a/app/src/main/res/menu/menu_article.xml
+++ b/app/src/main/res/menu/menu_article.xml
@@ -19,7 +19,7 @@
 
     <item
         android:id="@+id/article_action_share"
-        android:title="Share"
+        android:title="@string/menu_article_share"
         android:orderInCategory="100"
         android:icon="@drawable/ic_share_white_24dp"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/menu_filter.xml
index 86cfe5d..5822314 100755
--- a/app/src/main/res/menu/menu_filter.xml
+++ b/app/src/main/res/menu/menu_filter.xml
@@ -2,5 +2,5 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools" tools:context="org.rssin.android.HomeScreenActivity">
     <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
+        android:orderInCategory="100"  app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />
 </menu>
diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml
index 655ee84..a914ad8 100644..100755
--- a/app/src/main/res/menu/menu_filter_settings.xml
+++ b/app/src/main/res/menu/menu_filter_settings.xml
@@ -8,11 +8,13 @@
     <item
         android:id="@+id/filter_settings_action_title"
         android:title="@string/filter_settings_action_title"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_editor_border_color"/>
 
     <item
         android:id="@+id/filter_settings_action_delete"
         android:title="@string/filter_settings_action_delete"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_action_delete"/>
 
 </menu>
diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml
deleted file mode 100644
index 021ceb5..0000000
--- a/app/src/main/res/menu/menu_unified_inbox.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools" tools:context=".UnifiedInboxActivity">
-
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
-    <item android:id="@+id/action_filters" android:title="@string/action_filters"
-        android:orderInCategory="100" app:showAsAction="never" />
-    <item android:id="@+id/action_feeds" android:title="@string/action_feeds"
-        android:orderInCategory="100" app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/values/feeds.xml b/app/src/main/res/values/feeds.xml
index e4ae386..384739b 100644
--- a/app/src/main/res/values/feeds.xml
+++ b/app/src/main/res/values/feeds.xml
@@ -1,86 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="default_feeds">
-        <item>http://feeds.bbci.co.uk/news/business/rss.xml</item>
-        <item>http://feeds.bbci.co.uk/news/entertainment_and_arts/rss.xml</item>
-        <item>http://feeds.bbci.co.uk/news/health/rss.xml</item>
         <item>http://feeds.bbci.co.uk/news/politics/rss.xml</item>
         <item>http://feeds.bbci.co.uk/news/science_and_environment/rss.xml</item>
         <item>http://feeds.bbci.co.uk/news/technology/rss.xml</item>
-        <item>http://feeds.bbci.co.uk/news/uk/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/internal/travel/mixed</item>
-        <item>http://feeds.foxnews.com/foxnews/opinion</item>
         <item>http://feeds.foxnews.com/foxnews/politics</item>
         <item>http://feeds.foxnews.com/foxnews/science</item>
-        <item>http://feeds.foxnews.com/foxnews/section/lifestyle</item>
         <item>http://feeds.foxnews.com/foxnews/sports</item>
         <item>http://feeds.foxnews.com/foxnews/tech</item>
-        <item>http://feeds.mashable.com/mashable/business</item>
-        <item>http://feeds.mashable.com/mashable/entertainment</item>
-        <item>http://feeds.mashable.com/mashable/socialmedia</item>
-        <item>http://feeds.mashable.com/mashable/tech</item>
-        <item>http://feeds.reuters.com/news/artsculture</item>
-        <item>http://feeds.reuters.com/news/economy</item>
-        <item>http://feeds.reuters.com/news/reutersmedia</item>
-        <item>http://feeds.reuters.com/news/wealth</item>
-        <item>http://feeds.reuters.com/reuters/businessNews</item>
-        <item>http://feeds.reuters.com/reuters/entertainment</item>
         <item>http://feeds.reuters.com/reuters/environment</item>
         <item>http://feeds.reuters.com/reuters/financialsNews</item>
-        <item>http://feeds.reuters.com/reuters/healthNews</item>
-        <item>http://feeds.reuters.com/reuters/hotStocksNews</item>
-        <item>http://feeds.reuters.com/reuters/lifestyle</item>
-        <item>http://feeds.reuters.com/reuters/oddlyEnoughNews</item>
-        <item>http://feeds.reuters.com/Reuters/PoliticsNews</item>
-        <item>http://feeds.reuters.com/reuters/scienceNews</item>
-        <item>http://feeds.reuters.com/reuters/sportsNews</item>
-        <item>http://feeds.reuters.com/reuters/technologyNews</item>
-        <item>http://feeds.reuters.com/reuters/technologysectorNews</item>
-        <item>http://feeds.reuters.com/reuters/UShealthcareNews</item>
         <item>http://feeds.reuters.com/reuters/worldNews</item>
-        <item>http://rss.cnn.com/rss/edition_entertainment.rss</item>
-        <item>http://rss.cnn.com/rss/edition_space.rss</item>
-        <item>http://rss.cnn.com/rss/edition_sport.rss</item>
-        <item>http://rss.cnn.com/rss/edition_technology.rss</item>
-        <item>http://rss.cnn.com/rss/money_news_international.rss</item>
-        <item>http://rss.cnn.com/rss/si_topstories.rss</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Books.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Business.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Dance.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Economy.xml</item>
         <item>http://rss.nytimes.com/services/xml/rss/nyt/Environment.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/FashionandStyle.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/MediaandAdvertising.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Movies.xml</item>
         <item>http://rss.nytimes.com/services/xml/rss/nyt/Music.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Science.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Sports.xml</item>
-        <item>http://rss.nytimes.com/services/xml/rss/nyt/Technology.xml</item>
         <item>http://rss.nytimes.com/services/xml/rss/nyt/Travel.xml</item>
-        <item>http://www.cnet.com/rss/news/</item>
-        <item>http://www.dailymail.co.uk/health/index.rss</item>
-        <item>http://www.dailymail.co.uk/money/index.rss</item>
-        <item>http://www.dailymail.co.uk/sciencetech/index.rss</item>
-        <item>http://www.dailymail.co.uk/sport/index.rss</item>
-        <item>http://www.dailymail.co.uk/tvshowbiz/index.rss</item>
-        <item>http://www.thesundaily.my/rss/business</item>
-        <item>http://www.thesundaily.my/rss/lifestyle/food</item>
-        <item>http://www.thesundaily.my/rss/lifestyle/health</item>
-        <item>http://www.thesundaily.my/rss/lifestyle/tech</item>
-        <item>http://www.thesundaily.my/rss/lifestyle/travel</item>
-        <item>http://www.thesundaily.my/rss/media-marketing</item>
-        <item>http://www.thesundaily.my/rss/opinion</item>
-        <item>http://www.thesundaily.my/rss/showbiz</item>
-        <item>http://www.thesundaily.my/rss/sports</item>
-        <item>http://www.thesundaily.my/rss/style</item>
-        <item>http://www.washingtontimes.com/rss/headlines/culture/autos/</item>
-        <item>http://www.washingtontimes.com/rss/headlines/culture/entertainment/</item>
-        <item>http://www.washingtontimes.com/rss/headlines/culture/health/</item>
-        <item>http://www.washingtontimes.com/rss/headlines/culture/travel/</item>
-        <item>http://www.washingtontimes.com/rss/headlines/news/politics/</item>
-        <item>http://www.washingtontimes.com/rss/headlines/opinion/</item>
-        <item>http://www.washingtontimes.com/rss/headlines/sports/</item>
     </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc747fc..9129913 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,4 +71,15 @@
     <string name="walkthrough_text_4">Image 4 resource.</string>
     <string name="walkthrough_text_5">Image 5 resource.</string>
     <string name="walkthrough_text_button">Skip tutorial</string>
+    <string name="navigation_drawer_all_feeds">All feeds</string>
+    <string name="navigation_drawer_start">START</string>
+    <string name="navigation_drawer_edit_filters">FILTERS</string>
+    <string name="navigation_drawer_edit_feeds">FEEDS</string>
+    <string name="article_feedback_saved">Feedback saved.</string>
+    <string name="feeds_activity_add_feed">Add feed</string>
+    <string name="feeds_activity_url">URL:</string>
+    <string name="filter_settings_title">Title</string>
+    <string name="filter_settings_new_title">New title:</string>
+    <string name="menu_article_share">Share</string>
+    <string name="navigation_drawer_edit_text">(EDIT)</string>
 </resources>