diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index 1e2a0fe..7c06aac 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -18,13 +18,18 @@ 891A15FF27656F9200B26659 /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A15FE27656F9200B26659 /* HeaderView.swift */; }; 891A160127656FB200B26659 /* FooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A160027656FB200B26659 /* FooterView.swift */; }; 891A160327656FC700B26659 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A160227656FC700B26659 /* HomeView.swift */; }; - 891A1607276572A800B26659 /* Onboarding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A1606276572A800B26659 /* Onboarding.swift */; }; 891A160B2765732700B26659 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A160A2765732700B26659 /* HomeViewModel.swift */; }; 891A160E27657CEA00B26659 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A160D27657CEA00B26659 /* User.swift */; }; 891A1611276590B000B26659 /* ChatsCarouselView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A1610276590B000B26659 /* ChatsCarouselView.swift */; }; 891A16132765A44300B26659 /* ChatsCarouselViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891A16122765A44300B26659 /* ChatsCarouselViewModel.swift */; }; 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 */; }; 89D99D2E2766FD6B00237814 /* Liquid in Frameworks */ = {isa = PBXBuildFile; productRef = 89D99D2D2766FD6B00237814 /* Liquid */; }; /* End PBXBuildFile section */ @@ -42,13 +47,14 @@ 891A15FE27656F9200B26659 /* HeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = ""; }; 891A160027656FB200B26659 /* FooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterView.swift; sourceTree = ""; }; 891A160227656FC700B26659 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = ""; }; - 891A1606276572A800B26659 /* Onboarding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Onboarding.swift; sourceTree = ""; }; 891A160A2765732700B26659 /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = ""; }; 891A160D27657CEA00B26659 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = ""; }; 891A1610276590B000B26659 /* ChatsCarouselView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatsCarouselView.swift; sourceTree = ""; }; 891A16122765A44300B26659 /* ChatsCarouselViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatsCarouselViewModel.swift; sourceTree = ""; }; 892179E32765FEB8001E6C60 /* FooterControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterControlsView.swift; sourceTree = ""; }; 892179E52765FECD001E6C60 /* FooterControlsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterControlsViewModel.swift; sourceTree = ""; }; + 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 = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,6 +62,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 89288EC3276756DF00E962C4 /* FirebaseAnalytics in Frameworks */, + 89288EC5276756DF00E962C4 /* FirebaseAuth in Frameworks */, + 89288EC7276756DF00E962C4 /* FirebaseDatabase in Frameworks */, + 89288EC9276756DF00E962C4 /* FirebaseStorage in Frameworks */, 89D99D2E2766FD6B00237814 /* Liquid in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -90,6 +100,7 @@ 891A15E027653A7000B26659 /* nirvana_iosApp.swift */, 891A15E227653A7000B26659 /* ContentView.swift */, 891A15E427653A7100B26659 /* Assets.xcassets */, + 89288EBF276755DF00E962C4 /* GoogleService-Info.plist */, 891A15E627653A7100B26659 /* Preview Content */, ); path = "nirvana-ios"; @@ -135,7 +146,7 @@ children = ( 891A160027656FB200B26659 /* FooterView.swift */, 891A15FE27656F9200B26659 /* HeaderView.swift */, - 891A1606276572A800B26659 /* Onboarding.swift */, + 89288ECA27675B9F00E962C4 /* OnboardingTemplateView.swift */, ); path = Templates; sourceTree = ""; @@ -203,6 +214,10 @@ name = "nirvana-ios"; packageProductDependencies = ( 89D99D2D2766FD6B00237814 /* Liquid */, + 89288EC2276756DF00E962C4 /* FirebaseAnalytics */, + 89288EC4276756DF00E962C4 /* FirebaseAuth */, + 89288EC6276756DF00E962C4 /* FirebaseDatabase */, + 89288EC8276756DF00E962C4 /* FirebaseStorage */, ); productName = "nirvana-ios"; productReference = 891A15DD27653A7000B26659 /* nirvana-ios.app */; @@ -234,6 +249,7 @@ mainGroup = 891A15D427653A7000B26659; packageReferences = ( 89D99D2C2766FD6B00237814 /* XCRemoteSwiftPackageReference "liquid" */, + 89288EC1276756DF00E962C4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, ); productRefGroup = 891A15DE27653A7000B26659 /* Products */; projectDirPath = ""; @@ -250,6 +266,7 @@ buildActionMask = 2147483647; files = ( 891A15F12765528700B26659 /* Satisfy-Regular.ttf in Resources */, + 89288EC0276755DF00E962C4 /* GoogleService-Info.plist in Resources */, 891A15E827653A7100B26659 /* Preview Assets.xcassets in Resources */, 891A15E527653A7100B26659 /* Assets.xcassets in Resources */, ); @@ -262,12 +279,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 891A1607276572A800B26659 /* Onboarding.swift in Sources */, 891A15E327653A7000B26659 /* ContentView.swift in Sources */, 891A160327656FC700B26659 /* HomeView.swift in Sources */, 891A160B2765732700B26659 /* HomeViewModel.swift in Sources */, 892179E62765FECD001E6C60 /* FooterControlsViewModel.swift in Sources */, 891A15F5276557AB00B26659 /* colors.swift in Sources */, + 89288ECB27675B9F00E962C4 /* OnboardingTemplateView.swift in Sources */, 891A15F9276563CA00B26659 /* WelcomeView.swift in Sources */, 891A1611276590B000B26659 /* ChatsCarouselView.swift in Sources */, 891A16132765A44300B26659 /* ChatsCarouselViewModel.swift in Sources */, @@ -487,6 +504,14 @@ /* 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; + }; + }; 89D99D2C2766FD6B00237814 /* XCRemoteSwiftPackageReference "liquid" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/maustinstar/liquid"; @@ -498,6 +523,26 @@ /* 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; + }; 89D99D2D2766FD6B00237814 /* Liquid */ = { isa = XCSwiftPackageProductDependency; package = 89D99D2C2766FD6B00237814 /* XCRemoteSwiftPackageReference "liquid" */; diff --git a/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 15c5d7b..526812f 100644 --- a/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/nirvana-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,6 +1,87 @@ { "object": { "pins": [ + { + "package": "abseil", + "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git", + "state": { + "branch": null, + "revision": "fffc3c2729be5747390ad02d5100291a0d9ad26a", + "version": "0.20200225.4" + } + }, + { + "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": "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" + } + }, + { + "package": "GTMSessionFetcher", + "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", + "state": { + "branch": null, + "revision": "bc6a19702ac76ac4e488b68148710eb815f9bc56", + "version": "1.7.0" + } + }, + { + "package": "leveldb", + "repositoryURL": "https://github.com/firebase/leveldb.git", + "state": { + "branch": null, + "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", + "version": "1.22.2" + } + }, { "package": "Liquid", "repositoryURL": "https://github.com/maustinstar/liquid", @@ -9,6 +90,33 @@ "revision": "9123b9d1fb24c8273c989924b4e889f07629a26b", "version": "0.0.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" + } } ] }, diff --git a/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist b/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist index fd84f58..1a67d6b 100644 --- a/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/nirvana-ios.xcodeproj/xcuserdata/talksik.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,10 +4,31 @@ SchemeUserState + Promises (Playground) 1.xcscheme + + isShown + + orderHint + 2 + + Promises (Playground) 2.xcscheme + + isShown + + orderHint + 3 + + Promises (Playground).xcscheme + + isShown + + orderHint + 0 + nirvana-ios.xcscheme_^#shared#^_ orderHint - 0 + 1 diff --git a/nirvana-ios/GoogleService-Info.plist b/nirvana-ios/GoogleService-Info.plist new file mode 100644 index 0000000..037f934 --- /dev/null +++ b/nirvana-ios/GoogleService-Info.plist @@ -0,0 +1,34 @@ + + + + + CLIENT_ID + 93806270104-62r53m53imapfocl1sck8bn4ho910ndh.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.93806270104-62r53m53imapfocl1sck8bn4ho910ndh + API_KEY + AIzaSyCCd0OGpv0fyeNKHDflt42PIiXW09Oz-NA + GCM_SENDER_ID + 93806270104 + PLIST_VERSION + 1 + BUNDLE_ID + com.usenirvana.nirvana-ios + PROJECT_ID + nirvana-ccf04 + STORAGE_BUCKET + nirvana-ccf04.appspot.com + IS_ADS_ENABLED + + IS_ANALYTICS_ENABLED + + IS_APPINVITE_ENABLED + + IS_GCM_ENABLED + + IS_SIGNIN_ENABLED + + GOOGLE_APP_ID + 1:93806270104:ios:108b36b0d2c42381d0e2ed + + \ No newline at end of file diff --git a/nirvana-ios/Views/Templates/Onboarding.swift b/nirvana-ios/Views/Templates/Onboarding.swift deleted file mode 100644 index ce4a4eb..0000000 --- a/nirvana-ios/Views/Templates/Onboarding.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// Onboarding.swift -// nirvana-ios -// -// Created by Arjun Patel on 12/11/21. -// - -import SwiftUI - -struct Onboarding: View { - var body: some View { - Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/) - } -} - -struct Onboarding_Previews: PreviewProvider { - static var previews: some View { - Onboarding() - } -} diff --git a/nirvana-ios/Views/Templates/OnboardingTemplateView.swift b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift new file mode 100644 index 0000000..8c476bc --- /dev/null +++ b/nirvana-ios/Views/Templates/OnboardingTemplateView.swift @@ -0,0 +1,29 @@ +// +// OnboardingTemplateView.swift +// nirvana-ios +// +// Created by Arjun Patel on 12/13/21. +// + +import SwiftUI + +struct OnboardingTemplateView: View { + + + init() { + + } + + var body: some View { + VStack(alignment: .leading, spacing: 0) { + + } + + } +} + +struct OnboardingTemplateView_Previews: PreviewProvider { + static var previews: some View { + OnboardingTemplateView() + } +} diff --git a/nirvana-ios/nirvana_iosApp.swift b/nirvana-ios/nirvana_iosApp.swift index cbeeca0..ced16b1 100644 --- a/nirvana-ios/nirvana_iosApp.swift +++ b/nirvana-ios/nirvana_iosApp.swift @@ -6,9 +6,15 @@ // import SwiftUI +import Firebase @main struct nirvana_iosApp: App { + + init() { + FirebaseApp.configure() + } + var body: some Scene { WindowGroup { ContentView()