From 69754e4159c446c32dc3d1c9d36456f391289621 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 12 Feb 2025 11:21:48 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../ui/expressStatus/ExpressStatusBlock.kt | 4 +- .../preview/PreviewUserWalletListComponent.kt | 2 +- .../impl/presentation/ui/send/SendContent.kt | 7 +-- .../feature/swap/ui/SwapScreenContent.kt | 48 ++++++++++--------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt index cdf3f1f8fb..d31f527a9d 100644 --- a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt +++ b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusBlock.kt @@ -1,5 +1,6 @@ package com.tangem.common.ui.expressStatus +import android.content.res.Configuration import androidx.annotation.DrawableRes import androidx.compose.animation.* import androidx.compose.animation.core.tween @@ -203,8 +204,9 @@ private fun StepSeparator() { ) } -@Preview @Composable +@Preview(showBackground = true, widthDp = 360) +@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES) private fun Preview_ExchangeStatusBlock() { val state = ExpressStatusUM( title = resourceReference(R.string.express_exchange_status_title), diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt index b376ac1202..d9bdebec63 100644 --- a/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt +++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/component/preview/PreviewUserWalletListComponent.kt @@ -53,7 +53,7 @@ internal class PreviewUserWalletListComponent : UserWalletListComponent { ), ), addNewWalletText = resourceReference(R.string.user_wallet_list_add_button), - isWalletSavingInProgress = false, + isWalletSavingInProgress = true, onAddNewWalletClick = {}, ), ) diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/SendContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/SendContent.kt index ff3fda113f..a1484e4532 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/SendContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/send/SendContent.kt @@ -3,7 +3,6 @@ package com.tangem.features.send.impl.presentation.ui.send import android.content.res.Configuration import androidx.compose.animation.* import androidx.compose.animation.core.MutableTransitionState -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -104,7 +103,6 @@ private fun LazyListScope.blocks(uiState: SendUiState) { } } -@OptIn(ExperimentalFoundationApi::class) private fun LazyListScope.tapHelp(isDisplay: Boolean, modifier: Modifier = Modifier) { item(key = TAP_HELP_KEY) { val animationState = remember { MutableTransitionState(false) } @@ -122,11 +120,10 @@ private fun LazyListScope.tapHelp(isDisplay: Boolean, modifier: Modifier = Modif ).plus(fadeIn()), exit = slideOutVertically().plus(fadeOut()), ) { - modifier - .fillMaxWidth() Column( horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier + modifier = modifier + .fillMaxWidth() .animateItem(fadeInSpec = null, fadeOutSpec = null) .padding(top = TangemTheme.dimens.spacing20), ) { diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt index 5744e49278..2e2d7ab136 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt @@ -3,16 +3,22 @@ package com.tangem.feature.swap.ui import android.content.res.Configuration import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.* import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.ClickableText import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.* +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.shadow import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle @@ -259,31 +265,27 @@ private fun getAnnotatedStringForLegalsWithClick( @Composable private fun SwapButton(state: SwapStateHolder, modifier: Modifier = Modifier) { - Card( - elevation = CardDefaults.cardElevation( - defaultElevation = 2.dp, - pressedElevation = 2.dp, - ), - shape = CircleShape, - colors = CardDefaults.cardColors( - containerColor = TangemTheme.colors.background.action, - disabledContainerColor = TangemTheme.colors.background.action, - contentColor = TangemTheme.colors.text.primary1, - disabledContentColor = TangemTheme.colors.text.primary1, - ), - modifier = modifier.size(TangemTheme.dimens.size48), - onClick = state.onChangeCardsClicked, - enabled = state.changeCardsButtonState == ChangeCardsButtonState.ENABLED, + Box( + modifier = modifier + .size(TangemTheme.dimens.size48) + .shadow(elevation = 2.dp, shape = CircleShape) + .background(TangemTheme.colors.background.action) + .clickable( + enabled = state.changeCardsButtonState == ChangeCardsButtonState.ENABLED, + onClick = state.onChangeCardsClicked, + indication = ripple(), + interactionSource = remember { MutableInteractionSource() }, + ), ) { when (state.changeCardsButtonState) { ChangeCardsButtonState.UPDATE_IN_PROGRESS -> { - CircularProgressIndicator( - modifier = Modifier - .size(TangemTheme.dimens.size16) - .padding(TangemTheme.dimens.spacing14), - color = TangemTheme.colors.icon.primary1, - strokeWidth = TangemTheme.dimens.size2, - ) + Box { + CircularProgressIndicator( + modifier = Modifier.padding(TangemTheme.dimens.spacing12), + color = TangemTheme.colors.icon.primary1, + strokeWidth = TangemTheme.dimens.size2, + ) + } } ChangeCardsButtonState.ENABLED -> { Icon(