Skip to content

Merge main into branch #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zainbilalh merged 1 commit into from
Oct 2, 2025
Merged

Merge main into branch #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ci_scripts/ci_post_clone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ echo "Downloading Secrets"
brew install wget
cd $CI_PRIMARY_REPOSITORY_PATH/ci_scripts
mkdir ../ScoreSecrets
wget -O ../ScoreSecrets/GoogleService-Info.plist "$GOOGLE_SERVICE_INFO"
wget -O ../ScoreSecrets/Keys.xcconfig "$KEYS"
wget -O ../ScoreSecrets/apollo-codegen-config-dev.json "$CODEGEN_DEV"
wget -O ../ScoreSecrets/apollo-codegen-config-prod.json "$CODEGEN_PROD"
Expand Down
Binary file removed gameAPI/.DS_Store
View file
Open in desktop
Binary file not shown.
45 changes: 37 additions & 8 deletions score-ios.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
CE8ED5122D6C3FCB00A274DE /* CarouselView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8ED5112D6C3FCB00A274DE /* CarouselView.swift */; };
CE8ED5142D6C42D400A274DE /* GameSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8ED5132D6C42D400A274DE /* GameSectionHeaderView.swift */; };
CEA25A932D75279A00B9837A /* ScoreEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA25A922D75279A00B9837A /* ScoreEnvironment.swift */; };
D0A904F52E8DDD990008194B /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = D0A904F42E8DDD990008194B /* FirebaseAnalytics */; };
D0A904F72E8DDD990008194B /* FirebaseCore in Frameworks */ = {isa = PBXBuildFile; productRef = D0A904F62E8DDD990008194B /* FirebaseCore */; };
D0A904F92E8DDD990008194B /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = D0A904F82E8DDD990008194B /* FirebaseCrashlytics */; };
D836AD922CB62C8800BD1545 /* NoGameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D836AD912CB62C8800BD1545 /* NoGameView.swift */; };
D83EE8862CC9917C008B693C /* ScoreSummaryTile.swift in Sources */ = {isa = PBXBuildFile; fileRef = D83EE8852CC9917C008B693C /* ScoreSummaryTile.swift */; };
D85802102D6C38700075B036 /* DynamicScoreBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = D858020F2D6C38670075B036 /* DynamicScoreBox.swift */; };
Expand Down Expand Up @@ -203,9 +206,12 @@
2C1375C12E7230250089EBC7 /* FirebaseCore in Frameworks */,
D89102042CED69EF004CE226 /* Apollo in Frameworks */,
2C1375C32E7230250089EBC7 /* FirebaseCrashlytics in Frameworks */,
D0A904F92E8DDD990008194B /* FirebaseCrashlytics in Frameworks */,
2C1375BF2E7230250089EBC7 /* FirebaseAnalytics in Frameworks */,
D0A904F72E8DDD990008194B /* FirebaseCore in Frameworks */,
2C1375C72E7230630089EBC7 /* FirebaseCore in Frameworks */,
D89102182CF151DD004CE226 /* GameAPI in Frameworks */,
D0A904F52E8DDD990008194B /* FirebaseAnalytics in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -588,8 +594,8 @@
mainGroup = CE725D2F2C89120100386943;
packageReferences = (
D89102012CED68D9004CE226 /* XCRemoteSwiftPackageReference "apollo-ios" */,
2CBC5B0A2E722C31006C1167 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
2C1375BB2E722CB70089EBC7 /* XCLocalSwiftPackageReference "../../../Downloads/GameAPI" */,
FD602E2D2DC11D4A002711BE /* XCLocalSwiftPackageReference "GameAPI" */,
D0A904F32E8DDD990008194B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
);
productRefGroup = CE725D392C89120200386943 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -886,7 +892,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 26;
DEVELOPMENT_ASSET_PATHS = "\"score-ios/Preview Content\"";
DEVELOPMENT_TEAM = W7U2WA4D54;
ENABLE_PREVIEWS = YES;
Expand All @@ -902,7 +908,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.cornellappdev.score-ios";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -920,7 +926,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 26;
DEVELOPMENT_ASSET_PATHS = "\"score-ios/Preview Content\"";
DEVELOPMENT_TEAM = W7U2WA4D54;
ENABLE_PREVIEWS = YES;
Expand All @@ -936,7 +942,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "com.cornellappdev.score-ios";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -1061,9 +1067,9 @@
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
2C1375BB2E722CB70089EBC7 /* XCLocalSwiftPackageReference "../../../Downloads/GameAPI" */ = {
FD602E2D2DC11D4A002711BE /* XCLocalSwiftPackageReference "GameAPI" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../../../Downloads/GameAPI;
relativePath = GameAPI;
};
/* End XCLocalSwiftPackageReference section */

Expand All @@ -1076,6 +1082,14 @@
minimumVersion = 12.2.0;
};
};
D0A904F32E8DDD990008194B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 12.3.0;
};
};
D89102012CED68D9004CE226 /* XCRemoteSwiftPackageReference "apollo-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apollographql/apollo-ios.git";
Expand Down Expand Up @@ -1116,6 +1130,21 @@
package = 2CBC5B0A2E722C31006C1167 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCore;
};
D0A904F42E8DDD990008194B /* FirebaseAnalytics */ = {
isa = XCSwiftPackageProductDependency;
package = D0A904F32E8DDD990008194B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseAnalytics;
};
D0A904F62E8DDD990008194B /* FirebaseCore */ = {
isa = XCSwiftPackageProductDependency;
package = D0A904F32E8DDD990008194B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCore;
};
D0A904F82E8DDD990008194B /* FirebaseCrashlytics */ = {
isa = XCSwiftPackageProductDependency;
package = D0A904F32E8DDD990008194B /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseCrashlytics;
};
D89102032CED69EF004CE226 /* Apollo */ = {
isa = XCSwiftPackageProductDependency;
package = D89102012CED68D9004CE226 /* XCRemoteSwiftPackageReference "apollo-ios" */;
Expand Down
150 changes: 0 additions & 150 deletions score-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

Binary file modified score-ios/.DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion score-ios/Networking/NetworkManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class NetworkManager {
let apolloClient = ApolloClient(url: ScoreEnvironment.baseURL)

func fetchGames(limit: Int, offset: Int, completion: @escaping ([GamesQuery.Data.Game]?, Error?) -> Void) {
apolloClient.fetch(query: GamesQuery()) { result in
apolloClient.fetch(query: GamesQuery(limit: limit, offset: offset)) { result in
switch result {
case .success(let graphQLResult):
if let gamesData = graphQLResult.data?.games?.compactMap({ $0 }) {
Expand Down
1 change: 1 addition & 0 deletions score-ios/Views/DetailedViews/UpcomingCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ extension UpcomingGameCard {
.withTrailingFadeGradient()



Spacer()

Image(game.sport.rawValue + "-g")
Expand Down