diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
index 9b74ea49..3fda6286 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt
@@ -28,6 +28,7 @@ fun AppearanceSettingsScreen() {
val context = LocalContext.current
val navController = LocalNavController.current
val themeName by viewModel.themeName.collectAsStateWithLifecycle(null)
+ val compatModeColors by viewModel.compatModeColors.collectAsState()
PreferenceScreen(title = stringResource(id = R.string.preference_screen_appearance)) {
item {
PreferenceCategory {
@@ -52,17 +53,6 @@ fun AppearanceSettingsScreen() {
navController?.navigate("settings/appearance/themes")
}
)
- if (isAtLeastApiLevel(31)) {
- val compatModeColors by viewModel.compatModeColors.collectAsState()
- SwitchPreference(
- title = stringResource(id = R.string.preference_force_compat_system_colors),
- summary = stringResource(id = R.string.preference_force_compat_system_colors_summary),
- value = compatModeColors,
- onValueChanged = {
- viewModel.setCompatModeColors(it)
- }
- )
- }
val font by viewModel.font.collectAsState()
ListPreference(
title = stringResource(R.string.preference_font),
@@ -91,5 +81,23 @@ fun AppearanceSettingsScreen() {
)
}
}
+
+ if (isAtLeastApiLevel(31)) {
+ item {
+ PreferenceCategory(stringResource(R.string.preference_category_advanced)) {
+ ListPreference(
+ title = stringResource(R.string.preference_mdy_color_sorce),
+ items = listOf(
+ stringResource(R.string.preference_mdy_color_sorce_system) to false,
+ stringResource(R.string.preference_mdy_color_sorce_wallpaper) to true,
+ ),
+ value = compatModeColors,
+ onValueChanged = {
+ viewModel.setCompatModeColors(it)
+ }
+ )
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml
index cdc959da..ac8b7138 100644
--- a/core/i18n/src/main/res/values/strings.xml
+++ b/core/i18n/src/main/res/values/strings.xml
@@ -447,14 +447,16 @@
Generate from primary color
Light color scheme
Dark color scheme
- Ignore system colors
- Request color scheme via Material You Compat
+ Source for dynamic colors
+ System
+ Wallpaper
Font
System default
About
Version
Links
Open source licenses
+ Advanced
Open website
App and license information