Merge branch 'master' of github:camilstaps/RSSin

25 files changed, 21 insertions, 9 deletions

diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..694179b
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..238cfd6
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png
diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000..b09a692
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png
diff --git a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..3856041
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..d3cec05
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png
diff --git a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000..e944fd7
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..67bb598
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..193185f
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000..22a8783
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..0fdced8
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..9cb0348
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000..a35b3cd
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
new file mode 100644
index 0000000..d64c22e
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png
new file mode 100644
index 0000000..623d147
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
new file mode 100644
index 0000000..e351c7b
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
diff --git a/app/src/main/res/layout/activity_filter.xml b/app/src/main/res/layout/activity_filter.xml
index 7475330..6318a31 100755
--- a/app/src/main/res/layout/activity_filter.xml
+++ b/app/src/main/res/layout/activity_filter.xml
@@ -3,7 +3,7 @@
 xmlns:tools="http://schemas.android.com/tools"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
-tools:context="org.rssin.android.FilterActivity">
+tools:context="org.rssin.android.HomeScreenActivity">
     <!-- A RecyclerView with some commonly used attributes -->
 
     <android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_filters.xml b/app/src/main/res/layout/fragment_filters.xml
index c948344..fad91ad 100644..100755
--- a/app/src/main/res/layout/fragment_filters.xml
+++ b/app/src/main/res/layout/fragment_filters.xml
@@ -7,7 +7,7 @@
     android:paddingRight="0dp"
     android:paddingTop="0dp"
     android:paddingBottom="0dp"
-    tools:context="org.rssin.android.FiltersActivity">
+    tools:context="org.rssin.android.HomeScreenActivity">
 
     <ListView
         android:id="@+id/filters_list"
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
index 6b9ec1d..caa58c8 100755
--- a/app/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -1,7 +1,8 @@
 <ListView xmlns:android="http://schemas.android.com/apk/res/android"

     xmlns:tools="http://schemas.android.com/tools"

-    android:layout_width="match_parent"

-    android:layout_height="match_parent"

+    android:layout_width="wrap_content"

+    android:layout_height="wrap_content"

     android:choiceMode="singleChoice"

     android:divider="@android:color/transparent" android:dividerHeight="0dp"

-    android:background="#cccc" tools:context="org.rssin.android.NavigationDrawerFragment" />
\ No newline at end of file
+    android:background="#121212"

+    tools:context="org.rssin.android.NavigationDrawerFragment" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml
index 32a8837..6555bb3 100755
--- a/app/src/main/res/layout/item_navigation_drawer.xml
+++ b/app/src/main/res/layout/item_navigation_drawer.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical"

 

     android:layout_marginTop="0dp"

-    android:background="?android:attr/activatedBackgroundIndicator"

+    android:background="#121212"

     >

 

     <LinearLayout

@@ -23,6 +23,7 @@
             android:layout_height="wrap_content"

             android:layout_margin="10dp"

             android:textAppearance="?android:attr/textAppearanceMedium"

+            android:textColor="#FFFFFF"

             />

     </LinearLayout>

 

diff --git a/app/src/main/res/layout/separator_navigation_drawer.xml b/app/src/main/res/layout/separator_navigation_drawer.xml
index 856093c..81a9d0a 100755
--- a/app/src/main/res/layout/separator_navigation_drawer.xml
+++ b/app/src/main/res/layout/separator_navigation_drawer.xml
@@ -7,7 +7,7 @@ android:layout_height="wrap_content"
 android:layout_alignParentLeft="true"

 android:orientation="vertical"

 android:layout_marginTop="0dp"

-android:background="?android:attr/activatedBackgroundIndicator"

+android:background="#252525"

     >

 

     <LinearLayout

@@ -22,6 +22,7 @@ android:background="?android:attr/activatedBackgroundIndicator"
             android:layout_height="wrap_content"

             android:layout_margin="4dp"

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

+            android:textColor="#FFFFFF"

             />

     </LinearLayout>

 

diff --git a/app/src/main/res/menu/menu_article.xml b/app/src/main/res/menu/menu_article.xml
index c0f4281..064831b 100755
--- a/app/src/main/res/menu/menu_article.xml
+++ b/app/src/main/res/menu/menu_article.xml
@@ -16,4 +16,11 @@
         android:orderInCategory="100"
         android:icon="@drawable/ic_action_action_thumb_down"
         app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/article_action_share"
+        android:title="Share"
+        android:orderInCategory="100"
+        android:icon="@drawable/ic_share_white_24dp"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/menu_feeds.xml b/app/src/main/res/menu/menu_feeds.xml
index 20a4fea..b3c3044 100644
--- a/app/src/main/res/menu/menu_feeds.xml
+++ b/app/src/main/res/menu/menu_feeds.xml
@@ -7,6 +7,7 @@
     <item
         android:id="@+id/feeds_action_add"
         android:title="@string/feeds_action_add"
+        android:icon="@drawable/ic_add_white_24dp"
         android:orderInCategory="100"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/menu_filter.xml
index aaf1ca1..86cfe5d 100644..100755
--- a/app/src/main/res/menu/menu_filter.xml
+++ b/app/src/main/res/menu/menu_filter.xml
@@ -1,6 +1,6 @@
 <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="org.rssin.android.FilterActivity">
+    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" />
 </menu>
diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml
index 5973bd0..b91df52 100644
--- a/app/src/main/res/menu/menu_filters.xml
+++ b/app/src/main/res/menu/menu_filters.xml
@@ -8,6 +8,7 @@
     <item
         android:id="@+id/filters_action_add"
         android:title="@string/filters_action_add"
+        android:icon="@drawable/ic_add_white_24dp"
         android:orderInCategory="100"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 550bc2a..1a279c7 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,7 +50,7 @@
 
     <string name="article_action_dislike">Dislike</string>
     <string name="article_action_like">Like</string>
-    <string name="title_activity_home_screen">HomeScreenActivity</string>
+    <string name="title_activity_home_screen">RSSin</string>
 
     <string name="title_section1">Section 1</string>
     <string name="title_section2">Section 2</string>