relese/2.3.3 #56

Merged
fabian merged 9 commits from relese/2.3.3 into master 2024-08-26 23:37:44 +02:00
Showing only changes of commit 80039a5f94 - Show all commits

View File

@@ -53,7 +53,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.zobrist.tichucounter.R import me.zobrist.tichucounter.R
import me.zobrist.tichucounter.data.GameWithScores import me.zobrist.tichucounter.data.GameWithScores
@@ -160,31 +159,23 @@ fun HistoryList(
onDeleteAllClicked: () -> Unit, onDeleteAllClicked: () -> Unit,
lazyListState: LazyListState = LazyListState(), lazyListState: LazyListState = LazyListState(),
) { ) {
val scope = rememberCoroutineScope()
Row { Row {
LazyColumn(state = lazyListState) { LazyColumn(state = lazyListState) {
items( items(
items = games, items = games,
key = { it.game.uid }) { item -> key = { it.hashCode() }) {
if (item.game.active) { if (it.game.active) {
HistoryListItem( HistoryListItem(
item, it,
Modifier Modifier
.animateItemPlacement() .animateItemPlacement()
.padding(2.dp) .padding(2.dp)
) )
} else { } else {
DismissibleHistoryListItem( DismissibleHistoryListItem(
item, it,
Modifier.animateItemPlacement(), Modifier.animateItemPlacement(),
{ onOpenClicked,
onOpenClicked(it)
scope.launch {
delay(100)
lazyListState.animateScrollToItem(0)
}
},
onDeleteClicked onDeleteClicked
) )
} }