aboutsummaryrefslogtreecommitdiff
path: root/res/values
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>2013-10-15 15:24:18 +0400
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>2013-10-15 15:24:18 +0400
commitdedd069a90a59c94318df65ec47eca605d67b8c0 (patch)
tree1a50bfcf164a1a16656b4800c860d82096bdf162 /res/values
parent79537ba544f0bb82fa3818e986bc7b2ac9e97c57 (diff)
add experimental support for sherlock devicedefault theme
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml2
-rw-r--r--res/values/strings.xml1
-rw-r--r--res/values/style.xml43
3 files changed, 39 insertions, 7 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 63e90184..3586c84c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -4,12 +4,14 @@
<item>@string/theme_dark_gray</item>
<item>@string/theme_light</item>
<item>@string/theme_sepia</item>
+ <item>@string/theme_system</item>
</string-array>
<string-array name="pref_theme_values" translatable="false">
<item>THEME_DARK</item>
<item>THEME_DARK_GRAY</item>
<item>THEME_LIGHT</item>
<item>THEME_SEPIA</item>
+ <item>THEME_SYSTEM</item>
</string-array>
<string-array name="pref_font_size_names">
<item>@string/font_size_small</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4ef4831..24e3fc1f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -201,4 +201,5 @@
<string name="n_unread_articles">%1$d unread articles</string>
<string name="pref_headline_font_size">Headline text size</string>
<string name="context_confirm_catchup">Mark all articles in %1$s as read?</string>
+ <string name="theme_system">Device Default (4.2+)</string>
</resources>
diff --git a/res/values/style.xml b/res/values/style.xml
index 4a8e93ba..31299fae 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -7,9 +7,9 @@
<item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item>
<item name="headlinesBackgroundSolid">#f0f0f0</item>
<item name="articleBackground">@android:color/transparent</item>
- <item name="headlineSelectedBackground">#88b0f0</item>
- <item name="headlineUnreadBackground">#ffffff</item>
- <item name="headlineNormalBackground">#f0f0f0</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected</item>
+ <item name="headlineUnreadBackground">@drawable/headline_row_unread</item>
+ <item name="headlineNormalBackground">@drawable/headline_row</item>
<item name="feedsSelectedBackground">#88b0f0</item>
<item name="feedlistTextColor">@android:color/primary_text_light</item>
<item name="feedlistSelectedTextColor">#ffffff</item>
@@ -32,8 +32,9 @@
<item name="feedlistBackground">@drawable/shadow_feeds_sepia</item>
<item name="headlinesBackground">@drawable/shadow_headlines_sepia</item>
<item name="headlinesBackgroundSolid">@drawable/paper_sepia</item>
- <item name="headlineUnreadBackground">#f2eae8</item> <!-- #F2EAE8 -->
- <item name="headlineSelectedBackground">#E5B0A0</item>
+ <item name="headlineUnreadBackground">@drawable/headline_row_unread_sepia</item> <!-- #F2EAE8 -->
+ <item name="headlineNormalBackground">@drawable/headline_row_sepia</item>
+ <item name="headlineSelectedBackground">@drawable/headline_row_selected_sepia</item> <!-- #E5B0A0 -->
<item name="feedsSelectedBackground">#E5B0A0</item>
<item name="articleBackground">@drawable/paper_sepia</item>
<item name="unreadCounterBackground">@drawable/counter_background_sepia</item>
@@ -70,7 +71,35 @@
<item name="unreadCounterBackground">@drawable/counter_background_dark</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
</style>
-
+
+ <style name="SystemTheme" parent="Theme.Sherlock.DeviceDefault">
+ <item name="smallScreenBackground">@android:color/transparent</item>
+ <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
+ <item name="feedlistBackground">@android:color/transparent</item>
+ <item name="unreadCounterColor">#ffffff</item>
+ <item name="headlinesBackground">@android:color/black</item>
+ <item name="headlinesBackgroundSolid">@android:color/black</item>
+ <item name="articleBackground">@android:color/black</item>
+ <item name="headlineSelectedBackground">@color/ics_cyan</item>
+ <item name="headlineUnreadBackground">#202020</item>
+ <item name="headlineNormalBackground">#151515</item>
+ <item name="feedsSelectedBackground">@color/ics_cyan</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>
+ <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item>
+ <item name="headlineSelectedTextColor">@android:color/white</item>
+ <item name="headlineExcerptTextColor">@android:color/secondary_text_dark</item>
+ <item name="headlineSelectedExcerptTextColor">@android:color/black</item>
+ <item name="headlineSecondaryTextColor">#909090</item>
+ <item name="headlineSelectedSecondaryTextColor">#404040</item>
+ <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
+ <item name="linkColor">@color/ics_cyan</item>
+ <item name="loadingBackground">@android:color/black</item>
+ <item name="unreadCounterBackground">@drawable/counter_background_dark</item>
+ <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
+ </style>
+
<style name="DarkGrayTheme" parent="DarkTheme">
<item name="smallScreenBackground">@color/feeds_dark_gray</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
@@ -93,7 +122,7 @@
<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
<item name="android:background">#232527</item>
</style>
-
+
<style name="DarkDialogTheme" parent="android:Theme.Dialog">
</style>