Skip to content

Commit 2c4dd76

Browse files
ui: wrap in ScollView + dividers on AuthPickerView
1 parent bf922dd commit 2c4dd76

1 file changed

Lines changed: 38 additions & 34 deletions

File tree

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,49 @@ public struct AuthPickerView<Content: View> {
1717

1818
extension AuthPickerView: View {
1919
public var body: some View {
20-
VStack {
21-
Text(authService.string.authPickerTitle)
22-
.font(.largeTitle)
23-
.fontWeight(.bold)
24-
.padding()
25-
if authService.authenticationState == .authenticated {
26-
SignedInView()
27-
} else if authService.authView == .passwordRecovery {
28-
PasswordRecoveryView()
29-
} else if authService.authView == .emailLink {
30-
EmailLinkView()
31-
} else {
32-
Text(authService.authenticationFlow == .login ? authService.string
33-
.emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
34-
VStack { Divider() }
20+
ScrollView {
21+
VStack {
22+
Text(authService.string.authPickerTitle)
23+
.font(.largeTitle)
24+
.fontWeight(.bold)
25+
.padding()
26+
if authService.authenticationState == .authenticated {
27+
SignedInView()
28+
} else if authService.authView == .passwordRecovery {
29+
PasswordRecoveryView()
30+
} else if authService.authView == .emailLink {
31+
Divider()
32+
EmailLinkView()
33+
} else {
34+
Divider()
35+
Text(authService.authenticationFlow == .login ? authService.string
36+
.emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
37+
VStack { Divider() }
3538

36-
EmailAuthView()
37-
VStack {
38-
authService.renderButtons()
39-
}.padding(.horizontal)
39+
EmailAuthView()
40+
VStack {
41+
authService.renderButtons()
42+
}.padding(.horizontal)
4043

41-
VStack { Divider() }
42-
HStack {
43-
Text(authService
44-
.authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
45-
authService.string.alreadyHaveAnAccountLabel)
46-
Button(action: {
47-
withAnimation {
48-
switchFlow()
44+
VStack { Divider() }
45+
HStack {
46+
Text(authService
47+
.authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
48+
authService.string.alreadyHaveAnAccountLabel)
49+
Button(action: {
50+
withAnimation {
51+
switchFlow()
52+
}
53+
}) {
54+
Text(authService.authenticationFlow == .signUp ? authService.string
55+
.emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
56+
.fontWeight(.semibold)
57+
.foregroundColor(.blue)
4958
}
50-
}) {
51-
Text(authService.authenticationFlow == .signUp ? authService.string
52-
.emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
53-
.fontWeight(.semibold)
54-
.foregroundColor(.blue)
5559
}
60+
PrivacyTOCsView(displayMode: .footer)
61+
Text(authService.errorMessage).foregroundColor(.red)
5662
}
57-
PrivacyTOCsView(displayMode: .footer)
58-
Text(authService.errorMessage).foregroundColor(.red)
5963
}
6064
}
6165
}

0 commit comments

Comments
 (0)