From 905337e2b767ba21d184edf23dc378fbab937fab Mon Sep 17 00:00:00 2001
From: Mark Anderson <manderson23@gmail.com>
Date: Wed, 14 May 2014 20:50:04 +0100
Subject: [PATCH] Folder/feed text and highlights on the main view

---
 .../drawable/dark_feed_background_highlight.xml | 17 +++++++++++++++++
 .../dark_folder_background_highlight.xml        |  9 +++++++++
 .../drawable/dark_selector_feed_background.xml  |  2 +-
 .../dark_selector_folder_background.xml         |  2 +-
 .../android/NewsBlur/res/layout/row_feed.xml    |  2 +-
 .../res/layout/row_folder_collapsed.xml         |  3 +--
 clients/android/NewsBlur/res/values/attrs.xml   |  2 ++
 clients/android/NewsBlur/res/values/colors.xml  |  5 +++++
 clients/android/NewsBlur/res/values/styles.xml  | 17 +++++++++++++++++
 clients/android/NewsBlur/res/values/theme.xml   |  4 ++++
 10 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 clients/android/NewsBlur/res/drawable/dark_feed_background_highlight.xml
 create mode 100644 clients/android/NewsBlur/res/drawable/dark_folder_background_highlight.xml

diff --git a/clients/android/NewsBlur/res/drawable/dark_feed_background_highlight.xml b/clients/android/NewsBlur/res/drawable/dark_feed_background_highlight.xml
new file mode 100644
index 000000000..27084309e
--- /dev/null
+++ b/clients/android/NewsBlur/res/drawable/dark_feed_background_highlight.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+                android:shape="rectangle">
+            <solid android:color="@color/dark_feed_background_selected_start"/>
+        </shape>
+    </item>
+    <item
+            android:top="0.5dp"
+            android:bottom="0.5dp">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+               android:shape="rectangle">
+            <solid android:color="@color/dark_feed_background_selected_end"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/clients/android/NewsBlur/res/drawable/dark_folder_background_highlight.xml b/clients/android/NewsBlur/res/drawable/dark_folder_background_highlight.xml
new file mode 100644
index 000000000..fccfd3ecb
--- /dev/null
+++ b/clients/android/NewsBlur/res/drawable/dark_folder_background_highlight.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <gradient
+            android:angle="90"
+            android:type="linear"
+            android:startColor="@color/dark_folder_background_selected_start"
+            android:endColor="@color/dark_folder_background_selected_end"/>
+</shape>
diff --git a/clients/android/NewsBlur/res/drawable/dark_selector_feed_background.xml b/clients/android/NewsBlur/res/drawable/dark_selector_feed_background.xml
index a4d04b9c6..15736c046 100644
--- a/clients/android/NewsBlur/res/drawable/dark_selector_feed_background.xml
+++ b/clients/android/NewsBlur/res/drawable/dark_selector_feed_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/feed_background_highlight" />
+    <item android:state_pressed="true" android:drawable="@drawable/dark_feed_background_highlight" />
     <item android:drawable="@drawable/dark_feed_background_default" />
 </selector>
diff --git a/clients/android/NewsBlur/res/drawable/dark_selector_folder_background.xml b/clients/android/NewsBlur/res/drawable/dark_selector_folder_background.xml
index a3bfb4b1e..0796d19d6 100644
--- a/clients/android/NewsBlur/res/drawable/dark_selector_folder_background.xml
+++ b/clients/android/NewsBlur/res/drawable/dark_selector_folder_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/folder_background_highlight" />
+    <item android:state_pressed="true" android:drawable="@drawable/dark_folder_background_highlight" />
     <item android:drawable="@drawable/dark_folder_background_default" />
 </selector>
diff --git a/clients/android/NewsBlur/res/layout/row_feed.xml b/clients/android/NewsBlur/res/layout/row_feed.xml
index 37e39217a..12d8a90df 100644
--- a/clients/android/NewsBlur/res/layout/row_feed.xml
+++ b/clients/android/NewsBlur/res/layout/row_feed.xml
@@ -68,7 +68,7 @@
         android:layout_toRightOf="@id/row_feedfavicon"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textColor="@color/folder_text"
+        style="?selectorRowFeedName"
         android:textSize="14sp"
         android:textStyle="bold" />
 
diff --git a/clients/android/NewsBlur/res/layout/row_folder_collapsed.xml b/clients/android/NewsBlur/res/layout/row_folder_collapsed.xml
index 56773b49a..f042808bf 100644
--- a/clients/android/NewsBlur/res/layout/row_folder_collapsed.xml
+++ b/clients/android/NewsBlur/res/layout/row_folder_collapsed.xml
@@ -78,12 +78,11 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@id/row_folder_icon"
         android:layout_toLeftOf="@+id/row_foldersums"
