feature/swipe-actions #44

Merged
fabian merged 6 commits from feature/swipe-actions into develop 2023-08-25 18:19:45 +02:00
3 changed files with 12 additions and 5 deletions
Showing only changes of commit c8098fc904 - Show all commits

View File

@@ -4,6 +4,7 @@ package me.zobrist.tichucounter.ui.history
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -40,6 +41,7 @@ import androidx.compose.ui.Alignment.Companion.CenterVertically
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
@@ -161,7 +163,11 @@ fun DismissibleHistoryListItem(
onOpenClicked: (gameId: Long) -> Unit,
onDeleteClicked: (gameId: Long) -> Unit
) {
val dismissState = rememberDismissState(confirmValueChange = {
val density = LocalDensity.current
val dismissState = rememberDismissState(
positionalThreshold = { with(density) { 100.dp.toPx() } },
confirmValueChange = {
if (it == DismissValue.DismissedToStart) {
onDeleteClicked(game.game.uid)
}
@@ -189,7 +195,7 @@ fun DismissibleHistoryListItem(
DismissDirection.EndToStart -> Icons.Outlined.Delete
}
val text = when (direction) {
DismissDirection.StartToEnd -> stringResource(id = R.string.activate)
DismissDirection.StartToEnd -> stringResource(id = R.string.continue_play)
DismissDirection.EndToStart -> stringResource(id = R.string.delete)
}
val scale by animateFloatAsState(
@@ -203,7 +209,8 @@ fun DismissibleHistoryListItem(
.padding(horizontal = 20.dp),
contentAlignment = alignment
) {
Row {
Column(verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally) {
Icon(
icon, contentDescription = null, modifier = Modifier.scale(scale)
)

View File

@@ -24,6 +24,6 @@
<string name="menu_counter">Counter</string>
<string name="menu_about">About</string>
<string name="contact_us">Schreib uns</string>
<string name="activate">Aktivieren</string>
<string name="continue_play">Weiterspielen</string>
</resources>

View File

@@ -28,5 +28,5 @@
<string name="menu_about">About</string>
<string name="contact_us">Contact us</string>
<string name="play_store" translatable="false">Play Store</string>
<string name="activate">Activate</string>
<string name="continue_play">Continue</string>
</resources>