From 5e2075ee87d65afe013c567207cf3beb96e14441 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 17 Jan 2012 14:16:59 +0300 Subject: [PATCH] update resources for ICS (externalize several more text color classes) --- res/layout-port/headlines_row.xml | 3 +- res/layout-port/headlines_row_selected.xml | 3 +- res/layout-port/headlines_row_unread.xml | 3 +- res/layout-xlarge/headlines_row.xml | 3 +- res/layout-xlarge/headlines_row_selected.xml | 3 +- res/layout-xlarge/headlines_row_unread.xml | 3 +- res/layout/feeds_row.xml | 3 +- res/layout/feeds_row_selected.xml | 3 +- res/layout/headlines_row.xml | 3 +- res/layout/headlines_row_loadmore.xml | 1 + res/layout/headlines_row_selected.xml | 3 +- res/layout/headlines_row_unread.xml | 3 +- res/values-v11/style.xml | 75 +++++++++++-------- res/values-v14/style.xml | 20 ++++- res/values/attrs.xml | 6 ++ 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" /> 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" /> 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" /> 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" > @@ -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" > 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" > @@ -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" > 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" > @@ -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" > 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"/> @@ -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" > 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..." /> 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" > @@ -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" > 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" > @@ -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" > 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 @@ - - - + + + + \ 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 @@ #0000ff #ffffff #96c5ff - @android:color/transparent + @android:color/transparent #fff7d5 #ffffff @android:color/transparent @@ -13,6 +13,12 @@ #96C5FF #909090 #DBC981 + @android:color/primary_text_light + @android:color/primary_text_light + @android:color/primary_text_light + @android:color/primary_text_light + @android:color/secondary_text_light + @android:color/secondary_text_light - + \ 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 @@ + + + + + + \ 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 @@ - - - - + + + + + \ No newline at end of file