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 3ab83f1270.
This commit is contained in:
parent
ab9e17c739
commit
9136c15b9e
2 changed files with 6 additions and 6 deletions
|
|
@ -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 <--
|
||||
|
|
|
|||
|
|
@ -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 ->
|
||||
|
|
|
|||
Loading…
Reference in a new issue