diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index 514bcc3..c0be10e 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -30,7 +30,8 @@ 89288EC9276756DF00E962C4 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 89288EC8276756DF00E962C4 /* FirebaseStorage */; }; 89288ECB27675B9F00E962C4 /* OnboardingTemplateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89288ECA27675B9F00E962C4 /* OnboardingTemplateView.swift */; }; 89B46E71276893E200B74255 /* AuthSessionStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89B46E70276893E200B74255 /* AuthSessionStore.swift */; }; - 89BCABD9276B34E9009E9B10 /* NavigationKit in Frameworks */ = {isa = PBXBuildFile; productRef = 89BCABD8276B34E9009E9B10 /* NavigationKit */; }; + 89BCABDC276B3557009E9B10 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BCABDB276B3557009E9B10 /* HomeView.swift */; }; + 89BCABE2276B3CB0009E9B10 /* NavigationStack in Frameworks */ = {isa = PBXBuildFile; productRef = 89BCABE1276B3CB0009E9B10 /* NavigationStack */; }; 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 */; }; @@ -68,6 +69,7 @@ 89288EBF276755DF00E962C4 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 89288ECA27675B9F00E962C4 /* OnboardingTemplateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTemplateView.swift; sourceTree = ""; }; 89B46E70276893E200B74255 /* AuthSessionStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthSessionStore.swift; sourceTree = ""; }; + 89BCABDB276B3557009E9B10 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; 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 = ""; }; @@ -87,8 +89,8 @@ buildActionMask = 2147483647; files = ( 89288EC3276756DF00E962C4 /* FirebaseAnalytics in Frameworks */, + 89BCABE2276B3CB0009E9B10 /* NavigationStack in Frameworks */, 89288EC5276756DF00E962C4 /* FirebaseAuth in Frameworks */, - 89BCABD9276B34E9009E9B10 /* NavigationKit in Frameworks */, 89288EC7276756DF00E962C4 /* FirebaseDatabase in Frameworks */, 89288EC9276756DF00E962C4 /* FirebaseStorage in Frameworks */, 89D99D2E2766FD6B00237814 /* Liquid in Frameworks */, @@ -118,6 +120,7 @@ 891A15DF27653A7000B26659 /* nirvana-ios */ = { isa = PBXGroup; children = ( + 89BCABDA276B3533009E9B10 /* v2 */, 89F05BA2276ACBFA0002E9C7 /* Services */, 891A160C27657CD600B26659 /* Models */, 891A1609276572C600B26659 /* Globals */, @@ -230,6 +233,22 @@ path = FooterControlsView; sourceTree = ""; }; + 89BCABDA276B3533009E9B10 /* v2 */ = { + isa = PBXGroup; + children = ( + 89BCABDF276B3588009E9B10 /* Home */, + ); + path = v2; + sourceTree = ""; + }; + 89BCABDF276B3588009E9B10 /* Home */ = { + isa = PBXGroup; + children = ( + 89BCABDB276B3557009E9B10 /* HomeView.swift */, + ); + path = Home; + sourceTree = ""; + }; 89BDCDE827697F6100577829 /* UserMenu */ = { isa = PBXGroup; children = ( @@ -288,7 +307,7 @@ 89288EC6276756DF00E962C4 /* FirebaseDatabase */, 89288EC8276756DF00E962C4 /* FirebaseStorage */, 89F1386F2767F55F006680ED /* GoogleSignIn */, - 89BCABD8276B34E9009E9B10 /* NavigationKit */, + 89BCABE1276B3CB0009E9B10 /* NavigationStack */, ); productName = "nirvana-ios"; productReference = 891A15DD27653A7000B26659 /* nirvana-ios.app */; @@ -322,7 +341,7 @@ 89D99D2C2766FD6B00237814 /* XCRemoteSwiftPackageReference "liquid" */, 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, 89F1386E2767F55F006680ED /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, - 89BCABD7276B34E8009E9B10 /* XCRemoteSwiftPackageReference "NavigationKit" */, + 89BCABE0276B3CB0009E9B10 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */, ); productRefGroup = 891A15DE27653A7000B26659 /* Products */; projectDirPath = ""; @@ -362,6 +381,7 @@ 89288ECB27675B9F00E962C4 /* OnboardingTemplateView.swift in Sources */, 89F05BA4276ACC060002E9C7 /* ContactService.swift in Sources */, 89B46E71276893E200B74255 /* AuthSessionStore.swift in Sources */, + 89BCABDC276B3557009E9B10 /* HomeView.swift in Sources */, 891A15F9276563CA00B26659 /* WelcomeView.swift in Sources */, 89BDCDEF2769B50C00577829 /* ContactsView.swift in Sources */, 891A1611276590B000B26659 /* ChatsCarouselView.swift in Sources */, @@ -598,12 +618,12 @@ minimumVersion = 8.0.0; }; }; - 89BCABD7276B34E8009E9B10 /* XCRemoteSwiftPackageReference "NavigationKit" */ = { + 89BCABE0276B3CB0009E9B10 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/rebeloper/NavigationKit.git"; + repositoryURL = "https://github.com/matteopuc/swiftui-navigation-stack.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.4.9; + minimumVersion = 1.0.0; }; }; 89D99D2C2766FD6B00237814 /* XCRemoteSwiftPackageReference "liquid" */ = { @@ -645,10 +665,10 @@ package = 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseStorage; }; - 89BCABD8276B34E9009E9B10 /* NavigationKit */ = { + 89BCABE1276B3CB0009E9B10 /* NavigationStack */ = { isa = XCSwiftPackageProductDependency; - package = 89BCABD7276B34E8009E9B10 /* XCRemoteSwiftPackageReference "NavigationKit" */; - productName = NavigationKit; + package = 89BCABE0276B3CB0009E9B10 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */; + productName = NavigationStack; }; 89D99D2D2766FD6B00237814 /* Liquid */ = { isa = XCSwiftPackageProductDependency; diff --git a/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 12ce317..e8b8529 100644 --- a/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -127,15 +127,6 @@ "version": "2.30908.0" } }, - { - "package": "NavigationKit", - "repositoryURL": "https://github.com/rebeloper/NavigationKit.git", - "state": { - "branch": null, - "revision": "9fc0dea7c57c6671c087f23361d7fe3493ffaa1c", - "version": "0.4.10" - } - }, { "package": "Promises", "repositoryURL": "https://github.com/google/promises.git", @@ -153,6 +144,15 @@ "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", "version": "1.18.0" } + }, + { + "package": "NavigationStack", + "repositoryURL": "https://github.com/matteopuc/swiftui-navigation-stack.git", + "state": { + "branch": null, + "revision": "be0db68ed0d84ed543bf8f7600a1f84de015f753", + "version": "1.0.4" + } } ] }, diff --git a/nirvana-ios/ContentView.swift b/nirvana-ios/ContentView.swift index c822248..84918ac 100644 --- a/nirvana-ios/ContentView.swift +++ b/nirvana-ios/ContentView.swift @@ -12,7 +12,7 @@ struct ContentView: View { var body: some View { ZStack { - ContactsView() // TEMPORARY FOR TESTING +// ContactsView() // TEMPORARY FOR TESTING // switch self.authSessionStore.sessionState { // case SessionState.isAuthenticated: // HomeView() diff --git a/nirvana-ios/v2/Home/HomeView.swift b/nirvana-ios/v2/Home/HomeView.swift new file mode 100644 index 0000000..d1d57a2 --- /dev/null +++ b/nirvana-ios/v2/Home/HomeView.swift @@ -0,0 +1,20 @@ +// +// HomePage.swift +// nirvana-ios +// +// Created by Arjun Patel on 12/16/21. +// + +import SwiftUI + +struct HomeView: View { + var body: some View { + Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) + } +} + +struct HomeView_Previews: PreviewProvider { + static var previews: some View { + HomeView() + } +}