chore: furhter UI tweaks

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/StringUtils.swift

@@ -350,4 +350,11 @@ public class StringUtils {
   public var privacyPolicyLabel: String {
     return localizedString(for: "PrivacyPolicy")
   }
+
+  /// Alert Error title
+  /// found in:
+  /// PasswordRecoveryView
+  public var alertErrorTitle: String {
+    return localizedString(for: "Error")
+  }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -15,46 +15,50 @@ public struct AuthPickerView {
 
 extension AuthPickerView: View {
   public var body: some View {
-    VStack {
-      Text(authService.string.authPickerTitle)
-        .font(.largeTitle)
-        .fontWeight(.bold)
-        .padding()
-      if authService.authenticationState == .authenticated {
-        SignedInView()
-      } else if authService.authView == .passwordRecovery {
-        PasswordRecoveryView()
-      } else if authService.authView == .emailLink {
-        EmailLinkView()
-      } else {
-        if authService.emailSignInEnabled {
-          Text(authService.authenticationFlow == .login ? authService.string
-            .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-          Divider()
-          EmailAuthView()
+    ScrollView {
+      VStack {
+        if authService.authView == .authPicker {
+          Text(authService.string.authPickerTitle)
+            .font(.largeTitle)
+            .fontWeight(.bold)
+            .padding()
         }
-        VStack {
-          authService.renderButtons()
-        }.padding(.horizontal)
-        if authService.emailSignInEnabled {
-          Divider()
-          HStack {
-            Text(authService
-              .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
-              authService.string.alreadyHaveAnAccountLabel)
-            Button(action: {
-              withAnimation {
-                switchFlow()
+        if authService.authenticationState == .authenticated {
+          SignedInView()
+        } else if authService.authView == .passwordRecovery {
+          PasswordRecoveryView()
+        } else if authService.authView == .emailLink {
+          EmailLinkView()
+        } else {
+          if authService.emailSignInEnabled {
+            Text(authService.authenticationFlow == .login ? authService.string
+              .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+            Divider()
+            EmailAuthView()
+          }
+          VStack {
+            authService.renderButtons()
+          }.padding(.horizontal)
+          if authService.emailSignInEnabled {
+            Divider()
+            HStack {
+              Text(authService
+                .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
+                authService.string.alreadyHaveAnAccountLabel)
+              Button(action: {
+                withAnimation {
+                  switchFlow()
+                }
+              }) {
+                Text(authService.authenticationFlow == .signUp ? authService.string
+                  .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+                  .fontWeight(.semibold)
+                  .foregroundColor(.blue)
               }
-            }) {
-              Text(authService.authenticationFlow == .signUp ? authService.string
-                .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-                .fontWeight(.semibold)
-                .foregroundColor(.blue)
             }
+            PrivacyTOCsView(displayMode: .footer)
+            Text(authService.errorMessage).foregroundColor(.red)
           }
-          PrivacyTOCsView(displayMode: .footer)
-          Text(authService.errorMessage).foregroundColor(.red)
         }
       }
     }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift

@@ -1,18 +1,32 @@
 import FirebaseCore
 import SwiftUI
 
+enum PasswordRecoveryResult: Identifiable {
+  case success
+  case failure
+
+  var id: String {
+    switch self {
+    case .success: return "success"
+    case .failure: return "failure"
+    }
+  }
+}
+
 public struct PasswordRecoveryView {
   @Environment(AuthService.self) private var authService
   @State private var email = ""
-  @State private var showModal = false
+  @State private var result: PasswordRecoveryResult?
 
   public init() {}
 
   private func sendPasswordRecoveryEmail() async {
     do {
       try await authService.sendPasswordRecoveryEmail(to: email)
-      showModal = true
-    } catch {}
+      result = .success
+    } catch {
+      result = .failure
+    }
   }
 }
 
@@ -46,30 +60,48 @@ extension PasswordRecoveryView: View {
           .frame(maxWidth: .infinity)
       }
       .disabled(!CommonUtils.isValidEmail(email))
-      .padding([.top, .bottom], 8)
+      .padding([.top, .bottom, .horizontal], 8)
       .frame(maxWidth: .infinity)
       .buttonStyle(.borderedProminent)
-    }.sheet(isPresented: $showModal) {
+    }.sheet(item: $result) { result in
       VStack {
-        Text(authService.string.passwordRecoveryEmailSentTitle)
-          .font(.largeTitle)
-          .fontWeight(.bold)
-          .padding()
-        Text(authService.string.passwordRecoveryHelperMessage)
+        switch result {
+        case .success:
+          Text(authService.string.passwordRecoveryEmailSentTitle)
+            .font(.largeTitle)
+            .fontWeight(.bold)
+            .padding()
+          Text(authService.string.passwordRecoveryHelperMessage)
+            .padding()
+
+          Divider()
+
+          Text(authService.string.passwordRecoveryEmailSentMessage)
+            .padding()
+          Button(authService.string.okButtonLabel) {
+            self.result = nil
+          }
           .padding()
+        case .failure:
+          Text(authService.string.alertErrorTitle)
+            .font(.title)
+            .fontWeight(.semibold)
+            .padding()
 
-        Divider()
+          Divider()
 
-        Text(authService.string.passwordRecoveryEmailSentMessage)
+          Text(authService.errorMessage)
+            .padding()
+
+          Divider()
+
+          Button(authService.string.okButtonLabel) {
+            self.result = nil
+          }
           .padding()
-        Button(authService.string.okButtonLabel) {
-          showModal = false
         }
-        .padding()
       }
       .padding()
-    }.onOpenURL { _ in
-      // move the user to email/password View
     }
     .navigationBarItems(leading: Button(action: {
       authService.authView = .authPicker