From 01fe899c0c2d4c56dc9da6b97c6f2243c4350380 Mon Sep 17 00:00:00 2001 From: Guillermo Villafuerte Date: Sat, 6 Jan 2024 15:47:01 -0600 Subject: [PATCH] FIX: The flag for ignore system colors appeared on API versions below 31 Signed-off-by: Guillermo Villafuerte --- .../appearance/AppearanceSettingsScreen.kt | 21 +++++++++++-------- core/i18n/src/main/res/values/strings.xml | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) 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 c295bcda..ebc31cd7 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 @@ -9,6 +9,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewmodel.compose.viewModel +import de.mm20.launcher2.ktx.isAtLeastApiLevel import de.mm20.launcher2.preferences.Settings.AppearanceSettings import de.mm20.launcher2.preferences.Settings.AppearanceSettings.ColorScheme import de.mm20.launcher2.preferences.Settings.AppearanceSettings.Theme @@ -52,15 +53,17 @@ fun AppearanceSettingsScreen() { navController?.navigate("settings/appearance/themes") } ) - val compatMode by viewModel.compatMode.collectAsState() - SwitchPreference( - title = stringResource(id = R.string.preference_force_compat_system_colors), - summary = stringResource(id = R.string.preference_force_compat_system_colors_summary), - value = compatMode, - onValueChanged = { - viewModel.setCompatMode(it) - } - ) + if (isAtLeastApiLevel(31)) { + val compatMode by viewModel.compatMode.collectAsState() + SwitchPreference( + title = stringResource(id = R.string.preference_force_compat_system_colors), + summary = stringResource(id = R.string.preference_force_compat_system_colors_summary), + value = compatMode, + onValueChanged = { + viewModel.setCompatMode(it) + } + ) + } val font by viewModel.font.collectAsState() ListPreference( title = stringResource(R.string.preference_font), diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml index 9cd8e541..15d7dafd 100644 --- a/core/i18n/src/main/res/values/strings.xml +++ b/core/i18n/src/main/res/values/strings.xml @@ -448,7 +448,7 @@ Light color scheme Dark color scheme Ignore system colors - Request color scheme via Material You Compat, if available + Request color scheme via Material You Compat Font System default About