Skip to content

Emil jiang gamedetails UI #37

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
EmilJiang merged 24 commits into from
Apr 15, 2025
Merged

Emil jiang gamedetails UI #37

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
826118f
gamedetails networking
EmilJiang Mar 13, 2025
8cbd945
all PR comments addressed except for toResult
EmilJiang Mar 19, 2025
cd5cf16
fixed data classes to match schema
EmilJiang Mar 19, 2025
e2b5bce
Merge branch 'main' of https://github.com/cuappdev/score-android into…
EmilJiang Mar 19, 2025
7945993
merge
EmilJiang Mar 19, 2025
002a60c
first draft
EmilJiang Mar 24, 2025
e86d68b
lint fix
EmilJiang Mar 24, 2025
f621fd2
nav
EmilJiang Mar 24, 2025
df67add
merge
EmilJiang Mar 28, 2025
0a44180
pr changes
EmilJiang Apr 6, 2025
c25f927
new changes
EmilJiang Apr 6, 2025
567d295
ui changes
EmilJiang Apr 9, 2025
d57b258
minor fix
EmilJiang Apr 9, 2025
e5130a0
Merge branch 'main' into emil_jiang_gamedetails_ui
EmilJiang Apr 9, 2025
c26c0d4
todo
EmilJiang Apr 9, 2025
739c73d
pr changes
EmilJiang Apr 14, 2025
dea4ad2
merge
EmilJiang Apr 14, 2025
c59f6ab
test
EmilJiang Apr 14, 2025
2d72680
nav fix
EmilJiang Apr 14, 2025
8c3264b
center button and fix padding
EmilJiang Apr 14, 2025
fc8df1d
Merge remote-tracking branch 'origin/main' into emil_jiang_gamedetail…
zachseidner1 Apr 14, 2025
2512179
Add preview, fix small score box thing, navigation bar not shown when…
zachseidner1 Apr 15, 2025
d337068
Ellipses
zachseidner1 Apr 15, 2025
a54bdda
pr
EmilJiang Apr 15, 2025
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
44 changes: 26 additions & 18 deletions app/src/main/java/com/cornellappdev/score/screen/GameDetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
Expand Down Expand Up @@ -161,28 +162,35 @@ fun GameDetailsContent(gameCard: DetailsCardData) {
Text("No Scoring Summary") // TODO: Make state when there are no scores
}
} else {
Spacer(modifier = Modifier.height(40.dp))
if (gameCard.daysUntilGame != null && gameCard.hoursUntilGame != null) {
TimeUntilStartCard(
gameCard.daysUntilGame,
gameCard.hoursUntilGame
val context = LocalContext.current
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally
) {
Spacer(modifier = Modifier.height(40.dp))

if (gameCard.daysUntilGame != null && gameCard.hoursUntilGame != null) {
TimeUntilStartCard(
gameCard.daysUntilGame,
gameCard.hoursUntilGame
)
}

Spacer(modifier = Modifier.weight(1f))

ButtonPrimary(
"Add to Calendar",
painterResource(R.drawable.ic_calendar),
onClick = {
gameCard.toCalendarEvent()?.let { event ->
addToCalendar(context = context, event)
Copy link
Collaborator

@zachseidner1 zachseidner1 Apr 15, 2025

Choose a reason for hiding this comment

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

Optional nit: I don't think you need to pass in context as a named parameter, feels a bit redundant.

Copy link
Contributor Author

@EmilJiang EmilJiang Apr 15, 2025

Choose a reason for hiding this comment

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

The addTocalendar still does not work, so I think I will be working on that as the first issue.

}
}
)
}

}
}
if (!gameCard.isPastStartTime) {
val context = LocalContext.current
Spacer(modifier = Modifier.height(84.dp))
ButtonPrimary(
"Add to Calendar",
painterResource(R.drawable.ic_calendar),
onClick = {
gameCard.toCalendarEvent()?.let { event ->
addToCalendar(context = context, event)
}
}
)
}

}
}