Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 70 additions & 2 deletions Uplift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@
2EE5F3E22B12EDB6008E0299 /* Apollo in Frameworks */ = {isa = PBXBuildFile; productRef = 2EE5F3E12B12EDB6008E0299 /* Apollo */; };
2EE5F3E42B12EDB6008E0299 /* ApolloAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 2EE5F3E32B12EDB6008E0299 /* ApolloAPI */; };
2EF1A2582B129EEB007A299F /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EF1A2572B129EEB007A299F /* Network.swift */; };
63001AD62CC9ACFF0082AFFA /* LoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63001AD52CC9ACFF0082AFFA /* LoginViewModel.swift */; };
63001AD82CC9AD970082AFFA /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 63001AD72CC9AD970082AFFA /* GoogleSignIn */; };
63001ADA2CC9AD980082AFFA /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 63001AD92CC9AD970082AFFA /* GoogleSignInSwift */; };
6329A4462C964D0800D30A2F /* SignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6329A4452C964D0800D30A2F /* SignInView.swift */; };
6329A4482CA0F89D00D30A2F /* CreateProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6329A4472CA0F89D00D30A2F /* CreateProfileView.swift */; };
6329A44A2CA0FE8A00D30A2F /* CheckBoxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6329A4492CA0FE8A00D30A2F /* CheckBoxView.swift */; };
6338EC5C2CE149AA000BBFD3 /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 6338EC5B2CE149AA000BBFD3 /* UpliftAPI */; };
6338EC5F2CE14B54000BBFD3 /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 6338EC5E2CE14B54000BBFD3 /* UpliftAPI */; };
636E3D412BBE1EB100B6EFFC /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 636E3D402BBE1EB100B6EFFC /* UpliftAPI */; };
636E3D442BBE1F3800B6EFFC /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 636E3D432BBE1F3800B6EFFC /* UpliftAPI */; };
63A7ABCD2B86B971008D58FB /* UpliftAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 63A7ABCC2B86B971008D58FB /* UpliftAPI */; };
Expand Down Expand Up @@ -167,6 +175,10 @@
2EE0C7CA2B12D6EE000D3BF6 /* GymQueries.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = GymQueries.graphql; sourceTree = "<group>"; };
2EE5F3C72B12E094008E0299 /* ApolloClientProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApolloClientProtocol.swift; sourceTree = "<group>"; };
2EF1A2572B129EEB007A299F /* Network.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
63001AD52CC9ACFF0082AFFA /* LoginViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginViewModel.swift; sourceTree = "<group>"; };
6329A4452C964D0800D30A2F /* SignInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInView.swift; sourceTree = "<group>"; };
6329A4472CA0F89D00D30A2F /* CreateProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateProfileView.swift; sourceTree = "<group>"; };
6329A4492CA0FE8A00D30A2F /* CheckBoxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckBoxView.swift; sourceTree = "<group>"; };
63A7ABCE2B8C119A008D58FB /* Equipment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Equipment.swift; sourceTree = "<group>"; };
89599A4D2BD4B39B00DA44DE /* FitnessClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitnessClass.swift; sourceTree = "<group>"; };
89599A4F2BD4B4B600DA44DE /* FitnessClassInstance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FitnessClassInstance.swift; sourceTree = "<group>"; };
Expand All @@ -190,14 +202,18 @@
buildActionMask = 2147483647;
files = (
2EE5F3E42B12EDB6008E0299 /* ApolloAPI in Frameworks */,
63001AD82CC9AD970082AFFA /* GoogleSignIn in Frameworks */,
2EE5F3E22B12EDB6008E0299 /* Apollo in Frameworks */,
2E6785BC2B3A48D700DD3ADA /* WrappingHStack in Frameworks */,
2E4F06DC2B4B48DC008905C8 /* UpliftAPI in Frameworks */,
2E090ECB2B12FF5900BAE982 /* UpliftAPI in Frameworks */,
2E45B2452B4F632700FB83B7 /* FirebaseAnalytics in Frameworks */,
6338EC5F2CE14B54000BBFD3 /* UpliftAPI in Frameworks */,
2E39D82F2B3BCBA400AD238B /* UpliftAPI in Frameworks */,
6338EC5C2CE149AA000BBFD3 /* UpliftAPI in Frameworks */,
897DF9BA2CCDC49B00246B0D /* UpliftAPI in Frameworks */,
2E2748D22BCD4EC00023882E /* UpliftAPI in Frameworks */,
63001ADA2CC9AD980082AFFA /* GoogleSignInSwift in Frameworks */,
63A7ABCD2B86B971008D58FB /* UpliftAPI in Frameworks */,
2E45B2402B4E361100FB83B7 /* FirebaseCrashlytics in Frameworks */,
636E3D412BBE1EB100B6EFFC /* UpliftAPI in Frameworks */,
Expand Down Expand Up @@ -277,6 +293,7 @@
isa = PBXGroup;
children = (
89950D892B992E8400DFB007 /* ClassesView.swift */,
63CA15862C924B84001620B5 /* Onboarding */,
2E8FE3912B1278B700B3DC6A /* HomeView.swift */,
2E15F5052B39F81B00414BEC /* MainView.swift */,
89C8658B2BB4778400758337 /* Classes */,
Expand All @@ -289,6 +306,7 @@
2E090ED12B1308D500BAE982 /* ViewModels */ = {
isa = PBXGroup;
children = (
63001AD52CC9ACFF0082AFFA /* LoginViewModel.swift */,
897703652BA2028D00F9992F /* ClassesViewModel.swift */,
2E39D82B2B3BB35000AD238B /* FacilityExpandedViewModel.swift */,
2E39D8232B3B66FD00AD238B /* FitnessCenterViewModel.swift */,
Expand Down Expand Up @@ -463,6 +481,16 @@
path = Fonts;
sourceTree = "<group>";
};
63CA15862C924B84001620B5 /* Onboarding */ = {
isa = PBXGroup;
children = (
6329A4452C964D0800D30A2F /* SignInView.swift */,
6329A4472CA0F89D00D30A2F /* CreateProfileView.swift */,
6329A4492CA0FE8A00D30A2F /* CheckBoxView.swift */,
);
path = Onboarding;
sourceTree = "<group>";
};
89C8658B2BB4778400758337 /* Classes */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -525,6 +553,13 @@
636E3D432BBE1F3800B6EFFC /* UpliftAPI */,
2E2748D12BCD4EC00023882E /* UpliftAPI */,
897DF9B92CCDC49B00246B0D /* UpliftAPI */,
63001AD72CC9AD970082AFFA /* GoogleSignIn */,
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */,
897DF9B92CCDC49B00246B0D /* UpliftAPI */,
63001AD72CC9AD970082AFFA /* GoogleSignIn */,
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */,
6338EC5B2CE149AA000BBFD3 /* UpliftAPI */,
6338EC5E2CE14B54000BBFD3 /* UpliftAPI */,
);
productName = Uplift;
productReference = 2E8FE38C2B1278B700B3DC6A /* Uplift.app */;
Expand Down Expand Up @@ -564,7 +599,8 @@
2E6785BA2B3A48D700DD3ADA /* XCRemoteSwiftPackageReference "WrappingHStack" */,
2EC3EE642B3C000E00E927BF /* XCRemoteSwiftPackageReference "Kingfisher" */,
2E45B23E2B4E361100FB83B7 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
897DF9B82CCDC49B00246B0D /* XCLocalSwiftPackageReference "UpliftAPI" */,
63001AD42CC9A6B20082AFFA /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
6338EC5D2CE14B54000BBFD3 /* XCLocalSwiftPackageReference "UpliftAPI" */,
);
productRefGroup = 2E8FE38D2B1278B700B3DC6A /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -667,6 +703,7 @@
files = (
896500DC2BB4D33500D822AB /* ClassDetailView.swift in Sources */,
2EF1A2582B129EEB007A299F /* Network.swift in Sources */,
6329A4462C964D0800D30A2F /* SignInView.swift in Sources */,
2E39D81C2B3B5F3700AD238B /* NavBackButton.swift in Sources */,
2E15F4E02B39143700414BEC /* Gym.swift in Sources */,
2E39D8242B3B66FD00AD238B /* FitnessCenterViewModel.swift in Sources */,
Expand All @@ -687,8 +724,12 @@
2E39D8222B3B631200AD238B /* DividerLine.swift in Sources */,
2E15F5062B39F81B00414BEC /* MainView.swift in Sources */,
8996FEE02BDF351800F13C67 /* NextSessionCell.swift in Sources */,
6329A4482CA0F89D00D30A2F /* CreateProfileView.swift in Sources */,
8996FEE02BDF351800F13C67 /* NextSessionCell.swift in Sources */,
6329A4482CA0F89D00D30A2F /* CreateProfileView.swift in Sources */,
2E39D82A2B3B9F3D00AD238B /* FacilityExpandedView.swift in Sources */,
2EB161C92BBC9C3100493B71 /* StretchyModifier.swift in Sources */,
6329A44A2CA0FE8A00D30A2F /* CheckBoxView.swift in Sources */,
2E39D82C2B3BB35000AD238B /* FacilityExpandedViewModel.swift in Sources */,
2E3D6C202B1285D200B51BB2 /* UpliftEnvironment.swift in Sources */,
2E2748CF2BCD4D1F0023882E /* MainViewModel.swift in Sources */,
Expand All @@ -712,6 +753,7 @@
2E3DC2432BCD2F1D0063B369 /* GiveawayModal.swift in Sources */,
2E15F5042B39E54700414BEC /* LocationManager.swift in Sources */,
2E39D81E2B3B610200AD238B /* UINavigationController+Extension.swift in Sources */,
63001AD62CC9ACFF0082AFFA /* LoginViewModel.swift in Sources */,
2E15F4DC2B39117300414BEC /* OpenHours.swift in Sources */,
2E090ED62B13121600BAE982 /* Constants.swift in Sources */,
2E39D8282B3B726D00AD238B /* GymTabType.swift in Sources */,
Expand Down Expand Up @@ -1013,7 +1055,7 @@
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
897DF9B82CCDC49B00246B0D /* XCLocalSwiftPackageReference "UpliftAPI" */ = {
6338EC5D2CE14B54000BBFD3 /* XCLocalSwiftPackageReference "UpliftAPI" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = UpliftAPI;
};
Expand Down Expand Up @@ -1052,6 +1094,14 @@
minimumVersion = 1.7.1;
};
};
63001AD42CC9A6B20082AFFA /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/google/GoogleSignIn-iOS";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -1109,6 +1159,24 @@
package = 2EE5F3E02B12EDB6008E0299 /* XCRemoteSwiftPackageReference "apollo-ios" */;
productName = ApolloAPI;
};
63001AD72CC9AD970082AFFA /* GoogleSignIn */ = {
isa = XCSwiftPackageProductDependency;
package = 63001AD42CC9A6B20082AFFA /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
productName = GoogleSignIn;
};
63001AD92CC9AD970082AFFA /* GoogleSignInSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 63001AD42CC9A6B20082AFFA /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
productName = GoogleSignInSwift;
};
6338EC5B2CE149AA000BBFD3 /* UpliftAPI */ = {
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
};
6338EC5E2CE14B54000BBFD3 /* UpliftAPI */ = {
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
};
636E3D402BBE1EB100B6EFFC /* UpliftAPI */ = {
isa = XCSwiftPackageProductDependency;
productName = UpliftAPI;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Uplift/Configs/UpliftEnvironment.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ enum UpliftEnvironment {
static let announcementsHost = "ANNOUNCEMENTS_HOST"
static let announcementsPath = "ANNOUNCEMENTS_PATH"
static let announcementsScheme = "ANNOUNCEMENTS_SCHEME"

static let googleClientID = googleServiceDict["CLIENT_ID"] as? String ?? ""
}

/// A dictionary storing key-value pairs from Info.plist.
Expand All @@ -32,6 +34,17 @@ enum UpliftEnvironment {
return dict
}()

/// An NSDictionary storing key-value pairs from GoogleService-Info.plist.
private static let googleServiceDict: NSDictionary = {
guard let path = Bundle.main.path(forResource: "GoogleService-Info", ofType: "plist") else {
fatalError("Path for GoogleService-Info invalid")
}
guard let myDict = NSDictionary(contentsOfFile: path) else {
fatalError("GoogleService-Info.plist not found")
}
return myDict
}()

/**
The base URL of Uplift's backend server.

Expand Down
Loading