diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/Contents.json b/nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/Contents.json new file mode 100644 index 0000000..4f5d054 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "undraw_off_road_-9-oae.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/undraw_off_road_-9-oae.svg b/nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/undraw_off_road_-9-oae.svg new file mode 100644 index 0000000..3081455 --- /dev/null +++ b/nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/undraw_off_road_-9-oae.svg @@ -0,0 +1 @@ +off road \ No newline at end of file diff --git a/nirvana-ios/Views/PhoneVerification/PhoneCodeVerificationView.swift b/nirvana-ios/Views/PhoneVerification/PhoneCodeVerificationView.swift index df1f5f0..aaf32c1 100644 --- a/nirvana-ios/Views/PhoneVerification/PhoneCodeVerificationView.swift +++ b/nirvana-ios/Views/PhoneVerification/PhoneCodeVerificationView.swift @@ -36,7 +36,7 @@ struct PhoneCodeVerificationView: View { ZStack(alignment: .topLeading) { Color.clear - OnboardingTemplateView(hdrText: "Let's get you verified", imgName: "undraw_my_password_d-6-kg", bottomActArea: AnyView( + OnboardingTemplateView(hdrText: "Let's get you verified", imgName: "undraw_off_road_-9-oae", bottomActArea: AnyView( VStack { TextField("Code", text: self.$verificationCode) .padding() @@ -48,6 +48,9 @@ struct PhoneCodeVerificationView: View { .padding(.vertical) .keyboardType(.phonePad) .focused(self.$focusedInputField) + Text("Please allow up to 30 seconds to receive your code. Navigate back and re-enter phone number if you do not get the message.") + .font(.caption) + .foregroundColor(NirvanaColor.teal) if self.verificationCode.count == 6 { @@ -138,12 +141,12 @@ struct PhoneCodeVerificationView: View { .clipShape(Capsule()) .shadow(radius:10) } - } else { + } else { // show dull button if didn't enter full phone number Text("Verify") .foregroundColor(Color.white.opacity(0.2)) .frame(maxWidth: .infinity) .padding(.vertical, 20) - .background(Color.white.opacity(0.2)) // show dull button if didn't enter full phone number + .background(Color.white.opacity(0.2)) .clipShape(Capsule()) .shadow(radius:10) .animation(.default) diff --git a/nirvana-ios/Views/PhoneVerification/PhoneVerificationView.swift b/nirvana-ios/Views/PhoneVerification/PhoneVerificationView.swift index 359084b..97fabb9 100644 --- a/nirvana-ios/Views/PhoneVerification/PhoneVerificationView.swift +++ b/nirvana-ios/Views/PhoneVerification/PhoneVerificationView.swift @@ -40,7 +40,7 @@ struct PhoneVerificationView: View { ZStack(alignment: .topLeading) { Color.clear - OnboardingTemplateView(hdrText: "Let's get you verified", imgName: "undraw_my_password_d-6-kg", bottomActArea: AnyView( + OnboardingTemplateView(hdrText: "Let's get you verified", imgName: "undraw_off_road_-9-oae", bottomActArea: AnyView( VStack { HStack { Text("+\(ccode)") @@ -121,22 +121,22 @@ struct PhoneVerificationView: View { .foregroundColor(Color.white) .frame(maxWidth: .infinity) .padding(.vertical, 20) - .background(NirvanaColor.teal) // show dull button if didn't enter full phone number + .background(NirvanaColor.teal) .clipShape(Capsule()) .shadow(radius:10) .animation(.default) Text("You might receive an SMS message for verification and standard rates apply.") - .font(.footnote) - .foregroundColor(Color.black.opacity(0.5)) + .font(.caption) + .foregroundColor(NirvanaColor.teal) } } - } else { + } else { // show dull button if didn't enter full phone number Text("Send Verification") .foregroundColor(Color.white.opacity(0.2)) .frame(maxWidth: .infinity) .padding(.vertical, 20) - .background(Color.white.opacity(0.2)) // show dull button if didn't enter full phone number + .background(Color.white.opacity(0.2)) .clipShape(Capsule()) .shadow(radius:10) .animation(.default) diff --git a/nirvana-ios/Views/WelcomeView/WelcomeView.swift b/nirvana-ios/Views/WelcomeView/WelcomeView.swift index 7dcde5a..d53ddc8 100644 --- a/nirvana-ios/Views/WelcomeView/WelcomeView.swift +++ b/nirvana-ios/Views/WelcomeView/WelcomeView.swift @@ -21,7 +21,7 @@ struct WelcomeView: View { self.navigationStack.push(PhoneVerificationView()) } label: { Text("Start Your Detox") - .bold() + .fontWeight(.heavy) .foregroundColor(NirvanaColor.white) .frame(maxWidth: .infinity) .padding(.vertical, 20)