From 2c4fd340c88d1bc9501e6e40ae6a8e2c2ea6c760 Mon Sep 17 00:00:00 2001 From: inorichi Date: Sat, 27 Oct 2018 19:10:11 +0200 Subject: [PATCH] Restore dark blue theme. Closes #1302 --- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 1 + .../ui/setting/SettingsGeneralController.kt | 5 +++-- app/src/main/res/values-v21/themes.xml | 16 +++++++++++++--- app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/themes.xml | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 4cd8b2a81..d96b222c2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -50,6 +50,7 @@ class MainActivity : BaseActivity() { setTheme(when (preferences.theme()) { 2 -> R.style.Theme_Tachiyomi_Dark 3 -> R.style.Theme_Tachiyomi_Amoled + 4 -> R.style.Theme_Tachiyomi_DarkBlue else -> R.style.Theme_Tachiyomi }) super.onCreate(savedInstanceState) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index 2c52bbcd3..ab81f4787 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -52,8 +52,9 @@ class SettingsGeneralController : SettingsController() { intListPreference { key = Keys.theme titleRes = R.string.pref_theme - entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme, R.string.amoled_theme) - entryValues = arrayOf("1", "2", "3") + entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme, + R.string.amoled_theme, R.string.darkblue_theme) + entryValues = arrayOf("1", "2", "3", "4") defaultValue = "1" summary = "%s" diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index 84ccab60f..a84911b1e 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -10,9 +10,9 @@ @color/colorPrimaryDark - - - + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ae703eaf..520f70e43 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -139,6 +139,7 @@ Main theme Dark theme AMOLED theme + Dark blue Start screen Language System default diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 90fdb2696..c04866ac6 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -83,6 +83,11 @@ + +