diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index 42e9540..5f912c1 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -49,6 +49,21 @@ 89F05BA6276ACD830002E9C7 /* ContactsPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F05BA5276ACD830002E9C7 /* ContactsPickerView.swift */; }; 89F1386D2767EB19006680ED /* SignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89F1386C2767EB19006680ED /* SignInView.swift */; }; 89F138702767F55F006680ED /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 89F1386F2767F55F006680ED /* GoogleSignIn */; }; + 89F18ACE276E881800115B1E /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18ACD276E881800115B1E /* FirebaseAnalytics */; }; + 89F18AD0276E881800115B1E /* FirebaseAnalyticsSwift-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18ACF276E881800115B1E /* FirebaseAnalyticsSwift-Beta */; }; + 89F18AD2276E881800115B1E /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AD1276E881800115B1E /* FirebaseAuth */; }; + 89F18AD4276E881800115B1E /* FirebaseAuthCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AD3276E881800115B1E /* FirebaseAuthCombine-Community */; }; + 89F18AD6276E881900115B1E /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AD5276E881900115B1E /* FirebaseDatabase */; }; + 89F18AD8276E881900115B1E /* FirebaseDatabaseSwift-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AD7276E881900115B1E /* FirebaseDatabaseSwift-Beta */; }; + 89F18ADA276E881900115B1E /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AD9276E881900115B1E /* FirebaseFirestore */; }; + 89F18ADC276E881900115B1E /* FirebaseFirestoreCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18ADB276E881900115B1E /* FirebaseFirestoreCombine-Community */; }; + 89F18ADE276E881900115B1E /* FirebaseFirestoreSwift-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18ADD276E881900115B1E /* FirebaseFirestoreSwift-Beta */; }; + 89F18AE0276E881900115B1E /* FirebaseFunctions in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18ADF276E881900115B1E /* FirebaseFunctions */; }; + 89F18AE2276E881900115B1E /* FirebaseFunctionsCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AE1276E881900115B1E /* FirebaseFunctionsCombine-Community */; }; + 89F18AE4276E881900115B1E /* FirebaseFunctionsSwift-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AE3276E881900115B1E /* FirebaseFunctionsSwift-Beta */; }; + 89F18AE6276E881900115B1E /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AE5276E881900115B1E /* FirebaseStorage */; }; + 89F18AE8276E881900115B1E /* FirebaseStorageCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AE7276E881900115B1E /* FirebaseStorageCombine-Community */; }; + 89F18AEA276E881900115B1E /* FirebaseStorageSwift-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = 89F18AE9276E881900115B1E /* FirebaseStorageSwift-Beta */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -102,7 +117,22 @@ buildActionMask = 2147483647; files = ( 89BCABE2276B3CB0009E9B10 /* NavigationStack in Frameworks */, + 89F18AD4276E881800115B1E /* FirebaseAuthCombine-Community in Frameworks */, + 89F18AEA276E881900115B1E /* FirebaseStorageSwift-Beta in Frameworks */, + 89F18AD2276E881800115B1E /* FirebaseAuth in Frameworks */, + 89F18AE0276E881900115B1E /* FirebaseFunctions in Frameworks */, + 89F18ADC276E881900115B1E /* FirebaseFirestoreCombine-Community in Frameworks */, + 89F18ADE276E881900115B1E /* FirebaseFirestoreSwift-Beta in Frameworks */, 89F138702767F55F006680ED /* GoogleSignIn in Frameworks */, + 89F18AD0276E881800115B1E /* FirebaseAnalyticsSwift-Beta in Frameworks */, + 89F18AE6276E881900115B1E /* FirebaseStorage in Frameworks */, + 89F18AE2276E881900115B1E /* FirebaseFunctionsCombine-Community in Frameworks */, + 89F18AE8276E881900115B1E /* FirebaseStorageCombine-Community in Frameworks */, + 89F18ADA276E881900115B1E /* FirebaseFirestore in Frameworks */, + 89F18AD6276E881900115B1E /* FirebaseDatabase in Frameworks */, + 89F18AD8276E881900115B1E /* FirebaseDatabaseSwift-Beta in Frameworks */, + 89F18ACE276E881800115B1E /* FirebaseAnalytics in Frameworks */, + 89F18AE4276E881900115B1E /* FirebaseFunctionsSwift-Beta in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -172,6 +202,8 @@ 892179E22765FE93001E6C60 /* FooterControlsView */, 891A16052765726800B26659 /* Templates */, 891A16042765725D00B26659 /* WelcomeView */, + 89BCABDF276B3588009E9B10 /* InnerCircle */, + 89BDCDE827697F6100577829 /* UserMenu */, 891A1608276572BB00B26659 /* HomeView */, ); path = Views; @@ -199,8 +231,6 @@ 891A1608276572BB00B26659 /* HomeView */ = { isa = PBXGroup; children = ( - 89BCABDF276B3588009E9B10 /* InnerCircle */, - 89BDCDE827697F6100577829 /* UserMenu */, 891A160F2765909400B26659 /* ChatsCarouselView */, 891A160227656FC700B26659 /* HomeView.swift */, 891A160A2765732700B26659 /* HomeViewModel.swift */, @@ -352,6 +382,21 @@ packageProductDependencies = ( 89F1386F2767F55F006680ED /* GoogleSignIn */, 89BCABE1276B3CB0009E9B10 /* NavigationStack */, + 89F18ACD276E881800115B1E /* FirebaseAnalytics */, + 89F18ACF276E881800115B1E /* FirebaseAnalyticsSwift-Beta */, + 89F18AD1276E881800115B1E /* FirebaseAuth */, + 89F18AD3276E881800115B1E /* FirebaseAuthCombine-Community */, + 89F18AD5276E881900115B1E /* FirebaseDatabase */, + 89F18AD7276E881900115B1E /* FirebaseDatabaseSwift-Beta */, + 89F18AD9276E881900115B1E /* FirebaseFirestore */, + 89F18ADB276E881900115B1E /* FirebaseFirestoreCombine-Community */, + 89F18ADD276E881900115B1E /* FirebaseFirestoreSwift-Beta */, + 89F18ADF276E881900115B1E /* FirebaseFunctions */, + 89F18AE1276E881900115B1E /* FirebaseFunctionsCombine-Community */, + 89F18AE3276E881900115B1E /* FirebaseFunctionsSwift-Beta */, + 89F18AE5276E881900115B1E /* FirebaseStorage */, + 89F18AE7276E881900115B1E /* FirebaseStorageCombine-Community */, + 89F18AE9276E881900115B1E /* FirebaseStorageSwift-Beta */, ); productName = "nirvana-ios"; productReference = 891A15DD27653A7000B26659 /* nirvana-ios.app */; @@ -384,6 +429,7 @@ packageReferences = ( 89F1386E2767F55F006680ED /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, 89BCABE0276B3CB0009E9B10 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */, + 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, ); productRefGroup = 891A15DE27653A7000B26659 /* Products */; projectDirPath = ""; @@ -677,6 +723,14 @@ minimumVersion = 6.0.0; }; }; + 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + branch = master; + kind = branch; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -690,6 +744,81 @@ package = 89F1386E2767F55F006680ED /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */; productName = GoogleSignIn; }; + 89F18ACD276E881800115B1E /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAnalytics; + }; + 89F18ACF276E881800115B1E /* FirebaseAnalyticsSwift-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseAnalyticsSwift-Beta"; + }; + 89F18AD1276E881800115B1E /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAuth; + }; + 89F18AD3276E881800115B1E /* FirebaseAuthCombine-Community */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseAuthCombine-Community"; + }; + 89F18AD5276E881900115B1E /* FirebaseDatabase */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseDatabase; + }; + 89F18AD7276E881900115B1E /* FirebaseDatabaseSwift-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseDatabaseSwift-Beta"; + }; + 89F18AD9276E881900115B1E /* FirebaseFirestore */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseFirestore; + }; + 89F18ADB276E881900115B1E /* FirebaseFirestoreCombine-Community */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseFirestoreCombine-Community"; + }; + 89F18ADD276E881900115B1E /* FirebaseFirestoreSwift-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseFirestoreSwift-Beta"; + }; + 89F18ADF276E881900115B1E /* FirebaseFunctions */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseFunctions; + }; + 89F18AE1276E881900115B1E /* FirebaseFunctionsCombine-Community */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseFunctionsCombine-Community"; + }; + 89F18AE3276E881900115B1E /* FirebaseFunctionsSwift-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseFunctionsSwift-Beta"; + }; + 89F18AE5276E881900115B1E /* FirebaseStorage */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseStorage; + }; + 89F18AE7276E881900115B1E /* FirebaseStorageCombine-Community */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseStorageCombine-Community"; + }; + 89F18AE9276E881900115B1E /* FirebaseStorageSwift-Beta */ = { + isa = XCSwiftPackageProductDependency; + package = 89F18ACC276E881800115B1E /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = "FirebaseStorageSwift-Beta"; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 891A15D527653A7000B26659 /* Project object */; diff --git a/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist b/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist index 4adebe5..84bd8a7 100644 --- a/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,14 +9,35 @@ isShown orderHint - 2 + 3 Promises (Playground) 2.xcscheme isShown orderHint - 3 + 4 + + Promises (Playground) 3.xcscheme + + isShown + + orderHint + 2 + + Promises (Playground) 4.xcscheme + + isShown + + orderHint + 5 + + Promises (Playground) 5.xcscheme + + isShown + + orderHint + 6 Promises (Playground).xcscheme @@ -28,7 +49,7 @@ nirvana-ios.xcscheme_^#shared#^_ orderHint - 0 + 1 diff --git a/nirvana-ios/Repositories/FirestoreService.swift b/nirvana-ios/Repositories/FirestoreService.swift index 86fbb9b..8fca406 100644 --- a/nirvana-ios/Repositories/FirestoreService.swift +++ b/nirvana-ios/Repositories/FirestoreService.swift @@ -7,7 +7,7 @@ import Foundation import Firebase -import FirebaseStorage +import FirebaseFirestore class FirestoreService { enum Collections: String { diff --git a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift b/nirvana-ios/Views/InnerCircle/InnerCircleView.swift similarity index 100% rename from nirvana-ios/Views/HomeView/InnerCircle/InnerCircleView.swift rename to nirvana-ios/Views/InnerCircle/InnerCircleView.swift diff --git a/nirvana-ios/Views/HomeView/InnerCircle/InnerCircleViewModel.swift b/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift similarity index 100% rename from nirvana-ios/Views/HomeView/InnerCircle/InnerCircleViewModel.swift rename to nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift diff --git a/nirvana-ios/Views/HomeView/UserMenu/UserMenu.swift b/nirvana-ios/Views/UserMenu/UserMenu.swift similarity index 100% rename from nirvana-ios/Views/HomeView/UserMenu/UserMenu.swift rename to nirvana-ios/Views/UserMenu/UserMenu.swift