Merge branch 'master' of http://github.com/camilstaps/RSSin

5 files changed, 124 insertions, 6 deletions

diff --git a/app/src/main/res/layout/activity_article.xml b/app/src/main/res/layout/activity_article.xml
index b08fe38..da66067 100644
--- a/app/src/main/res/layout/activity_article.xml
+++ b/app/src/main/res/layout/activity_article.xml
@@ -2,19 +2,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="org.rssin.android.ArticleActivity">
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
             android:orientation="vertical">
 
             <TextView
diff --git a/app/src/main/res/layout/item_feeditem.xml b/app/src/main/res/layout/item_feeditem.xml
index 3927038..1ecd1c5 100755
--- a/app/src/main/res/layout/item_feeditem.xml
+++ b/app/src/main/res/layout/item_feeditem.xml
@@ -11,7 +11,7 @@
         android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="15dp"
+        android:layout_margin="8dp"
         card_view:cardElevation="6dp"
         card_view:cardCornerRadius="2dp">
 
@@ -29,6 +29,10 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/font_size_small"/>
+            <TextView android:id="@+id/feeditem_date"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/walkthrough_activity.xml b/app/src/main/res/layout/walkthrough_activity.xml
new file mode 100644
index 0000000..84a8c10
--- /dev/null
+++ b/app/src/main/res/layout/walkthrough_activity.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/screen_navigation_button" />
+
+    <!--  This TextView will not swipe when you swipe in the ViewPager -->
+
+    <TextView
+        android:id="@id/screen_navigation_button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:padding="10dip"
+        android:textSize="18sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/walkthrough_single_view.xml b/app/src/main/res/layout/walkthrough_single_view.xml
new file mode 100644
index 0000000..e8ef067
--- /dev/null
+++ b/app/src/main/res/layout/walkthrough_single_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/image_view"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/values/feeds.xml b/app/src/main/res/values/feeds.xml
new file mode 100644
index 0000000..e4ae386
--- /dev/null
+++ b/app/src/main/res/values/feeds.xml
@@ -0,0 +1,86 @@
+<?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