Merge branch 'master' of github:camilstaps/RSSin

5 files changed, 10 insertions, 7 deletions

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>