reorganize settings into separate functions

app/src/main/java/com/geode/launcher/preferences/SettingsActivity.kt

@@ -241,73 +241,10 @@ fun DeveloperModeDialog(onDismiss: () -> Unit, onEnable: () -> Unit) {
     )
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SettingsScreen(
+fun GeneralSettingsGroup() {
-    onBackPressedDispatcher: OnBackPressedDispatcher?,
-    releaseViewModel: ReleaseViewModel = viewModel(factory = ReleaseViewModel.Factory)
-) {
     val context = LocalContext.current
-    val resources = LocalResources.current
 
-    val currentRelease by PreferenceUtils.useStringPreference(PreferenceUtils.Key.CURRENT_VERSION_TAG)
-    val updateStatus by releaseViewModel.uiState.collectAsState()
-
-    val snackbarHostState = remember { SnackbarHostState() }
-    var showUpdateInProgress by remember { mutableStateOf(false) }
-
-    if (showUpdateInProgress) {
-        LaunchedEffect(snackbarHostState) {
-            snackbarHostState.showSnackbar(
-                resources.getString(R.string.preference_check_for_updates_already_updating)
-            )
-            showUpdateInProgress = false
-        }
-    }
-
-    // fix theme transition by giving it the exact same animation as the top bar
-    val containerColor by animateColorAsState(
-        targetValue = MaterialTheme.colorScheme.background,
-        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
-        label = "background color"
-    )
-
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
-    Scaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
-        containerColor = containerColor,
-        snackbarHost = {
-           SnackbarHost(hostState = snackbarHostState)
-        },
-        topBar = {
-            TopAppBar(
-                navigationIcon = {
-                    IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
-                        Icon(
-                            painterResource(R.drawable.icon_arrow_back),
-                            contentDescription = stringResource(R.string.back_icon_alt)
-                        )
-                    }
-                },
-                title = {
-                    Text(
-                        stringResource(R.string.title_activity_settings),
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis
-                    )
-                },
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.background),
-            )
-        },
-        content = { innerPadding ->
-            Column(
-                Modifier
-                    .padding(innerPadding)
-                    .fillMaxWidth()
-                    .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
-            ) {
     OptionsGroup(stringResource(R.string.preference_category_testing)) {
         SettingsSelectCard(
             title = stringResource(R.string.preference_theme_name),
@@ -362,6 +299,11 @@ fun SettingsScreen(
             onClick = { onOpenFileManager(context) }
         )
     }
+}
+
+@Composable
+fun GameplaySettingsGroup() {
+    val context = LocalContext.current
 
     OptionsGroup(stringResource(R.string.preference_category_gameplay)) {
         SettingsCard(
@@ -433,6 +375,11 @@ fun SettingsScreen(
             maxFrameRate = maxFrameRate
         )
     }
+}
+
+@Composable
+fun UpdateSettingsGroup(releaseViewModel: ReleaseViewModel, snackbarHostState: SnackbarHostState, onUpdate: () -> Unit) {
+    val updateStatus by releaseViewModel.uiState.collectAsState()
 
     OptionsGroup(stringResource(R.string.preference_category_updater)) {
         SettingsCard(
@@ -472,11 +419,7 @@ fun SettingsScreen(
             modifier = Modifier
                 .clickable(
                     onClick = {
-                                    if (releaseViewModel.isInUpdate) {
+                        onUpdate()
-                                        showUpdateInProgress = true
-                                    } else {
-                                        releaseViewModel.runReleaseCheck(true)
-                                    }
                     },
                     role = Role.Button
                 )
@@ -484,8 +427,11 @@ fun SettingsScreen(
             UpdateIndicator(snackbarHostState, updateStatus)
         }
     }
+}
 
-                val developerModeEnabled by PreferenceUtils.useBooleanPreference(PreferenceUtils.Key.DEVELOPER_MODE)
+@Composable
+fun AdvancedSettingsGroup(developerModeEnabled: Boolean) {
+    val context = LocalContext.current
 
     OptionsGroup(stringResource(R.string.preference_category_developer)) {
         if (developerModeEnabled) {
@@ -542,6 +488,13 @@ fun SettingsScreen(
             }
         }
     }
+}
+
+@Composable
+fun AboutSettingsGroup(developerModeEnabled: Boolean) {
+    val context = LocalContext.current
+    val resources = LocalResources.current
+    val currentRelease by PreferenceUtils.useStringPreference(PreferenceUtils.Key.CURRENT_VERSION_TAG)
 
     OptionsGroup(stringResource(R.string.preference_category_about)) {
         var launcherButtonTapped by remember { mutableIntStateOf(0) }
@@ -565,7 +518,6 @@ fun SettingsScreen(
             }
         }
 
-                    val context = LocalContext.current
         if (showDeveloperDialog) {
             DeveloperModeDialog(
                 onDismiss = {
@@ -614,6 +566,86 @@ fun SettingsScreen(
             )
         }
     }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SettingsScreen(
+    onBackPressedDispatcher: OnBackPressedDispatcher?,
+    releaseViewModel: ReleaseViewModel = viewModel(factory = ReleaseViewModel.Factory)
+) {
+    val resources = LocalResources.current
+
+    val snackbarHostState = remember { SnackbarHostState() }
+    var showUpdateInProgress by remember { mutableStateOf(false) }
+
+    if (showUpdateInProgress) {
+        LaunchedEffect(snackbarHostState) {
+            snackbarHostState.showSnackbar(
+                resources.getString(R.string.preference_check_for_updates_already_updating)
+            )
+            showUpdateInProgress = false
+        }
+    }
+
+    // fix theme transition by giving it the exact same animation as the top bar
+    val containerColor by animateColorAsState(
+        targetValue = MaterialTheme.colorScheme.background,
+        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+        label = "background color"
+    )
+
+    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+    Scaffold(
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        containerColor = containerColor,
+        snackbarHost = {
+           SnackbarHost(hostState = snackbarHostState)
+        },
+        topBar = {
+            TopAppBar(
+                navigationIcon = {
+                    IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
+                        Icon(
+                            painterResource(R.drawable.icon_arrow_back),
+                            contentDescription = stringResource(R.string.back_icon_alt)
+                        )
+                    }
+                },
+                title = {
+                    Text(
+                        stringResource(R.string.title_activity_settings),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                },
+                scrollBehavior = scrollBehavior,
+                colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.background),
+            )
+        },
+        content = { innerPadding ->
+            Column(
+                Modifier
+                    .padding(innerPadding)
+                    .fillMaxWidth()
+                    .verticalScroll(rememberScrollState()),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                GeneralSettingsGroup()
+                GameplaySettingsGroup()
+
+                UpdateSettingsGroup(releaseViewModel, snackbarHostState, onUpdate = {
+                    if (releaseViewModel.isInUpdate) {
+                        showUpdateInProgress = true
+                    } else {
+                        releaseViewModel.runReleaseCheck(true)
+                    }
+                })
+
+                val developerModeEnabled by PreferenceUtils.useBooleanPreference(PreferenceUtils.Key.DEVELOPER_MODE)
+
+                AdvancedSettingsGroup(developerModeEnabled)
+                AboutSettingsGroup(developerModeEnabled)
 
                 Spacer(Modifier.height(4.dp))
             }