From 72666a4f303d578c03c05ec5fbecd972b9113441 Mon Sep 17 00:00:00 2001
From: Mark Anderson <manderson23@gmail.com>
Date: Wed, 14 May 2014 21:07:49 +0100
Subject: [PATCH] Background and font colours for all stories/shared stories
 and saved stories selectors

---
 .../NewsBlur/res/layout/fragment_intelligenceselector.xml | 2 +-
 .../NewsBlur/res/layout/row_all_shared_stories.xml        | 4 ++--
 clients/android/NewsBlur/res/layout/row_all_stories.xml   | 4 ++--
 clients/android/NewsBlur/res/layout/row_saved_stories.xml | 4 ++--
 clients/android/NewsBlur/res/values/attrs.xml             | 1 +
 clients/android/NewsBlur/res/values/styles.xml            | 8 ++++++++
 clients/android/NewsBlur/res/values/theme.xml             | 2 ++
 7 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/clients/android/NewsBlur/res/layout/fragment_intelligenceselector.xml b/clients/android/NewsBlur/res/layout/fragment_intelligenceselector.xml
index 9f4d71bbb..7125e2c00 100644
--- a/clients/android/NewsBlur/res/layout/fragment_intelligenceselector.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_intelligenceselector.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/actionbar_background"
+    style="?actionbarBackground"
     android:gravity="center"
     android:orientation="horizontal" >
 
diff --git a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
index e4eb9ed1d..97c5927cf 100644
--- a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_folder_background" >
+    style="?selectorFolderBackground" >
 
     <ImageView
         android:id="@+id/row_everything_icon"
@@ -80,7 +80,7 @@
         android:paddingBottom="10dp"
         android:paddingTop="10dp"
         android:text="@string/all_shared_stories"
-        android:textColor="@color/folder_text"
+        style="?selectorRowFeedName"
         android:textSize="14dp"
         android:textStyle="bold" />
 
diff --git a/clients/android/NewsBlur/res/layout/row_all_stories.xml b/clients/android/NewsBlur/res/layout/row_all_stories.xml
index 92f503caf..1c5d1dd90 100644
--- a/clients/android/NewsBlur/res/layout/row_all_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_stories.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_folder_background" >
+    style="?selectorFolderBackground" >
 
     <ImageView
         android:id="@+id/row_everything_icon"
@@ -24,7 +24,7 @@
         android:paddingBottom="10dp"
         android:paddingTop="10dp"
         android:text="@string/all_stories_row_title"
-        android:textColor="@color/folder_text"
+        style="?selectorRowFeedName"
         android:textSize="14dp"
         android:textStyle="bold" />
 
diff --git a/clients/android/NewsBlur/res/layout/row_saved_stories.xml b/clients/android/NewsBlur/res/layout/row_saved_stories.xml
index 13bb8c366..6f444cff3 100644
--- a/clients/android/NewsBlur/res/layout/row_saved_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_saved_stories.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_folder_background" >
+    style="?selectorFolderBackground" >
 
     <ImageView
         android:id="@+id/row_saved_icon"
@@ -24,7 +24,7 @@
         android:paddingBottom="9dp"
         android:paddingTop="9dp"
         android:text="@string/saved_stories_row_title"
-        android:textColor="@color/folder_text"
+        style="?selectorRowFeedName"
         android:textSize="13dp"
         android:textStyle="bold" />
 
diff --git a/clients/android/NewsBlur/res/values/attrs.xml b/clients/android/NewsBlur/res/values/attrs.xml
index 3664ced3c..c85aa61c3 100644
--- a/clients/android/NewsBlur/res/values/attrs.xml
+++ b/clients/android/NewsBlur/res/values/attrs.xml
@@ -6,6 +6,7 @@
     <attr name="selectorFeedBackground" format="string" />
     <attr name="selectorRowFolderName" format="string" />
     <attr name="selectorRowFeedName" format="string" />
+    <attr name="actionbarBackground" format="string" />
     
     <declare-styleable name="FlowLayout">
         <attr name="flow" />
diff --git a/clients/android/NewsBlur/res/values/styles.xml b/clients/android/NewsBlur/res/values/styles.xml
index 674398d7c..c3ea9c5b5 100644
--- a/clients/android/NewsBlur/res/values/styles.xml
+++ b/clients/android/NewsBlur/res/values/styles.xml
@@ -57,4 +57,12 @@
     <style name="selectorRowFeedName.dark">
         <item name="android:textColor">@color/dark_folder_text</item>
     </style>
+
+    <style name="actionbarBackground">
+        <item name="android:background">@drawable/actionbar_background</item>
+    </style>
+
+    <style name="actionbarBackground.dark">
+        <item name="android:background">@drawable/dark_actionbar_background</item>
+    </style>
 </resources>
diff --git a/clients/android/NewsBlur/res/values/theme.xml b/clients/android/NewsBlur/res/values/theme.xml
index 032fa823f..ef785072e 100644
--- a/clients/android/NewsBlur/res/values/theme.xml
+++ b/clients/android/NewsBlur/res/values/theme.xml
@@ -7,6 +7,7 @@
         <item name="selectorFeedBackground">@style/selectorFeedBackground</item>
         <item name="selectorRowFolderName">@style/selectorRowFolderName</item>
         <item name="selectorRowFeedName">@style/selectorRowFeedName</item>
+        <item name="actionbarBackground">@style/actionbarBackground</item>
 	</style>
 
     <style name="NewsBlurDarkTheme" parent="@android:style/Theme.Holo" >
@@ -16,5 +17,6 @@
         <item name="selectorFeedBackground">@style/selectorFeedBackground.dark</item>
         <item name="selectorRowFolderName">@style/selectorRowFolderName.dark</item>
         <item name="selectorRowFeedName">@style/selectorRowFeedName.dark</item>
+        <item name="actionbarBackground">@style/actionbarBackground.dark</item>
     </style>
 </resources>