fixes mozilla-mobile#23644: re-emit wallpaper settings on rotation

MatthewTighe · Feb 9, 2022 · 63194b5 · 63194b5
1 parent 9746530
commit 63194b5
Showing 1 changed file with 40 additions and 26 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettingsFragment.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings.wallpaper
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,6 +16,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentContainer
 import androidx.navigation.fragment.findNavController
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.metrics.Event
@@ -44,35 +46,47 @@ class WallpaperSettingsFragment : Fragment() {
     ): View? {
         metrics.track(Event.WallpaperSettingsOpened)
         return ComposeView(requireContext()).apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
-                FirefoxTheme {
-                    var currentWallpaper by remember { mutableStateOf(wallpaperManager.currentWallpaper) }
-                    var wallpapersSwitchedByLogo by remember { mutableStateOf(settings.wallpapersSwitchedByLogoTap) }
-                    WallpaperSettings(
-                        wallpapers = wallpaperManager.wallpapers,
-                        defaultWallpaper = WallpaperManager.defaultWallpaper,
-                        loadWallpaperResource = {
-                            wallpaperManager.loadSavedWallpaper(requireContext(), it)
-                        },
-                        selectedWallpaper = currentWallpaper,
-                        onSelectWallpaper = { selectedWallpaper: Wallpaper ->
-                            currentWallpaper = selectedWallpaper
-                            wallpaperManager.currentWallpaper = selectedWallpaper
-                            metrics.track(Event.WallpaperSelected(selectedWallpaper))
-                        },
-                        onViewWallpaper = { findNavController().navigate(R.id.homeFragment) },
-                        tapLogoSwitchChecked = wallpapersSwitchedByLogo,
-                        onTapLogoSwitchCheckedChange = {
-                            settings.wallpapersSwitchedByLogoTap = it
-                            wallpapersSwitchedByLogo = it
-                            metrics.track(Event.ChangeWallpaperWithLogoToggled(it))
-                        }
-                    )
-                }
+            wallpaperSettings()
+        }
+    }
+
+    private fun ComposeView.wallpaperSettings() {
+        setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+        setContent {
+            FirefoxTheme {
+                var currentWallpaper by remember { mutableStateOf(wallpaperManager.currentWallpaper) }
+                var wallpapersSwitchedByLogo by remember { mutableStateOf(settings.wallpapersSwitchedByLogoTap) }
+                WallpaperSettings(
+                    wallpapers = wallpaperManager.wallpapers,
+                    defaultWallpaper = WallpaperManager.defaultWallpaper,
+                    loadWallpaperResource = {
+                        wallpaperManager.loadSavedWallpaper(requireContext(), it)
+                    },
+                    selectedWallpaper = currentWallpaper,
+                    onSelectWallpaper = { selectedWallpaper: Wallpaper ->
+                        currentWallpaper = selectedWallpaper
+                        wallpaperManager.currentWallpaper = selectedWallpaper
+                        metrics.track(Event.WallpaperSelected(selectedWallpaper))
+                    },
+                    onViewWallpaper = { findNavController().navigate(R.id.homeFragment) },
+                    tapLogoSwitchChecked = wallpapersSwitchedByLogo,
+                    onTapLogoSwitchCheckedChange = {
+                        settings.wallpapersSwitchedByLogoTap = it
+                        wallpapersSwitchedByLogo = it
+                        metrics.track(Event.ChangeWallpaperWithLogoToggled(it))
+                    }
+                )
             }
         }
     }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        (view as? ComposeView)?.apply {
+            wallpaperSettings()
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         showToolbar(getString(R.string.customize_wallpapers))