From a987e00cdcdb9857b3ac9532938efd1b93f4995b Mon Sep 17 00:00:00 2001 From: Angelina Chen <117685487+angelinaa-chen@users.noreply.github.com> Date: Thu, 2 Oct 2025 14:54:43 -0400 Subject: [PATCH] Merge release into main (#35) * Use different Bundle ID (#12) * Testflight version 1 from main (#13) * Use different Bundle ID * Add ci_scripts and remove codegen file * Add ci_scripts and Display Name * Fix secrets ci_script issue * Made script executable * Made AppIcon square * Ensure AppIcon has no transparency * Release 1.0.0 Build 17 (#19) * Merge release into Main (#15) * Use different Bundle ID (#12) * Testflight version 1 from main (#13) * Use different Bundle ID * Add ci_scripts and remove codegen file * Add ci_scripts and Display Name * Fix secrets ci_script issue * Made script executable * Made AppIcon square * Ensure AppIcon has no transparency * Added scrollview to opponent name (#10) * added String extension file with a function to remove prefix for university of. Applied it to opponent names in game cards * added comment to new string function * reverse shorten University name, instead made it scrollable * added scroll view to more views * Delete Package.resolved * made new textUtil file for string manipulation specifically for university name being too long, made it scrollable, added shadow to trailing to indicate scrollable. Shorten university of to U * added comment to TextUtil.trailingFadeWhite * PR Comment Fixed - made new folder for ViewModifier and moved TrailingFadeGradient to withTrailingFadeGradient - renamed TextUtil file to String+Extention --------- Co-authored-by: Jayson Hahn * Adelynnwu/fix background bugs (#18) * added ci_scripts and modified codegen * refactor duplicated code in GameView, DynamicScoreBox, etc and implemented PastGameViewModel * fixed game tile text color * fixed game summary background and carousel card corner radius * Some bug fixes * fixed score box and game location display issue * Prepare for testing attempt 1 * Fix merge bugs and set App Category & build * Fix loading state bug --------- Co-authored-by: Jayson Hahn --------- Co-authored-by: Jay Z. <143547098+Juribu@users.noreply.github.com> Co-authored-by: AdelynnWu <150749410+AdelynnWu@users.noreply.github.com> * fixed incosistenc score breakdowns and removed ice hockey (#23) (#24) * fixed incosistenc score breakdowns and removed ice hockey * Remove tracking of GameAPI and change to fragments * Remove default to prevent error * Implement Temp Fix for pagination and add load more button --------- Co-authored-by: AdelynnWu <150749410+AdelynnWu@users.noreply.github.com> * Release 1.0.0 Build 23 (#25) * fixed incosistenc score breakdowns and removed ice hockey (#23) * fixed incosistenc score breakdowns and removed ice hockey * Remove tracking of GameAPI and change to fragments * Remove default to prevent error * Implement Temp Fix for pagination and add load more button --------- Co-authored-by: Jayson Hahn * Increment marketing version --------- Co-authored-by: AdelynnWu <150749410+AdelynnWu@users.noreply.github.com> * Release Version 1.0.2 Build 26 (#28) * fixed incosistenc score breakdowns and removed ice hockey (#23) * fixed incosistenc score breakdowns and removed ice hockey * Remove tracking of GameAPI and change to fragments * Remove default to prevent error * Implement Temp Fix for pagination and add load more button --------- Co-authored-by: Jayson Hahn * Increment marketing version * fix upcoming card icon (#27) * Updated Build and version --------- Co-authored-by: AdelynnWu <150749410+AdelynnWu@users.noreply.github.com> Co-authored-by: Jayson Hahn * Release 1.0.3 Build 27 (#32) * fixed incosistenc score breakdowns and removed ice hockey (#23) * fixed incosistenc score breakdowns and removed ice hockey * Remove tracking of GameAPI and change to fragments * Remove default to prevent error * Implement Temp Fix for pagination and add load more button --------- Co-authored-by: Jayson Hahn * Increment marketing version * fix upcoming card icon (#27) * Updated README and added set-up instructions (#30) * Set up Firebase Analytics (#29) * Set up Firebase * Removed previous TODO * Resolved merge conflicts --------- Co-authored-by: AdelynnWu <150749410+AdelynnWu@users.noreply.github.com> Co-authored-by: Jayson Hahn Co-authored-by: Angelina Chen <117685487+angelinaa-chen@users.noreply.github.com> Co-authored-by: Angelina Chen * Create Package.resolved * Release 1.0.3 Build 29 * Release 1.0.3 Build 30 --------- Co-authored-by: Jayson Hahn <46629787+JaysonHahn@users.noreply.github.com> Co-authored-by: Jayson Hahn Co-authored-by: Jay Z. <143547098+Juribu@users.noreply.github.com> Co-authored-by: AdelynnWu <150749410+AdelynnWu@users.noreply.github.com> Co-authored-by: Richie Sun <105038960+rs929@users.noreply.github.com> Co-authored-by: Peter Bidoshi <86176234+MrPeterss@users.noreply.github.com> Co-authored-by: Peter --- ci_scripts/ci_post_clone.sh | 1 + gameAPI/.DS_Store | Bin 6148 -> 0 bytes score-ios.xcodeproj/project.pbxproj | 45 +++++- .../xcshareddata/swiftpm/Package.resolved | 150 ------------------ score-ios/.DS_Store | Bin 6148 -> 6148 bytes score-ios/Networking/NetworkManager.swift | 2 +- .../Views/DetailedViews/UpcomingCard.swift | 1 + 7 files changed, 40 insertions(+), 159 deletions(-) delete mode 100644 gameAPI/.DS_Store delete mode 100644 score-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved 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 4d3e22723849752fd1cf314f32f382c27c2ade5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO-sW-5S^{nCWz33LXQEjqO}!4yu?}$-o%I=RBF;j4aTfAsX3HF&iZ4#`b+#f zIL;JDl4&U;3N?lgR}jJ~ zq>xW!bHg+$K;Lcw4#0;l++g|f{UW%8Y(JLWAeI4U(J!)tzWS;RBY+BcAYlM~WQUM` z$$t7hJIK>JGxl?E7e{GUufK@WOnG*$Vp-O_b?#lu+{^rIkhc8(Db%v*Ah^isw3bcbczcBfh!4jY^G6{p!~j#ixERs-XW z&5hB>ww9LHwhucu@ogd>)GR^Z->q!H;20h;_@cqR*H2=ZTw%|cHO^*a1y})AU|JL~ z>ytGsHfxjj!FmNYUGj?U%)xZY(rl+|17LmmdHduMJlK delta 28 kcmZoMXfc@J&&a(oU^g=(_hufJ?MxfXTo^aAbNuB80D&q9)c^nh 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")