From 5e2075ee87d65afe013c567207cf3beb96e14441 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 17 Jan 2012 14:16:59 +0300
Subject: update resources for ICS (externalize several more text color
 classes)

---
 res/values/attrs.xml |  6 ++++
 res/values/style.xml | 77 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 51 insertions(+), 32 deletions(-)

(limited to 'res/values')

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 630c361f..10b06a8f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -13,4 +13,10 @@
     <attr name="headlineSeparatorUnread" format="reference|color" />
     <attr name="headlineSeparatorSelected" format="reference|color" />
     <attr name="headlineSeparatorNormal" format="reference|color" />
+    <attr name="feedlistTextColor" format="reference|color" />
+    <attr name="feedlistSelectedTextColor" format="reference|color" />
+    <attr name="headlineTextColor" format="reference|color" />
+    <attr name="headlineSelectedTextColor" format="reference|color" />
+    <attr name="headlineExcerptTextColor" format="reference|color" />
+    <attr name="headlineSelectedExcerptTextColor" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index 779b1b3c..33834026 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -1,34 +1,47 @@
 <resources>
-	<style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
-		<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
-		<item name="feedlistBackground">#fafafa</item>
-		<item name="unreadCounterColor">#0000ff</item>
-		<item name="headlinesBackground">#ffffff</item>
-		<item name="articleDivider">#96c5ff</item>
-		<item name="articleHeader">@android:color/transparent</item>		
-		<item name="headlineSelectedBackground">#fff7d5</item>
-		<item name="headlineUnreadBackground">#ffffff</item>
-		<item name="headlineNormalBackground">#f0f0f0</item>
-		<item name="feedsSelectedBackground">#96C5FF</item>
-		<item name="headlineSeparatorUnread">#96C5FF</item>
-		<item name="headlineSeparatorNormal">#909090</item>
-		<item name="headlineSeparatorSelected">#DBC981</item>
-	</style>
-	    
-	<style name="DarkTheme" parent="android:Theme.Black.NoTitleBar">
-		<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
-		<item name="feedlistBackground">#101010</item>
-		<item name="unreadCounterColor">#303030</item>
-		<item name="headlinesBackground">#000000</item>
-		<item name="articleDivider">#303060</item>
-		<item name="articleHeader">@android:color/transparent</item>
-		<item name="headlineSelectedBackground">#303060</item>
-		<item name="headlineUnreadBackground">#303030</item>
-		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">#303060</item>
-		<item name="headlineSeparatorUnread">#303060</item>
-		<item name="headlineSeparatorNormal">#303030</item>
-		<item name="headlineSeparatorSelected">#47478E</item>
-	</style>
-	    
+
+    <style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
+        <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
+        <item name="feedlistBackground">#fafafa</item>
+        <item name="unreadCounterColor">#0000ff</item>
+        <item name="headlinesBackground">#ffffff</item>
+        <item name="articleDivider">#96c5ff</item>
+        <item name="articleHeader">@android:color/transparent</item>
+        <item name="headlineSelectedBackground">#fff7d5</item>
+        <item name="headlineUnreadBackground">#ffffff</item>
+        <item name="headlineNormalBackground">#f0f0f0</item>
+        <item name="feedsSelectedBackground">#96C5FF</item>
+        <item name="headlineSeparatorUnread">#96C5FF</item>
+        <item name="headlineSeparatorNormal">#909090</item>
+        <item name="headlineSeparatorSelected">#DBC981</item>
+        <item name="feedlistTextColor">@android:color/primary_text_light</item>
+        <item name="feedlistSelectedTextColor">@android:color/primary_text_light</item>
+        <item name="headlineTextColor">@android:color/primary_text_light</item>
+        <item name="headlineSelectedTextColor">@android:color/primary_text_light</item>
+        <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
+        <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
+    </style>
+
+    <style name="DarkTheme" parent="android:Theme.Black.NoTitleBar">
+        <item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
+        <item name="feedlistBackground">#101010</item>
+        <item name="unreadCounterColor">#303030</item>
+        <item name="headlinesBackground">#000000</item>
+        <item name="articleDivider">#303060</item>
+        <item name="articleHeader">@android:color/transparent</item>
+        <item name="headlineSelectedBackground">#303060</item>
+        <item name="headlineUnreadBackground">#303030</item>
+        <item name="headlineNormalBackground">@android:color/transparent</item>
+        <item name="feedsSelectedBackground">#303060</item>
+        <item name="headlineSeparatorUnread">#303060</item>
+        <item name="headlineSeparatorNormal">#303030</item>
+        <item name="headlineSeparatorSelected">#47478E</item>
+        <item name="feedlistTextColor">@android:color/primary_text_dark</item>
+        <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item>
+        <item name="headlineTextColor">@android:color/primary_text_dark</item>
+        <item name="headlineSelectedTextColor">@android:color/primary_text_dark</item>
+        <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
+        <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item>
+    </style>
+
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3