Adding Black 'n' Red theme

And I thought the dusk theme was edgy

and this is the one that actually closes #719
This commit is contained in:
Jays2Kings 2021-04-10 17:13:38 -04:00
parent b7b8c61533
commit a98a578af3
4 changed files with 16 additions and 2 deletions

View File

@ -76,6 +76,11 @@ object ThemeUtil {
AppCompatDelegate.MODE_NIGHT_YES, AppCompatDelegate.MODE_NIGHT_YES,
R.string.amoled_black R.string.amoled_black
), ),
BLACK_N_RED(
R.style.Theme_Tachiyomi_BlackAndRed,
AppCompatDelegate.MODE_NIGHT_YES,
R.string.black_and_red
),
LIGHT_BLUE( LIGHT_BLUE(
R.style.Theme_Tachiyomi_AllBlue, R.style.Theme_Tachiyomi_AllBlue,
AppCompatDelegate.MODE_NIGHT_NO, AppCompatDelegate.MODE_NIGHT_NO,
@ -155,7 +160,7 @@ object ThemeUtil {
@ColorInt @ColorInt
val darkBackground: Int = Color.parseColor( val darkBackground: Int = Color.parseColor(
when (styleRes) { when (styleRes) {
R.style.Theme_Tachiyomi_Amoled -> "#000000" R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed -> "#000000"
R.style.Theme_Tachiyomi_MidnightDusk -> "#16151D" R.style.Theme_Tachiyomi_MidnightDusk -> "#16151D"
else -> "#1C1C1D" else -> "#1C1C1D"
} }
@ -173,6 +178,7 @@ object ThemeUtil {
val darkAccent: Int = Color.parseColor( val darkAccent: Int = Color.parseColor(
when (styleRes) { when (styleRes) {
R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475" R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475"
R.style.Theme_Tachiyomi_BlackAndRed -> "#AA2200"
else -> "#3399FF" else -> "#3399FF"
} }
) )
@ -215,7 +221,7 @@ object ThemeUtil {
val darkBottomBar: Int = Color.parseColor( val darkBottomBar: Int = Color.parseColor(
when (styleRes) { when (styleRes) {
R.style.Theme_Tachiyomi_AllBlue -> "#54759E" R.style.Theme_Tachiyomi_AllBlue -> "#54759E"
R.style.Theme_Tachiyomi_Amoled -> "#000000" R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed -> "#000000"
R.style.Theme_Tachiyomi_MidnightDusk -> "#201F27" R.style.Theme_Tachiyomi_MidnightDusk -> "#201F27"
else -> "#212121" else -> "#212121"
} }

View File

@ -21,4 +21,10 @@
<!-- Material Dialog colors --> <!-- Material Dialog colors -->
<item name="md_background_color">@color/colorAmoledPrimary</item> <item name="md_background_color">@color/colorAmoledPrimary</item>
</style> </style>
<style name="Theme.Tachiyomi.BlackAndRed" parent="Theme.Tachiyomi.Amoled">
<item name="colorAccent">@color/holo_red</item>
<item name="colorAccentText">@color/md_red_500</item>
</style>
</resources> </resources>

View File

@ -568,6 +568,7 @@
<string name="dark_blue">Dark Blue</string> <string name="dark_blue">Dark Blue</string>
<string name="midnight_dusk">Midnight Dusk</string> <string name="midnight_dusk">Midnight Dusk</string>
<string name="spring_blossom">Spring Blossom</string> <string name="spring_blossom">Spring Blossom</string>
<string name="black_and_red">Black \'n\' Red</string>
<string name="white_theme">Pure White</string> <string name="white_theme">Pure White</string>
<string name="system_default_amoled">System default (White + Black)</string> <string name="system_default_amoled">System default (White + Black)</string>
<string name="system_default_all_blue">System default (All Blue)</string> <string name="system_default_all_blue">System default (All Blue)</string>

View File

@ -69,6 +69,7 @@
<item name="android:windowLightNavigationBar" tools:targetApi="27">false</item> <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
</style> </style>
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Tachiyomi"/> <style name="Theme.Tachiyomi.Amoled" parent="Theme.Tachiyomi"/>
<style name="Theme.Tachiyomi.BlackAndRed" parent="Theme.Tachiyomi.Amoled"/>
<style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Tachiyomi"> <style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Tachiyomi">
<item name="colorPrimary">@color/dialogDuskDawn</item> <item name="colorPrimary">@color/dialogDuskDawn</item>
<item name="colorPrimaryDark">@color/dialogDuskDawn</item> <item name="colorPrimaryDark">@color/dialogDuskDawn</item>