Implemented focus and handling of the return key presses in the LoginForm view apart from overall UI improvements.

BeReal/Login/Components/LoginForm.swift

@@ -10,12 +10,20 @@ import SwiftUI
 
 struct LoginForm: View {
     
+    // MARK: States
+    
+    @FocusState private var focusedField: Field?
+    
     // MARK: Bindings
     
     @Binding var username: String
     @Binding var password: String
     @Binding var errorMessage: String?
     
+    // MARK: Properties
+    
+    let onReturn: () -> Void
+    
     // MARK: Body
     
     var body: some View {
@@ -23,25 +31,33 @@ struct LoginForm: View {
             alignment: .leading,
             spacing: 16
         ) {
-            TextField(
+            TextField("Username", text: $username) { isBeginEditing in
-                "Username",
+                guard isBeginEditing, errorMessage != nil else { return }
-                text: $username
+                
-            )
+                errorMessage = nil
-            .textContentType(.username)
+            }
-            .autocapitalization(.none)
+                .textContentType(.username)
-            .disableAutocorrection(true)
+                .lineLimit(1)
-            .keyboardType(.default)
+                .autocapitalization(.none)
+                .disableAutocorrection(true)
+                .keyboardType(.default)
+                .focused($focusedField, equals: .username)
+                .onSubmit {
+                    onUsernameReturnPressed()
+                }
             
             Divider()
             
-            SecureField(
+            SecureField("Password", text: $password)
-                "Password",
+                .textContentType(.password)
-                text: $password
+                .lineLimit(1)
-            )
+                .autocapitalization(.none)
-            .textContentType(.password)
+                .disableAutocorrection(true)
-            .autocapitalization(.none)
+                .keyboardType(.default)
-            .disableAutocorrection(true)
+                .focused($focusedField, equals: .password)
-            .keyboardType(.default)
+                .onSubmit {
+                    onPasswordReturnPressed()
+                }
             
             if let errorMessage {
                 Divider()
@@ -53,7 +69,7 @@ struct LoginForm: View {
         }
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding(16)
-        .background(Color.white)
+        .background(Color.primary.colorInvert())
         .cornerRadius(8)
         .onAppear {
             setClearButtonIfNeeded()
@@ -69,6 +85,41 @@ private extension LoginForm {
         
         UITextField.appearance().clearButtonMode = .whileEditing
     }
+    
+    func onUsernameReturnPressed() {
+        guard !username.isEmpty else {
+            focusedField = .username
+            return
+        }
+        
+        if password.isEmpty {
+            focusedField = .password
+        } else {
+            onReturn()
+        }
+    }
+    
+    func onPasswordReturnPressed() {
+        guard !password.isEmpty else {
+            focusedField = .password
+            return
+        }
+        
+        if username.isEmpty {
+            focusedField = .username
+        } else {
+            onReturn()
+        }
+    }
+}
+
+// MARK: - Enumerations
+
+private extension LoginForm {
+    enum Field: Hashable {
+        case username
+        case password
+    }
 }
 
 // MARK: - Previews
@@ -78,14 +129,16 @@ struct LoginForm_Previews: PreviewProvider {
         LoginForm(
             username: .constant("Some username"),
             password: .constant("Some Password"),
-            errorMessage: .constant(nil)
+            errorMessage: .constant(nil),
+            onReturn: {}
         )
         .previewDisplayName("Login form with no error message")
         
         LoginForm(
             username: .constant("Some username"),
             password: .constant("Some Password"),
-            errorMessage: .constant("Some error goes in here...")
+            errorMessage: .constant("Some error goes in here..."),
+            onReturn: {}
         )
         .previewDisplayName("Login form with some error message")
     }