Update changelog

aberja · Aug 4, 2024 · 403de89 · 403de89
1 parent 7ed6da6
commit 403de89
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fix trailing whitespaces returning inconsistent search results (@mags0ft)
 - Fix location permission dialog being shown twice when resuming app (@ecawthorne)
 - Fix prompt for background location permission not being shown
+- Cards fade in and other elements preferences can’t work if animations are disabled at Android system level, greying out these options in this case (@ecawthorne)
 
 **Sources**
 - [Servizio Meteo AM] Fix some failures to refresh (@chunshek)

diff --git a/app/src/main/java/org/breezyweather/settings/compose/MainScreenSettingsScreen.kt b/app/src/main/java/org/breezyweather/settings/compose/MainScreenSettingsScreen.kt
@@ -183,10 +183,16 @@ fun MainScreenSettingsScreen(
             switchPreferenceItem(R.string.settings_main_cards_fade_in_switch) { id ->
                 SwitchPreferenceView(
                     titleId = id,
-                    summaryOnId = if (animationsEnabled) R.string.settings_enabled
-                    else R.string.settings_unavailable_no_animations,
-                    summaryOffId = if (animationsEnabled) R.string.settings_disabled
-                    else R.string.settings_unavailable_no_animations,
+                    summaryOnId = if (animationsEnabled) {
+                        R.string.settings_enabled
+                    } else {
+                        R.string.settings_unavailable_no_animations
+                    },
+                    summaryOffId = if (animationsEnabled) {
+                        R.string.settings_disabled
+                    } else {
+                        R.string.settings_unavailable_no_animations
+                    },
                     checked = SettingsManager.getInstance(context).isCardsFadeInEnabled
                             && animationsEnabled,
                     onValueChanged = {
@@ -198,10 +204,16 @@ fun MainScreenSettingsScreen(
             switchPreferenceItem(R.string.settings_main_cards_other_element_animations_switch) { id ->
                 SwitchPreferenceView(
                     titleId = id,
-                    summaryOnId = if (animationsEnabled) R.string.settings_enabled
-                    else R.string.settings_unavailable_no_animations,
-                    summaryOffId = if (animationsEnabled) R.string.settings_disabled
-                    else R.string.settings_unavailable_no_animations,
+                    summaryOnId = if (animationsEnabled) {
+                        R.string.settings_enabled
+                    } else {
+                        R.string.settings_unavailable_no_animations
+                    },
+                    summaryOffId = if (animationsEnabled) {
+                        R.string.settings_disabled
+                    } else {
+                        R.string.settings_unavailable_no_animations
+                    },
                     checked = SettingsManager.getInstance(context).isElementsAnimationEnabled
                             && animationsEnabled,
                     onValueChanged = {