From 5db7ad01f2f3e0b2f2d4fac2e87062070c2964bc Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Fri, 9 Sep 2016 06:37:51 +0200 Subject: [PATCH] Optimized themes a bit again --- app/src/main/res/values/preferences.xml | 16 ++++++++-------- app/src/main/res/values/themes_quassel.xml | 5 +++++ app/src/main/res/values/themes_solarized.xml | 5 +++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml index 6a1eb490c..bc7c18200 100644 --- a/app/src/main/res/values/preferences.xml +++ b/app/src/main/res/values/preferences.xml @@ -49,15 +49,15 @@ <string name="preference_brackets_summary_off">Show plain nicks in chat</string> <string-array name="preference_theme_entries"> - <item>Quassel™ (Light)</item> - <item>Quassel™ (Dark)</item> - <item>Solarized (Light)</item> - <item>Solarized (Dark)</item> + <item>@string/themeQuasselLightName</item> + <item>@string/themeQuasselDarkName</item> + <item>@string/themeSolarizedLightName</item> + <item>@string/themeSolarizedDarkName</item> </string-array> <string-array name="preference_theme_values"> - <item>QUASSEL_LIGHT</item> - <item>QUASSEL_DARK</item> - <item>SOLARIZED_LIGHT</item> - <item>SOLARIZED_DARK</item> + <item>@string/themeQuasselLightId</item> + <item>@string/themeQuasselDarkId</item> + <item>@string/themeSolarizedLightId</item> + <item>@string/themeSolarizedDarkId</item> </string-array> </resources> diff --git a/app/src/main/res/values/themes_quassel.xml b/app/src/main/res/values/themes_quassel.xml index d7c6bc0d5..b92fba7d6 100644 --- a/app/src/main/res/values/themes_quassel.xml +++ b/app/src/main/res/values/themes_quassel.xml @@ -21,6 +21,8 @@ --> <resources> + <string name="themeQuasselLightName">Quassel™ (Light)</string> + <string name="themeQuasselLightId">QUASSEL_LIGHT</string> <style name="Quassel_Light" parent="AppTheme.Light"> <item name="senderColor0">#e90d7f</item> @@ -61,6 +63,9 @@ <color name="quasselLight_background">#FAFAFA</color> + <string name="themeQuasselDarkName">Quassel™ (Dark)</string> + <string name="themeQuasselDarkId">QUASSEL_DARK</string> + <style name="Quassel_Dark" parent="AppTheme"> <item name="senderColor0">#e90d7f</item> <item name="senderColor1">#8e55e9</item> diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml index 5d48b01aa..9a0209ab9 100644 --- a/app/src/main/res/values/themes_solarized.xml +++ b/app/src/main/res/values/themes_solarized.xml @@ -21,6 +21,8 @@ --> <resources> + <string name="themeSolarizedLightName">Solarized (Light)</string> + <string name="themeSolarizedLightId">SOLARIZED_LIGHT</string> <style name="Solarized_Light" parent="AppTheme.Light"> <item name="colorPrimary">?attr/colorBackgroundCard</item> @@ -67,6 +69,9 @@ <color name="solarizedLight_background">#FDF6E3</color> + <string name="themeSolarizedDarkName">Solarized (Dark)</string> + <string name="themeSolarizedDarkId">SOLARIZED_DARK</string> + <style name="Solarized_Dark" parent="AppTheme"> <item name="colorPrimary">?attr/colorBackgroundCard</item> <item name="colorPrimaryDark">?attr/colorBackground</item> -- GitLab