diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index 9dd21f3..4c9975d 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -7,9 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 8904DEC2277054A80071E6CA /* Onboarding_One.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8904DEC1277054A80071E6CA /* Onboarding_One.swift */; }; - 8904DEC4277054C50071E6CA /* Onboarding_Two.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8904DEC3277054C50071E6CA /* Onboarding_Two.swift */; }; - 8904DEC6277054E10071E6CA /* Onboarding_Three.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8904DEC5277054E10071E6CA /* Onboarding_Three.swift */; }; 8904DEC8277055E90071E6CA /* OnboardingTrioView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8904DEC7277055E90071E6CA /* OnboardingTrioView.swift */; }; 891A15E127653A7000B26659 /* nirvana_iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A15E027653A7000B26659 /* nirvana_iosApp.swift */; }; 891A15E327653A7000B26659 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A15E227653A7000B26659 /* ContentView.swift */; }; @@ -76,9 +73,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 8904DEC1277054A80071E6CA /* Onboarding_One.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding_One.swift; sourceTree = ""; }; - 8904DEC3277054C50071E6CA /* Onboarding_Two.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding_Two.swift; sourceTree = ""; }; - 8904DEC5277054E10071E6CA /* Onboarding_Three.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding_Three.swift; sourceTree = ""; }; 8904DEC7277055E90071E6CA /* OnboardingTrioView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTrioView.swift; sourceTree = ""; }; 891A15DD27653A7000B26659 /* nirvana-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "nirvana-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 891A15E027653A7000B26659 /* nirvana_iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = nirvana_iosApp.swift; sourceTree = ""; }; @@ -398,9 +392,6 @@ isa = PBXGroup; children = ( 8904DEC7277055E90071E6CA /* OnboardingTrioView.swift */, - 8904DEC1277054A80071E6CA /* Onboarding_One.swift */, - 8904DEC3277054C50071E6CA /* Onboarding_Two.swift */, - 8904DEC5277054E10071E6CA /* Onboarding_Three.swift */, ); path = OnBoarding; sourceTree = ""; @@ -520,7 +511,6 @@ 891A15F5276557AB00B26659 /* colors.swift in Sources */, 894E80C327702E5900624B72 /* AddBasicInfoViewModel.swift in Sources */, 89288ECB27675B9F00E962C4 /* OnboardingTemplateView.swift in Sources */, - 8904DEC4277054C50071E6CA /* Onboarding_Two.swift in Sources */, 89F05BA4276ACC060002E9C7 /* ContactService.swift in Sources */, 89B46E71276893E200B74255 /* AuthSessionStore.swift in Sources */, 891A15F9276563CA00B26659 /* WelcomeView.swift in Sources */, @@ -550,8 +540,6 @@ 89F18AF5276ECF2A00115B1E /* AddBasicInfoView.swift in Sources */, 89BCABF0276D53C4009E9B10 /* PhoneVerificationViewModel.swift in Sources */, 89BDCDE72769616600577829 /* UIImage+Extension.swift in Sources */, - 8904DEC6277054E10071E6CA /* Onboarding_Three.swift in Sources */, - 8904DEC2277054A80071E6CA /* Onboarding_One.swift in Sources */, 89F1386D2767EB19006680ED /* SignInView.swift in Sources */, 89BDCDF12769E64200577829 /* Messages.swift in Sources */, 891A160E27657CEA00B26659 /* User.swift in Sources */, diff --git a/nirvana-ios/ContentView.swift b/nirvana-ios/ContentView.swift index 24532f3..04e55c6 100644 --- a/nirvana-ios/ContentView.swift +++ b/nirvana-ios/ContentView.swift @@ -11,7 +11,7 @@ import NavigationStack struct ContentView: View { var body: some View { NavigationStackView { - RouterView() + OnboardingTrioView() } } } diff --git a/nirvana-ios/Views/OnBoarding/OnboardingTrioView.swift b/nirvana-ios/Views/OnBoarding/OnboardingTrioView.swift index 3e123ff..9a08d3b 100644 --- a/nirvana-ios/Views/OnBoarding/OnboardingTrioView.swift +++ b/nirvana-ios/Views/OnBoarding/OnboardingTrioView.swift @@ -12,33 +12,33 @@ struct OnboardingTrioView: View { @EnvironmentObject var navigationStack: NavigationStack var body: some View { - VStack { - TabView { - OnboardingTemplateView(imgName: "undraw_through_the_park_lxnl", mainLeadingActText: "Be", mainHighlightedActText: "yourself", mainTrailingActText: "again.", subActText: "No more endless feeds, media, fomo, anxiety...focus on you and be more present.") - - OnboardingTemplateView(imgName: "undraw_connection_b-38-q", mainLeadingActText: "Be picky about your ", mainHighlightedActText: "inner circle.", mainTrailingActText: "", subActText: "You are who you hang out with. We kept things minimal because less is more...and we care.") - - OnboardingTemplateView(imgName: "undraw_voice_assistant_nrv7", mainLeadingActText: "Buttery smooth convos with your ", mainHighlightedActText: "authentic voice.", mainTrailingActText: "", subActText: "Less screen time, no more meaningless texts. Start mindfully conversing without all of the noise.", bottomActArea: AnyView( - VStack { - Button { - self.navigationStack.push(AddBasicInfoView()) - } label: { - Text("Start Your Detox") - .bold() - .foregroundColor(NirvanaColor.white) - .frame(maxWidth: .infinity) - .padding(.vertical, 20) - .background(NirvanaColor.teal) - .clipShape(Capsule()) - .shadow(radius:10) - } - }.padding(.bottom, 30) - ) + TabView { + OnboardingTemplateView(imgName: "undraw_through_the_park_lxnl", mainLeadingActText: "Be", mainHighlightedActText: "yourself", mainTrailingActText: "again.", subActText: "No more endless feeds, media, fomo, anxiety...focus on you and be more present.") + + OnboardingTemplateView(imgName: "undraw_connection_b-38-q", mainLeadingActText: "Be picky about your ", mainHighlightedActText: "inner circle.", mainTrailingActText: "", subActText: "You are who you hang out with. We kept things minimal because less is more...and we care.") + + OnboardingTemplateView(imgName: "undraw_voice_assistant_nrv7", mainLeadingActText: "Buttery smooth convos with your ", mainHighlightedActText: "authentic voice.", mainTrailingActText: "", subActText: "Less screen time, no more meaningless texts. Start mindfully conversing without all of the noise.", bottomActArea: AnyView( + VStack { + Button { + self.navigationStack.push(AddBasicInfoView()) + } label: { + Text("Start Your Detox") + .bold() + .foregroundColor(NirvanaColor.white) + .frame(maxWidth: .infinity) + .padding(.vertical, 20) + .background(NirvanaColor.teal) + .clipShape(Capsule()) + .shadow(radius:10) + } + }.padding(.bottom, 30) ) - } - .navigationBarHidden(true) - .tabViewStyle(.page(indexDisplayMode: .automatic)) + ) } + .navigationBarHidden(true) + .tabViewStyle(.page(indexDisplayMode: .automatic)) + .ignoresSafeArea(.all) + } } diff --git a/nirvana-ios/Views/OnBoarding/Onboarding_One.swift b/nirvana-ios/Views/OnBoarding/Onboarding_One.swift deleted file mode 100644 index d3cd9d3..0000000 --- a/nirvana-ios/Views/OnBoarding/Onboarding_One.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// Onboarding-1.swift -// nirvana-ios -// -// Created by Arjun Patel on 12/19/21. -// - -import SwiftUI - -struct Onboarding_One: View { - var body: some View { - OnboardingTemplateView(imgName: "undraw_through_the_park_lxnl", mainLeadingActText: "Be", mainHighlightedActText: "yourself", mainTrailingActText: "again.", subActText: "No more endless feeds, media, fomo, anxiety...focus on you and be more present.") - } -} - -struct Onboarding_One_Previews: PreviewProvider { - static var previews: some View { - Onboarding_One() - } -} diff --git a/nirvana-ios/Views/OnBoarding/Onboarding_Three.swift b/nirvana-ios/Views/OnBoarding/Onboarding_Three.swift deleted file mode 100644 index 264a455..0000000 --- a/nirvana-ios/Views/OnBoarding/Onboarding_Three.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// Onboarding_Three.swift -// nirvana-ios -// -// Created by Arjun Patel on 12/19/21. -// - -import SwiftUI - -struct Onboarding_Three: View { - var body: some View { - Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) - } -} - -struct Onboarding_Three_Previews: PreviewProvider { - static var previews: some View { - Onboarding_Three() - } -} diff --git a/nirvana-ios/Views/OnBoarding/Onboarding_Two.swift b/nirvana-ios/Views/OnBoarding/Onboarding_Two.swift deleted file mode 100644 index 3906239..0000000 --- a/nirvana-ios/Views/OnBoarding/Onboarding_Two.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// Onboarding_Two.swift -// nirvana-ios -// -// Created by Arjun Patel on 12/19/21. -// - -import SwiftUI - -struct Onboarding_Two: View { - var body: some View { - Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) - } -} - -struct Onboarding_Two_Previews: PreviewProvider { - static var previews: some View { - Onboarding_Two() - } -} diff --git a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift index bd3ed63..7778826 100644 --- a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift +++ b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift @@ -94,19 +94,20 @@ struct OnboardingTemplateView: View { VStack(alignment: .leading) { Text(self.mainLeadingActionText! + " ") - .font(.title) + .font(.largeTitle) .foregroundColor(NirvanaColor.black) .fontWeight(.medium) + Text(self.mainHighlightedActionText! + " ") - .font(.title) + .font(.largeTitle) .foregroundColor(NirvanaColor.teal) .fontWeight(.medium) + Text(self.mainTrailingActionText!) - .font(.title) + .font(.largeTitle) .foregroundColor(NirvanaColor.black) .fontWeight(.medium) Text(self.subActionText!) + .font(.headline) .foregroundColor(Color.black.opacity(0.7)) .padding(.top, 5)