diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index aedb5ee..8b9c7ad 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -24,14 +24,12 @@ 892179E42765FEB8001E6C60 /* FooterControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892179E32765FEB8001E6C60 /* FooterControlsView.swift */; }; 892179E62765FECD001E6C60 /* FooterControlsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892179E52765FECD001E6C60 /* FooterControlsViewModel.swift */; }; 89288EC0276755DF00E962C4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 89288EBF276755DF00E962C4 /* GoogleService-Info.plist */; }; - 89288EC3276756DF00E962C4 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 89288EC2276756DF00E962C4 /* FirebaseAnalytics */; }; - 89288EC5276756DF00E962C4 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 89288EC4276756DF00E962C4 /* FirebaseAuth */; }; - 89288EC7276756DF00E962C4 /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 89288EC6276756DF00E962C4 /* FirebaseDatabase */; }; - 89288EC9276756DF00E962C4 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 89288EC8276756DF00E962C4 /* FirebaseStorage */; }; 89288ECB27675B9F00E962C4 /* OnboardingTemplateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89288ECA27675B9F00E962C4 /* OnboardingTemplateView.swift */; }; 89AD5573276DD790001658E0 /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD5572276DD790001658E0 /* SplashView.swift */; }; 89AD5575276DE724001658E0 /* PhoneCodeVerificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD5574276DE724001658E0 /* PhoneCodeVerificationView.swift */; }; 89AD5578276DEAB3001658E0 /* LogoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD5577276DEAB3001658E0 /* LogoHeaderView.swift */; }; + 89AD557A276DF7C5001658E0 /* EditProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD5579276DF7C5001658E0 /* EditProfileView.swift */; }; + 89AD557C276DF86A001658E0 /* FirestoreService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AD557B276DF86A001658E0 /* FirestoreService.swift */; }; 89B46E71276893E200B74255 /* AuthSessionStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89B46E70276893E200B74255 /* AuthSessionStore.swift */; }; 89BCABE2276B3CB0009E9B10 /* NavigationStack in Frameworks */ = {isa = PBXBuildFile; productRef = 89BCABE1276B3CB0009E9B10 /* NavigationStack */; }; 89BCABE5276B3D58009E9B10 /* InnerCircleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BCABE4276B3D58009E9B10 /* InnerCircleView.swift */; }; @@ -44,7 +42,7 @@ 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 /* Firestore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDF02769E64200577829 /* Firestore.swift */; }; + 89BDCDF12769E64200577829 /* Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BDCDF02769E64200577829 /* Messages.swift */; }; 89F05B9B276A87920002E9C7 /* ContactsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F05B9A276A87920002E9C7 /* ContactsViewModel.swift */; }; 89F05B9F276A8D360002E9C7 /* Contact.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F05B9E276A8D360002E9C7 /* Contact.swift */; }; 89F05BA4276ACC060002E9C7 /* ContactService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F05BA3276ACC060002E9C7 /* ContactService.swift */; }; @@ -77,6 +75,8 @@ 89AD5572276DD790001658E0 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = ""; }; 89AD5574276DE724001658E0 /* PhoneCodeVerificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneCodeVerificationView.swift; sourceTree = ""; }; 89AD5577276DEAB3001658E0 /* LogoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoHeaderView.swift; sourceTree = ""; }; + 89AD5579276DF7C5001658E0 /* EditProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProfileView.swift; sourceTree = ""; }; + 89AD557B276DF86A001658E0 /* FirestoreService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestoreService.swift; sourceTree = ""; }; 89B46E70276893E200B74255 /* AuthSessionStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthSessionStore.swift; sourceTree = ""; }; 89BCABE4276B3D58009E9B10 /* InnerCircleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InnerCircleView.swift; sourceTree = ""; }; 89BCABE6276B3D64009E9B10 /* InnerCircleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InnerCircleViewModel.swift; sourceTree = ""; }; @@ -88,7 +88,7 @@ 89BDCDE927697F9C00577829 /* UserMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserMenu.swift; sourceTree = ""; }; 89BDCDEB2769918D00577829 /* OnboardingTrioView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingTrioView.swift; sourceTree = ""; }; 89BDCDEE2769B50C00577829 /* ContactsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsView.swift; sourceTree = ""; }; - 89BDCDF02769E64200577829 /* Firestore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Firestore.swift; sourceTree = ""; }; + 89BDCDF02769E64200577829 /* Messages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Messages.swift; sourceTree = ""; }; 89F05B9A276A87920002E9C7 /* ContactsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactsViewModel.swift; sourceTree = ""; }; 89F05B9E276A8D360002E9C7 /* Contact.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contact.swift; sourceTree = ""; }; 89F05BA3276ACC060002E9C7 /* ContactService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactService.swift; sourceTree = ""; }; @@ -101,11 +101,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 89288EC3276756DF00E962C4 /* FirebaseAnalytics in Frameworks */, 89BCABE2276B3CB0009E9B10 /* NavigationStack in Frameworks */, - 89288EC5276756DF00E962C4 /* FirebaseAuth in Frameworks */, - 89288EC7276756DF00E962C4 /* FirebaseDatabase in Frameworks */, - 89288EC9276756DF00E962C4 /* FirebaseStorage in Frameworks */, 89F138702767F55F006680ED /* GoogleSignIn in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -132,6 +128,7 @@ 891A15DF27653A7000B26659 /* nirvana-ios */ = { isa = PBXGroup; children = ( + 89AD557D276E01E2001658E0 /* Repositories */, 89F05BA2276ACBFA0002E9C7 /* Services */, 891A160C27657CD600B26659 /* Models */, 891A1609276572C600B26659 /* Globals */, @@ -168,6 +165,7 @@ children = ( 89AD5576276DEA9D001658E0 /* LogoHeader */, 89AD5571276DD77D001658E0 /* SplashView */, + 89AD5570276DBBD4001658E0 /* EditProfile */, 89BCABEE276D2DD6009E9B10 /* PhoneVerification */, 89BDCDED2769B3EB00577829 /* Contacts */, 89F1386B2767EB07006680ED /* SignIn */, @@ -224,7 +222,7 @@ 891A160C27657CD600B26659 /* Models */ = { isa = PBXGroup; children = ( - 89BDCDF02769E64200577829 /* Firestore.swift */, + 89BDCDF02769E64200577829 /* Messages.swift */, 891A160D27657CEA00B26659 /* User.swift */, 89F05B9E276A8D360002E9C7 /* Contact.swift */, ); @@ -249,6 +247,14 @@ path = FooterControlsView; sourceTree = ""; }; + 89AD5570276DBBD4001658E0 /* EditProfile */ = { + isa = PBXGroup; + children = ( + 89AD5579276DF7C5001658E0 /* EditProfileView.swift */, + ); + path = EditProfile; + sourceTree = ""; + }; 89AD5571276DD77D001658E0 /* SplashView */ = { isa = PBXGroup; children = ( @@ -265,6 +271,14 @@ path = LogoHeader; sourceTree = ""; }; + 89AD557D276E01E2001658E0 /* Repositories */ = { + isa = PBXGroup; + children = ( + 89AD557B276DF86A001658E0 /* FirestoreService.swift */, + ); + path = Repositories; + sourceTree = ""; + }; 89BCABDF276B3588009E9B10 /* InnerCircle */ = { isa = PBXGroup; children = ( @@ -336,10 +350,6 @@ ); name = "nirvana-ios"; packageProductDependencies = ( - 89288EC2276756DF00E962C4 /* FirebaseAnalytics */, - 89288EC4276756DF00E962C4 /* FirebaseAuth */, - 89288EC6276756DF00E962C4 /* FirebaseDatabase */, - 89288EC8276756DF00E962C4 /* FirebaseStorage */, 89F1386F2767F55F006680ED /* GoogleSignIn */, 89BCABE1276B3CB0009E9B10 /* NavigationStack */, ); @@ -362,7 +372,7 @@ }; }; }; - buildConfigurationList = 891A15D827653A7000B26659 /* Build configuration list for PBXProject "nirvana-ios" */; + buildConfigurationList = 891A15D827653A7000B26659 /* Build configuration list for PBXProject "``````````````````````" */; compatibilityVersion = "Xcode 13.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -372,7 +382,6 @@ ); mainGroup = 891A15D427653A7000B26659; packageReferences = ( - 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, 89F1386E2767F55F006680ED /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, 89BCABE0276B3CB0009E9B10 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */, ); @@ -404,6 +413,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 89AD557A276DF7C5001658E0 /* EditProfileView.swift in Sources */, 89BDCDEC2769918D00577829 /* OnboardingTrioView.swift in Sources */, 891A15E327653A7000B26659 /* ContentView.swift in Sources */, 89F05B9F276A8D360002E9C7 /* Contact.swift in Sources */, @@ -428,6 +438,7 @@ 89F05BA6276ACD830002E9C7 /* ContactsPickerView.swift in Sources */, 89BDCDEA27697F9C00577829 /* UserMenu.swift in Sources */, 89BCABE7276B3D64009E9B10 /* InnerCircleViewModel.swift in Sources */, + 89AD557C276DF86A001658E0 /* FirestoreService.swift in Sources */, 891A15FF27656F9200B26659 /* HeaderView.swift in Sources */, 89AD5575276DE724001658E0 /* PhoneCodeVerificationView.swift in Sources */, 892179E42765FEB8001E6C60 /* FooterControlsView.swift in Sources */, @@ -436,7 +447,7 @@ 89BCABF0276D53C4009E9B10 /* PhoneVerificationViewModel.swift in Sources */, 89BDCDE72769616600577829 /* UIImage+Extension.swift in Sources */, 89F1386D2767EB19006680ED /* SignInView.swift in Sources */, - 89BDCDF12769E64200577829 /* Firestore.swift in Sources */, + 89BDCDF12769E64200577829 /* Messages.swift in Sources */, 891A160E27657CEA00B26659 /* User.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -629,7 +640,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 891A15D827653A7000B26659 /* Build configuration list for PBXProject "nirvana-ios" */ = { + 891A15D827653A7000B26659 /* Build configuration list for PBXProject "``````````````````````" */ = { isa = XCConfigurationList; buildConfigurations = ( 891A15E927653A7100B26659 /* Debug */, @@ -650,14 +661,6 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 8.0.0; - }; - }; 89BCABE0276B3CB0009E9B10 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/matteopuc/swiftui-navigation-stack.git"; @@ -677,26 +680,6 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 89288EC2276756DF00E962C4 /* FirebaseAnalytics */ = { - isa = XCSwiftPackageProductDependency; - package = 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseAnalytics; - }; - 89288EC4276756DF00E962C4 /* FirebaseAuth */ = { - isa = XCSwiftPackageProductDependency; - package = 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseAuth; - }; - 89288EC6276756DF00E962C4 /* FirebaseDatabase */ = { - isa = XCSwiftPackageProductDependency; - package = 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseDatabase; - }; - 89288EC8276756DF00E962C4 /* FirebaseStorage */ = { - isa = XCSwiftPackageProductDependency; - package = 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseStorage; - }; 89BCABE1276B3CB0009E9B10 /* NavigationStack */ = { isa = XCSwiftPackageProductDependency; package = 89BCABE0276B3CB0009E9B10 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */; diff --git a/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9d5cafb..575c2ac 100644 --- a/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,15 +1,6 @@ { "object": { "pins": [ - { - "package": "abseil", - "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", - "state": { - "branch": null, - "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version": "0.20200225.4" - } - }, { "package": "AppAuth", "repositoryURL": "https://github.com/openid/AppAuth-iOS.git", @@ -19,67 +10,13 @@ "version": "1.4.0" } }, - { - "package": "BoringSSL-GRPC", - "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git", - "state": { - "branch": null, - "revision": "734a8247442fde37df4364c21f6a0085b6a36728", - "version": "0.7.2" - } - }, - { - "package": "Firebase", - "repositoryURL": "https://github.com/firebase/firebase-ios-sdk", - "state": { - "branch": null, - "revision": "08686f04881483d2bc098b2696e674c0ba135e47", - "version": "8.10.0" - } - }, - { - "package": "GoogleAppMeasurement", - "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", - "state": { - "branch": null, - "revision": "9b2f6aca5b4685c45f9f5481f19bee8e7982c538", - "version": "8.9.1" - } - }, - { - "package": "GoogleDataTransport", - "repositoryURL": "https://github.com/google/GoogleDataTransport.git", - "state": { - "branch": null, - "revision": "15ccdfd25ac55b9239b82809531ff26605e7556e", - "version": "9.1.2" - } - }, { "package": "GoogleSignIn", "repositoryURL": "https://github.com/google/GoogleSignIn-iOS.git", "state": { "branch": null, - "revision": "27bc94f5e1bd1f3b12ba5abb2230dd77dd143f1e", - "version": "6.0.2" - } - }, - { - "package": "GoogleUtilities", - "repositoryURL": "https://github.com/google/GoogleUtilities.git", - "state": { - "branch": null, - "revision": "797005ad8a1f0614063933e2fa010a5d13cb09d0", - "version": "7.6.0" - } - }, - { - "package": "gRPC", - "repositoryURL": "https://github.com/firebase/grpc-SwiftPM.git", - "state": { - "branch": null, - "revision": "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version": "1.28.4" + "revision": "60ca2bfd218ccb194a746a79b41d9d50eb7e3af0", + "version": "6.1.0" } }, { @@ -100,42 +37,6 @@ "version": "1.2.2" } }, - { - "package": "leveldb", - "repositoryURL": "https://github.com/firebase/leveldb.git", - "state": { - "branch": null, - "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", - "version": "1.22.2" - } - }, - { - "package": "nanopb", - "repositoryURL": "https://github.com/firebase/nanopb.git", - "state": { - "branch": null, - "revision": "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version": "2.30908.0" - } - }, - { - "package": "Promises", - "repositoryURL": "https://github.com/google/promises.git", - "state": { - "branch": null, - "revision": "611337c330350c9c1823ad6d671e7f936af5ee13", - "version": "2.0.0" - } - }, - { - "package": "SwiftProtobuf", - "repositoryURL": "https://github.com/apple/swift-protobuf.git", - "state": { - "branch": null, - "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824", - "version": "1.18.0" - } - }, { "package": "NavigationStack", "repositoryURL": "https://github.com/matteopuc/swiftui-navigation-stack.git",