From 83436c9550fb46f6322959b01959542e967ec84e Mon Sep 17 00:00:00 2001 From: Riztard Lanthorn Date: Mon, 16 Aug 2021 21:15:28 +0700 Subject: [PATCH] add Theme "Teal & Turquoise" (#5681) * add Theme "Teal & Turquoise" * re sorting & change tertiary dark * use alpha on ripple color & capitalize --- .../tachiyomi/data/preference/PreferenceValues.kt | 1 + .../tachiyomi/ui/base/activity/BaseThemedActivity.kt | 3 +++ app/src/main/res/values-night/colors.xml | 7 +++++++ app/src/main/res/values/colors.xml | 7 +++++++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/themes.xml | 11 +++++++++++ 6 files changed, 30 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 77076c965f..b7e2f6ae0b 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 @@ -29,6 +29,7 @@ object PreferenceValues { MIDNIGHT_DUSK(R.string.theme_midnightdusk), STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri), TAKO(R.string.theme_tako), + TEALTURQUOISE(R.string.theme_tealturquoise), YINYANG(R.string.theme_yinyang), YOTSUBA(R.string.theme_yotsuba), 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 0926ae1834..694751ac4b 100644 --- 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 @@ -39,6 +39,9 @@ abstract class BaseThemedActivity : AppCompatActivity() { PreferenceValues.AppTheme.TAKO -> { resIds += R.style.Theme_Tachiyomi_Tako } + PreferenceValues.AppTheme.TEALTURQUOISE -> { + resIds += R.style.Theme_Tachiyomi_TealTurquoise + } PreferenceValues.AppTheme.YINYANG -> { resIds += R.style.Theme_Tachiyomi_YinYang } diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 4e43f3595d..9c55f75f8e 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -33,6 +33,13 @@ #21212E @color/accent_tako + + #40E0D0 + #000000 + #BF1F2F + #FFFFFF + #1F40E0D0 + #FFFFFF #000000 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ffaae60531..994e0b3507 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -49,6 +49,13 @@ #F2EDF7 #F29940 + + #008080 + #FFFFFF + #FF7F7F + #000000 + #1F008080 + #000000 #FFFFFF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cf179e108b..9adf4c6f92 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -153,6 +153,7 @@ Midnight Dusk Strawberry Daiquiri Tako + Teal & Turquoise Yin & Yang Yotsuba Pure black dark mode diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index cb132c8a97..18dccc504b 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -128,6 +128,17 @@ @color/filter_tako + + +