From 9136c15b9e25dac15255fb7a361336daba0184fb Mon Sep 17 00:00:00 2001
From: Cuong-Tran <16017808+cuong-tran@users.noreply.github.com>
Date: Fri, 9 Jan 2026 14:30:16 +0700
Subject: [PATCH] Revert part of "Switch to MaterialExpressiveTheme" (#1377)

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

This reverts part of commit 3ab83f1270075a871e68242d3d08876dfad619b1.
---
 app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt    | 4 ++--
 .../more/settings/screen/SettingsAppearanceScreen.kt      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt b/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
index 75bdf132c..1ef4a874c 100644
--- a/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
+++ b/app/src/main/java/eu/kanade/domain/ui/UiPreferences.kt
@@ -33,11 +33,11 @@ class UiPreferences(
     // KMK -->
     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 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)
     // KMK <--
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
index 9491d8de2..8ebe807a5 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAppearanceScreen.kt
@@ -112,14 +112,14 @@ object SettingsAppearanceScreen : SearchableSettings {
                     entries = PaletteStyle.entries
                         .associateWith {
                             when (it) {
-                                PaletteStyle.Expressive ->
-                                    stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
                                 PaletteStyle.TonalSpot ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_tonalspot)
                                 PaletteStyle.Neutral ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_neutral)
                                 PaletteStyle.Vibrant ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_vibrant)
+                                PaletteStyle.Expressive ->
+                                    stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
                                 PaletteStyle.Rainbow ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_rainbow)
                                 PaletteStyle.FruitSalad ->
@@ -175,14 +175,14 @@ object SettingsAppearanceScreen : SearchableSettings {
                     entries = PaletteStyle.entries
                         .associateWith {
                             when (it) {
-                                PaletteStyle.Expressive ->
-                                    stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
                                 PaletteStyle.TonalSpot ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_tonalspot)
                                 PaletteStyle.Neutral ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_neutral)
                                 PaletteStyle.Vibrant ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_vibrant)
+                                PaletteStyle.Expressive ->
+                                    stringResource(KMR.strings.pref_theme_cover_based_style_expressive)
                                 PaletteStyle.Rainbow ->
                                     stringResource(KMR.strings.pref_theme_cover_based_style_rainbow)
                                 PaletteStyle.FruitSalad ->