add Theme "Teal & Turquoise" (#5681)

* add Theme "Teal & Turquoise"

* re sorting & change tertiary dark

* use alpha on ripple color & capitalize
This commit is contained in:
Riztard Lanthorn 2021-08-16 21:15:28 +07:00 committed by GitHub
parent 2084822731
commit 83436c9550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 0 deletions

View File

@ -29,6 +29,7 @@ object PreferenceValues {
MIDNIGHT_DUSK(R.string.theme_midnightdusk), MIDNIGHT_DUSK(R.string.theme_midnightdusk),
STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri), STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
TAKO(R.string.theme_tako), TAKO(R.string.theme_tako),
TEALTURQUOISE(R.string.theme_tealturquoise),
YINYANG(R.string.theme_yinyang), YINYANG(R.string.theme_yinyang),
YOTSUBA(R.string.theme_yotsuba), YOTSUBA(R.string.theme_yotsuba),

View File

@ -39,6 +39,9 @@ abstract class BaseThemedActivity : AppCompatActivity() {
PreferenceValues.AppTheme.TAKO -> { PreferenceValues.AppTheme.TAKO -> {
resIds += R.style.Theme_Tachiyomi_Tako resIds += R.style.Theme_Tachiyomi_Tako
} }
PreferenceValues.AppTheme.TEALTURQUOISE -> {
resIds += R.style.Theme_Tachiyomi_TealTurquoise
}
PreferenceValues.AppTheme.YINYANG -> { PreferenceValues.AppTheme.YINYANG -> {
resIds += R.style.Theme_Tachiyomi_YinYang resIds += R.style.Theme_Tachiyomi_YinYang
} }

View File

@ -33,6 +33,13 @@
<color name="background_tako">#21212E</color> <color name="background_tako">#21212E</color>
<color name="filter_tako">@color/accent_tako</color> <color name="filter_tako">@color/accent_tako</color>
<!-- Teal & Turquoise Theme -->
<color name="accent_tealturquoise">#40E0D0</color>
<color name="color_on_primary_tealturquoise">#000000</color>
<color name="tertiary_tealturquoise">#BF1F2F</color>
<color name="color_on_tertiary_tealturquoise">#FFFFFF</color>
<color name="ripple_colored_tealturquoise">#1F40E0D0</color>
<!-- Yin & Yang Theme --> <!-- Yin & Yang Theme -->
<color name="accent_yinyang">#FFFFFF</color> <color name="accent_yinyang">#FFFFFF</color>
<color name="color_on_secondary_yinyang">#000000</color> <color name="color_on_secondary_yinyang">#000000</color>

View File

@ -49,6 +49,13 @@
<color name="background_tako">#F2EDF7</color> <color name="background_tako">#F2EDF7</color>
<color name="filter_tako">#F29940</color> <color name="filter_tako">#F29940</color>
<!-- Teal & Turquoise Theme -->
<color name="accent_tealturquoise">#008080</color>
<color name="color_on_primary_tealturquoise">#FFFFFF</color>
<color name="tertiary_tealturquoise">#FF7F7F</color>
<color name="color_on_tertiary_tealturquoise">#000000</color>
<color name="ripple_colored_tealturquoise">#1F008080</color>
<!-- Yin & Yang Theme --> <!-- Yin & Yang Theme -->
<color name="accent_yinyang">#000000</color> <color name="accent_yinyang">#000000</color>
<color name="color_on_secondary_yinyang">#FFFFFF</color> <color name="color_on_secondary_yinyang">#FFFFFF</color>

View File

@ -153,6 +153,7 @@
<string name="theme_midnightdusk">Midnight Dusk</string> <string name="theme_midnightdusk">Midnight Dusk</string>
<string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string> <string name="theme_strawberrydaiquiri">Strawberry Daiquiri</string>
<string name="theme_tako">Tako</string> <string name="theme_tako">Tako</string>
<string name="theme_tealturquoise">Teal &amp; Turquoise</string>
<string name="theme_yinyang">Yin &amp; Yang</string> <string name="theme_yinyang">Yin &amp; Yang</string>
<string name="theme_yotsuba">Yotsuba</string> <string name="theme_yotsuba">Yotsuba</string>
<string name="pref_dark_theme_pure_black">Pure black dark mode</string> <string name="pref_dark_theme_pure_black">Pure black dark mode</string>

View File

@ -128,6 +128,17 @@
<item name="colorFilterActive">@color/filter_tako</item> <item name="colorFilterActive">@color/filter_tako</item>
</style> </style>
<!--== Teal & Turquoise Theme ==-->
<style name="Theme.Tachiyomi.TealTurquoise">
<!-- Theme Colors -->
<item name="colorPrimary">@color/accent_tealturquoise</item>
<item name="colorOnPrimary">@color/color_on_primary_tealturquoise</item>
<item name="colorOnSecondary">@color/color_on_primary_tealturquoise</item>
<item name="colorTertiary">@color/tertiary_tealturquoise</item>
<item name="colorOnTertiary">@color/color_on_tertiary_tealturquoise</item>
<item name="colorControlHighlight">@color/ripple_colored_tealturquoise</item>
</style>
<!--== Yin & Yang Theme ==--> <!--== Yin & Yang Theme ==-->
<style name="Theme.Tachiyomi.YinYang"> <style name="Theme.Tachiyomi.YinYang">
<!-- Theme Colors --> <!-- Theme Colors -->