Skip to content
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

Implement UI components of Game Details Screen #13

Merged
merged 3 commits into from
Dec 9, 2024

Conversation

helenjb
Copy link
Collaborator

@helenjb helenjb commented Nov 20, 2024

Screenshot 2024-11-20 at 17 10 56
  • Create GameDetailsScreen.kt
  • Implement GameScoreHeader.kt, TimeUntilStartCard.kt, and ButtonPrimary.kt
  • Solely UI (no logic yet)

Copy link
Contributor

@thisjustin123 thisjustin123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great UI additions! I have a few tweaks for you for the components but once you change those you can feel free to merge.

As for the merge conflicts, you can resolve them by locally merging (the latest version of) main into your branch and going through whatever merge conflict resolver stuff you have to resolve, then pushing again.

@helenjb helenjb merged commit 0d33def into main Dec 9, 2024
@helenjb helenjb deleted the helen/game-details-screen branch December 9, 2024 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants