clean up login page

lib/pages/login_page.dart

@@ -2,58 +2,43 @@ import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/models/requests/login_request.dart";
 import "package:nexus/widgets/appbar.dart";
 
 class LoginPage extends HookConsumerWidget {
   final Uri homeserver;
-
   const LoginPage({super.key, required this.homeserver});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final client = ref.watch(ClientController.provider.notifier);
-    final isLoggingIn = useState(false);
-    final hasError = useState(false);
-    final passwordFocusNode = useFocusNode();
-
-    final theme = Theme.of(context);
 
+    final isLoading = useState(false);
     final username = useTextEditingController();
     final password = useTextEditingController();
 
+    final inputError = useState<String?>(null);
+
     Future<void> tryLogin() async {
-      if (isLoggingIn.value) return;
+      isLoading.value = true;
-      isLoggingIn.value = true;
-      hasError.value = false;
 
-      final error = await client.login(
+      try {
-        LoginRequest(
+        final error = await client.login(
-          username: username.text,
+          .new(
-          password: password.text,
+            username: username.text,
-          homeserverUrl: homeserver.origin,
+            password: password.text,
-        ),
+            homeserverUrl: homeserver.origin,
-      );
-
-      if (!context.mounted) return;
-
-      if (error != null) {
-        hasError.value = true;
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(
-              "Login failed. Is your password right?\nError: $error",
-              style: TextStyle(color: theme.colorScheme.onErrorContainer),
-            ),
-            backgroundColor: theme.colorScheme.errorContainer,
           ),
         );
-        isLoggingIn.value = false;
+
-      } else {
+        if (error != null) {
-        Navigator.of(context).pop();
+          inputError.value = error;
+          isLoading.value = false;
+        } else {
+          if (context.mounted) Navigator.of(context).pop();
+        }
+      } finally {
+        isLoading.value = false;
       }
-      passwordFocusNode.requestFocus();
-      isLoggingIn.value = false;
     }
 
     return Scaffold(
@@ -66,57 +51,24 @@ class LoginPage extends HookConsumerWidget {
       body: AlertDialog(
         title: Text("Login to ${homeserver.host}"),
         content: Column(
-          mainAxisSize: MainAxisSize.min,
+          mainAxisSize: .min,
-          crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: .start,
           children: [
-            Text("Enter your login credentials:"),
-            SizedBox(height: 12),
             TextField(
               autofocus: true,
-              textInputAction: TextInputAction.next,
+              textInputAction: .next,
-              onChanged: (newVal) {
+              decoration: .new(label: Text("Username")),
-                if (hasError.value) {
-                  hasError.value = false;
-                }
-              },
-              decoration: InputDecoration(
-                label: Text("Username"),
-                focusedBorder: hasError.value
-                    ? OutlineInputBorder(
-                        borderSide: BorderSide(color: theme.colorScheme.error),
-                      )
-                    : null,
-                enabledBorder: hasError.value
-                    ? OutlineInputBorder(
-                        borderSide: BorderSide(color: theme.colorScheme.error),
-                      )
-                    : null,
-              ),
               controller: username,
             ),
             SizedBox(height: 12),
             TextField(
-              focusNode: passwordFocusNode,
+              textInputAction: .done,
-              textInputAction: TextInputAction.done,
               onSubmitted: (_) => tryLogin(),
-              onChanged: (newVal) {
-                if (hasError.value) {
-                  hasError.value = false;
-                }
-              },
               selectAllOnFocus: true,
-              decoration: InputDecoration(
+              decoration: .new(
                 label: Text("Password"),
-                focusedBorder: hasError.value
+                errorText: inputError.value,
-                    ? OutlineInputBorder(
+                errorMaxLines: 5,
-                        borderSide: BorderSide(color: theme.colorScheme.error),
-                      )
-                    : null,
-                enabledBorder: hasError.value
-                    ? OutlineInputBorder(
-                        borderSide: BorderSide(color: theme.colorScheme.error),
-                      )
-                    : null,
               ),
               controller: password,
               obscureText: true,
@@ -125,7 +77,7 @@ class LoginPage extends HookConsumerWidget {
         ),
         actions: [
           TextButton(
-            onPressed: hasError.value ? null : tryLogin,
+            onPressed: isLoading.value ? null : tryLogin,
             child: Text("Sign In"),
           ),
         ],

lib/pages/verify_page.dart

@@ -3,7 +3,6 @@ import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/controllers/client_controller.dart";
 import "package:nexus/widgets/appbar.dart";
-import "package:nexus/widgets/form_text_input.dart";
 
 class VerifyPage extends HookConsumerWidget {
   const VerifyPage({super.key});
@@ -11,7 +10,8 @@ class VerifyPage extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final passphraseController = useTextEditingController();
-    final isVerifying = useState(false);
+    final isLoading = useState(false);
+
     return Scaffold(
       appBar: Appbar(),
       body: AlertDialog(
@@ -24,19 +24,17 @@ class VerifyPage extends HookConsumerWidget {
               "Enter your recovery key or passphrase below to unlock encrypted events.\nYour passphrase is usually not the same as your password.",
             ),
             SizedBox(height: 12),
-            FormTextInput(
+            TextField(
-              required: false,
               autofocus: true,
-              capitalize: true,
               controller: passphraseController,
-              obscure: true,
+              obscureText: true,
-              title: "Recovery Key or Passphrase",
+              decoration: .new(label: Text("Recovery Key or Passphrase")),
             ),
           ],
         ),
         actions: [
           TextButton(
-            onPressed: isVerifying.value
+            onPressed: isLoading.value
                 ? null
                 : () async {
                     final scaffoldMessenger = ScaffoldMessenger.of(context);
@@ -49,7 +47,7 @@ class VerifyPage extends HookConsumerWidget {
                       ),
                     );
 
-                    isVerifying.value = true;
+                    isLoading.value = true;
 
                     final error = await ref
                         .watch(ClientController.provider.notifier)
@@ -57,7 +55,7 @@ class VerifyPage extends HookConsumerWidget {
 
                     snackbar.close();
                     if (error != null) {
-                      isVerifying.value = false;
+                      isLoading.value = false;
                       if (context.mounted) {
                         scaffoldMessenger.showSnackBar(
                           .new(

lib/widgets/form_text_input.dart

@@ -1,81 +0,0 @@
-import "package:flutter/material.dart";
-import "package:flutter/services.dart";
-
-class FormTextInput extends StatelessWidget {
-  final List<String? Function(String value)> extraValidators;
-  final TextEditingController? controller;
-  final TextInputType keyboardType;
-  final String? initialValue;
-  final bool readOnly;
-  final bool obscure;
-  final String? title;
-  final int? minLines;
-  final int? maxLength;
-  final bool outlined;
-  final int? maxLines;
-  final bool capitalize;
-  final bool required;
-  final bool autocorrect;
-  final void Function()? onTap;
-  final Widget? trailing;
-  final InputBorder? border;
-  final List<TextInputFormatter>? formatters;
-  final bool autofocus;
-
-  const FormTextInput({
-    super.key,
-    this.border,
-    this.controller,
-    this.autofocus = false,
-    this.title,
-    this.obscure = false,
-    this.readOnly = false,
-    this.extraValidators = const [],
-    this.keyboardType = TextInputType.text,
-    this.initialValue,
-    this.minLines,
-    this.capitalize = false,
-    this.maxLength,
-    this.formatters,
-    this.maxLines = 1,
-    this.outlined = true,
-    this.trailing,
-    this.onTap,
-    this.autocorrect = true,
-    this.required = true,
-  });
-
-  @override
-  Widget build(BuildContext context) => TextFormField(
-    autofocus: autofocus,
-    controller: controller,
-    keyboardType: keyboardType,
-    readOnly: readOnly,
-    minLines: minLines,
-    maxLines: maxLines,
-    maxLength: maxLength,
-    inputFormatters: formatters,
-    textCapitalization: capitalize ? .sentences : .none,
-    initialValue: initialValue,
-    autocorrect: autocorrect,
-    obscureText: obscure,
-    onTap: onTap,
-    decoration: .new(
-      labelText: title,
-      border: border ?? (outlined ? null : const UnderlineInputBorder()),
-      suffixIcon: trailing,
-    ),
-    validator: (value) {
-      if ((value?.isEmpty ?? true) && required) {
-        return "This field is required";
-      }
-
-      for (final validator in extraValidators) {
-        final reason = validator(value!);
-        if (reason != null) return reason;
-      }
-
-      return null;
-    },
-  );
-}