Updated on 2026-08-14

This commit is contained in:
Tangem 2025-08-15 19:11:29 +05:00
parent 853304539d
commit c2082a822c
10 changed files with 16 additions and 252 deletions

View file

@ -1,15 +1,11 @@
package com.tangem.features.onboarding.v2.visa.impl.child.choosewallet.ui
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
@ -19,9 +15,9 @@ import com.tangem.core.ui.components.notifications.Notification
import com.tangem.core.ui.components.notifications.NotificationConfig
import com.tangem.core.ui.components.rows.RowContentContainer
import com.tangem.core.ui.extensions.TextReference
import com.tangem.core.ui.extensions.outsetBorder
import com.tangem.core.ui.extensions.resolveReference
import com.tangem.core.ui.extensions.resourceReference
import com.tangem.core.ui.extensions.selectedBorder
import com.tangem.core.ui.extensions.stringResourceSafe
import com.tangem.core.ui.res.TangemTheme
import com.tangem.core.ui.res.TangemThemePreview
@ -112,17 +108,7 @@ private fun SelectableChainRow(
RowContentContainer(
modifier = modifier
.heightIn(min = 48.dp)
.outsetBorder(
color = if (selected) TangemTheme.colors.icon.accent.copy(alpha = 0.15f) else Color.Transparent,
width = 5.dp,
shape = RoundedCornerShape(size = 18.dp),
)
.clip(TangemTheme.shapes.roundedCornersXMedium)
.border(
width = 1.dp,
color = if (selected) TangemTheme.colors.icon.accent else Color.Transparent,
shape = TangemTheme.shapes.roundedCornersXMedium,
)
.selectedBorder(selected)
.clickable(onClick = onClick)
.padding(12.dp),
icon = {
@ -163,7 +149,7 @@ private fun Preview() {
),
),
selectedOption = SelectableChainRowUM(
event = OnboardingVisaChooseWalletComponent.Params.Event.OtherWallet,
event = OnboardingVisaChooseWalletComponent.Params.Event.TangemWallet,
icon = R.drawable.ic_tangem_24,
text = TextReference.Str("Tangem Wallet"),
),

View file

@ -79,7 +79,7 @@ internal fun FeeSelectorModalBottomSheet(
FeeSelectorItems(
state = state,
feeSelectorIntents = feeSelectorIntents,
modifier = Modifier.padding(vertical = 4.dp, horizontal = 13.dp),
modifier = Modifier.padding(vertical = 4.dp, horizontal = 12.dp),
)
},
footer = {
@ -141,7 +141,6 @@ private fun FeeSelectorItems(
)
val itemModifier = Modifier
.fillMaxWidth()
.background(TangemTheme.colors.background.primary)
.selectedBorder(isSelected = isSelected)
.clickableSingle(onClick = { feeSelectorIntents.onFeeItemSelected(item) })
when (item) {

View file

@ -5,14 +5,12 @@ import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
@ -65,7 +63,7 @@ internal fun SwapChooseProviderContent(
) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = modifier.padding(horizontal = 13.dp),
modifier = modifier.padding(horizontal = 12.dp),
) {
Text(
text = stringResourceSafe(id = R.string.onramp_choose_provider_title_hint),
@ -89,7 +87,6 @@ internal fun SwapChooseProviderContent(
SwapProviderItem(
state = provider.swapProviderState,
modifier = Modifier
.clip(RoundedCornerShape(14.dp))
.selectedBorder(isSelected = provider.swapProviderState.isSelected)
.clickable(
enabled = provider.quote !is SwapQuoteUM.Error,

View file

@ -96,13 +96,13 @@ internal object SwapChooseProviderContentPreview {
),
quote = quote2,
swapProviderState = SwapProviderState.Content(
name = provider1.name,
type = provider1.type.typeName,
name = provider2.name,
type = provider2.type.typeName,
iconUrl = "",
subtitle = stringReference("1800 POL"),
additionalBadge = SwapProviderState.AdditionalBadge.BestTrade,
diffPercent = SwapQuoteUM.Content.DifferencePercent.Best,
isSelected = true,
isSelected = false,
),
),
),