Added "Yotsuba" theme (#5290)
This commit is contained in:
parent
4dfb3cc972
commit
9b967177c5
7 changed files with 35 additions and 2 deletions
|
@ -22,6 +22,7 @@ object PreferenceValues {
|
||||||
default,
|
default,
|
||||||
blue,
|
blue,
|
||||||
strawberrydaiquiri,
|
strawberrydaiquiri,
|
||||||
|
yotsuba
|
||||||
}
|
}
|
||||||
|
|
||||||
// Keys are lowercase to match legacy string values
|
// Keys are lowercase to match legacy string values
|
||||||
|
|
|
@ -41,6 +41,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
|
||||||
LightThemeVariant.default -> R.style.Theme_Tachiyomi_Light
|
LightThemeVariant.default -> R.style.Theme_Tachiyomi_Light
|
||||||
LightThemeVariant.blue -> R.style.Theme_Tachiyomi_Light_Blue
|
LightThemeVariant.blue -> R.style.Theme_Tachiyomi_Light_Blue
|
||||||
LightThemeVariant.strawberrydaiquiri -> R.style.Theme_Tachiyomi_Light_StrawberryDaiquiri
|
LightThemeVariant.strawberrydaiquiri -> R.style.Theme_Tachiyomi_Light_StrawberryDaiquiri
|
||||||
|
LightThemeVariant.yotsuba -> R.style.Theme_Tachiyomi_Light_Yotsuba
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setTheme(themeId)
|
setTheme(themeId)
|
||||||
|
|
|
@ -124,12 +124,14 @@ class SettingsGeneralController : SettingsController() {
|
||||||
entriesRes = arrayOf(
|
entriesRes = arrayOf(
|
||||||
R.string.theme_light_default,
|
R.string.theme_light_default,
|
||||||
R.string.theme_light_blue,
|
R.string.theme_light_blue,
|
||||||
R.string.theme_light_strawberrydaiquiri
|
R.string.theme_light_strawberrydaiquiri,
|
||||||
|
R.string.theme_light_yotsuba
|
||||||
)
|
)
|
||||||
entryValues = arrayOf(
|
entryValues = arrayOf(
|
||||||
Values.LightThemeVariant.default.name,
|
Values.LightThemeVariant.default.name,
|
||||||
Values.LightThemeVariant.blue.name,
|
Values.LightThemeVariant.blue.name,
|
||||||
Values.LightThemeVariant.strawberrydaiquiri.name
|
Values.LightThemeVariant.strawberrydaiquiri.name,
|
||||||
|
Values.LightThemeVariant.yotsuba.name
|
||||||
)
|
)
|
||||||
defaultValue = Values.LightThemeVariant.default.name
|
defaultValue = Values.LightThemeVariant.default.name
|
||||||
summary = "%s"
|
summary = "%s"
|
||||||
|
|
|
@ -33,6 +33,11 @@
|
||||||
<color name="rippleSecondaryColorStrawberry">#0AED4A65</color>
|
<color name="rippleSecondaryColorStrawberry">#0AED4A65</color>
|
||||||
<color name="selectorColorStrawberry">#BFED4A65</color>
|
<color name="selectorColorStrawberry">#BFED4A65</color>
|
||||||
|
|
||||||
|
<!-- Yotsuba Theme -->
|
||||||
|
<color name="colorAccentYotsuba">#FC8C5C</color>
|
||||||
|
<color name="rippleSecondaryColorYotsuba">#0AFC8C5C</color>
|
||||||
|
<color name="selectorColorYotsuba">#BFFC8C5C</color>
|
||||||
|
|
||||||
<!-- Dark Theme -->
|
<!-- Dark Theme -->
|
||||||
<color name="colorAccentDark">#3399FF</color>
|
<color name="colorAccentDark">#3399FF</color>
|
||||||
<color name="textColorPrimaryDark">@color/md_white_1000</color>
|
<color name="textColorPrimaryDark">@color/md_white_1000</color>
|
||||||
|
|
|
@ -148,6 +148,7 @@
|
||||||
<string name="theme_light_default">Default</string>
|
<string name="theme_light_default">Default</string>
|
||||||
<string name="theme_light_blue">Light Blue</string>
|
<string name="theme_light_blue">Light Blue</string>
|
||||||
<string name="theme_light_strawberrydaiquiri">Strawberry Daiquiri</string>
|
<string name="theme_light_strawberrydaiquiri">Strawberry Daiquiri</string>
|
||||||
|
<string name="theme_light_yotsuba">Yotsuba</string>
|
||||||
<string name="pref_theme_dark">Dark theme</string>
|
<string name="pref_theme_dark">Dark theme</string>
|
||||||
<string name="theme_dark_default">Default</string>
|
<string name="theme_dark_default">Default</string>
|
||||||
<string name="theme_dark_blue">Dark Blue</string>
|
<string name="theme_dark_blue">Dark Blue</string>
|
||||||
|
|
|
@ -72,6 +72,10 @@
|
||||||
<item name="colorAccent">@color/colorAccentStrawberry</item>
|
<item name="colorAccent">@color/colorAccentStrawberry</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="Theme.AlertDialog.Light.Yotsuba" parent="Theme.AlertDialog">
|
||||||
|
<item name="colorAccent">@color/colorAccentYotsuba</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="Theme.AlertDialog.Dark" parent="Theme.AlertDialog">
|
<style name="Theme.AlertDialog.Dark" parent="Theme.AlertDialog">
|
||||||
<item name="colorAccent">@color/colorAccentDark</item>
|
<item name="colorAccent">@color/colorAccentDark</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -155,6 +155,25 @@
|
||||||
<item name="colorLibrarySelectionActive">@color/selectorColorStrawberry</item>
|
<item name="colorLibrarySelectionActive">@color/selectorColorStrawberry</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<!--== Yotsuba theme ==-->
|
||||||
|
<style name="Theme.Tachiyomi.Light.Yotsuba">
|
||||||
|
<!-- Theme colors -->
|
||||||
|
<item name="colorAccentOnPrimary">@color/colorAccentYotsuba</item>
|
||||||
|
<item name="colorSecondary">@color/colorAccentYotsuba</item>
|
||||||
|
<item name="colorTertiary">@color/md_blue_A400</item>
|
||||||
|
<item name="colorOnTertiary">@color/md_white_1000</item>
|
||||||
|
<item name="colorAccent">@color/colorAccentYotsuba</item>
|
||||||
|
|
||||||
|
<!-- Ripples -->
|
||||||
|
<item name="rippleSecondaryColor">@color/rippleSecondaryColorYotsuba</item>
|
||||||
|
|
||||||
|
<!-- Themes -->
|
||||||
|
<item name="materialAlertDialogTheme">@style/Theme.AlertDialog.Light.Yotsuba</item>
|
||||||
|
|
||||||
|
<!-- Custom Attributes-->
|
||||||
|
<item name="colorLibrarySelectionActive">@color/selectorColorYotsuba</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<!--=============-->
|
<!--=============-->
|
||||||
<!-- Dark Themes -->
|
<!-- Dark Themes -->
|
||||||
<!--=============-->
|
<!--=============-->
|
||||||
|
|
Reference in a new issue