Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-19 02:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added "Yotsuba" theme (#5290)

Browse Source
This commit is contained in:
Zakhar Timoshenko 2021-06-12 16:45:49 +03:00 committed by GitHub
parent 4dfb3cc972
commit 9b967177c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
View File

@ -22,6 +22,7 @@ object PreferenceValues {
default,
blue,
strawberrydaiquiri,
yotsuba
}
// Keys are lowercase to match legacy string values

1
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
View File

@ -41,6 +41,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
LightThemeVariant.default -> R.style.Theme_Tachiyomi_Light
LightThemeVariant.blue -> R.style.Theme_Tachiyomi_Light_Blue
LightThemeVariant.strawberrydaiquiri -> R.style.Theme_Tachiyomi_Light_StrawberryDaiquiri
LightThemeVariant.yotsuba -> R.style.Theme_Tachiyomi_Light_Yotsuba
}
}
setTheme(themeId)

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View File

@ -124,12 +124,14 @@ class SettingsGeneralController : SettingsController() {
entriesRes = arrayOf(
R.string.theme_light_default,
R.string.theme_light_blue,
R.string.theme_light_strawberrydaiquiri
R.string.theme_light_strawberrydaiquiri,
R.string.theme_light_yotsuba
)
entryValues = arrayOf(
Values.LightThemeVariant.default.name,
Values.LightThemeVariant.blue.name,
Values.LightThemeVariant.strawberrydaiquiri.name
Values.LightThemeVariant.strawberrydaiquiri.name,
Values.LightThemeVariant.yotsuba.name
)
defaultValue = Values.LightThemeVariant.default.name
summary = "%s"

5
app/src/main/res/values/colors.xml
View File

@ -33,6 +33,11 @@
<color name="rippleSecondaryColorStrawberry">#0AED4A65</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 -->
<color name="colorAccentDark">#3399FF</color>
<color name="textColorPrimaryDark">@color/md_white_1000</color>

1
app/src/main/res/values/strings.xml
View File

@ -148,6 +148,7 @@
<string name="theme_light_default">Default</string>
<string name="theme_light_blue">Light Blue</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="theme_dark_default">Default</string>
<string name="theme_dark_blue">Dark Blue</string>

4
app/src/main/res/values/styles.xml
View File

@ -72,6 +72,10 @@
<item name="colorAccent">@color/colorAccentStrawberry</item>
</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">
<item name="colorAccent">@color/colorAccentDark</item>
</style>

19
app/src/main/res/values/themes.xml
View File

@ -155,6 +155,25 @@
<item name="colorLibrarySelectionActive">@color/selectorColorStrawberry</item>
</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 -->
<!--=============-->