From c8098fc90417c1e42406dfa87267b297b51f752f Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sun, 20 Aug 2023 12:31:20 +0200 Subject: [PATCH] Increase dismiss threshold. Change translation of continue. --- .../zobrist/tichucounter/ui/history/HistoryView.kt | 13 ++++++++++--- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt index e0d40b6..97ae917 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/history/HistoryView.kt @@ -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) ) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bee00f7..98e1a74 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -24,6 +24,6 @@ Counter About Schreib uns - Aktivieren + Weiterspielen \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 65e0d14..d688695 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,5 +28,5 @@ About Contact us Play Store - Activate + Continue \ No newline at end of file