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

This commit is contained in:
Andrew Dolgov 2012-01-17 14:16:59 +03:00
parent 92e962f515
commit 5e2075ee87
16 changed files with 134 additions and 78 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,34 +1,47 @@
<resources> <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"> <style name="LightTheme" parent="android:Theme.Holo.Light">
<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item> <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground">#101010</item> <item name="feedlistBackground">#fafafa</item>
<item name="unreadCounterColor">#303030</item> <item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground">#000000</item> <item name="headlinesBackground">#ffffff</item>
<item name="articleDivider">#303060</item> <item name="articleDivider">#96c5ff</item>
<item name="articleHeader">@android:color/transparent</item> <item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#303060</item> <item name="headlineSelectedBackground">#fff7d5</item>
<item name="headlineUnreadBackground">#303030</item> <item name="headlineUnreadBackground">#ffffff</item>
<item name="headlineNormalBackground">@android:color/transparent</item> <item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#303060</item> <item name="feedsSelectedBackground">#96C5FF</item>
<item name="headlineSeparatorUnread">#303060</item> <item name="headlineSeparatorUnread">#96C5FF</item>
<item name="headlineSeparatorNormal">#303030</item> <item name="headlineSeparatorNormal">#909090</item>
<item name="headlineSeparatorSelected">#47478E</item> <item name="headlineSeparatorSelected">#DBC981</item>
</style> <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> </resources>

View File

@ -5,7 +5,7 @@
<item name="unreadCounterColor">#0000ff</item> <item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground">#ffffff</item> <item name="headlinesBackground">#ffffff</item>
<item name="articleDivider">#96c5ff</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="headlineSelectedBackground">#fff7d5</item>
<item name="headlineUnreadBackground">#ffffff</item> <item name="headlineUnreadBackground">#ffffff</item>
<item name="headlineNormalBackground">@android:color/transparent</item> <item name="headlineNormalBackground">@android:color/transparent</item>
@ -13,6 +13,12 @@
<item name="headlineSeparatorUnread">#96C5FF</item> <item name="headlineSeparatorUnread">#96C5FF</item>
<item name="headlineSeparatorNormal">#909090</item> <item name="headlineSeparatorNormal">#909090</item>
<item name="headlineSeparatorSelected">#DBC981</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>
<style name="DarkTheme" parent="android:Theme.Holo"> <style name="DarkTheme" parent="android:Theme.Holo">
@ -22,13 +28,19 @@
<item name="headlinesBackground">#000000</item> <item name="headlinesBackground">#000000</item>
<item name="articleDivider">#33b5e5</item> <item name="articleDivider">#33b5e5</item>
<item name="articleHeader">@android:color/transparent</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="headlineUnreadBackground">#303030</item>
<item name="headlineNormalBackground">@android:color/transparent</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="headlineSeparatorUnread">#33b5e5</item>
<item name="headlineSeparatorNormal">#303030</item> <item name="headlineSeparatorNormal">#303030</item>
<item name="headlineSeparatorSelected">#33b5e5</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> </style>
</resources> </resources>

View File

@ -13,4 +13,10 @@
<attr name="headlineSeparatorUnread" format="reference|color" /> <attr name="headlineSeparatorUnread" format="reference|color" />
<attr name="headlineSeparatorSelected" format="reference|color" /> <attr name="headlineSeparatorSelected" format="reference|color" />
<attr name="headlineSeparatorNormal" 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> </resources>

View File

@ -1,34 +1,47 @@
<resources> <resources>
<style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item> <style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
<item name="feedlistBackground">#fafafa</item> <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
<item name="unreadCounterColor">#0000ff</item> <item name="feedlistBackground">#fafafa</item>
<item name="headlinesBackground">#ffffff</item> <item name="unreadCounterColor">#0000ff</item>
<item name="articleDivider">#96c5ff</item> <item name="headlinesBackground">#ffffff</item>
<item name="articleHeader">@android:color/transparent</item> <item name="articleDivider">#96c5ff</item>
<item name="headlineSelectedBackground">#fff7d5</item> <item name="articleHeader">@android:color/transparent</item>
<item name="headlineUnreadBackground">#ffffff</item> <item name="headlineSelectedBackground">#fff7d5</item>
<item name="headlineNormalBackground">#f0f0f0</item> <item name="headlineUnreadBackground">#ffffff</item>
<item name="feedsSelectedBackground">#96C5FF</item> <item name="headlineNormalBackground">#f0f0f0</item>
<item name="headlineSeparatorUnread">#96C5FF</item> <item name="feedsSelectedBackground">#96C5FF</item>
<item name="headlineSeparatorNormal">#909090</item> <item name="headlineSeparatorUnread">#96C5FF</item>
<item name="headlineSeparatorSelected">#DBC981</item> <item name="headlineSeparatorNormal">#909090</item>
</style> <item name="headlineSeparatorSelected">#DBC981</item>
<item name="feedlistTextColor">@android:color/primary_text_light</item>
<style name="DarkTheme" parent="android:Theme.Black.NoTitleBar"> <item name="feedlistSelectedTextColor">@android:color/primary_text_light</item>
<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item> <item name="headlineTextColor">@android:color/primary_text_light</item>
<item name="feedlistBackground">#101010</item> <item name="headlineSelectedTextColor">@android:color/primary_text_light</item>
<item name="unreadCounterColor">#303030</item> <item name="headlineExcerptTextColor">@android:color/secondary_text_light</item>
<item name="headlinesBackground">#000000</item> <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_light</item>
<item name="articleDivider">#303060</item> </style>
<item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#303060</item> <style name="DarkTheme" parent="android:Theme.Black.NoTitleBar">
<item name="headlineUnreadBackground">#303030</item> <item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
<item name="headlineNormalBackground">@android:color/transparent</item> <item name="feedlistBackground">#101010</item>
<item name="feedsSelectedBackground">#303060</item> <item name="unreadCounterColor">#303030</item>
<item name="headlineSeparatorUnread">#303060</item> <item name="headlinesBackground">#000000</item>
<item name="headlineSeparatorNormal">#303030</item> <item name="articleDivider">#303060</item>
<item name="headlineSeparatorSelected">#47478E</item> <item name="articleHeader">@android:color/transparent</item>
</style> <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> </resources>