diff options
| -rw-r--r-- | res/layout/article_fragment.xml | 2 | ||||
| -rw-r--r-- | res/values-v14/style.xml | 12 | ||||
| -rw-r--r-- | res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | res/values/style.xml | 12 |
4 files changed, 6 insertions, 26 deletions
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 16ae890a..70f4ea0b 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -60,7 +60,7 @@ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
- android:background="?feedlistDivider"
+ android:background="?horizontalDivider"
android:paddingTop="2dip" >
</ImageView>
diff --git a/res/values-v14/style.xml b/res/values-v14/style.xml index 222aea54..696fea9b 100644 --- a/res/values-v14/style.xml +++ b/res/values-v14/style.xml @@ -1,19 +1,15 @@ <resources>
<style name="LightTheme" parent="android:Theme.Holo.Light">
- <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
+ <item name="horizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item>
<item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
<item name="headlinesBackgroundSolid">#f0f0f0</item>
- <item name="articleDivider">#96c5ff</item>
<item name="articleHeader">#ffffff</item>
<item name="headlineSelectedBackground">#ffffff</item>
<item name="headlineUnreadBackground">@android:color/transparent</item>
<item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#f0f0f0</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/secondary_text_light</item>
@@ -25,20 +21,16 @@ </style>
<style name="DarkTheme" parent="android:Theme.Holo">
- <item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="horizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">@android:color/transparent</item>
<item name="unreadCounterColor">#303030</item>
<item name="headlinesBackground">#101010</item>
<item name="headlinesBackgroundSolid">#101010</item>
- <item name="articleDivider">#33b5e5</item>
<item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#33b5e5</item>
<item name="headlineUnreadBackground">@android:color/transparent</item>
<item name="headlineNormalBackground">@android:color/transparent</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/secondary_text_dark</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 4278a138..61b0a706 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="utf-8"?>
<resources>
- <attr name="feedlistDivider" format="reference|color" />
+ <attr name="horizontalDivider" format="reference|color" />
<attr name="feedlistBackground" format="reference|color" />
<attr name="unreadCounterColor" format="reference|color" />
<attr name="headlinesBackground" format="reference|color" />
<attr name="headlinesBackgroundSolid" format="reference|color" />
<attr name="articleHeader" format="reference|color" />
- <attr name="articleDivider" format="reference|color" />
<attr name="headlineSelectedBackground" format="reference|color" />
<attr name="headlineUnreadBackground" format="reference|color" />
<attr name="headlineNormalBackground" format="reference|color" />
<attr name="feedsSelectedBackground" format="reference|color" />
- <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" />
diff --git a/res/values/style.xml b/res/values/style.xml index 26dd0fcf..61940c8c 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -1,20 +1,16 @@ <resources>
<style name="LightTheme" parent="android:Theme.Light.NoTitleBar">
- <item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
+ <item name="horizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground">#fafafa</item>
<item name="unreadCounterColor">#0000ff</item>
<item name="headlinesBackground">#ffffff</item>
<item name="headlinesBackgroundSolid">#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>
@@ -26,20 +22,16 @@ </style>
<style name="DarkTheme" parent="android:Theme.Black.NoTitleBar">
- <item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="horizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">#101010</item>
<item name="unreadCounterColor">#303030</item>
<item name="headlinesBackground">#000000</item>
<item name="headlinesBackgroundSolid">#000000</item>
- <item name="articleDivider">#F5B800</item>
<item name="articleHeader">@android:color/transparent</item>
<item name="headlineSelectedBackground">#F5B800</item>
<item name="headlineUnreadBackground">#303030</item>
<item name="headlineNormalBackground">@android:color/transparent</item>
<item name="feedsSelectedBackground">#F5B800</item>
- <item name="headlineSeparatorUnread">#F5B800</item>
- <item name="headlineSeparatorNormal">#F5B800</item>
- <item name="headlineSeparatorSelected">#F5B800</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>
|