taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

commit bd4e0958bfa9c4ac42d92f2feb710efc98ad53ec
parent 7f33ed68dd9463db9f0d869c3b1dbea5704488d6
Author: Iván Ávalos <avalos@disroot.org>
Date:   Fri, 25 Oct 2024 21:15:32 +0200

[wallet] Add divider to Transaction items

Diffstat:
Mwallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt | 109+++++++++++++++++++++++++++++++++++++++++--------------------------------------
1 file changed, 57 insertions(+), 52 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt @@ -37,6 +37,7 @@ import androidx.compose.material.icons.rounded.CheckCircle import androidx.compose.material.icons.rounded.RadioButtonUnchecked import androidx.compose.material3.AlertDialog import androidx.compose.material3.Badge +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.ListItem import androidx.compose.material3.ListItemDefaults @@ -276,62 +277,66 @@ fun TransactionRow( ) { val context = LocalContext.current - ListItem( - modifier = Modifier - .defaultMinSize(minHeight = 80.dp) - .combinedClickable( - onClick = onTransactionClick, - onLongClick = onTransactionSelect, - ), - trailingContent = { - Box( - modifier = Modifier.padding(8.dp), - contentAlignment = Alignment.Center, - ) { - TransactionAmountInfo(tx, spec) - } - }, - leadingContent = { - Box( - modifier = Modifier.padding(8.dp), - contentAlignment = Alignment.Center, - ) { - if (!selectionMode) { - Icon(painterResource(tx.icon), contentDescription = null) - } else if (isSelected) { - Icon( - Icons.Rounded.CheckCircle, - contentDescription = null, - tint = MaterialTheme.colorScheme.primary, - ) + Column { + ListItem( + modifier = Modifier + .defaultMinSize(minHeight = 80.dp) + .combinedClickable( + onClick = onTransactionClick, + onLongClick = onTransactionSelect, + ), + trailingContent = { + Box( + modifier = Modifier.padding(8.dp), + contentAlignment = Alignment.Center, + ) { + TransactionAmountInfo(tx, spec) + } + }, + leadingContent = { + Box( + modifier = Modifier.padding(8.dp), + contentAlignment = Alignment.Center, + ) { + if (!selectionMode) { + Icon(painterResource(tx.icon), contentDescription = null) + } else if (isSelected) { + Icon( + Icons.Rounded.CheckCircle, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + ) + } else { + Icon( + Icons.Rounded.RadioButtonUnchecked, + contentDescription = null, + tint = MaterialTheme.colorScheme.outline, + ) + } + } + }, + headlineContent = { + Text( + tx.getTitle(context), + modifier = Modifier.padding(vertical = 3.dp), + style = MaterialTheme.typography.titleMedium, + ) + }, + supportingContent = { + TransactionExtraInfo(tx) + }, + overlineContent = { Text(tx.timestamp.ms.toRelativeTime(context).toString()) }, + colors = ListItemDefaults.colors( + containerColor = if (isSelected) { + MaterialTheme.colorScheme.secondaryContainer } else { - Icon( - Icons.Rounded.RadioButtonUnchecked, - contentDescription = null, - tint = MaterialTheme.colorScheme.outline, - ) + ListItemDefaults.containerColor } - } - }, - headlineContent = { - Text( - tx.getTitle(context), - modifier = Modifier.padding(vertical = 3.dp), - style = MaterialTheme.typography.titleMedium, ) - }, - supportingContent = { - TransactionExtraInfo(tx) - }, - overlineContent = { Text(tx.timestamp.ms.toRelativeTime(context).toString()) }, - colors = ListItemDefaults.colors( - containerColor = if (isSelected) { - MaterialTheme.colorScheme.secondaryContainer - } else { - ListItemDefaults.containerColor - } ) - ) + + HorizontalDivider() + } } @Composable