From 73524b4c7e78b75a83cf36449fdd40daa68187eb Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 9 Apr 2022 14:28:00 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/tap/common/compose/Button.kt | 2 + .../java/com/tangem/tap/common/compose/Log.kt | 2 +- .../com/tangem/tap/common/compose/Spacer.kt | 60 +++++++++---------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/compose/Button.kt b/app/src/main/java/com/tangem/tap/common/compose/Button.kt index dc5d278520..fd450f68bd 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/Button.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/Button.kt @@ -24,6 +24,7 @@ private class Button {} fun Button( text: String = "", textId: Int? = null, + isEnabled: Boolean = true, modifier: Modifier = Modifier, leftContent: @Composable RowScope.() -> Unit = {}, rightContent: @Composable RowScope.() -> Unit = {}, @@ -31,6 +32,7 @@ fun Button( ) { Button( modifier = modifier.height(42.dp), + enabled = isEnabled, onClick = onClick, ) { leftContent() diff --git a/app/src/main/java/com/tangem/tap/common/compose/Log.kt b/app/src/main/java/com/tangem/tap/common/compose/Log.kt index c55fda6f4b..851798dfe1 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/Log.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/Log.kt @@ -8,5 +8,5 @@ import timber.log.Timber */ @Composable fun LogSideEffect(message: String) { - Timber.w("SideEffect: $message") + Timber.d("SideEffect: $message") } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/compose/Spacer.kt b/app/src/main/java/com/tangem/tap/common/compose/Spacer.kt index c1d9a7de9a..cfea07e9c8 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/Spacer.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/Spacer.kt @@ -14,78 +14,78 @@ import androidx.compose.ui.unit.dp */ // ***************************** Horizontal @Composable -fun SpacerH(height: Dp) { - Spacer(modifier = Modifier.height(height)) +fun SpacerH(height: Dp, modifier: Modifier = Modifier) { + Spacer(modifier = modifier.height(height)) } @Composable -fun SpacerH4() { - SpacerH(4.dp) +fun SpacerH4(modifier: Modifier = Modifier) { + SpacerH(4.dp, modifier) } @Composable -fun SpacerH8() { - SpacerH(8.dp) +fun SpacerH8(modifier: Modifier = Modifier) { + SpacerH(8.dp, modifier) } @Composable -fun SpacerH16() { - SpacerH(16.dp) +fun SpacerH16(modifier: Modifier = Modifier) { + SpacerH(16.dp, modifier) } @Composable -fun SpacerH24() { - SpacerH(24.dp) +fun SpacerH24(modifier: Modifier = Modifier) { + SpacerH(24.dp, modifier) } // ***************************** Vertical @Composable -fun SpacerV(width: Dp) { - Spacer(modifier = Modifier.width(width)) +fun SpacerV(width: Dp, modifier: Modifier = Modifier) { + Spacer(modifier = modifier.width(width)) } @Composable -fun SpacerV4() { - SpacerV(4.dp) +fun SpacerV4(modifier: Modifier = Modifier) { + SpacerV(4.dp, modifier) } @Composable -fun SpacerV8() { - SpacerV(8.dp) +fun SpacerV8(modifier: Modifier = Modifier) { + SpacerV(8.dp, modifier) } @Composable -fun SpacerV16() { - SpacerV(16.dp) +fun SpacerV16(modifier: Modifier = Modifier) { + SpacerV(16.dp, modifier) } @Composable -fun SpacerV24() { - SpacerV(24.dp) +fun SpacerV24(modifier: Modifier = Modifier) { + SpacerV(24.dp, modifier) } // ***************************** Size @Composable -fun SpacerS(size: Dp) { - Spacer(modifier = Modifier.size(size)) +fun SpacerS(size: Dp, modifier: Modifier = Modifier) { + Spacer(modifier = modifier.size(size)) } @Composable -fun SpacerS4() { - SpacerS(4.dp) +fun SpacerS4(modifier: Modifier = Modifier) { + SpacerS(4.dp, modifier) } @Composable -fun SpacerS8() { - SpacerS(8.dp) +fun SpacerS8(modifier: Modifier = Modifier) { + SpacerS(8.dp, modifier) } @Composable -fun SpacerS16() { - SpacerS(16.dp) +fun SpacerS16(modifier: Modifier = Modifier) { + SpacerS(16.dp, modifier) } @Composable -fun SpacerS24() { - SpacerS(24.dp) +fun SpacerS24(modifier: Modifier = Modifier) { + SpacerS(24.dp, modifier) } \ No newline at end of file