update colors to match tt-rss main better

6 files changed, 28 insertions, 7 deletions

diff --git a/res/drawable/counter_background_selected_light.xml b/res/drawable/counter_background_selected_light.xml
new file mode 100644
index 00000000..ca0c37da
--- /dev/null
+++ b/res/drawable/counter_background_selected_light.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<shape xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <solid android:color="@color/unread_counter_background_selected_light" />

+

+    <corners

+        android:bottomLeftRadius="4dp"

+        android:bottomRightRadius="4dp"

+        android:topLeftRadius="4dp"

+        android:topRightRadius="4dp" />

+

+</shape>
\ No newline at end of file
diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml
index 01714502..ecb793f1 100644
--- a/res/layout/feeds_row_selected.xml
+++ b/res/layout/feeds_row_selected.xml
@@ -38,7 +38,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginRight="6dp"
         android:layout_weight="0"
-        android:background="?attr/unreadCounterBackground"
+        android:background="?attr/unreadSelectedCounterBackground"
         android:gravity="center"
         android:paddingBottom="4dp"
         android:paddingLeft="4dp"
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml
index d69c47c7..db3cbc52 100644
--- a/res/values-v11/style.xml
+++ b/res/values-v11/style.xml
@@ -21,9 +21,10 @@
     	<item name="headlineSelectedSecondaryTextColor">#606060</item>
     	<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-    	<item name="linkColor">#30B0E0</item>
+    	<item name="linkColor">#4684ff</item>
     	<item name="loadingBackground">@android:color/white</item>
-    	<item name="unreadCounterBackground">@drawable/counter_background</item>
+    	<item name="unreadCounterBackground">@drawable/counter_background</item>    	    	
+    	<item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</item>
 	</style>
 
 	<style name="SepiaTheme" parent="LightTheme">
@@ -36,6 +37,7 @@
 		<item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item>
 		<item name="articleBackground">@drawable/paper_sepia</item>
 		<item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
+		<item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item>
 		<item name="feedlistTextColor">#35281C</item>
 		<item name="linkColor">#C46262</item>
         <!--  <item name="android:actionBarStyle">@style/ActionBarSepia</item> -->
@@ -66,6 +68,7 @@
         <item name="linkColor">@color/ics_cyan</item>
         <item name="loadingBackground">@android:color/black</item>
         <item name="unreadCounterBackground">@drawable/counter_background_dark</item>
+        <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
 	</style>
 	
 	<style name="DarkGrayTheme" parent="DarkTheme">
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0a010ceb..28c86d64 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -24,4 +24,5 @@
     <attr name="linkColor" format="reference|color" />

     <attr name="loadingBackground" format="reference|color" />

     <attr name="unreadCounterBackground" format="reference|color" />    

+    <attr name="unreadSelectedCounterBackground" format="reference|color" />

 </resources>
\ No newline at end of file
diff --git a/res/values/resources.xml b/res/values/resources.xml
index 2bb097fa..134f7960 100644
--- a/res/values/resources.xml
+++ b/res/values/resources.xml
@@ -5,7 +5,7 @@
     <color name="headlines_light">#ffffff</color>

     <color name="headlines_sepia">#EAE2DC</color>

     <color name="feeds_sepia">#D3C6BA</color>

-    <color name="headline_row_selected_light">#33b5e5</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>

@@ -16,4 +16,5 @@
 	<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>

 </resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index 4326a9f2..8f2530ec 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -21,9 +21,10 @@
     	<item name="headlineSelectedSecondaryTextColor">#606060</item>
     	<item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
         <item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
-    	<item name="linkColor">#30B0E0</item>
+    	<item name="linkColor">#4684ff</item>
     	<item name="loadingBackground">@android:color/white</item>
-    	<item name="unreadCounterBackground">@drawable/counter_background</item>
+    	<item name="unreadCounterBackground">@drawable/counter_background</item>    	    	
+    	<item name="unreadSelectedCounterBackground">@drawable/counter_background</item>
 	</style>
 
 	<style name="SepiaTheme" parent="LightTheme">
@@ -36,6 +37,7 @@
 		<item name="feedsSelectedBackground">@drawable/headline_row_selected_sepia</item>
 		<item name="articleBackground">@drawable/paper_sepia</item>
 		<item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
+		<item name="unreadSelectedCounterBackground">@drawable/counter_background_sepia</item>
 		<item name="feedlistTextColor">#35281C</item>
 		<item name="linkColor">#C46262</item>
         <!--  <item name="android:actionBarStyle">@style/ActionBarSepia</item> -->
@@ -66,12 +68,13 @@
         <item name="linkColor">@color/ics_cyan</item>
         <item name="loadingBackground">@android:color/black</item>
         <item name="unreadCounterBackground">@drawable/counter_background_dark</item>
+        <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</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="feedlistBackground">@drawable/shadow_feeds_gray</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>
@@ -84,6 +87,7 @@
         <item name="actionBarStyle">@style/ActionBarDarkGray</item>
         <item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
         <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
+        
 	</style>
 	
 	<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">