diff --git a/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift b/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift index 7ea3fcacb..0428b4751 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift @@ -53,8 +53,16 @@ struct WelcomeView: View { } var footerView: some View { - Text("By signing up, you agree to Omnivore’s\nTerms of Service and Privacy Policy") - .font(.appSubheadline) + Group { + Text("By signing up, you agree to Omnivore’s\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) } diff --git a/apple/OmnivoreKit/Sources/Views/Buttons/AppleSignInButton.swift b/apple/OmnivoreKit/Sources/Views/Buttons/AppleSignInButton.swift index b8381201f..4242e84ae 100644 --- a/apple/OmnivoreKit/Sources/Views/Buttons/AppleSignInButton.swift +++ b/apple/OmnivoreKit/Sources/Views/Buttons/AppleSignInButton.swift @@ -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) } } diff --git a/apple/OmnivoreKit/Sources/Views/Buttons/GoogleAuthButton.swift b/apple/OmnivoreKit/Sources/Views/Buttons/GoogleAuthButton.swift index 9296252c7..ea1d59c76 100644 --- a/apple/OmnivoreKit/Sources/Views/Buttons/GoogleAuthButton.swift +++ b/apple/OmnivoreKit/Sources/Views/Buttons/GoogleAuthButton.swift @@ -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()) }