diff options
| author | Andrew Dolgov <[email protected]> | 2012-01-17 14:16:59 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-01-17 14:16:59 +0300 |
| commit | 5e2075ee87d65afe013c567207cf3beb96e14441 (patch) | |
| tree | f70c8efd223705d09cb5119df8c7ecae9c251cf1 | |
| parent | 92e962f515e8da0c65c255d84e6d9e144381edde (diff) | |
update resources for ICS (externalize several more text color classes)
| -rw-r--r-- | res/layout-port/headlines_row.xml | 3 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_selected.xml | 3 | ||||
| -rw-r--r-- | res/layout-port/headlines_row_unread.xml | 3 | ||||
| -rw-r--r-- | res/layout-xlarge/headlines_row.xml | 3 | ||||
| -rw-r--r-- | res/layout-xlarge/headlines_row_selected.xml | 3 | ||||
| -rw-r--r-- | res/layout-xlarge/headlines_row_unread.xml | 3 | ||||
| -rw-r--r-- | res/layout/feeds_row.xml | 3 | ||||
| -rw-r--r-- | res/layout/feeds_row_selected.xml | 3 | ||||
| -rw-r--r-- | res/layout/headlines_row.xml | 3 | ||||
| -rw-r--r-- | res/layout/headlines_row_loadmore.xml | 1 | ||||
| -rw-r--r-- | res/layout/headlines_row_selected.xml | 3 | ||||
| -rw-r--r-- | res/layout/headlines_row_unread.xml | 3 | ||||
| -rw-r--r-- | res/values-v11/style.xml | 75 | ||||
| -rw-r--r-- | res/values-v14/style.xml | 20 | ||||
| -rw-r--r-- | res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | res/values/style.xml | 77 |
16 files changed, 134 insertions, 78 deletions
diff --git a/res/layout-port/headlines_row.xml b/res/layout-port/headlines_row.xml index 833a1397..23d144bd 100644 --- a/res/layout-port/headlines_row.xml +++ b/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>
diff --git a/res/layout-port/headlines_row_selected.xml b/res/layout-port/headlines_row_selected.xml index abdb188b..b4622d6a 100644 --- a/res/layout-port/headlines_row_selected.xml +++ b/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>
diff --git a/res/layout-port/headlines_row_unread.xml b/res/layout-port/headlines_row_unread.xml index 6510535c..c485d84b 100644 --- a/res/layout-port/headlines_row_unread.xml +++ b/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>
diff --git a/res/layout-xlarge/headlines_row.xml b/res/layout-xlarge/headlines_row.xml index 9b5832c9..ace43e40 100644 --- a/res/layout-xlarge/headlines_row.xml +++ b/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>
diff --git a/res/layout-xlarge/headlines_row_selected.xml b/res/layout-xlarge/headlines_row_selected.xml index 916e2634..3734141f 100644 --- a/res/layout-xlarge/headlines_row_selected.xml +++ b/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>
diff --git a/res/layout-xlarge/headlines_row_unread.xml b/res/layout-xlarge/headlines_row_unread.xml index 84fcd33f..210e5fb3 100644 --- a/res/layout-xlarge/headlines_row_unread.xml +++ b/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>
diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml index b5fc8ce7..46f809a8 100644 --- a/res/layout/feeds_row.xml +++ b/res/layout/feeds_row.xml @@ -18,7 +18,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="center_vertical" - android:paddingLeft="6dip" + android:paddingLeft="6dip" + android:textColor="?feedlistTextColor" android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/> <TextView android:id="@+id/unread_counter" diff --git a/res/layout/feeds_row_selected.xml b/res/layout/feeds_row_selected.xml index 4a1ba5f0..ea3a050a 100644 --- a/res/layout/feeds_row_selected.xml +++ b/res/layout/feeds_row_selected.xml @@ -20,7 +20,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="center_vertical" - android:paddingLeft="6dip" + android:paddingLeft="6dip" + android:textColor="?feedlistSelectedTextColor" android:text="{FEED}" android:layout_width="0dp" android:textSize="18dip"/> <TextView android:id="@+id/unread_counter" diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 9b5832c9..cdd04d2c 100644 --- a/res/layout/headlines_row.xml +++ b/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>
diff --git a/res/layout/headlines_row_loadmore.xml b/res/layout/headlines_row_loadmore.xml index 26e21ee5..472db87b 100644 --- a/res/layout/headlines_row_loadmore.xml +++ b/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>
diff --git a/res/layout/headlines_row_selected.xml b/res/layout/headlines_row_selected.xml index 916e2634..c7ddedc3 100644 --- a/res/layout/headlines_row_selected.xml +++ b/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>
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml index 84fcd33f..210e5fb3 100644 --- a/res/layout/headlines_row_unread.xml +++ b/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>
diff --git a/res/values-v11/style.xml b/res/values-v11/style.xml index 454a31a7..53563ab1 100644 --- a/res/values-v11/style.xml +++ b/res/values-v11/style.xml @@ -1,34 +1,47 @@ <resources>
- <style name="LightTheme" parent="android:Theme.Holo.Light">
- <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">@android:color/transparent</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.Holo">
- <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.Holo.Light">
+ <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">@android:color/transparent</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.Holo">
+ <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 diff --git a/res/values-v14/style.xml b/res/values-v14/style.xml index 7c876100..7cac2d5f 100644 --- a/res/values-v14/style.xml +++ b/res/values-v14/style.xml @@ -5,7 +5,7 @@ <item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground">#ffffff</item>
<item name="articleDivider">#96c5ff</item>
- <item name="articleHeader">@android:color/transparent</item>
+ <item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#fff7d5</item>
<item name="headlineUnreadBackground">#ffffff</item>
<item name="headlineNormalBackground">@android:color/transparent</item>
@@ -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>
\ No newline at end of file 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 |