fixing inconsistencies in ui in onboarding
This commit is contained in:
+21
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/undraw_off_road_-9-oae.svg
Vendored
+1
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 61 KiB |
@@ -36,7 +36,7 @@ struct PhoneCodeVerificationView: View {
|
|||||||
ZStack(alignment: .topLeading) {
|
ZStack(alignment: .topLeading) {
|
||||||
Color.clear
|
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 {
|
VStack {
|
||||||
TextField("Code", text: self.$verificationCode)
|
TextField("Code", text: self.$verificationCode)
|
||||||
.padding()
|
.padding()
|
||||||
@@ -48,6 +48,9 @@ struct PhoneCodeVerificationView: View {
|
|||||||
.padding(.vertical)
|
.padding(.vertical)
|
||||||
.keyboardType(.phonePad)
|
.keyboardType(.phonePad)
|
||||||
.focused(self.$focusedInputField)
|
.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 {
|
if self.verificationCode.count == 6 {
|
||||||
@@ -138,12 +141,12 @@ struct PhoneCodeVerificationView: View {
|
|||||||
.clipShape(Capsule())
|
.clipShape(Capsule())
|
||||||
.shadow(radius:10)
|
.shadow(radius:10)
|
||||||
}
|
}
|
||||||
} else {
|
} else { // show dull button if didn't enter full phone number
|
||||||
Text("Verify")
|
Text("Verify")
|
||||||
.foregroundColor(Color.white.opacity(0.2))
|
.foregroundColor(Color.white.opacity(0.2))
|
||||||
.frame(maxWidth: .infinity)
|
.frame(maxWidth: .infinity)
|
||||||
.padding(.vertical, 20)
|
.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())
|
.clipShape(Capsule())
|
||||||
.shadow(radius:10)
|
.shadow(radius:10)
|
||||||
.animation(.default)
|
.animation(.default)
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ struct PhoneVerificationView: View {
|
|||||||
ZStack(alignment: .topLeading) {
|
ZStack(alignment: .topLeading) {
|
||||||
Color.clear
|
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 {
|
VStack {
|
||||||
HStack {
|
HStack {
|
||||||
Text("+\(ccode)")
|
Text("+\(ccode)")
|
||||||
@@ -121,22 +121,22 @@ struct PhoneVerificationView: View {
|
|||||||
.foregroundColor(Color.white)
|
.foregroundColor(Color.white)
|
||||||
.frame(maxWidth: .infinity)
|
.frame(maxWidth: .infinity)
|
||||||
.padding(.vertical, 20)
|
.padding(.vertical, 20)
|
||||||
.background(NirvanaColor.teal) // show dull button if didn't enter full phone number
|
.background(NirvanaColor.teal)
|
||||||
.clipShape(Capsule())
|
.clipShape(Capsule())
|
||||||
.shadow(radius:10)
|
.shadow(radius:10)
|
||||||
.animation(.default)
|
.animation(.default)
|
||||||
|
|
||||||
Text("You might receive an SMS message for verification and standard rates apply.")
|
Text("You might receive an SMS message for verification and standard rates apply.")
|
||||||
.font(.footnote)
|
.font(.caption)
|
||||||
.foregroundColor(Color.black.opacity(0.5))
|
.foregroundColor(NirvanaColor.teal)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else { // show dull button if didn't enter full phone number
|
||||||
Text("Send Verification")
|
Text("Send Verification")
|
||||||
.foregroundColor(Color.white.opacity(0.2))
|
.foregroundColor(Color.white.opacity(0.2))
|
||||||
.frame(maxWidth: .infinity)
|
.frame(maxWidth: .infinity)
|
||||||
.padding(.vertical, 20)
|
.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())
|
.clipShape(Capsule())
|
||||||
.shadow(radius:10)
|
.shadow(radius:10)
|
||||||
.animation(.default)
|
.animation(.default)
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ struct WelcomeView: View {
|
|||||||
self.navigationStack.push(PhoneVerificationView())
|
self.navigationStack.push(PhoneVerificationView())
|
||||||
} label: {
|
} label: {
|
||||||
Text("Start Your Detox")
|
Text("Start Your Detox")
|
||||||
.bold()
|
.fontWeight(.heavy)
|
||||||
.foregroundColor(NirvanaColor.white)
|
.foregroundColor(NirvanaColor.white)
|
||||||
.frame(maxWidth: .infinity)
|
.frame(maxWidth: .infinity)
|
||||||
.padding(.vertical, 20)
|
.padding(.vertical, 20)
|
||||||
|
|||||||
Reference in New Issue
Block a user