Skip to content

Commit b161bd2

Browse files
russellwheatleyrussellwheatley
committed
format
1 parent cff650f commit b161bd2

11 files changed

Lines changed: 25 additions & 24 deletions

File tree

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ extension EmailAuthView: View {
111111
keyboardType: .emailAddress,
112112
contentType: .emailAddress,
113113
validations: [
114-
FormValidators.email
114+
FormValidators.email,
115115
],
116116
maintainsValidationMessage: authService.authenticationFlow == .signUp,
117117
onSubmit: { _ in
@@ -161,7 +161,7 @@ extension EmailAuthView: View {
161161
contentType: .password,
162162
isSecureTextField: true,
163163
validations: [
164-
FormValidators.confirmPassword(password: password)
164+
FormValidators.confirmPassword(password: password),
165165
],
166166
maintainsValidationMessage: true,
167167
onSubmit: { _ in

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extension EmailLinkView: View {
5050
keyboardType: .emailAddress,
5151
contentType: .emailAddress,
5252
validations: [
53-
FormValidators.email
53+
FormValidators.email,
5454
],
5555
leading: {
5656
Image(systemName: "at")

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterPhoneNumberView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ struct EnterPhoneNumberView: View {
3939
keyboardType: .phonePad,
4040
contentType: .telephoneNumber,
4141
validations: [
42-
FormValidators.phoneNumber
42+
FormValidators.phoneNumber,
4343
],
4444
onChange: { _ in }
4545
) {

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EnterVerificationCodeView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct EnterVerificationCodeView: View {
5252
VerificationCodeInputField(
5353
code: $verificationCode,
5454
validations: [
55-
FormValidators.verificationCode
55+
FormValidators.verificationCode,
5656
],
5757
maintainsValidationMessage: true
5858
)

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/MFAEnrolmentView.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ extension MFAEnrolmentView: View {
375375
keyboardType: .phonePad,
376376
contentType: .telephoneNumber,
377377
validations: [
378-
FormValidators.phoneNumber
378+
FormValidators.phoneNumber,
379379
],
380380
maintainsValidationMessage: true,
381381
onChange: { _ in }
@@ -393,7 +393,7 @@ extension MFAEnrolmentView: View {
393393
label: authService.string.displayNameFieldLabel,
394394
prompt: authService.string.enterDisplayNameForDevicePrompt,
395395
validations: [
396-
FormValidators.notEmpty(label: "Display name")
396+
FormValidators.notEmpty(label: "Display name"),
397397
],
398398
maintainsValidationMessage: true,
399399
leading: {
@@ -441,7 +441,7 @@ extension MFAEnrolmentView: View {
441441
VerificationCodeInputField(
442442
code: $verificationCode,
443443
validations: [
444-
FormValidators.verificationCode
444+
FormValidators.verificationCode,
445445
],
446446
maintainsValidationMessage: true
447447
)
@@ -584,7 +584,7 @@ extension MFAEnrolmentView: View {
584584
label: authService.string.displayNameFieldLabel,
585585
prompt: authService.string.enterDisplayNameForAuthenticatorPrompt,
586586
validations: [
587-
FormValidators.notEmpty(label: "Display name")
587+
FormValidators.notEmpty(label: "Display name"),
588588
],
589589
maintainsValidationMessage: true,
590590
leading: {
@@ -596,7 +596,7 @@ extension MFAEnrolmentView: View {
596596
VerificationCodeInputField(
597597
code: $totpCode,
598598
validations: [
599-
FormValidators.verificationCode
599+
FormValidators.verificationCode,
600600
],
601601
maintainsValidationMessage: true
602602
)

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extension PasswordRecoveryView: View {
4545
keyboardType: .emailAddress,
4646
contentType: .emailAddress,
4747
validations: [
48-
FormValidators.email
48+
FormValidators.email,
4949
],
5050
leading: {
5151
Image(systemName: "at")

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/UpdatePasswordView.swift‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ public struct UpdatePasswordView {
4646
do {
4747
try await authService.updatePassword(to: confirmPassword)
4848
showAlert = true
49-
} catch {
50-
51-
}
49+
} catch {}
5250
}
5351
}
5452
}
@@ -64,7 +62,7 @@ extension UpdatePasswordView: View {
6462
contentType: .password,
6563
isSecureTextField: true,
6664
validations: [
67-
FormValidators.atLeast6Characters
65+
FormValidators.atLeast6Characters,
6866
],
6967
maintainsValidationMessage: true,
7068
leading: {
@@ -81,7 +79,7 @@ extension UpdatePasswordView: View {
8179
contentType: .password,
8280
isSecureTextField: true,
8381
validations: [
84-
FormValidators.confirmPassword(password: password)
82+
FormValidators.confirmPassword(password: password),
8583
],
8684
maintainsValidationMessage: true,
8785
leading: {

‎FirebaseSwiftUI/FirebaseAuthUIComponents/Sources/Components/AuthTextField.swift‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public struct AuthTextField<Leading: View>: View {
1818
@FocusState private var isFocused: Bool
1919
@State var obscured: Bool = true
2020
@State var hasInteracted: Bool = false
21-
21+
2222
@Binding var text: String
2323
let label: String
2424
let prompt: String
@@ -32,7 +32,7 @@ public struct AuthTextField<Leading: View>: View {
3232
var onSubmit: ((String) -> Void)?
3333
var onChange: ((String) -> Void)?
3434
private let leading: () -> Leading?
35-
35+
3636
public init(text: Binding<String>,
3737
label: String,
3838
prompt: String,
@@ -60,11 +60,11 @@ public struct AuthTextField<Leading: View>: View {
6060
self.onChange = onChange
6161
self.leading = leading
6262
}
63-
63+
6464
var allRequirementsMet: Bool {
6565
validations.allSatisfy { $0.isValid(input: text) }
6666
}
67-
67+
6868
public var body: some View {
6969
VStack(alignment: .leading) {
7070
Text(LocalizedStringResource(stringLiteral: label))
@@ -142,7 +142,8 @@ public struct AuthTextField<Leading: View>: View {
142142
isFocused = true
143143
}
144144
}
145-
if !validations.isEmpty && hasInteracted && (maintainsValidationMessage || !allRequirementsMet) {
145+
if !validations
146+
.isEmpty && hasInteracted && (maintainsValidationMessage || !allRequirementsMet) {
146147
VStack(alignment: .leading, spacing: 4) {
147148
ForEach(validations) { validator in
148149
let isValid = validator.isValid(input: text)

‎FirebaseSwiftUI/FirebaseAuthUIComponents/Sources/Components/VerificationCodeInputField.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public struct VerificationCodeInputField: View {
9696
.frame(maxWidth: .infinity, alignment: .leading)
9797
}
9898

99-
if !validations.isEmpty && hasInteracted && (maintainsValidationMessage || !allRequirementsMet) {
99+
if !validations
100+
.isEmpty && hasInteracted && (maintainsValidationMessage || !allRequirementsMet) {
100101
VStack(alignment: .leading, spacing: 4) {
101102
ForEach(validations) { validator in
102103
let isValid = validator.isValid(input: code)

‎FirebaseSwiftUI/FirebaseAuthUIComponents/Sources/Validation/FormValidator.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public struct FormValidators {
4141
}
4242
)
4343

44-
public static func confirmPassword(password: @autoclosure @escaping () -> String) -> FormValidator {
44+
public static func confirmPassword(password: @autoclosure @escaping () -> String)
45+
-> FormValidator {
4546
return FormValidator(
4647
message: "Passwords must match",
4748
validate: { input in

0 commit comments

Comments
 (0)