update resources for ICS (externalize several more text color classes)

res/layout-port/headlines_row.xml

@@ -32,6 +32,7 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:textColor="?headlineTextColor"
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textSize="16sp" />
 
@@ -48,7 +49,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                    android:textColor="#909090"
+                    android:textColor="?headlineExcerptTextColor"
                     android:textSize="13sp" />
             </LinearLayout>
 

res/layout-port/headlines_row_selected.xml

@@ -33,6 +33,7 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:textColor="?headlineSelectedTextColor"
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textSize="16sp" />
 
@@ -49,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                    android:textColor="#909090"
+                    android:textColor="?headlineSelectedExcerptTextColor"
                     android:textSize="13sp" />
             </LinearLayout>
 

res/layout-port/headlines_row_unread.xml

@@ -33,6 +33,7 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:textColor="?headlineTextColor"
                 android:text="There are many variations of passages of Lorem Ipsum available"
                 android:textSize="16sp" />
 
@@ -49,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
-                    android:textColor="#909090"
+                    android:textColor="?headlineExcerptTextColor"
                     android:textSize="13sp" />
             </LinearLayout>
 

res/layout-xlarge/headlines_row.xml

@@ -43,6 +43,7 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:textColor="?headlineTextColor"
                 android:text="{Title...}"
                 android:textSize="16sp" >
             </TextView>
@@ -52,7 +53,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:text="{Content excerpt...}"
-                android:textColor="#909090"
+                android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>

res/layout-xlarge/headlines_row_selected.xml

@@ -41,6 +41,7 @@
                 android:layout_height="match_parent"
                 android:ellipsize="end"
                 android:singleLine="true"
+                android:textColor="?headlineSelectedTextColor"
                 android:text="{Title...}"
                 android:textSize="16sp" >
             </TextView>
@@ -50,7 +51,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:text="{Content excerpt...}"
-                android:textColor="#909090"
+                android:textColor="?headlineSelectedExcerptTextColor"
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>

res/layout-xlarge/headlines_row_unread.xml

@@ -42,6 +42,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="{Title...}"
+                android:textColor="?headlineTextColor"
                 android:textSize="16sp" >
             </TextView>
 
@@ -50,7 +51,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:text="{Content excerpt...}"
-                android:textColor="#909090"
+                android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>

res/layout/feeds_row.xml

@@ -19,6 +19,7 @@
             android:layout_weight="1"           
             android:layout_gravity="center_vertical"    
             android:paddingLeft="6dip"
+            android:textColor="?feedlistTextColor"   
             android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/>
         <TextView
             android:id="@+id/unread_counter"

res/layout/feeds_row_selected.xml

@@ -21,6 +21,7 @@
             android:layout_weight="1"           
             android:layout_gravity="center_vertical"    
             android:paddingLeft="6dip" 
+            android:textColor="?feedlistSelectedTextColor"  
             android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/>
         <TextView
             android:id="@+id/unread_counter"

res/layout/headlines_row.xml

@@ -44,6 +44,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="{Title...}"
+                android:textColor="?headlineTextColor"
                 android:textSize="16sp" >
             </TextView>
 
@@ -52,7 +53,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:text="{Content excerpt...}"
-                android:textColor="#909090"
+                android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>

res/layout/headlines_row_loadmore.xml

@@ -27,6 +27,7 @@
             android:id="@+id/loadmore_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="?headlineTextColor"
             android:text="Loading, please wait..." />
     </LinearLayout>
 

res/layout/headlines_row_selected.xml

@@ -42,6 +42,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="{Title...}"
+                android:textColor="?headlineSelectedTextColor"
                 android:textSize="16sp" >
             </TextView>
 
@@ -50,7 +51,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:text="{Content excerpt...}"
-                android:textColor="#909090"
+                android:textColor="?headlineSelectedExcerptTextColor"
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>

res/layout/headlines_row_unread.xml

@@ -42,6 +42,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="{Title...}"
+                android:textColor="?headlineTextColor"
                 android:textSize="16sp" >
             </TextView>
 
@@ -50,7 +51,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:text="{Content excerpt...}"
-                android:textColor="#909090"
+                android:textColor="?headlineExcerptTextColor"
                 android:textSize="13sp" >
             </TextView>
         </LinearLayout>

res/values-v11/style.xml

@@ -1,4 +1,5 @@
 <resources>
+
     <style name="LightTheme" parent="android:Theme.Holo.Light">
         <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
         <item name="feedlistBackground">#fafafa</item>
@@ -13,6 +14,12 @@
         <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.Holo">
@@ -29,6 +36,12 @@
         <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>

res/values-v14/style.xml

@@ -13,6 +13,12 @@
 		<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.Holo">
@@ -22,13 +28,19 @@
 		<item name="headlinesBackground">#000000</item>
 		<item name="articleDivider">#33b5e5</item>
 		<item name="articleHeader">@android:color/transparent</item>
-		<item name="headlineSelectedBackground">#195668</item>
+		<item name="headlineSelectedBackground">#33b5e5</item>
 		<item name="headlineUnreadBackground">#303030</item>
 		<item name="headlineNormalBackground">@android:color/transparent</item>
-		<item name="feedsSelectedBackground">#195668</item>
+		<item name="feedsSelectedBackground">#33b5e5</item>
 		<item name="headlineSeparatorUnread">#33b5e5</item>
 		<item name="headlineSeparatorNormal">#303030</item>
 		<item name="headlineSeparatorSelected">#33b5e5</item>
+        <item name="feedlistTextColor">@android:color/primary_text_dark</item>
+        <item name="feedlistSelectedTextColor">@android:color/black</item>
+        <item name="headlineTextColor">@android:color/primary_text_dark</item>
+        <item name="headlineSelectedTextColor">@android:color/black</item>
+        <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
+        <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
 	</style>
 
 </resources>

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>

res/values/style.xml

@@ -1,4 +1,5 @@
 <resources>
+
     <style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
         <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
         <item name="feedlistBackground">#fafafa</item>
@@ -13,6 +14,12 @@
         <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">
@@ -29,6 +36,12 @@
         <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>