diff --git a/app/src/main/java/de/jrpie/android/launcher/preferences/theme/Background.kt b/app/src/main/java/de/jrpie/android/launcher/preferences/theme/Background.kt index da301c0..ca385af 100644 --- a/app/src/main/java/de/jrpie/android/launcher/preferences/theme/Background.kt +++ b/app/src/main/java/de/jrpie/android/launcher/preferences/theme/Background.kt @@ -16,7 +16,13 @@ enum class Background(val id: Int, val dim: Boolean = false, val blur: Boolean = ; fun applyToTheme(theme: Resources.Theme) { - theme.applyStyle(id, true) + var background = this + + // force a solid background when using the light theme + if (LauncherPreferences.theme().colorTheme() == ColorTheme.LIGHT) { + background = SOLID + } + theme.applyStyle(background.id, true) } fun applyToWindow(window: Window) { diff --git a/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt b/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt index 1e57f9f..8cef124 100644 --- a/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt +++ b/app/src/main/java/de/jrpie/android/launcher/preferences/theme/ColorTheme.kt @@ -26,7 +26,7 @@ enum class ColorTheme( R.style.colorThemeLight, R.string.settings_theme_color_theme_item_light, R.style.textShadowLight, - { false }), + { true }), DYNAMIC( R.style.colorThemeDynamic, R.string.settings_theme_color_theme_item_dynamic, diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/de/jrpie/android/launcher/ui/settings/launcher/SettingsFragmentLauncher.kt index 0ae08c2..0b054ce 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/settings/launcher/SettingsFragmentLauncher.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/settings/launcher/SettingsFragmentLauncher.kt @@ -34,6 +34,12 @@ class SettingsFragmentLauncher : PreferenceFragmentCompat() { ) val timeVisible = LauncherPreferences.clock().timeVisible() showSeconds?.isVisible = timeVisible + + val background = findPreference( + LauncherPreferences.theme().keys().background() + ) + val lightTheme = LauncherPreferences.theme().colorTheme() == ColorTheme.LIGHT + background?.isVisible = !lightTheme } override fun onStart() {