diff --git a/app/release/app-release.aab b/app/release/app-release.aab new file mode 100644 index 0000000..6e8505b Binary files /dev/null and b/app/release/app-release.aab differ diff --git a/app/src/main/java/com/cornellappdev/score/components/PastGameCard.kt b/app/src/main/java/com/cornellappdev/score/components/PastGameCard.kt index 6e09ae5..16d09ef 100644 --- a/app/src/main/java/com/cornellappdev/score/components/PastGameCard.kt +++ b/app/src/main/java/com/cornellappdev/score/components/PastGameCard.kt @@ -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)) @@ -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, @@ -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 ) diff --git a/app/src/main/java/com/cornellappdev/score/model/Game.kt b/app/src/main/java/com/cornellappdev/score/model/Game.kt index d6dfd42..9586df3 100644 --- a/app/src/main/java/com/cornellappdev/score/model/Game.kt +++ b/app/src/main/java/com/cornellappdev/score/model/Game.kt @@ -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 @@ -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 ) } diff --git a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt index af87dcc..32f1cc1 100644 --- a/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt +++ b/app/src/main/java/com/cornellappdev/score/screen/PastGamesScreen.kt @@ -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