diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/TangemPayCardMainBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/TangemPayCardMainBlock.kt index 0c7551a2b4..c155df8fd4 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/TangemPayCardMainBlock.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/TangemPayCardMainBlock.kt @@ -1,5 +1,6 @@ package com.tangem.feature.wallet.presentation.wallet.ui.components.singlecurrency +import android.content.res.Configuration import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* import androidx.compose.material3.Surface @@ -9,13 +10,17 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.tangem.common.ui.R +import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.orMaskWithStars import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.res.TangemThemePreview import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState +import com.tangem.feature.wallet.presentation.wallet.ui.components.visa.TangemPayMainScreenBlock @Composable internal fun TangemPayCardMainBlock( @@ -33,8 +38,9 @@ internal fun TangemPayCardMainBlock( modifier = Modifier .fillMaxWidth() .height(IntrinsicSize.Min) - .padding(horizontal = 16.dp, vertical = 12.dp), + .padding(horizontal = 12.dp, vertical = 16.dp), verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Image( painter = painterResource(R.drawable.img_visa_36), @@ -42,20 +48,15 @@ internal fun TangemPayCardMainBlock( modifier = Modifier.size(36.dp), ) - Spacer(Modifier.width(12.dp)) - Column( modifier = Modifier.weight(1f), - verticalArrangement = Arrangement.Center, + verticalArrangement = Arrangement.spacedBy(2.dp), ) { Text( text = stringResourceSafe(R.string.tangempay_payment_account), style = TangemTheme.typography.subtitle2, color = TangemTheme.colors.text.primary1, ) - - Spacer(Modifier.height(6.dp)) - Text( text = state.lastFourDigits.resolveReference(), style = TangemTheme.typography.caption2, @@ -64,6 +65,7 @@ internal fun TangemPayCardMainBlock( } Column( modifier = Modifier.fillMaxHeight(), + verticalArrangement = Arrangement.spacedBy(2.dp), horizontalAlignment = Alignment.End, ) { Text( @@ -72,14 +74,30 @@ internal fun TangemPayCardMainBlock( color = TangemTheme.colors.text.primary1, textAlign = TextAlign.End, ) - Text( text = state.balanceSymbol.resolveReference(), - style = TangemTheme.typography.body2, + style = TangemTheme.typography.caption2, color = TangemTheme.colors.text.tertiary, textAlign = TextAlign.End, ) } } } +} + +@Preview(showBackground = true) +@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +private fun TangemPayCardMainBlockPreview() { + TangemThemePreview { + TangemPayMainScreenBlock( + TangemPayState.Card( + lastFourDigits = TextReference.Str("*1234"), + balanceText = TextReference.Str("$ 0.00"), + balanceSymbol = TextReference.Str("USDC"), + onClick = {}, + ), + isBalanceHidden = false, + ) + } } \ No newline at end of file