From 8593df1d85bbfa780ec5af3eea13d70e47f398e0 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 23 Nov 2022 12:00:34 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/tap/common/compose/Button.kt | 18 ++- .../common/compose/ComposeDialogManager.kt | 5 +- .../com/tangem/tap/common/compose/Spacer.kt | 106 ----------------- .../com/tangem/tap/common/compose/Warning.kt | 1 + .../features/home/compose/content/Content.kt | 10 +- .../compose/content/CurrenciesWeb3Content.kt | 14 +-- .../home/compose/views/HomeButtons.kt | 2 +- .../home/compose/views/StoriesProgressBar.kt | 9 +- .../addCustomToken/compose/FormFieldViews.kt | 15 ++- .../com/tangem/core/ui/components/Spacers.kt | 108 +++++++++++++++++- 10 files changed, 160 insertions(+), 128 deletions(-) delete mode 100644 app/src/main/java/com/tangem/tap/common/compose/Spacer.kt 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 690f35f388..b20f7470b8 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 @@ -1,7 +1,17 @@ package com.tangem.tap.common.compose -import androidx.compose.foundation.layout.* -import androidx.compose.material.* +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.Button +import androidx.compose.material.ButtonDefaults +import androidx.compose.material.Icon +import androidx.compose.material.IconButton +import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -16,6 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import com.tangem.core.ui.components.SpacerH8 import com.tangem.tap.common.compose.extensions.stringResourceDefault import com.tangem.wallet.R @@ -137,8 +148,7 @@ fun ToggledRippleTheme( @Preview @Composable fun ButtonTest() { - Scaffold( - ) { + Scaffold { Column(modifier = Modifier.padding(16.dp)) { PreviewItem("Button") { RectangleButton(text = "Some button") {} diff --git a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt index fc496f1d9b..99042c3391 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt @@ -30,6 +30,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties +import com.tangem.core.ui.components.SpacerH16 import com.tangem.domain.DomainDialog import com.tangem.domain.redux.domainStore import com.tangem.domain.redux.global.DomainGlobalAction @@ -105,7 +106,7 @@ fun SimpleDialog( modifier = Modifier.padding(22.dp) ) { DialogTitle(title = title) - LazyColumn() { + LazyColumn { items(items) { item -> Row( modifier = Modifier @@ -154,4 +155,4 @@ fun ErrorDialog( } } ) -} +} \ 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 deleted file mode 100644 index ce0b190598..0000000000 --- a/app/src/main/java/com/tangem/tap/common/compose/Spacer.kt +++ /dev/null @@ -1,106 +0,0 @@ -package com.tangem.tap.common.compose - -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp - -/** -[REDACTED_AUTHOR] - */ -// ***************************** Horizontal -@Composable -fun SpacerH(height: Dp, modifier: Modifier = Modifier) { - Spacer(modifier = modifier.height(height)) -} - -@Composable -fun SpacerH4(modifier: Modifier = Modifier) { - SpacerH(4.dp, modifier) -} - -@Composable -fun SpacerH8(modifier: Modifier = Modifier) { - SpacerH(8.dp, modifier) -} - -@Composable -fun SpacerH16(modifier: Modifier = Modifier) { - SpacerH(16.dp, modifier) -} - -@Composable -fun SpacerH24(modifier: Modifier = Modifier) { - SpacerH(24.dp, modifier) -} - -@Composable -fun SpacerH32(modifier: Modifier = Modifier) { - SpacerH(32.dp, modifier) -} - -// ***************************** Vertical -@Composable -fun SpacerW(width: Dp, modifier: Modifier = Modifier) { - Spacer(modifier = modifier.width(width)) -} - -@Composable -fun SpacerW4(modifier: Modifier = Modifier) { - SpacerW(4.dp, modifier) -} - -@Composable -fun SpacerW8(modifier: Modifier = Modifier) { - SpacerW(8.dp, modifier) -} - -@Composable -fun SpacerW16(modifier: Modifier = Modifier) { - SpacerW(16.dp, modifier) -} - -@Composable -fun SpacerW24(modifier: Modifier = Modifier) { - SpacerW(24.dp, modifier) -} - -@Composable -fun SpacerW32(modifier: Modifier = Modifier) { - SpacerW(32.dp, modifier) -} - -// ***************************** Size -@Composable -fun SpacerS(size: Dp, modifier: Modifier = Modifier) { - Spacer(modifier = modifier.size(size)) -} - -@Composable -fun SpacerS4(modifier: Modifier = Modifier) { - SpacerS(4.dp, modifier) -} - -@Composable -fun SpacerS8(modifier: Modifier = Modifier) { - SpacerS(8.dp, modifier) -} - -@Composable -fun SpacerS16(modifier: Modifier = Modifier) { - SpacerS(16.dp, modifier) -} - -@Composable -fun SpacerS24(modifier: Modifier = Modifier) { - SpacerS(24.dp, modifier) -} - -@Composable -fun SpacerS32(modifier: Modifier = Modifier) { - SpacerS(32.dp, modifier) -} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/compose/Warning.kt b/app/src/main/java/com/tangem/tap/common/compose/Warning.kt index 07c82d1384..0d19a8e2ea 100644 --- a/app/src/main/java/com/tangem/tap/common/compose/Warning.kt +++ b/app/src/main/java/com/tangem/tap/common/compose/Warning.kt @@ -13,6 +13,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.tangem.common.module.ModuleMessage +import com.tangem.core.ui.components.SpacerH8 import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt index 9ee80263c3..e8a6b447f7 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt @@ -2,7 +2,11 @@ package com.tangem.tap.features.home.compose.content import androidx.annotation.DrawableRes import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -20,8 +24,8 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.tangem.tap.common.compose.SpacerH16 -import com.tangem.tap.common.compose.SpacerH32 +import com.tangem.core.ui.components.SpacerH16 +import com.tangem.core.ui.components.SpacerH32 import com.tangem.tap.features.home.compose.StoriesBottomImageAnimation import com.tangem.tap.features.home.compose.StoriesTextAnimation import com.tangem.wallet.R diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt index 198e71d324..85ec581b07 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp -import com.tangem.tap.common.compose.SpacerH +import com.tangem.core.ui.components.SpacerH12 import com.tangem.tap.common.compose.extensions.dpSize import com.tangem.tap.common.compose.extensions.halfHeight import com.tangem.tap.common.compose.extensions.toPx @@ -64,7 +64,7 @@ fun StoriesCurrenciesContent( targetOffset = animateTo.toPx(), contentDescription = "Currency row", ) - SpacerH(12.dp) + SpacerH12() } } } @@ -118,7 +118,7 @@ fun StoriesWeb3Content( @Composable private fun LightenBox(content: @Composable () -> Unit) { - Box() { + Box { content() Box( modifier = Modifier @@ -130,10 +130,10 @@ private fun LightenBox(content: @Composable () -> Unit) { Color.White.copy(alpha = 0f), Color.White.copy(alpha = 0.75f), Color.White.copy(alpha = 0.95f), - Color.White - ) - ) - ) + Color.White, + ), + ), + ), ) {} } } diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt index cb40186a87..1e3cc818b4 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.tangem.tap.common.compose.SpacerS8 +import com.tangem.core.ui.components.SpacerS8 import com.tangem.wallet.R @Composable diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt index 096b87cb0b..3779f57358 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt @@ -4,7 +4,12 @@ import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.tween import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember @@ -13,7 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.tangem.tap.common.compose.SpacerW4 +import com.tangem.core.ui.components.SpacerW4 @Composable fun StoriesProgressBar( diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt index fd792714be..bc4c0ae9c6 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt @@ -6,14 +6,25 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview +import com.tangem.core.ui.components.SpacerH8 import com.tangem.domain.common.form.Field import com.tangem.domain.features.addCustomToken.TokenBlockchainField import com.tangem.domain.features.addCustomToken.TokenDerivationPathField import com.tangem.domain.features.addCustomToken.TokenField -import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.* +import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenContractAddressChanged +import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDecimalsChanged +import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDerivationPathChanged +import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNameChanged +import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNetworkChanged +import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenSymbolChanged import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState import com.tangem.domain.redux.domainStore -import com.tangem.tap.common.compose.* +import com.tangem.tap.common.compose.BlockchainSpinner +import com.tangem.tap.common.compose.ClearButton +import com.tangem.tap.common.compose.ClosePopupTrigger +import com.tangem.tap.common.compose.OutlinedTextFieldWidget +import com.tangem.tap.common.compose.PasteButton +import com.tangem.tap.common.compose.TitleSubtitle import com.tangem.tap.common.extensions.getFromClipboard import com.tangem.wallet.R diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Spacers.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Spacers.kt index 60ce6bf8bc..8293073012 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/Spacers.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/Spacers.kt @@ -1,12 +1,17 @@ +@file:Suppress("unused") + package com.tangem.core.ui.components import androidx.annotation.DimenRes import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.dimensionResource +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp @Composable fun VerticalSpacer(@DimenRes spaceResId: Int) { @@ -16,4 +21,105 @@ fun VerticalSpacer(@DimenRes spaceResId: Int) { @Composable fun HorizontalSpacer(@DimenRes spaceResId: Int) { Spacer(modifier = Modifier.width(dimensionResource(id = spaceResId))) -} \ No newline at end of file +} + +// region Horizontal +@Composable +fun SpacerH(height: Dp, modifier: Modifier = Modifier) { + Spacer(modifier = modifier.height(height)) +} + +@Composable +fun SpacerH4(modifier: Modifier = Modifier) { + SpacerH(4.dp, modifier) +} + +@Composable +fun SpacerH8(modifier: Modifier = Modifier) { + SpacerH(8.dp, modifier) +} + +@Composable +fun SpacerH12(modifier: Modifier = Modifier) { + SpacerH(12.dp, modifier) +} + +@Composable +fun SpacerH16(modifier: Modifier = Modifier) { + SpacerH(16.dp, modifier) +} + +@Composable +fun SpacerH24(modifier: Modifier = Modifier) { + SpacerH(24.dp, modifier) +} + +@Composable +fun SpacerH32(modifier: Modifier = Modifier) { + SpacerH(32.dp, modifier) +} +// endregion Horizontal + +// region Vertical +@Composable +fun SpacerW(width: Dp, modifier: Modifier = Modifier) { + Spacer(modifier = modifier.width(width)) +} + +@Composable +fun SpacerW4(modifier: Modifier = Modifier) { + SpacerW(4.dp, modifier) +} + +@Composable +fun SpacerW8(modifier: Modifier = Modifier) { + SpacerW(8.dp, modifier) +} + +@Composable +fun SpacerW16(modifier: Modifier = Modifier) { + SpacerW(16.dp, modifier) +} + +@Composable +fun SpacerW24(modifier: Modifier = Modifier) { + SpacerW(24.dp, modifier) +} + +@Composable +fun SpacerW32(modifier: Modifier = Modifier) { + SpacerW(32.dp, modifier) +} +// endregion Vertical + +// region Size +@Composable +fun SpacerS(size: Dp, modifier: Modifier = Modifier) { + Spacer(modifier = modifier.size(size)) +} + +@Composable +fun SpacerS4(modifier: Modifier = Modifier) { + SpacerS(4.dp, modifier) +} + +@Composable +fun SpacerS8(modifier: Modifier = Modifier) { + SpacerS(8.dp, modifier) +} + +@Composable +fun SpacerS16(modifier: Modifier = Modifier) { + SpacerS(16.dp, modifier) +} + +@Composable +fun SpacerS24(modifier: Modifier = Modifier) { + SpacerS(24.dp, modifier) +} + +@Composable +fun SpacerS32(modifier: Modifier = Modifier) { + SpacerS(32.dp, modifier) +} +// endregion Size \ No newline at end of file