taler-android

commit bac4cb514296fc20ed9bfe9e899d766c4d05f506
parent d6ecf36975fa7e08e0d2cd02db1ce4c6894b8282
Author: Iván Ávalos <avalos@disroot.org>
Date:   Sun, 27 Jul 2025 22:24:51 +0200

[wallet] tweak paddings

Diffstat:
M
wallet/src/main/java/net/taler/wallet/balances/BalancesComposable.kt
 | 
9
++-------
M
wallet/src/main/java/net/taler/wallet/compose/Banner.kt
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/compose/Utils.kt
 | 
8
++++++++
M
wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt
 | 
3
++-

4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/balances/BalancesComposable.kt b/wallet/src/main/java/net/taler/wallet/balances/BalancesComposable.kt
@@ -58,6 +58,7 @@ import net.taler.wallet.balances.ScopeInfo.Global
 import net.taler.wallet.cleanExchange
 import net.taler.wallet.compose.LoadingScreen
 import net.taler.wallet.compose.TalerSurface
+import net.taler.wallet.compose.cardPaddings
 import net.taler.wallet.transactions.Transaction
 import net.taler.wallet.transactions.TransactionStateFilter
 import net.taler.wallet.transactions.TransactionsComposable
@@ -133,13 +134,7 @@ fun BalanceRow(
     onClick: () -> Unit,
     onPendingClick: () -> Unit,
 ) {
-    OutlinedCard(
-        modifier = Modifier
-            .padding(
-                horizontal = 9.dp,
-                vertical = 6.dp,
-            )
-    ) {
+    OutlinedCard(Modifier.cardPaddings()) {
         Column {
             ListItem(
                 modifier = Modifier
diff --git a/wallet/src/main/java/net/taler/wallet/compose/Banner.kt b/wallet/src/main/java/net/taler/wallet/compose/Banner.kt
@@ -38,7 +38,7 @@ fun Banner(
 ) {
     Card(
         modifier = modifier
-            .padding(horizontal = 9.dp)
+            .safeHorizontalPadding()
             .fillMaxWidth(),
         colors = colors,
         shape = ShapeDefaults.ExtraSmall,
diff --git a/wallet/src/main/java/net/taler/wallet/compose/Utils.kt b/wallet/src/main/java/net/taler/wallet/compose/Utils.kt
@@ -16,6 +16,7 @@
 
 package net.taler.wallet.compose
 
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
@@ -25,6 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.flowWithLifecycle
@@ -57,6 +59,12 @@ fun <T> StateFlow<T>.collectAsStateLifecycleAware(
     context: CoroutineContext = EmptyCoroutineContext,
 ): State<T> = collectAsStateLifecycleAware(initial = value, context = context)
 
+fun Modifier.safeHorizontalPadding(): Modifier =
+    then(Modifier.padding(horizontal = 14.dp))
+
+fun Modifier.cardPaddings(): Modifier =
+    then(Modifier.padding(horizontal = 14.dp, vertical = 7.dp))
+
 @Composable
 fun TalerSurface(content: @Composable () -> Unit) {
     Mdc3Theme {
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt
@@ -81,6 +81,7 @@ import net.taler.wallet.compose.Banner
 import net.taler.wallet.compose.LoadingScreen
 import net.taler.wallet.compose.SelectionModeTopAppBar
 import net.taler.wallet.compose.TalerSurface
+import net.taler.wallet.compose.cardPaddings
 import net.taler.wallet.transactions.AmountType.Negative
 import net.taler.wallet.transactions.AmountType.Neutral
 import net.taler.wallet.transactions.AmountType.Positive
@@ -292,7 +293,7 @@ fun TransactionsHeader(
         OutlinedCard(
             Modifier
                 .weight(1f)
-                .padding(8.dp)
+                .cardPaddings()
                 .clickable { onShowBalancesClicked() },
         ) {
             ListItem(