From 88469c2ca2eb9100f65ac77e93db20a36dba7fda Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Mon, 22 Dec 2025 08:38:44 -0300 Subject: [PATCH 1/2] fix: disabled NumberPad event click --- .../main/java/to/bitkit/ui/components/NumberPadActionButton.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt b/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt index f0691860b..a478d87d9 100644 --- a/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt +++ b/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt @@ -77,7 +77,7 @@ fun NumberPadActionButton( } } else { OutlinedButton( - onClick = onClick, + onClick = {}, shape = buttonShape, colors = AppButtonDefaults.secondaryColors, contentPadding = contentPadding, From b6e7c5c108e534f84d8ffeb2ba4f812359252fc5 Mon Sep 17 00:00:00 2001 From: jvsena42 Date: Mon, 22 Dec 2025 08:58:31 -0300 Subject: [PATCH 2/2] refactor: remove secondary button wrapper --- .../ui/components/NumberPadActionButton.kt | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt b/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt index a478d87d9..cdb30dfd2 100644 --- a/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt +++ b/app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt @@ -1,7 +1,7 @@ package to.bitkit.ui.components import androidx.annotation.DrawableRes -import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Button import androidx.compose.material3.Icon -import androidx.compose.material3.OutlinedButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -76,32 +75,30 @@ fun NumberPadActionButton( } } } else { - OutlinedButton( - onClick = {}, - shape = buttonShape, - colors = AppButtonDefaults.secondaryColors, - contentPadding = contentPadding, - border = BorderStroke(width = 1.dp, color = color), + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = modifier .requiredHeight(height) - ) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp), - ) { - if (icon != null) { - Icon( - painter = painterResource(icon), - contentDescription = text, - tint = color, - modifier = Modifier.size(16.dp) - ) - } - Caption13Up( - text = text, + .border( + width = 1.dp, color = color, + shape = buttonShape + ) + .padding(contentPadding) + ) { + if (icon != null) { + Icon( + painter = painterResource(icon), + contentDescription = text, + tint = color, + modifier = Modifier.size(16.dp) ) } + Caption13Up( + text = text, + color = color, + ) } } }