copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Revert part of "Switch to MaterialExpressiveTheme" (#1377)

Browse source 
Co-authored-by: Cuong-Tran <16017808+cuong-tran@users.noreply.github.com>
(cherry picked from commit 3e6afee13b9fd5716f7f2d547b3edcd3e17915db)

This reverts part of commit 3ab83f1270.
This commit is contained in:
Cuong-Tran 2026-01-09 14:30:16 +07:00 committed by GitHub
parent ab9e17c739
commit 9136c15b9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
View file

@ -33,11 +33,11 @@ class UiPreferences(
// KMK --> // KMK -->
fun colorTheme() = preferenceStore.getInt("pref_color_theme", 0xFFDF0090.toInt()) fun colorTheme() = preferenceStore.getInt("pref_color_theme", 0xFFDF0090.toInt())
fun customThemeStyle() = preferenceStore.getEnum("pref_custom_theme_style_key", PaletteStyle.Expressive) fun customThemeStyle() = preferenceStore.getEnum("pref_custom_theme_style_key", PaletteStyle.Fidelity)
fun themeCoverBased() = preferenceStore.getBoolean("pref_theme_cover_based_key", true) fun themeCoverBased() = preferenceStore.getBoolean("pref_theme_cover_based_key", true)
fun themeCoverBasedStyle() = preferenceStore.getEnum("pref_theme_cover_based_style_key", PaletteStyle.Expressive) fun themeCoverBasedStyle() = preferenceStore.getEnum("pref_theme_cover_based_style_key", PaletteStyle.Vibrant)
fun preloadLibraryColor() = preferenceStore.getBoolean("pref_preload_library_color_key", true) fun preloadLibraryColor() = preferenceStore.getBoolean("pref_preload_library_color_key", true)
// KMK <-- // KMK <--

8
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
View file

@ -112,14 +112,14 @@ object SettingsAppearanceScreen : SearchableSettings {
entries = PaletteStyle.entries entries = PaletteStyle.entries
.associateWith { .associateWith {
when (it) { when (it) {
PaletteStyle.Expressive ->
stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
PaletteStyle.TonalSpot -> PaletteStyle.TonalSpot ->
stringResource(KMR.strings.pref_theme_cover_based_style_tonalspot) stringResource(KMR.strings.pref_theme_cover_based_style_tonalspot)
PaletteStyle.Neutral -> PaletteStyle.Neutral ->
stringResource(KMR.strings.pref_theme_cover_based_style_neutral) stringResource(KMR.strings.pref_theme_cover_based_style_neutral)
PaletteStyle.Vibrant -> PaletteStyle.Vibrant ->
stringResource(KMR.strings.pref_theme_cover_based_style_vibrant) stringResource(KMR.strings.pref_theme_cover_based_style_vibrant)
PaletteStyle.Expressive ->
stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
PaletteStyle.Rainbow -> PaletteStyle.Rainbow ->
stringResource(KMR.strings.pref_theme_cover_based_style_rainbow) stringResource(KMR.strings.pref_theme_cover_based_style_rainbow)
PaletteStyle.FruitSalad -> PaletteStyle.FruitSalad ->
@ -175,14 +175,14 @@ object SettingsAppearanceScreen : SearchableSettings {
entries = PaletteStyle.entries entries = PaletteStyle.entries
.associateWith { .associateWith {
when (it) { when (it) {
PaletteStyle.Expressive ->
stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
PaletteStyle.TonalSpot -> PaletteStyle.TonalSpot ->
stringResource(KMR.strings.pref_theme_cover_based_style_tonalspot) stringResource(KMR.strings.pref_theme_cover_based_style_tonalspot)
PaletteStyle.Neutral -> PaletteStyle.Neutral ->
stringResource(KMR.strings.pref_theme_cover_based_style_neutral) stringResource(KMR.strings.pref_theme_cover_based_style_neutral)
PaletteStyle.Vibrant -> PaletteStyle.Vibrant ->
stringResource(KMR.strings.pref_theme_cover_based_style_vibrant) stringResource(KMR.strings.pref_theme_cover_based_style_vibrant)
PaletteStyle.Expressive ->
stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
PaletteStyle.Rainbow -> PaletteStyle.Rainbow ->
stringResource(KMR.strings.pref_theme_cover_based_style_rainbow) stringResource(KMR.strings.pref_theme_cover_based_style_rainbow)
PaletteStyle.FruitSalad -> PaletteStyle.FruitSalad ->