From 4cf0a44e79eb12c279d8297edb627dc71146e450 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 18 Dec 2021 21:02:28 -0800 Subject: [PATCH] changing to username instead of first and last name --- .../Views/AddBasicInfo/AddBasicInfoView.swift | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift b/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift index a59080f..36d648e 100644 --- a/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift +++ b/nirvana-ios/Views/AddBasicInfo/AddBasicInfoView.swift @@ -11,8 +11,7 @@ import NavigationStack struct AddBasicInfoView: View { @EnvironmentObject var navigationStack : NavigationStack - @State var firstName = "" - @State var lastName = "" + @State var username = "" @State var selectedAvatarIndex: Int = 0 @@ -53,7 +52,7 @@ struct AddBasicInfoView: View { .foregroundColor(NirvanaColor.teal) .multilineTextAlignment(.center) - Text("Select an avatar you like, then input your first and last name! You can always change this later.") + Text("Select an avatar you like, then make a username! You can always change this later.") .font(.subheadline) .foregroundColor(Color.black.opacity(0.7)) } @@ -81,15 +80,7 @@ struct AddBasicInfoView: View { // input first and last name VStack { - TextField("First Name", text: self.$firstName) - .padding() - .background(.ultraThinMaterial) - .clipShape(Capsule()) - .keyboardType(.phonePad) - .shadow(color: Color.black.opacity(0.3), radius: 20, x: 0, y: 20) - .font(.subheadline) - .multilineTextAlignment(.center) - TextField("Last Name", text: self.$lastName) + TextField("Username", text: self.$username) .padding() .background(.ultraThinMaterial) .clipShape(Capsule()) @@ -97,6 +88,11 @@ struct AddBasicInfoView: View { .shadow(color: Color.black.opacity(0.3), radius: 20, x: 0, y: 20) .font(.subheadline) .multilineTextAlignment(.center) + + Text("First name works just fine for now.") + .font(.footnote) + .foregroundColor(Color.black.opacity(0.4)) + } .padding() @@ -105,7 +101,7 @@ struct AddBasicInfoView: View { // button to save information Button { - if self.firstName.count == 0 || self.lastName.count == 0 { + if self.username.count == 0 { print("do nothing...user didn't input anything...maybe show an alert") return } @@ -124,7 +120,7 @@ struct AddBasicInfoView: View { .foregroundColor(Color.white) .frame(maxWidth: .infinity) .padding(.vertical, 20) - .background(self.firstName.count == 0 || self.lastName.count == 0 ? Color.white.opacity(0.3) : NirvanaColor.teal) + .background(self.username.count == 0 ? Color.white.opacity(0.3) : NirvanaColor.teal) .clipShape(Capsule()) .shadow(radius:10) }