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

adding in separate onboading files as the tabview solution won't work

Browse Source
This commit is contained in:
talksik
2021-12-19 22:13:39 -08:00
parent 298f824330
commit cd9b495a02
5 changed files with 128 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nirvana-ios.xcodeproj/project.pbxproj
+19 -7
View File
@@ -7,6 +7,10 @@
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 */; };
891A15E527653A7100B26659 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 891A15E427653A7100B26659 /* Assets.xcassets */; };
@@ -42,7 +46,6 @@
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 */; };
89BDCDEF2769B50C00577829 /* ContactsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDEE2769B50C00577829 /* ContactsView.swift */; };
89BDCDF12769E64200577829 /* Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDF02769E64200577829 /* Messages.swift */; };
89F05B9B276A87920002E9C7 /* ContactsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F05B9A276A87920002E9C7 /* ContactsViewModel.swift */; };
@@ -73,6 +76,10 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
8904DEC1277054A80071E6CA /* Onboarding_One.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding_One.swift; sourceTree = "<group>"; };
8904DEC3277054C50071E6CA /* Onboarding_Two.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding_Two.swift; sourceTree = "<group>"; };
8904DEC5277054E10071E6CA /* Onboarding_Three.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding_Three.swift; sourceTree = "<group>"; };
8904DEC7277055E90071E6CA /* OnboardingTrioView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingTrioView.swift; sourceTree = "<group>"; };
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 = "<group>"; };
891A15E227653A7000B26659 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -109,7 +116,6 @@
89BDCDE427695DB900577829 /* NirvanaImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NirvanaImage.swift; sourceTree = "<group>"; };
89BDCDE62769616600577829 /* UIImage+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Extension.swift"; sourceTree = "<group>"; };
89BDCDE927697F9C00577829 /* UserMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserMenu.swift; sourceTree = "<group>"; };
89BDCDEB2769918D00577829 /* OnboardingTrioView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTrioView.swift; sourceTree = "<group>"; };
89BDCDEE2769B50C00577829 /* ContactsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsView.swift; sourceTree = "<group>"; };
89BDCDF02769E64200577829 /* Messages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Messages.swift; sourceTree = "<group>"; };
89F05B9A276A87920002E9C7 /* ContactsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsViewModel.swift; sourceTree = "<group>"; };
@@ -207,7 +213,7 @@
children = (
894E80BF276EFCF500624B72 /* AudioPlayer */,
89F18AF3276ECF1800115B1E /* AddBasicInfo */,
89F18AF2276ECD5D00115B1E /* IntroView */,
89F18AF2276ECD5D00115B1E /* OnBoarding */,
89F18AEF276ECA9600115B1E /* Router */,
89AD5576276DEA9D001658E0 /* LogoHeader */,
89AD5571276DD77D001658E0 /* SplashView */,
@@ -388,12 +394,15 @@
path = Router;
sourceTree = "<group>";
};
89F18AF2276ECD5D00115B1E /* IntroView */ = {
89F18AF2276ECD5D00115B1E /* OnBoarding */ = {
isa = PBXGroup;
children = (
89BDCDEB2769918D00577829 /* OnboardingTrioView.swift */,
8904DEC7277055E90071E6CA /* OnboardingTrioView.swift */,
8904DEC1277054A80071E6CA /* Onboarding_One.swift */,
8904DEC3277054C50071E6CA /* Onboarding_Two.swift */,
8904DEC5277054E10071E6CA /* Onboarding_Three.swift */,
);
path = IntroView;
path = OnBoarding;
sourceTree = "<group>";
};
89F18AF3276ECF1800115B1E /* AddBasicInfo */ = {
@@ -501,7 +510,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
89BDCDEC2769918D00577829 /* OnboardingTrioView.swift in Sources */,
891A15E327653A7000B26659 /* ContentView.swift in Sources */,
894E80BE276ED7A700624B72 /* avatars.swift in Sources */,
89F05B9F276A8D360002E9C7 /* Contact.swift in Sources */,
@@ -512,6 +520,7 @@
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 */,
@@ -528,6 +537,7 @@
891A15E127653A7000B26659 /* nirvana_iosApp.swift in Sources */,
89BCABED276D2B05009E9B10 /* WavesGlassBackgroundView.swift in Sources */,
89F05BA6276ACD830002E9C7 /* ContactsPickerView.swift in Sources */,
8904DEC8277055E90071E6CA /* OnboardingTrioView.swift in Sources */,
89BDCDEA27697F9C00577829 /* UserMenu.swift in Sources */,
89BCABE7276B3D64009E9B10 /* InnerCircleViewModel.swift in Sources */,
89AD557C276DF86A001658E0 /* FirestoreService.swift in Sources */,
@@ -540,6 +550,8 @@
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 */,
nirvana-ios/Views/OnBoarding/OnboardingTrioView.swift
+49
View File
@@ -0,0 +1,49 @@
//
// OnboardingTrio.swift
// nirvana-ios
//
// Created by Arjun Patel on 12/14/21.
//
import SwiftUI
import NavigationStack
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)
)
)
}
.navigationBarHidden(true)
.tabViewStyle(.page(indexDisplayMode: .automatic))
}
}
}
struct OnboardingTrioView_Previews: PreviewProvider {
static var previews: some View {
OnboardingTrioView().environmentObject(AuthSessionStore())
}
}
nirvana-ios/Views/OnBoarding/Onboarding_One.swift
+20
View File
@@ -0,0 +1,20 @@
//
// 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()
}
}
nirvana-ios/Views/OnBoarding/Onboarding_Three.swift
+20
View File
@@ -0,0 +1,20 @@
//
// 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()
}
}
nirvana-ios/Views/OnBoarding/Onboarding_Two.swift
+20
View File
@@ -0,0 +1,20 @@
//
// 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()
}
}