diff --git a/ci_scripts/ci_post_clone.sh b/ci_scripts/ci_post_clone.sh index d958093..27d9254 100755 --- a/ci_scripts/ci_post_clone.sh +++ b/ci_scripts/ci_post_clone.sh @@ -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" diff --git a/gameAPI/.DS_Store b/gameAPI/.DS_Store deleted file mode 100644 index 4d3e227..0000000 Binary files a/gameAPI/.DS_Store and /dev/null differ diff --git a/score-ios.xcodeproj/project.pbxproj b/score-ios.xcodeproj/project.pbxproj index 43eea2b..b90ba3d 100644 --- a/score-ios.xcodeproj/project.pbxproj +++ b/score-ios.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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; }; @@ -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 = ""; @@ -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; @@ -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"; @@ -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; @@ -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"; @@ -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 */ @@ -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"; @@ -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" */; diff --git a/score-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/score-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 451b13a..0000000 --- a/score-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,150 +0,0 @@ -{ - "originHash" : "8402c67669511a2a6693e9449a9ace010ebf5c42b3702da53e2e624c1597020b", - "pins" : [ - { - "identity" : "abseil-cpp-binary", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/abseil-cpp-binary.git", - "state" : { - "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5", - "version" : "1.2024072200.0" - } - }, - { - "identity" : "apollo-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apollographql/apollo-ios.git", - "state" : { - "revision" : "c3f48d45ec1300bc95243bf19f67284f9dc0d14a", - "version" : "1.15.3" - } - }, - { - "identity" : "app-check", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/app-check.git", - "state" : { - "revision" : "61b85103a1aeed8218f17c794687781505fbbef5", - "version" : "11.2.0" - } - }, - { - "identity" : "firebase-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/firebase-ios-sdk", - "state" : { - "revision" : "e2a3c3fbcaa1df3fd549b5b3f1175bc8a11912fd", - "version" : "12.2.0" - } - }, - { - "identity" : "google-ads-on-device-conversion-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk", - "state" : { - "revision" : "a2d0f1f1666de591eb1a811f40b1706f5c63a2ed", - "version" : "2.3.0" - } - }, - { - "identity" : "googleappmeasurement", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleAppMeasurement.git", - "state" : { - "revision" : "1c7edd5cc6e4ad22d2b81166bb9b208b9e63058a", - "version" : "12.2.0" - } - }, - { - "identity" : "googledatatransport", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleDataTransport.git", - "state" : { - "revision" : "617af071af9aa1d6a091d59a202910ac482128f9", - "version" : "10.1.0" - } - }, - { - "identity" : "googleutilities", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleUtilities.git", - "state" : { - "revision" : "60da361632d0de02786f709bdc0c4df340f7613e", - "version" : "8.1.0" - } - }, - { - "identity" : "grpc-binary", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/grpc-binary.git", - "state" : { - "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6", - "version" : "1.69.1" - } - }, - { - "identity" : "gtm-session-fetcher", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/gtm-session-fetcher.git", - "state" : { - "revision" : "fb7f2740b1570d2f7599c6bb9531bf4fad6974b7", - "version" : "5.0.0" - } - }, - { - "identity" : "interop-ios-for-google-sdks", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/interop-ios-for-google-sdks.git", - "state" : { - "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe", - "version" : "101.0.0" - } - }, - { - "identity" : "leveldb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/leveldb.git", - "state" : { - "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1", - "version" : "1.22.5" - } - }, - { - "identity" : "nanopb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/nanopb.git", - "state" : { - "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1", - "version" : "2.30910.0" - } - }, - { - "identity" : "promises", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/promises.git", - "state" : { - "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac", - "version" : "2.4.0" - } - }, - { - "identity" : "sqlite.swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/stephencelis/SQLite.swift.git", - "state" : { - "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8", - "version" : "0.15.3" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "e3f69fd321d0c9fcdc16fb576a0cdd956675face", - "version" : "1.31.0" - } - } - ], - "version" : 3 -} diff --git a/score-ios/.DS_Store b/score-ios/.DS_Store index 1d33697..080e89c 100644 Binary files a/score-ios/.DS_Store and b/score-ios/.DS_Store differ diff --git a/score-ios/Networking/NetworkManager.swift b/score-ios/Networking/NetworkManager.swift index ea22bdc..57bace5 100644 --- a/score-ios/Networking/NetworkManager.swift +++ b/score-ios/Networking/NetworkManager.swift @@ -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 }) { diff --git a/score-ios/Views/DetailedViews/UpcomingCard.swift b/score-ios/Views/DetailedViews/UpcomingCard.swift index b747310..d394865 100644 --- a/score-ios/Views/DetailedViews/UpcomingCard.swift +++ b/score-ios/Views/DetailedViews/UpcomingCard.swift @@ -83,6 +83,7 @@ extension UpcomingGameCard { .withTrailingFadeGradient() + Spacer() Image(game.sport.rawValue + "-g")