talksik/nirvana-ios
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing inconsistencies in ui in onboarding

Browse Source
This commit is contained in:
talksik
2021-12-23 02:38:54 -08:00
parent 566574542f
commit 069cc543f4
5 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios/Assets.xcassets/illustrations/undraw_off_road_-9-oae.imageset/Contents.json
Vendored
+21
View File
@@ -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
View File
File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 61 KiB

nirvana-ios/Views/PhoneVerification/PhoneCodeVerificationView.swift
+6 -3
View File
@@ -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)
nirvana-ios/Views/PhoneVerification/PhoneVerificationView.swift
+6 -6
View File
@@ -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)
nirvana-ios/Views/WelcomeView/WelcomeView.swift
+1 -1
View File
@@ -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)