From 59798f699b4e0e8004a9cbef4bc43cd04cb9f6aa Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 26 Apr 2013 13:50:18 +0400
Subject: [PATCH] remove values-v15, not needed improve visibility of unread
 headlines

---
 res/values-v11/style.xml |  16 ++++---
 res/values-v15/style.xml | 101 ---------------------------------------
 res/values/style.xml     |   2 +-
 3 files changed, 11 insertions(+), 108 deletions(-)
 delete mode 100644 res/values-v15/style.xml

diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index 9fab6395..fe0b99c6 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/style.xml
@@ -1,4 +1,3 @@
-<!-- Note: the only difference between this and v15 style is Holo.Light base theme (Holo.Light.DarkActionBar does not exist in HC and causes breakage) -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 	<style name="LightTheme" parent="Theme.Sherlock.Light.DarkActionBar">
 	    <item name="smallScreenBackground">@android:color/transparent</item>
@@ -10,7 +9,7 @@
 		<item name="articleBackground">#ffffff</item>
 		<item name="headlineSelectedBackground">@drawable/headline_row_selected_light</item>
 		<item name="headlineSelectedBackgroundSolid">@color/headline_row_selected_light</item>
-		<item name="headlineUnreadBackground">@android:color/transparent</item>
+		<item name="headlineUnreadBackground">#ffffff</item>
 		<item name="headlineNormalBackground">@android:color/transparent</item>
 		<item name="feedsSelectedBackground">@drawable/headline_row_selected_light</item>
 		<item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_light</item>
@@ -39,8 +38,13 @@
 		<item name="unreadCounterColor">#C46262</item>
 		<item name="feedlistTextColor">#35281C</item>
 		<item name="linkColor">#C46262</item>
+        <!--  <item name="android:actionBarStyle">@style/ActionBarSepia</item> -->
 	</style>
-
+	
+	<!--  <style name="ActionBarSepia" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+    	<item name="android:background">#351d11</item>
+	</style> -->
+	
 	<style name="DarkTheme" parent="Theme.Sherlock">
 	    <item name="smallScreenBackground">@android:color/transparent</item>
 		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
@@ -51,7 +55,7 @@
 		<item name="articleBackground">@android:color/black</item>
 		<item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item>
 		<item name="headlineSelectedBackgroundSolid">@color/ics_cyan</item>
-		<item name="headlineUnreadBackground">@android:color/transparent</item>
+		<item name="headlineUnreadBackground">#202020</item>
 		<item name="headlineNormalBackground">@android:color/transparent</item>
 		<item name="feedsSelectedBackground">@drawable/headline_row_selected_dark</item>
 		<item name="feedsSelectedBackgroundSolid">@color/ics_cyan</item>
@@ -66,7 +70,7 @@
         <item name="linkColor">@color/ics_cyan</item>
         <item name="loadingBackground">@android:color/black</item>
 	</style>
-
+	
 	<style name="DarkGrayTheme" parent="DarkTheme">
 	    <item name="smallScreenBackground">@color/feeds_dark_gray</item>
 		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
@@ -83,8 +87,8 @@
         <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>
-        <item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
         <item name="actionBarStyle">@style/ActionBarDarkGray</item>
+        <item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
 	</style>
 	
 	<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
