zobrist/TichuCounter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 9 Wiki Activity

release/2.0 #21

Merged
fabian merged 137 commits from release/2.0 into master 2023-01-28 23:29:27 +01:00
Conversation 0 Commits 137 Files Changed 86 +7 -11
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52a73bf204 - Show all commits

18
app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt
View File

@@ -84,11 +84,7 @@ fun HistoryListItem(
)
Spacer(modifier = Modifier.padding(5.dp))
Text(
text = stringResource(R.string.created, format.format(game.created)),
style = MaterialTheme.typography.labelSmall
)
Text(
text = stringResource(R.string.modified, format.format(game.modified)),
text = format.format(game.modified),
style = MaterialTheme.typography.labelSmall
)
}
@@ -96,14 +92,14 @@ fun HistoryListItem(
Modifier
.wrapContentSize()
.width(70.dp)){
ElevatedButton(onClick = { onOpenClicked(game.gameId) }, enabled = true) {
Icon(Icons.Outlined.OpenInFull, null)
}
ElevatedButton(
onClick = { onDeleteClicked(game.gameId) }, enabled = !game.active ) {
Icon(Icons.Outlined.Delete, null)
}
ElevatedButton(onClick = { onOpenClicked(game.gameId) }, enabled = !game.active) {
Icon(Icons.Outlined.OpenInFull, null)
}
}
}
}
@@ -113,8 +109,8 @@ fun HistoryListItem(
@Composable
private fun HistoryListPreview() {
val tempData = listOf(
GameAndScore(false, "abc", "def", Date(), Date(), 1, 10, 50),
GameAndScore(true, "ADTH", "dogfg", Date(), Date(), 2, 20, 60),
GameAndScore(true, "abc", "def", Date(), Date(), 1, 10, 50),
GameAndScore(false, "ADTH", "dogfg", Date(), Date(), 2, 20, 60),
GameAndScore(false, "TeamA3 langer Name", "TeamB3", Date(), Date(), 3, 30, 70),
GameAndScore(false, "TeamA4", "TeamB4", Date(), Date(), 4, 40, 80),
GameAndScore(false, "TeamA5", "TeamB5", Date(), Date(), 5, 50, 90)