refactor: used computed properties for string localisation

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/StringUtils.swift

@@ -79,4 +79,89 @@ public class StringUtils {
       return error.localizedDescription
     }
   }
+
+  /// Auth Picker title
+  /// found in:
+  /// - AuthPickerView
+  public var authPickerTitle: String {
+    return localizedString(for: kAuthPickerTitle)
+  }
+
+  /// Email input label
+  /// found in:
+  /// - EmailAuthView
+  /// - PasswordRecoveryView
+  public var emailInputLabel: String {
+    return localizedString(for: kEnterYourEmail)
+  }
+
+  /// Password button action label
+  /// found in:
+  /// - EmailAuthView
+  public var passwordButtonLabel: String {
+    return localizedString(for: kForgotPasswordButtonLabel)
+  }
+
+  /// Password input label
+  /// found in:
+  /// - EmailAuthView
+  public var passwordInputLabel: String {
+    return localizedString(for: kEnterYourPassword)
+  }
+
+  /// Password recovery title
+  /// found in:
+  /// - PasswordRecoveryView
+  public var passwordRecoveryTitle: String {
+    return localizedString(for: kPasswordRecoveryTitle)
+  }
+
+  /// Password recovery email sent title
+  /// found in:
+  /// - PasswordRecoveryView
+  public var passwordRecoveryEmailSentTitle: String {
+    return localizedString(for: kPasswordRecoveryEmailSentTitle)
+  }
+
+  /// Password recovery helper message
+  /// found in:
+  /// - PasswordRecoveryView
+  public var passwordRecoveryHelperMessage: String {
+    return localizedString(for: kPasswordRecoveryMessage)
+  }
+
+  /// Password recovery email sent message
+  /// found in:
+  /// - PasswordRecoveryView
+  public var passwordRecoveryEmailSentMessage: String {
+    return localizedString(for: kPasswordRecoveryEmailSentMessage)
+  }
+
+  /// Forgot password input label
+  /// found in:
+  /// - PasswordRecoveryView
+  public var forgotPasswordInputLabel: String {
+    return localizedString(for: kForgotPasswordInputLabel)
+  }
+
+  /// Signed in title
+  /// found in:
+  /// - SignedInView
+  public var signedInTitle: String {
+    return localizedString(for: kSignedInTitle)
+  }
+
+  /// General string - Back button label
+  /// found in:
+  /// - PasswordRecoveryView
+  public var backButtonLabel: String {
+    return localizedString(for: kBack)
+  }
+
+  /// General string - OK button label
+  /// found in:
+  /// - PasswordRecoveryView
+  public var okButtonLabel: String {
+    return localizedString(for: kOK)
+  }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -18,7 +18,7 @@ public struct AuthPickerView<Content: View> {
 extension AuthPickerView: View {
   public var body: some View {
     VStack {
-      Text(authService.string.localizedString(for: kAuthPickerTitle))
+      Text(authService.string.authPickerTitle)
         .font(.largeTitle)
         .fontWeight(.bold)
         .padding()

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift

@@ -50,7 +50,7 @@ extension EmailAuthView: View {
   public var body: some View {
     VStack {
       LabeledContent {
-        TextField(authService.string.localizedString(for: kEnterYourEmail), text: $email)
+        TextField(authService.string.emailInputLabel, text: $email)
           .textInputAutocapitalization(.never)
           .disableAutocorrection(true)
           .focused($focus, equals: .email)
@@ -66,7 +66,7 @@ extension EmailAuthView: View {
       .padding(.bottom, 4)
 
       LabeledContent {
-        SecureField(authService.string.localizedString(for: kEnterYourPassword), text: $password)
+        SecureField(authService.string.passwordInputLabel, text: $password)
           .focused($focus, equals: .password)
           .submitLabel(.go)
           .onSubmit {
@@ -83,7 +83,7 @@ extension EmailAuthView: View {
         Button(action: {
           authService.authView = .passwordRecovery
         }) {
-          Text(authService.string.localizedString(for: kForgotPasswordButtonLabel))
+          Text(authService.string.passwordButtonLabel)
         }
       }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift

@@ -18,15 +18,15 @@ public struct PasswordRecoveryView {
 extension PasswordRecoveryView: View {
   public var body: some View {
     VStack {
-      Text(authService.string.localizedString(for: kPasswordRecoveryTitle))
+      Text(authService.string.passwordRecoveryTitle)
         .font(.largeTitle)
         .fontWeight(.bold)
         .padding()
 
       Divider()
 
       LabeledContent {
-        TextField(authService.string.localizedString(for: kEnterYourEmail), text: $email)
+        TextField(authService.string.emailInputLabel, text: $email)
           .textInputAutocapitalization(.never)
           .disableAutocorrection(true)
           .submitLabel(.next)
@@ -40,7 +40,7 @@ extension PasswordRecoveryView: View {
           await sendPasswordRecoveryEmail()
         }
       }) {
-        Text(authService.string.localizedString(for: kForgotPasswordInputLabel))
+        Text(authService.string.forgotPasswordInputLabel)
           .padding(.vertical, 8)
           .frame(maxWidth: .infinity)
       }
@@ -50,18 +50,18 @@ extension PasswordRecoveryView: View {
       .buttonStyle(.borderedProminent)
     }.sheet(isPresented: $showModal) {
       VStack {
-        Text(authService.string.localizedString(for: kPasswordRecoveryEmailSentTitle))
+        Text(authService.string.passwordRecoveryEmailSentTitle)
           .font(.largeTitle)
           .fontWeight(.bold)
           .padding()
-        Text(authService.string.localizedString(for: kPasswordRecoveryMessage))
+        Text(authService.string.passwordRecoveryMessage)
           .padding()
 
         Divider()
 
-        Text(authService.string.localizedString(for: kPasswordRecoveryEmailSentMessage))
+        Text(authService.string.passwordRecoveryEmailSentMessage)
           .padding()
-        Button(authService.string.localizedString(for: kOK)) {
+        Button(authService.string.okButtonLabel) {
           showModal = false
         }
         .padding()
@@ -75,7 +75,7 @@ extension PasswordRecoveryView: View {
     }) {
       Image(systemName: "chevron.left")
         .foregroundColor(.blue)
-      Text(authService.string.localizedString(for: kBack))
+      Text(authService.string.backButtonLabel)
         .foregroundColor(.blue)
     })
   }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift

@@ -15,7 +15,7 @@ extension SignedInView: View {
 
   public var body: some View {
     VStack {
-      Text(authService.string.localizedString(for: kSignedInTitle))
+      Text(authService.string.signedInTitle)
         .font(.largeTitle)
         .fontWeight(.bold)
         .padding()