android/app/src/main/java/com/fabledsword/minstrel/auth/ui/LoginScreen.kt

@@ -46,6 +46,22 @@ fun LoginScreen(
     }
 
     Box(modifier = Modifier.fillMaxSize()) {
+        LoginForm(
+            state = state,
+            onUsernameChange = viewModel::setUsername,
+            onPasswordChange = viewModel::setPassword,
+            onSubmit = viewModel::submit,
+        )
+    }
+}
+
+@Composable
+private fun LoginForm(
+    state: LoginFormState,
+    onUsernameChange: (String) -> Unit,
+    onPasswordChange: (String) -> Unit,
+    onSubmit: () -> Unit,
+) {
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -60,7 +76,7 @@ fun LoginScreen(
         )
         OutlinedTextField(
             value = state.username,
-                onValueChange = viewModel::setUsername,
+            onValueChange = onUsernameChange,
             modifier = Modifier.fillMaxWidth(),
             label = { Text("Username") },
             singleLine = true,
@@ -72,7 +88,7 @@ fun LoginScreen(
         )
         OutlinedTextField(
             value = state.password,
-                onValueChange = viewModel::setPassword,
+            onValueChange = onPasswordChange,
             modifier = Modifier.fillMaxWidth(),
             label = { Text("Password") },
             singleLine = true,
@@ -82,17 +98,23 @@ fun LoginScreen(
                 keyboardType = KeyboardType.Password,
                 imeAction = ImeAction.Done,
             ),
-                keyboardActions = KeyboardActions(onDone = { viewModel.submit() }),
+            keyboardActions = KeyboardActions(onDone = { onSubmit() }),
         )
         if (state.errorMessage != null) {
             Text(
-                    text = state.errorMessage.orEmpty(),
+                text = state.errorMessage,
                 color = MaterialTheme.colorScheme.error,
                 style = MaterialTheme.typography.bodySmall,
             )
         }
+        SubmitButton(state = state, onSubmit = onSubmit)
+    }
+}
+
+@Composable
+private fun SubmitButton(state: LoginFormState, onSubmit: () -> Unit) {
     Button(
-                onClick = viewModel::submit,
+        onClick = onSubmit,
         enabled = !state.isSubmitting &&
             state.username.isNotBlank() &&
             state.password.isNotBlank(),
@@ -109,5 +131,3 @@ fun LoginScreen(
         }
     }
 }
-    }
-}