Use inner function to reduce boilerplate in LookAndFeelActivity

LemmyNet · Jun 5, 2023 · d8ce3bd · d8ce3bd
1 parent 466195d
commit d8ce3bd
Showing 1 changed file with 18 additions and 50 deletions.
diff --git a/app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt b/app/src/main/java/com/jerboa/ui/components/settings/lookandfeel/LookAndFeelActivity.kt
@@ -16,7 +16,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import com.alorma.compose.settings.storage.base.SettingValueState
 import com.alorma.compose.settings.storage.base.rememberFloatSettingState
 import com.alorma.compose.settings.storage.base.rememberIntSettingState
 import com.alorma.compose.settings.ui.SettingsList
@@ -48,6 +47,20 @@ fun LookAndFeelActivity(
 
     val snackbarHostState = remember { SnackbarHostState() }
 
+    fun updateAppSettings() {
+        appSettingsViewModel.update(
+            AppSettings(
+                id = 1,
+                viewedChangelog = appSettingsViewModel.appSettings.value?.viewedChangelog ?: 0,
+                theme = themeState.value,
+                themeColor = themeColorState.value,
+                fontSize = fontSizeState.value.toInt(),
+                postViewMode = postViewModeState.value,
+            )
+        )
+
+    }
+
     Scaffold(
         snackbarHost = { SnackbarHost(snackbarHostState) },
         topBar = {
@@ -68,15 +81,7 @@ fun LookAndFeelActivity(
                     title = {
                         Text(text = "Font size: ${fontSizeState.value.toInt()}")
                     },
-                    onValueChangeFinished = {
-                        updateAppSettings(
-                            appSettingsViewModel,
-                            fontSizeState,
-                            themeState,
-                            themeColorState,
-                            postViewModeState,
-                        )
-                    },
+                    onValueChangeFinished = { updateAppSettings() },
                 )
                 SettingsList(
                     state = themeState,
@@ -92,13 +97,7 @@ fun LookAndFeelActivity(
                     },
                     onItemSelected = { i, _ ->
                         themeState.value = i
-                        updateAppSettings(
-                            appSettingsViewModel,
-                            fontSizeState,
-                            themeState,
-                            themeColorState,
-                            postViewModeState,
-                        )
+                        updateAppSettings()
                     },
                 )
                 SettingsList(
@@ -115,13 +114,7 @@ fun LookAndFeelActivity(
                     },
                     onItemSelected = { i, _ ->
                         themeColorState.value = i
-                        updateAppSettings(
-                            appSettingsViewModel,
-                            fontSizeState,
-                            themeState,
-                            themeColorState,
-                            postViewModeState,
-                        )
+                        updateAppSettings()
                     },
                 )
                 SettingsList(
@@ -138,35 +131,10 @@ fun LookAndFeelActivity(
                     },
                     onItemSelected = { i, _ ->
                         postViewModeState.value = i
-                        updateAppSettings(
-                            appSettingsViewModel,
-                            fontSizeState,
-                            themeState,
-                            themeColorState,
-                            postViewModeState,
-                        )
+                        updateAppSettings()
                     },
                 )
             }
         },
     )
 }
-
-private fun updateAppSettings(
-    appSettingsViewModel: AppSettingsViewModel,
-    fontSizeState: SettingValueState<Float>,
-    themeState: SettingValueState<Int>,
-    themeColorState: SettingValueState<Int>,
-    postViewModeState: SettingValueState<Int>,
-) {
-    appSettingsViewModel.update(
-        AppSettings(
-            id = 1,
-            fontSize = fontSizeState.value.toInt(),
-            theme = themeState.value,
-            themeColor = themeColorState.value,
-            viewedChangelog = appSettingsViewModel.appSettings.value?.viewedChangelog ?: 0,
-            postViewMode = postViewModeState.value,
-        ),
-    )
-}