From e416e2bb5b02618fc63d67b1b780cfea12fca209 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 18 Jul 2024 15:06:47 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../core/ui/components/rows/BlockchainRow.kt | 2 +- .../core/ui/components/rows/ChainRow.kt | 26 +++++++------------ .../preview/PreviewManageTokensComponent.kt | 8 ++++-- .../managetokens/ui/ManageTokensScreen.kt | 5 +++- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt index d0341755a7..4f8edf75c4 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt @@ -29,7 +29,7 @@ fun BlockchainRow(model: BlockchainRowUM, action: @Composable BoxScope.() -> Uni modifier = modifier .heightIn(min = TangemTheme.dimens.size52) .padding( - vertical = TangemTheme.dimens.spacing16, + vertical = TangemTheme.dimens.spacing8, horizontal = TangemTheme.dimens.spacing8, ), icon = { diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt index 175ace75f5..c57b6ebc1a 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt @@ -2,16 +2,17 @@ package com.tangem.core.ui.components.rows import android.content.res.Configuration import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider import com.tangem.core.ui.R +import com.tangem.core.ui.components.TangemSwitch import com.tangem.core.ui.components.currency.icon.CurrencyIcon import com.tangem.core.ui.components.currency.icon.CurrencyIconState import com.tangem.core.ui.components.rows.model.ChainRowUM @@ -27,9 +28,10 @@ fun ChainRow(model: ChainRowUM, modifier: Modifier = Modifier, action: @Composab RowContentContainer( modifier = modifier .heightIn(min = TangemTheme.dimens.size68) + .padding(vertical = TangemTheme.dimens.spacing8) .padding( - vertical = TangemTheme.dimens.spacing12, - horizontal = TangemTheme.dimens.spacing14, + start = TangemTheme.dimens.spacing8, + end = TangemTheme.dimens.spacing12, ), horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12), icon = { @@ -65,17 +67,7 @@ private fun Preview_ChainRow(@PreviewParameter(ChainRowParameterProvider::class) modifier = Modifier.background(TangemTheme.colors.background.primary), model = state, action = { - IconButton( - modifier = Modifier.size(TangemTheme.dimens.size32), - onClick = { /* [REDACTED_TODO_COMMENT]*/ }, - ) { - Icon( - modifier = Modifier.size(TangemTheme.dimens.size24), - tint = TangemTheme.colors.icon.informative, - painter = painterResource(id = R.drawable.ic_chevron_24), - contentDescription = null, - ) - } + TangemSwitch(onCheckedChange = {}, checked = false) }, ) } diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt index d68e6ca5d0..8fabf7cfd4 100644 --- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt +++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt @@ -119,11 +119,15 @@ internal class PreviewManageTokensComponent : ManageTokensComponent { ), showCustom = false, ), - networks = CurrencyItemUM.Basic.NetworksUM.Collapsed, + networks = if (index == 2) { + CurrencyItemUM.Basic.NetworksUM.Expanded(getCurrencyNetworks(index)) + } else { + CurrencyItemUM.Basic.NetworksUM.Collapsed + }, onExpandClick = { toggleCurrency(index) }, ) - private fun getCurrencyNetworks(currencyIndex: Int) = List(size = 5) { networkIndex -> + private fun getCurrencyNetworks(currencyIndex: Int) = List(size = 3) { networkIndex -> CurrencyNetworkUM( id = networkIndex.toString(), model = BlockchainRowUM( diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt index bfe586ebd9..5a29f66f24 100644 --- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt +++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt @@ -217,7 +217,10 @@ private fun BasicCurrencyItem(item: CurrencyItemUM.Basic, modifier: Modifier = M ) NetworksList( - modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16), + modifier = Modifier.padding( + start = TangemTheme.dimens.spacing10, + end = TangemTheme.dimens.spacing8, + ), networks = item.networks, currencyId = item.id, )