-
Notifications
You must be signed in to change notification settings - Fork 0
Merge release into main #34
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.
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
Open
angelinaa-chen
wants to merge
16
commits into
main
Choose a base branch
from
release
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Use different Bundle ID * Add ci_scripts and remove codegen file * Add ci_scripts and Display Name
* 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 <jhahn8985@gmail.com> * 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 <jhahn8985@gmail.com> --------- 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 * 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>
* 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 <jhahn8985@gmail.com> * Increment marketing version --------- Co-authored-by: AdelynnWu <150749410+AdelynnWu@users.noreply.github.com>
* 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 <jhahn8985@gmail.com> * 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 <jhahn8985@gmail.com>
* 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 <jhahn8985@gmail.com> * 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 <jhahn8985@gmail.com> Co-authored-by: Angelina Chen <117685487+angelinaa-chen@users.noreply.github.com> Co-authored-by: Angelina Chen <angelina.chhen@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.