summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-10-15 19:25:44 +0400
committerAndrew Dolgov <[email protected]>2014-10-15 19:25:44 +0400
commitf292677c71dce9dff4135988f39ab994f59571ec (patch)
tree27142210d26f706e9a3afba8eba2ca5d3d1612e1 /res
parent3e66d43c16b79e6f7348055c5a5e21efc935427e (diff)
rename generic dark theme to holo, set light as default theme
Diffstat (limited to 'res')
-rw-r--r--res/values/arrays.xml8
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/values/style.xml4
3 files changed, 8 insertions, 8 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b26a97a5..79d9a4d3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,15 +1,15 @@
<resources>
<string-array name="pref_theme_names">
- <item>@string/theme_dark</item>
- <item>@string/theme_dark_gray</item>
<item>@string/theme_light</item>
+ <item>@string/theme_dark</item>
<item>@string/theme_sepia</item>
+ <item>@string/theme_holo</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_DARK</item>
<item>THEME_SEPIA</item>
+ <item>THEME_HOLO</item>
</string-array>
<string-array name="pref_view_mode_names">
<item>@string/category_browse_headlines</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8235124b..879cf2b0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,9 +15,10 @@
<string name="pref_theme">Theme</string>
<string name="pref_theme_long">Changes color theme of the application</string>
<string name="ttrss_url">Tiny Tiny RSS URL</string>
+ <string name="theme_light">Light</string>
<string name="theme_dark">Dark</string>
+ <string name="theme_holo">Holo</string>
<string name="preferences">Settings</string>
- <string name="theme_light">Light</string>
<string name="connection">Connection</string>
<string name="headline_context_multiple">Selected articles</string>
<string name="http_authentication">HTTP Authentication</string>
@@ -156,7 +157,6 @@
<string name="trial_thanks">Full version, thank you for support!</string>
<string name="prefs_fullscreen_mode">Fullscreen mode</string>
<string name="reading">Reading</string>
- <string name="theme_dark_gray">Dark gray</string>
<string name="offline_articles_to_download">Amount of articles to download</string>
<string name="offline_articles_to_download_long">How many articles to download for offline mode (newest first).</string>
<string name="pref_headlines_show_content_long">Show content previews in headlines list</string>
diff --git a/res/values/style.xml b/res/values/style.xml
index 270579b9..81c15ef2 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -47,7 +47,7 @@
<item name="android:actionBarStyle">@style/ActionBar.Sepia</item>
</style>
- <style name="DarkTheme" parent="Theme.AppCompat">
+ <style name="HoloTheme" parent="Theme.AppCompat">
<item name="smallScreenBackground">@android:color/transparent</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">@android:color/transparent</item>
@@ -77,7 +77,7 @@
<item name="articleNoteBackground">#303030</item>
</style>
- <style name="DarkGrayTheme" parent="DarkTheme">
+ <style name="DarkTheme" parent="HoloTheme">
<item name="smallScreenBackground">@color/feeds_dark_gray</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
<item name="feedlistBackground">@drawable/shadow_feeds_gray</item>