android/app/src/main/java/com/fabledsword/minstrel/settings/ui/SettingsScreen.kt

@@ -91,6 +91,37 @@ fun SettingsScreen(
             )
         },
     ) { inner ->
+        SettingsList(
+            inner = inner,
+            state = state,
+            themeMode = themeMode,
+            onPickTheme = themeVm::setThemeMode,
+            onNavToRequests = { navController.navigate(Requests) },
+            onNavToAdmin = { navController.navigate(Admin) },
+            onSignOutClick = { showSignOutConfirm = true },
+        )
+    }
+    if (showSignOutConfirm) {
+        SignOutConfirmDialog(
+            onConfirm = {
+                showSignOutConfirm = false
+                viewModel.signOut()
+            },
+            onDismiss = { showSignOutConfirm = false },
+        )
+    }
+}
+
+@Composable
+private fun SettingsList(
+    inner: androidx.compose.foundation.layout.PaddingValues,
+    state: SettingsState,
+    themeMode: ThemeMode,
+    onPickTheme: (ThemeMode) -> Unit,
+    onNavToRequests: () -> Unit,
+    onNavToAdmin: () -> Unit,
+    onSignOutClick: () -> Unit,
+) {
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -108,36 +139,23 @@ fun SettingsScreen(
             icon = Lucide.ListMusic,
             title = "My requests",
             subtitle = "Track what you've asked Minstrel to add",
-                onClick = { navController.navigate(Requests) },
+            onClick = onNavToRequests,
         )
         if (state.isAdmin) {
             NavTile(
                 icon = Lucide.Shield,
                 title = "Admin",
                 subtitle = "Manage requests, quarantine, and users",
-                    onClick = { navController.navigate(Admin) },
+                onClick = onNavToAdmin,
             )
         }
         ProfileCard()
         PasswordCard()
         ListenBrainzCard()
-            AppearanceCard(themeMode = themeMode, onPick = themeVm::setThemeMode)
+        AppearanceCard(themeMode = themeMode, onPick = onPickTheme)
         StorageCard()
         AboutCard()
-            SignOutButton(
+        SignOutButton(isSigningOut = state.isSigningOut, onSignOut = onSignOutClick)
-                isSigningOut = state.isSigningOut,
-                onSignOut = { showSignOutConfirm = true },
-            )
-        }
-    }
-    if (showSignOutConfirm) {
-        SignOutConfirmDialog(
-            onConfirm = {
-                showSignOutConfirm = false
-                viewModel.signOut()
-            },
-            onDismiss = { showSignOutConfirm = false },
-        )
     }
 }