-        android:textColor="@color/folder_text"
+        style="?selectorRowFolderName"
         android:paddingBottom="8dp"
     	android:paddingTop="8dp"
         android:textSize="13sp"
         android:textStyle="bold"
-        android:shadowColor="@color/white"
         android:shadowDy="1"
         android:shadowRadius="1"
         android:maxLines="1"
diff --git a/clients/android/NewsBlur/res/values/attrs.xml b/clients/android/NewsBlur/res/values/attrs.xml
index 33a01a905..3664ced3c 100644
--- a/clients/android/NewsBlur/res/values/attrs.xml
+++ b/clients/android/NewsBlur/res/values/attrs.xml
@@ -4,6 +4,8 @@
     <attr name="defaultImageSize" format="integer" />
     <attr name="selectorFolderBackground" format="string" />
     <attr name="selectorFeedBackground" format="string" />
+    <attr name="selectorRowFolderName" format="string" />
+    <attr name="selectorRowFeedName" format="string" />
     
     <declare-styleable name="FlowLayout">
         <attr name="flow" />
diff --git a/clients/android/NewsBlur/res/values/colors.xml b/clients/android/NewsBlur/res/values/colors.xml
index c3e38d045..6ba7a966f 100644
--- a/clients/android/NewsBlur/res/values/colors.xml
+++ b/clients/android/NewsBlur/res/values/colors.xml
@@ -13,7 +13,10 @@
     <color name="dark_folder_background_start">#7000</color>
     <color name="folder_background_selected_end">#D9DBD4</color>
     <color name="folder_background_selected_start">#CDD0C7</color>
+    <color name="dark_folder_background_selected_end">#4C4C4C</color>
+    <color name="dark_folder_background_selected_start">#1A1A1A</color>
     <color name="folder_text">#4C4C4C</color>
+    <color name="dark_folder_text">#FDFDFD</color>
     <color name="folder_border_top">#FDFDFD</color>
     <color name="folder_border_bottom">#B7BBAA</color>
     <color name="feed_background">#F7F8F5</color>
@@ -22,6 +25,8 @@
     <color name="feed_background_start">#505050</color>
     <color name="feed_background_selected_end">#FFFFD2</color>
     <color name="feed_background_selected_start">#E3D0AE</color>
+    <color name="dark_feed_background_selected_end">#4C4C4C</color>
+    <color name="dark_feed_background_selected_start">#1A1A1A</color>
     <color name="story_background">#F7F8F5</color>
     <color name="story_background_end">#FFFDEF</color>
     <color name="story_background_start">#DFDDCF</color>
diff --git a/clients/android/NewsBlur/res/values/styles.xml b/clients/android/NewsBlur/res/values/styles.xml
index e96313f55..674398d7c 100644
--- a/clients/android/NewsBlur/res/values/styles.xml
+++ b/clients/android/NewsBlur/res/values/styles.xml
@@ -40,4 +40,21 @@
         <item name="android:background">@drawable/dark_selector_feed_background</item>
     </style>
 
+    <style name="selectorRowFolderName">
+        <item name="android:textColor">@color/folder_text</item>
+        <item name="android:shadowColor">@color/white</item>
+    </style>
+
+    <style name="selectorRowFolderName.dark">
+        <item name="android:textColor">@color/dark_folder_text</item>
+        <item name="android:shadowColor">@color/white</item>
+    </style>
+
+    <style name="selectorRowFeedName">
+        <item name="android:textColor">@color/folder_text</item>
+    </style>
+
+    <style name="selectorRowFeedName.dark">
+        <item name="android:textColor">@color/dark_folder_text</item>
+    </style>
 </resources>
diff --git a/clients/android/NewsBlur/res/values/theme.xml b/clients/android/NewsBlur/res/values/theme.xml
index c3d62be94..032fa823f 100644
--- a/clients/android/NewsBlur/res/values/theme.xml
+++ b/clients/android/NewsBlur/res/values/theme.xml
@@ -5,6 +5,8 @@
         <item name="android:expandableListViewStyle">@style/expandableListView</item>
         <item name="selectorFolderBackground">@style/selectorFolderBackground</item>
         <item name="selectorFeedBackground">@style/selectorFeedBackground</item>
+        <item name="selectorRowFolderName">@style/selectorRowFolderName</item>
+        <item name="selectorRowFeedName">@style/selectorRowFeedName</item>
 	</style>
 
     <style name="NewsBlurDarkTheme" parent="@android:style/Theme.Holo" >
@@ -12,5 +14,7 @@
         <item name="android:expandableListViewStyle">@style/expandableListView.dark</item>
         <item name="selectorFolderBackground">@style/selectorFolderBackground.dark</item>
         <item name="selectorFeedBackground">@style/selectorFeedBackground.dark</item>
+        <item name="selectorRowFolderName">@style/selectorRowFolderName.dark</item>
+        <item name="selectorRowFeedName">@style/selectorRowFeedName.dark</item>
     </style>
 </resources>