From f7d52e0372de4022ce7fc33b297a5e3a58f68429 Mon Sep 17 00:00:00 2001 From: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com> Date: Thu, 11 Mar 2021 01:28:07 +0100 Subject: [PATCH] Added "Hot Pink" theme (#238) * first test * added hot pink theme * moved string to correct place --- .../data/preference/PreferenceValues.kt | 1 + .../ui/base/activity/BaseThemedActivity.kt | 1 + .../ui/setting/SettingsGeneralController.kt | 2 ++ app/src/main/res/values/colors.xml | 9 ++++++++ app/src/main/res/values/strings_sy.xml | 1 + app/src/main/res/values/styles.xml | 4 ++++ app/src/main/res/values/themes_sy.xml | 23 +++++++++++++++++++ 7 files changed, 41 insertions(+) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index c7e14d6d8..7a089eb97 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -25,6 +25,7 @@ object PreferenceValues { amoled, red, midnightdusk, + hotpink, } enum class DisplayMode { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt index 9b064a4c0..5eaa3c65f 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt @@ -50,6 +50,7 @@ abstract class BaseThemedActivity : AppCompatActivity() { Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red Values.DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_MidnightDusk + Values.DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_HotPink else -> R.style.Theme_Tachiyomi_Dark } } 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 69336f2b4..5eecf85aa 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 @@ -135,6 +135,7 @@ class SettingsGeneralController : SettingsController() { R.string.theme_dark_amoled, R.string.theme_dark_red, R.string.theme_dark_midnightdusk, + R.string.theme_dark_hotpink, ) entryValues = arrayOf( Values.DarkThemeVariant.default.name, @@ -142,6 +143,7 @@ class SettingsGeneralController : SettingsController() { Values.DarkThemeVariant.amoled.name, Values.DarkThemeVariant.red.name, Values.DarkThemeVariant.midnightdusk.name, + Values.DarkThemeVariant.hotpink.name, ) defaultValue = Values.DarkThemeVariant.default.name summary = "%s" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 453e02bde..83d171db8 100755 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -47,6 +47,15 @@ #201F27 #80F02475 + + #FF3399 + @color/md_white_1000 + @color/md_white_1000_70 + @color/md_white_1000_50 + @color/md_black_1000 + @color/md_black_1000 + #80FF69B4 + @color/colorDarkPrimary @color/md_grey_50_75 diff --git a/app/src/main/res/values/strings_sy.xml b/app/src/main/res/values/strings_sy.xml index aea3dcb37..8ef278479 100644 --- a/app/src/main/res/values/strings_sy.xml +++ b/app/src/main/res/values/strings_sy.xml @@ -165,6 +165,7 @@ Black-Red Midnight Dusk + Hot Pink Expand all search filters by default Automatically solve captcha Use HIGHLY EXPERIMENTAL automatic ReCAPTCHA solver. Will be grayed out if unsupported by your device. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d67b29698..07450f01b 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -14,6 +14,10 @@ @color/md_white_1000 + + diff --git a/app/src/main/res/values/themes_sy.xml b/app/src/main/res/values/themes_sy.xml index ab99474cc..6fa989fd8 100644 --- a/app/src/main/res/values/themes_sy.xml +++ b/app/src/main/res/values/themes_sy.xml @@ -27,4 +27,27 @@ @color/selectorColorDark + + + \ No newline at end of file