-
Notifications
You must be signed in to change notification settings - Fork 487
refactor: UI tweaks #1255
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
refactor: UI tweaks #1255
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
2c4dd76
ui: wrap in ScollView + dividers on AuthPickerView
russellwheatley af59d88
refactor: phone auth into button
russellwheatley bf20f0c
chore: rename to "Sign with Facebook" for consistency
russellwheatley 0702988
chore: change order of buttons
russellwheatley 0410fb8
Merge branch 'main' into ui-tweaks
russellwheatley dea04f6
refactor: make phone auth a sheet that presents over AuthPickerView
russellwheatley e092014
chore: email button same horizontal padding as other auth buttons
russellwheatley 4854c78
chore: update string label
russellwheatley 4e1cec0
format
russellwheatley 69a9c61
chore: dismiss modal after sign-in/failure
russellwheatley afd1ee6
chore: horizontal padding to email verification button
russellwheatley 7866bf8
chore: annotate function as view builder
russellwheatley 47dbf7f
chore: rm unneeded swiftui core import
russellwheatley 5ced7b3
Merge branch 'main' into ui-tweaks
russellwheatley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Views/PhoneAuthView.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| // | ||
| // PhoneAuthView.swift | ||
| // FirebaseUI | ||
| // | ||
| // Created by Russell Wheatley on 14/05/2025. | ||
| // | ||
|
|
||
| import FirebaseAuthSwiftUI | ||
| import FirebaseCore | ||
| import SwiftUI | ||
|
|
||
| @MainActor | ||
| public struct PhoneAuthView { | ||
| @Environment(AuthService.self) private var authService | ||
| @State private var errorMessage = "" | ||
| @State private var phoneNumber = "" | ||
| @State private var showVerificationCodeInput = false | ||
| @State private var verificationCode = "" | ||
| @State private var verificationID = "" | ||
|
|
||
| public init() {} | ||
| } | ||
|
|
||
| extension PhoneAuthView: View { | ||
| public var body: some View { | ||
| if authService.authenticationState != .authenticating { | ||
| VStack { | ||
| LabeledContent { | ||
| TextField(authService.string.enterPhoneNumberLabel, text: $phoneNumber) | ||
| .textInputAutocapitalization(.never) | ||
| .disableAutocorrection(true) | ||
| .submitLabel(.next) | ||
| } label: { | ||
| Image(systemName: "at") | ||
| }.padding(.vertical, 6) | ||
| .background(Divider(), alignment: .bottom) | ||
| .padding(.bottom, 4) | ||
| Button(action: { | ||
| Task { | ||
| do { | ||
| let id = try await authService.verifyPhoneNumber(phoneNumber: phoneNumber) | ||
| verificationID = id | ||
| showVerificationCodeInput = true | ||
| } catch { | ||
| errorMessage = authService.string.localizedErrorMessage( | ||
| for: error | ||
| ) | ||
| } | ||
| } | ||
| }) { | ||
| Text(authService.string.smsCodeSentLabel) | ||
| .padding(.vertical, 8) | ||
| .frame(maxWidth: .infinity) | ||
| } | ||
| .disabled(!PhoneUtils.isValidPhoneNumber(phoneNumber)) | ||
| .padding([.top, .bottom], 8) | ||
| .frame(maxWidth: .infinity) | ||
| .buttonStyle(.borderedProminent) | ||
| Text(errorMessage).foregroundColor(.red) | ||
| }.sheet(isPresented: $showVerificationCodeInput) { | ||
| TextField(authService.string.phoneNumberVerificationCodeLabel, text: $verificationCode) | ||
| .keyboardType(.numberPad) | ||
| .padding() | ||
| .background(Color(.systemGray6)) | ||
| .cornerRadius(8) | ||
| .padding(.horizontal) | ||
|
|
||
| Button(action: { | ||
| Task { | ||
| do { | ||
| try await authService.signInWithPhoneNumber( | ||
| verificationID: verificationID, | ||
| verificationCode: verificationCode | ||
| ) | ||
| } catch { | ||
| errorMessage = authService.string.localizedErrorMessage(for: error) | ||
| } | ||
| showVerificationCodeInput = false | ||
| } | ||
| }) { | ||
| Text(authService.string.verifyPhoneNumberAndSignInLabel) | ||
| .foregroundColor(.white) | ||
| .padding() | ||
| .frame(maxWidth: .infinity) | ||
| .background(Color.green) | ||
| .cornerRadius(8) | ||
| .padding(.horizontal) | ||
| } | ||
| }.onOpenURL { url in | ||
| authService.auth.canHandle(url) | ||
| } | ||
| } else { | ||
| ProgressView() | ||
| .progressViewStyle(CircularProgressViewStyle(tint: .white)) | ||
| .padding(.vertical, 8) | ||
| .frame(maxWidth: .infinity) | ||
| } | ||
| Text(errorMessage).foregroundColor(.red) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| FirebaseOptions.dummyConfigurationForPreview() | ||
| return PhoneAuthView() | ||
| .environment(AuthService()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the nub of the problem and it is the same problem we have rendering the buttons. Core auth package doesn't know about PhoneAuthView so how can we render it?
We could:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To match behavior from old FirebaseUI, this should be a button that launches the phone auth view flow in a modal view. I think if we can we should keep it a separate package despite its small size since it's less popular than email auth.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've updated to present a modal, I've had to follow a similar pattern to
renderingButtons()logic for the same reason discussed previously (i.e. using AnyView):dea04f6(#1255)