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

@@ -91,44 +91,15 @@ fun SettingsScreen(
             )
         },
     ) { inner ->
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(inner)
-                .verticalScroll(rememberScrollState())
-                .padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-        ) {
-            AccountCard(
-                username = state.username,
-                isAdmin = state.isAdmin,
-                serverUrl = state.serverUrl,
-            )
-            NavTile(
-                icon = Lucide.ListMusic,
-                title = "My requests",
-                subtitle = "Track what you've asked Minstrel to add",
-                onClick = { navController.navigate(Requests) },
-            )
-            if (state.isAdmin) {
-                NavTile(
-                    icon = Lucide.Shield,
-                    title = "Admin",
-                    subtitle = "Manage requests, quarantine, and users",
-                    onClick = { navController.navigate(Admin) },
-                )
-            }
-            ProfileCard()
-            PasswordCard()
-            ListenBrainzCard()
-            AppearanceCard(themeMode = themeMode, onPick = themeVm::setThemeMode)
-            StorageCard()
-            AboutCard()
-            SignOutButton(
-                isSigningOut = state.isSigningOut,
-                onSignOut = { showSignOutConfirm = true },
-            )
-        }
+        SettingsList(
+            inner = inner,
+            state = state,
+            themeMode = themeMode,
+            onPickTheme = themeVm::setThemeMode,
+            onNavToRequests = { navController.navigate(Requests) },
+            onNavToAdmin = { navController.navigate(Admin) },
+            onSignOutClick = { showSignOutConfirm = true },
+        )
     }
     if (showSignOutConfirm) {
         SignOutConfirmDialog(
@@ -141,6 +112,53 @@ fun SettingsScreen(
     }
 }
 
+@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()
+            .padding(inner)
+            .verticalScroll(rememberScrollState())
+            .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        AccountCard(
+            username = state.username,
+            isAdmin = state.isAdmin,
+            serverUrl = state.serverUrl,
+        )
+        NavTile(
+            icon = Lucide.ListMusic,
+            title = "My requests",
+            subtitle = "Track what you've asked Minstrel to add",
+            onClick = onNavToRequests,
+        )
+        if (state.isAdmin) {
+            NavTile(
+                icon = Lucide.Shield,
+                title = "Admin",
+                subtitle = "Manage requests, quarantine, and users",
+                onClick = onNavToAdmin,
+            )
+        }
+        ProfileCard()
+        PasswordCard()
+        ListenBrainzCard()
+        AppearanceCard(themeMode = themeMode, onPick = onPickTheme)
+        StorageCard()
+        AboutCard()
+        SignOutButton(isSigningOut = state.isSigningOut, onSignOut = onSignOutClick)
+    }
+}
+
 @Composable
 private fun SignOutConfirmDialog(onConfirm: () -> Unit, onDismiss: () -> Unit) {
     AlertDialog(