From 87c88d3f78e3975bc1fa49a04ef71890fde42598 Mon Sep 17 00:00:00 2001 From: talksik Date: Tue, 14 Dec 2021 19:23:05 -0800 Subject: [PATCH] adding onboarding trio to make the flow almost complete --- nirvana-ios.xcodeproj/project.pbxproj | 4 ++ .../Templates/OnboardingTemplateView.swift | 2 +- .../WelcomeView/OnboardingTrioView.swift | 48 +++++++++++++++++++ .../Views/WelcomeView/WelcomeView.swift | 5 +- 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index fdab6cb..4e43700 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -34,6 +34,7 @@ 89BDCDE527695DB900577829 /* NirvanaImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDE427695DB900577829 /* NirvanaImage.swift */; }; 89BDCDE72769616600577829 /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDE62769616600577829 /* UIImage+Extension.swift */; }; 89BDCDEA27697F9C00577829 /* UserMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDE927697F9C00577829 /* UserMenu.swift */; }; + 89BDCDEC2769918D00577829 /* OnboardingTrioView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDEB2769918D00577829 /* OnboardingTrioView.swift */; }; 89D99D2E2766FD6B00237814 /* Liquid in Frameworks */ = {isa = PBXBuildFile; productRef = 89D99D2D2766FD6B00237814 /* Liquid */; }; 89F1386D2767EB19006680ED /* SignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F1386C2767EB19006680ED /* SignInView.swift */; }; 89F138702767F55F006680ED /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 89F1386F2767F55F006680ED /* GoogleSignIn */; }; @@ -65,6 +66,7 @@ 89BDCDE427695DB900577829 /* NirvanaImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NirvanaImage.swift; sourceTree = ""; }; 89BDCDE62769616600577829 /* UIImage+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Extension.swift"; sourceTree = ""; }; 89BDCDE927697F9C00577829 /* UserMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserMenu.swift; sourceTree = ""; }; + 89BDCDEB2769918D00577829 /* OnboardingTrioView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTrioView.swift; sourceTree = ""; }; 89F1386C2767EB19006680ED /* SignInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -151,6 +153,7 @@ isa = PBXGroup; children = ( 891A15F8276563CA00B26659 /* WelcomeView.swift */, + 89BDCDEB2769918D00577829 /* OnboardingTrioView.swift */, ); path = WelcomeView; sourceTree = ""; @@ -322,6 +325,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 89BDCDEC2769918D00577829 /* OnboardingTrioView.swift in Sources */, 891A15E327653A7000B26659 /* ContentView.swift in Sources */, 891A160327656FC700B26659 /* HomeView.swift in Sources */, 891A160B2765732700B26659 /* HomeViewModel.swift in Sources */, diff --git a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift index c9b6d6d..b010c6a 100644 --- a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift +++ b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift @@ -59,7 +59,7 @@ struct OnboardingTemplateView: View { } //outermost vstack .accentColor(NirvanaColor.teal) .background(NirvanaColor.bgLightGrey) - .navigationBarTitleDisplayMode(.inline) + .navigationBarHidden(true) } private var onboardingHeaderText: some View { diff --git a/nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift b/nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift new file mode 100644 index 0000000..e2226e7 --- /dev/null +++ b/nirvana-ios/Views/WelcomeView/OnboardingTrioView.swift @@ -0,0 +1,48 @@ +// +// OnboardingTrio.swift +// nirvana-ios +// +// Created by Arjun Patel on 12/14/21. +// + +import SwiftUI + +struct OnboardingTrioView: View { + var body: some View { + TabView { + OnboardingTemplateView(imgName: "undraw_through_the_park_lxnl", mainLeadingActText: "The path to living in the ", mainHighlightedActText: "present moment.", mainTrailingActText: "", subActText: "No more dopamine inducing news feeds. No profiles so no anxiety about the past or what others think.") + + OnboardingTemplateView(imgName: "undraw_voice_assistant_nrv7", mainLeadingActText: "Talk with your authentic ", mainHighlightedActText: "voice.", mainTrailingActText: "", subActText: "Less screen time, no more endless text chats with meaningless junk. Start mindfully listening.") + + OnboardingTemplateView(imgName: "undraw_connection_b-38-q", mainLeadingActText: "Be picky about your ", mainHighlightedActText: "inner circle.", mainTrailingActText: "", subActText: "You are who you hang out with. Maximum 8 people in your inner circle.", bottomActArea: AnyView( + VStack { + NavigationLink(destination: SignInView()) { + Text("Start Your Detox") + .bold() + .foregroundColor(NirvanaColor.white) + .frame(maxWidth: .infinity) + .padding(.vertical, 20) + .background(NirvanaColor.teal) + .clipShape(Capsule()) + .shadow(radius:10) + } + + NavigationLink(destination: WelcomeView()) { + Text("Go Back") + .bold() + .foregroundColor(NirvanaColor.teal) + } + }.padding(.bottom, 20) + ) + ) + } + .navigationBarHidden(true) + .tabViewStyle(.page(indexDisplayMode: .automatic)) + } +} + +struct OnboardingTrioView_Previews: PreviewProvider { + static var previews: some View { + OnboardingTrioView().environmentObject(AuthSessionStore()) + } +} diff --git a/nirvana-ios/Views/WelcomeView/WelcomeView.swift b/nirvana-ios/Views/WelcomeView/WelcomeView.swift index 62bcdba..8df116c 100644 --- a/nirvana-ios/Views/WelcomeView/WelcomeView.swift +++ b/nirvana-ios/Views/WelcomeView/WelcomeView.swift @@ -14,7 +14,7 @@ struct WelcomeView: View { NavigationView { OnboardingTemplateView(imgName: "undraw_friendship_mni7", mainLeadingActText: "Your", mainHighlightedActText: "minimalist", mainTrailingActText: "social media.", subActText: "Tired of the rat race on insta, snap, tik-tok, \"meta\"?", bottomActArea: AnyView( VStack(alignment: .center) { - NavigationLink(destination: SignInView()) { + NavigationLink(destination: OnboardingTrioView()) { Text("Start Your Detox") .bold() .foregroundColor(NirvanaColor.white) @@ -43,8 +43,7 @@ struct WelcomeView: View { .padding(.top, 20) ) ) - .navigationBarHidden(true) - } // navigation view + }.navigationBarHidden(true) // navigation view } // View body } // View