diff --git a/res/values-v15/style.xml b/res/values-v15/style.xml
deleted file mode 100644
index 28e2e80f..00000000
--- a/res/values-v15/style.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-	<style name="LightTheme" parent="Theme.Sherlock.Light.DarkActionBar">
-	    <item name="smallScreenBackground">@android:color/transparent</item>
-		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
-		<item name="feedlistBackground"><!--  #e0e0e0 -->@drawable/shadow_feeds</item>
-		<item name="unreadCounterColor">#0000ff</item>
-		<item name="headlinesBackground"><!--  #f0f0f0 -->@drawable/shadow_headlines</item>
-		<item name="headlinesBackgroundSolid">#f0f0f0</item>
-		<item name="articleBackground">#ffffff</item>
-		<item name="headlineSelectedBackground">@drawable/headline_row_selected_light</item>
-		<item name="headlineSelectedBackgroundSolid">@color/headline_row_selected_light</item>
-		<item name="headlineUnreadBackground">@android:color/transparent</item>
-		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">@drawable/headline_row_selected_light</item>
-		<item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_light</item>
-		<item name="feedlistTextColor">@android:color/primary_text_light</item>
-		<item name="feedlistSelectedTextColor">#ffffff</item>
-    	<item name="headlineTextColor">@android:color/secondary_text_light</item>
-    	<item name="headlineUnreadTextColor">@android:color/primary_text_light</item>
-    	<item name="headlineSelectedTextColor">#ffffff</item>
-    	<item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
-    	<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-    	<item name="linkColor">#30B0E0</item>
-    	<item name="loadingBackground">@android:color/white</item>
-	</style>
-
-	<style name="SepiaTheme" parent="LightTheme">
-	    <item name="smallScreenBackground">@drawable/paper_sepia</item>
-		<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="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item>
-		<item name="headlineSelectedBackgroundSolid">@color/headline_row_selected_sepia</item>
-		<item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item>
-		<item name="feedsSelectedBackgroundSolid">@color/headline_row_selected_sepia</item>
-		<item name="articleBackground">@drawable/paper_sepia</item>
-		<item name="unreadCounterColor">#C46262</item>
-		<item name="feedlistTextColor">#35281C</item>
-		<item name="linkColor">#C46262</item>
-        <!--  <item name="android:actionBarStyle">@style/ActionBarSepia</item> -->
-	</style>
-	
-	<!--  <style name="ActionBarSepia" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-    	<item name="android:background">#351d11</item>
-	</style> -->
-	
-	<style name="DarkTheme" parent="Theme.Sherlock">
-	    <item name="smallScreenBackground">@android:color/transparent</item>
-		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-		<item name="feedlistBackground">@drawable/ics_divider_vertical</item>
-		<item name="unreadCounterColor">@color/ics_cyan</item>
-		<item name="headlinesBackground">@drawable/headlines_dark</item>
-		<item name="headlinesBackgroundSolid">@drawable/headlines_dark</item>
-		<item name="articleBackground">@android:color/black</item>
-		<item name="headlineSelectedBackground">@drawable/headline_row_selected_dark</item>
-		<item name="headlineSelectedBackgroundSolid">@color/ics_cyan</item>
-		<item name="headlineUnreadBackground">@android:color/transparent</item>
-		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">@drawable/headline_row_selected_dark</item>
-		<item name="feedsSelectedBackgroundSolid">@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>
-        <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
-        <item name="headlineSelectedTextColor">@android:color/white</item>
-        <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
-        <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
-        <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
-        <item name="linkColor">@color/ics_cyan</item>
-        <item name="loadingBackground">@android:color/black</item>
-	</style>
-	
-	<style name="DarkGrayTheme" parent="DarkTheme">
-	    <item name="smallScreenBackground">@color/feeds_dark_gray</item>
-		<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-		<item name="feedlistBackground">@drawable/shadow_feeds_gray</item>
-		<item name="unreadCounterColor">#a0a0a0</item>
-		<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="headlineSelectedBackgroundSolid">@color/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="feedsSelectedBackgroundSolid">@color/headline_row_selected_gray</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>
-        <item name="actionBarStyle">@style/ActionBarDarkGray</item>
-        <item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
-	</style>
-	
-	<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
-    	<item name="android:background">#232527</item>
-	</style>
-	
-	<style name="DarkDialogTheme" parent="android:Theme.Holo.Dialog">
-    </style>
-	
-</resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index 21a3edaa..7dff3ecc 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -51,7 +51,7 @@
         <item name="articleBackground">@android:color/transparent</item>
         <item name="headlineSelectedBackground">#F5B800</item>
         <item name="headlineSelectedBackgroundSolid">#F5B800</item>
-        <item name="headlineUnreadBackground">#303030</item>
+        <item name="headlineUnreadBackground">#202020</item>
         <item name="headlineNormalBackground">@android:color/transparent</item>
         <item name="feedsSelectedBackground">#F5B800</item>
         <item name="feedsSelectedBackgroundSolid">#F5B800</item>