From 6a397ef34d3f0ff54867f1edccab340b72b191ce Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 8 Sep 2013 20:33:46 +0400
Subject: make ui more ~cards~ like, simplify some drawables

---
 res/values/resources.xml |  8 +-------
 res/values/style.xml     | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'res/values')

diff --git a/res/values/resources.xml b/res/values/resources.xml
index 134f7960..f32ec5b7 100644
--- a/res/values/resources.xml
+++ b/res/values/resources.xml
@@ -5,16 +5,10 @@
     <color name="headlines_light">#ffffff</color>
     <color name="headlines_sepia">#EAE2DC</color>
     <color name="feeds_sepia">#D3C6BA</color>
-    <color name="headline_row_selected_light">#88b0f0</color>
-    <color name="headline_row_selected_sepia">#E5B0A0</color>
     <color name="ics_cyan">#33b5e5</color>
-    <color name="feeds_dark_gray">#1c1d1e</color>
-	<color name="headline_row_selected_gray">#22667f</color>
-	<color name="headline_row_unread_gray">#383c42</color>
-	<color name="headline_row_unread_light">#f0f0f0</color>
-	<color name="headline_row_unread_sepia">#F2EAE8</color>
 	<color name="unread_counter_background">#88b0f0</color>
 	<color name="unread_counter_background_dark">#303030</color>
 	<color name="unread_counter_background_sepia">#C46262</color>
 	<color name="unread_counter_background_selected_light">#4684ff</color>
+	<color name="feeds_dark_gray">#1c1d1e</color>
 </resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index d1123515..f46cdf73 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -7,10 +7,10 @@
 		<item name="headlinesBackground"><!--  #f0f0f0 -->@drawable/shadow_headlines</item>
 		<item name="headlinesBackgroundSolid">#f0f0f0</item>
 		<item name="articleBackground">@android:color/transparent</item>
-		<item name="headlineSelectedBackground">@drawable/headline_row_selected_light</item>
-		<item name="headlineUnreadBackground">@drawable/headline_row_unread_light</item>
-		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">@drawable/headline_row_selected_light</item>
+		<item name="headlineSelectedBackground">#88b0f0</item>
+		<item name="headlineUnreadBackground">#ffffff</item>
+		<item name="headlineNormalBackground">#f0f0f0</item>
+		<item name="feedsSelectedBackground">#88b0f0</item>
 		<item name="feedlistTextColor">@android:color/primary_text_light</item>
 		<item name="feedlistSelectedTextColor">#ffffff</item>
     	<item name="headlineTextColor">@android:color/secondary_text_light</item>
@@ -32,9 +32,9 @@
 		<item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
 		<item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
 		<item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
-		<item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 -->
-		<item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item>
-		<item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item>
+		<item name="headlineUnreadBackground">#f2eae8</item> <!-- #F2EAE8 -->
+		<item name="headlineSelectedBackground">#E5B0A0</item>
+		<item name="feedsSelectedBackground">#E5B0A0</item>
 		<item name="articleBackground">@drawable/paper_sepia</item>
 		<item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
 		<item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item>
@@ -51,10 +51,10 @@
 		<item name="headlinesBackground">@android:color/black</item>
 		<item name="headlinesBackgroundSolid">@android:color/black</item>
 		<item name="articleBackground">@android:color/black</item>
-		<item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item>
+		<item name="headlineSelectedBackground">@color/ics_cyan</item>
 		<item name="headlineUnreadBackground">#202020</item>
-		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">@drawable/headline_row_selected_dark</item>
+		<item name="headlineNormalBackground">#101010</item>
+		<item name="feedsSelectedBackground">@color/ics_cyan</item>
         <item name="feedlistTextColor">@android:color/primary_text_dark</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
         <item name="headlineTextColor">@android:color/secondary_text_dark</item>
@@ -78,9 +78,9 @@
 		<item name="headlinesBackground">@drawable/shadow_headlines_gray</item>
 		<item name="headlinesBackgroundSolid">@color/feeds_dark_gray</item>
 		<item name="articleBackground">@color/feeds_dark_gray</item>
-		<item name="headlineSelectedBackground">@drawable/headline_row_selected_gray</item>
-		<item name="headlineUnreadBackground">@drawable/headline_row_unread_gray</item>
-		<item name="feedsSelectedBackground">@drawable/headline_row_selected_gray</item>
+		<item name="headlineSelectedBackground">#22667f</item>
+		<item name="headlineUnreadBackground">#383c42</item>
+		<item name="feedsSelectedBackground">#22667f</item>
         <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
         <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
         <item name="headlineTextColor">@android:color/secondary_text_dark</item>
-- 
cgit v1.2.3-54-g00ecf