fix: home layout style change not immediately reflected in appearance settings

Author: matsuzaka-yuki

app/src/main/java/me/bmax/apatch/ui/screen/Home.kt

@@ -96,6 +96,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
+import me.bmax.apatch.ui.theme.refreshTheme
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
@@ -178,7 +179,11 @@ fun HomeScreen(navigator: DestinationsNavigator) {
         }
     }
 
-    val homeLayout = remember { APApplication.sharedPreferences.getString("home_layout_style", "stats") }
+    var homeLayout by remember { mutableStateOf(APApplication.sharedPreferences.getString("home_layout_style", "stats")) }
+    val homeRefreshObserver by refreshTheme.observeAsState(false)
+    if (homeRefreshObserver) {
+        homeLayout = APApplication.sharedPreferences.getString("home_layout_style", "stats")
+    }
 
     Scaffold(topBar = {
         TopBar(onInstallClick = dropUnlessResumed {

app/src/main/java/me/bmax/apatch/ui/screen/settings/AppearanceSettings.kt

@@ -1667,7 +1667,10 @@ fun AppearanceSettingsContent(
         }
 
     if (showHomeLayoutChooseDialog.value) {
-        HomeLayoutChooseDialog(showHomeLayoutChooseDialog)
+        HomeLayoutChooseDialog(showHomeLayoutChooseDialog) { selectedLayout ->
+            currentStyle = selectedLayout
+            refreshTheme.value = true
+        }
     }
 
     if (showNavSchemeDialog) {
@@ -1860,7 +1863,7 @@ fun ThemeChooseDialog(showDialog: MutableState<Boolean>) {
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
+fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>, onLayoutSelected: (String) -> Unit) {
     val prefs = APApplication.sharedPreferences
 
     BasicAlertDialog(
@@ -1902,6 +1905,7 @@ fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
                             },
                             modifier = Modifier.clickable {
                                 prefs.edit().putString("home_layout_style", "default").apply()
+                                onLayoutSelected("default")
                                 showDialog.value = false
                             }
                         )
@@ -1916,6 +1920,7 @@ fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
                             },
                             modifier = Modifier.clickable {
                                 prefs.edit().putString("home_layout_style", "kernelsu").apply()
+                                onLayoutSelected("kernelsu")
                                 showDialog.value = false
                             }
                         )
@@ -1930,6 +1935,7 @@ fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
                             },
                             modifier = Modifier.clickable {
                                 prefs.edit().putString("home_layout_style", "focus").apply()
+                                onLayoutSelected("focus")
                                 showDialog.value = false
                             }
                         )
@@ -1944,6 +1950,7 @@ fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
                             },
                             modifier = Modifier.clickable {
                                 prefs.edit().putString("home_layout_style", "sign").apply()
+                                onLayoutSelected("sign")
                                 showDialog.value = false
                             }
                         )
@@ -1958,6 +1965,7 @@ fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
                             },
                             modifier = Modifier.clickable {
                                 prefs.edit().putString("home_layout_style", "circle").apply()
+                                onLayoutSelected("circle")
                                 showDialog.value = false
                             }
                         )
@@ -1972,6 +1980,7 @@ fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
                             },
                             modifier = Modifier.clickable {
                                 prefs.edit().putString("home_layout_style", "dashboard_ui").apply()
+                                onLayoutSelected("dashboard_ui")
                                 showDialog.value = false
                             }
                         )
@@ -1986,6 +1995,7 @@ fun HomeLayoutChooseDialog(showDialog: MutableState<Boolean>) {
                             },
                             modifier = Modifier.clickable {
                                 prefs.edit().putString("home_layout_style", "stats").apply()
+                                onLayoutSelected("stats")
                                 showDialog.value = false
                             }
                         )