Merge

2 files changed, 11 insertions, 66 deletions

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>