Skip to content

Fix bugs #67

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
zachseidner1 merged 1 commit into from
Apr 16, 2025
Merged

Fix bugs #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added app/release/app-release.aab
View file
Open in desktop
Binary file not shown.
18 changes: 10 additions & 8 deletions app/src/main/java/com/cornellappdev/score/components/PastGameCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,17 @@ fun PastGameCard(
data.teamLogo,
data.team,
data.firstTeamListedWins,
data.cornellScore ?: -1,
data.otherScore ?: -1
data.cornellScore,
data.otherScore,
)
Spacer(modifier = Modifier.height(10.dp))
TeamScore(
!data.isHome,
data.teamLogo,
data.team,
!data.firstTeamListedWins,
data.cornellScore ?: -1,
data.otherScore ?: -1
data.secondTeamListedWins,
data.cornellScore,
data.otherScore
)
}
Spacer(modifier = Modifier.width(24.dp))
Expand Down Expand Up @@ -138,9 +138,10 @@ private fun TeamScore(
teamLogo: String,
team: String,
winningTeam: Boolean,
cornellScore: Number,
otherScore: Number
cornellScore: Number?,
otherScore: Number?
) {

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
Expand Down Expand Up @@ -177,7 +178,8 @@ private fun TeamScore(
}
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = if (cornellScore == -1 && otherScore == -1) "-" else if (isCornell) cornellScore.toString() else otherScore.toString(),
text = if (isCornell) cornellScore?.toString() ?: "-" else otherScore?.toString()
?: "-",
style = metricMedium,
color = if (winningTeam) GrayPrimary else GrayLight
)
Expand Down
9 changes: 8 additions & 1 deletion app/src/main/java/com/cornellappdev/score/model/Game.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,15 @@ data class GameCardData(
) {
val firstTeamListedWins: Boolean
get() {
if (cornellScore == null && otherScore == null) return false

val cornellWins = (cornellScore?.toFloat() ?: 0f) > (otherScore?.toFloat() ?: 0f)
val firstWins = (cornellWins && isHome) || (!cornellWins && !isHome)
return firstWins
}
val secondTeamListedWins: Boolean
get() =
(cornellScore != null || otherScore != null) && !firstTeamListedWins
}

// Data for GameDetailsScreen
Expand Down Expand Up @@ -218,7 +223,9 @@ fun Game.toGameCardData(): GameCardData {
genderIcon = if (gender == "Mens") R.drawable.ic_gender_men else R.drawable.ic_gender_women,
sport = sport,
sportIcon = Sport.fromDisplayName(sport)?.emptyIcon
?: R.drawable.ic_empty_placeholder
?: R.drawable.ic_empty_placeholder,
cornellScore = cornellScore,
otherScore = otherScore
)
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private fun PastGamesLazyColumn(
LazyColumn(contentPadding = PaddingValues(top = 24.dp)) {
item {
Text(
text = "Upcoming",
text = "Latest",
style = heading1,
color = GrayPrimary,
modifier = Modifier
Expand Down
Loading