diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt index d835895565..79a2e16273 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt @@ -125,6 +125,7 @@ data class TangemDimens internal constructor( val spacing56: Dp = 56.dp, val spacing60: Dp = 60.dp, val spacing70: Dp = 70.dp, + val spacing72: Dp = 72.dp, val spacing76: Dp = 76.dp, val spacing80: Dp = 80.dp, val spacing92: Dp = 92.dp, diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendNavigationButtons.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendNavigationButtons.kt index 94b544a15e..5bdb10824e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendNavigationButtons.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendNavigationButtons.kt @@ -31,13 +31,17 @@ import com.tangem.features.send.impl.presentation.state.SendUiState import com.tangem.features.send.impl.presentation.state.SendUiStateType @Composable -internal fun SendNavigationButtons(uiState: SendUiState, currentState: SendUiCurrentScreen) { +internal fun SendNavigationButtons( + uiState: SendUiState, + currentState: SendUiCurrentScreen, + modifier: Modifier = Modifier, +) { val sendState = uiState.sendState ?: return val isSuccess = sendState.isSuccess val isSendingState = currentState.type == SendUiStateType.Send && !isSuccess val isSentState = currentState.type == SendUiStateType.Send && isSuccess Column( - modifier = Modifier + modifier = modifier .padding( start = TangemTheme.dimens.spacing16, end = TangemTheme.dimens.spacing16, diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendScreen.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendScreen.kt index 91c44b07ab..b227fe07fe 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendScreen.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/SendScreen.kt @@ -74,13 +74,17 @@ internal fun SendScreen(uiState: SendUiState, currentStateFlow: StateFlow item::class.java }, itemContent = { i, item -> val bottomPadding = if (i == notifications.lastIndex) { - TangemTheme.dimens.spacing12 + TangemTheme.dimens.spacing72 } else { TangemTheme.dimens.spacing0 } diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt index 2276dc4848..50fde69ede 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt @@ -20,6 +20,7 @@ import kotlinx.collections.immutable.ImmutableList internal fun SendCustomFeeEthereum( customValues: ImmutableList, selectedFee: FeeType, + hasNotifications: Boolean, modifier: Modifier = Modifier, ) { AnimatedVisibility( @@ -34,8 +35,8 @@ internal fun SendCustomFeeEthereum( ) { repeat(customValues.size) { index -> val value = customValues[index] - val bottomPadding = if (index == customValues.lastIndex) { - TangemTheme.dimens.spacing12 + val bottomPadding = if (index == customValues.lastIndex && !hasNotifications) { + TangemTheme.dimens.spacing72 } else { TangemTheme.dimens.spacing0 } diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt index cb132488c6..ee4055bff5 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt @@ -23,8 +23,9 @@ private const val FEE_CUSTOM_KEY = "FEE_CUSTOM_KEY" internal fun SendSpeedAndFeeContent(state: SendStates.FeeState?, clickIntents: SendClickIntents) { if (state == null) return val feeSendState = state.feeSelectorState as? FeeSelectorState.Content - val isCustomSelected = feeSendState?.selectedFee == FeeType.Custom val notifications = state.notifications + val isCustomSelected = feeSendState?.selectedFee == FeeType.Custom + val hasNotifications = notifications.isNotEmpty() LazyColumn( modifier = Modifier .fillMaxSize() @@ -35,7 +36,7 @@ internal fun SendSpeedAndFeeContent(state: SendStates.FeeState?, clickIntents: S ) { feeSelector(state, clickIntents) if (feeSendState != null) { - customFee(feeSendState) + customFee(feeSendState = feeSendState, hasNotifications = hasNotifications) } notifications(notifications = notifications, hasPaddingAbove = isCustomSelected) } @@ -55,13 +56,18 @@ private fun LazyListScope.feeSelector(state: SendStates.FeeState, clickIntents: } @OptIn(ExperimentalFoundationApi::class) -internal fun LazyListScope.customFee(feeSendState: FeeSelectorState.Content, modifier: Modifier = Modifier) { +internal fun LazyListScope.customFee( + feeSendState: FeeSelectorState.Content, + hasNotifications: Boolean, + modifier: Modifier = Modifier, +) { item( key = FEE_CUSTOM_KEY, ) { SendCustomFeeEthereum( customValues = feeSendState.customValues, selectedFee = feeSendState.selectedFee, + hasNotifications = hasNotifications, modifier = modifier .fillMaxWidth() .animateItemPlacement() diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt index 3a31549af5..93910bc2a6 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/recipient/SendRecipientContent.kt @@ -182,7 +182,7 @@ private fun LazyListScope.listItem( .then( if (isLast && index == list.lastIndex) { Modifier - .padding(bottom = TangemTheme.dimens.spacing12) + .padding(bottom = TangemTheme.dimens.spacing72) .clip( shape = RoundedCornerShape( bottomStart = TangemTheme.dimens.radius16,