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

@@ -131,8 +131,20 @@ fun SettingsScreen(
         }
     }
     if (showSignOutConfirm) {
+        SignOutConfirmDialog(
+            onConfirm = {
+                showSignOutConfirm = false
+                viewModel.signOut()
+            },
+            onDismiss = { showSignOutConfirm = false },
+        )
+    }
+}
+
+@Composable
+private fun SignOutConfirmDialog(onConfirm: () -> Unit, onDismiss: () -> Unit) {
     AlertDialog(
-            onDismissRequest = { showSignOutConfirm = false },
+        onDismissRequest = onDismiss,
         title = { Text("Sign out?") },
         text = {
             Text(
@@ -142,10 +154,7 @@ fun SettingsScreen(
         },
         confirmButton = {
             Button(
-                    onClick = {
+                onClick = onConfirm,
-                        showSignOutConfirm = false
-                        viewModel.signOut()
-                    },
                 colors = ButtonDefaults.buttonColors(
                     containerColor = MaterialTheme.colorScheme.errorContainer,
                     contentColor = MaterialTheme.colorScheme.onErrorContainer,
@@ -153,10 +162,9 @@ fun SettingsScreen(
             ) { Text("Sign out") }
         },
         dismissButton = {
-                TextButton(onClick = { showSignOutConfirm = false }) { Text("Cancel") }
+            TextButton(onClick = onDismiss) { Text("Cancel") }
         },
     )
-    }
 }
 
 @Composable