style welcome footer view

This commit is contained in:
Satindar Dhillon 2022-05-31 22:40:22 -07:00
parent 65e0accd36
commit cbc93acf4a
3 changed files with 22 additions and 10 deletions

View file

@ -53,8 +53,16 @@ struct WelcomeView: View {
}
var footerView: some View {
Text("By signing up, you agree to Omnivores\nTerms of Service and Privacy Policy")
.font(.appSubheadline)
Group {
Text("By signing up, you agree to Omnivores\n")
+ Text("Terms of Service").underline()
+ Text(" and ")
+ Text("Privacy Policy").underline()
}
.font(.appSubheadline)
.onTapGesture {
print("show action sheet")
}
}
var logoView: some View {
@ -74,7 +82,6 @@ struct WelcomeView: View {
AppleSignInButton {
viewModel.handleAppleSignInCompletion(result: $0, authenticator: authenticator)
}
// set maxwidth = 260
if AppKeys.sharedInstance?.iosClientGoogleId != nil {
GoogleAuthButton {
@ -92,7 +99,10 @@ struct WelcomeView: View {
}
if let loginError = viewModel.loginError {
LoginErrorMessageView(loginError: loginError)
HStack {
LoginErrorMessageView(loginError: loginError)
Spacer()
}
}
}
}
@ -128,6 +138,7 @@ struct WelcomeView: View {
.padding()
}
}
.preferredColorScheme(.light)
.sheet(isPresented: $showDebugModal) {
DebugMenuView(selectedEnvironment: $selectedEnvironment)
}

View file

@ -18,8 +18,9 @@ public struct AppleSignInButton: View {
},
onCompletion: onCompletion
)
.frame(height: 44)
.frame(height: 54)
.frame(maxWidth: 260)
.cornerRadius(8)
.signInWithAppleButtonStyle(colorScheme == .dark ? .white : .black)
.signInWithAppleButtonStyle(.white)
}
}

View file

@ -12,13 +12,13 @@ public struct GoogleAuthButton: View {
HStack(spacing: 8) {
Image.googleIcon
.resizable()
.frame(width: 12, height: 12)
.frame(width: 16, height: 16)
Text(LocalText.googleAuthButton)
.font(isMacApp ? .appCaption : .appBody)
.font(isMacApp ? .appCaption : .appTitleThree)
.foregroundColor(.black)
}
.frame(maxWidth: .infinity)
.frame(height: isMacApp ? 30 : 44)
.frame(maxWidth: 260)
.frame(height: isMacApp ? 30 : 54)
}
.buttonStyle(GoogleButtonStyle())
}