Updated on 2026-08-14

2023-11-23 15:29:21 +03:00 · 2023-11-23 15:29:21 +03:00 · 464f8f8a80
commit 464f8f8a80
parent f80c30c206
14 changed files with 115 additions and 102 deletions
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/states/ChooseProviderBottomSheetConfig.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/states/ChooseProviderBottomSheetConfig.kt
@ -3,7 +3,7 @@ package com.tangem.feature.swap.models.states
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
 import kotlinx.collections.immutable.ImmutableList

-class ChooseProviderBottomSheetConfig(
+data class ChooseProviderBottomSheetConfig(
    val selectedProviderId: String,
    val providers: ImmutableList<ProviderState>,
 ) : TangemBottomSheetConfigContent
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt
@ -1,12 +1,15 @@
 package com.tangem.feature.swap.ui

 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet
@ -52,17 +55,24 @@ private fun ChooseProviderBottomSheetContent(content: ChooseProviderBottomSheetC
                .background(
                    color = TangemTheme.colors.background.action,
                    shape = TangemTheme.shapes.roundedCornersXMedium,
-                ),
+                )
+                .clip(shape = TangemTheme.shapes.roundedCornersXMedium),
+            verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
        ) {
-            content.providers.forEach {
-                val isSelected = it.id == content.selectedProviderId
+            content.providers.forEach { provider ->
+                val isSelected = provider.id == content.selectedProviderId
                ProviderItem(
-                    state = it,
+                    state = provider,
                    isSelected = isSelected,
-                    modifier = Modifier.padding(
-                        horizontal = TangemTheme.dimens.spacing12,
-                        vertical = TangemTheme.dimens.spacing12,
-                    ),
+                    modifier = Modifier
+                        .clickable(
+                            enabled = provider.onProviderClick != null,
+                            onClick = { provider.onProviderClick?.invoke(provider.id) },
+                        )
+                        .padding(
+                            horizontal = TangemTheme.dimens.spacing12,
+                            vertical = TangemTheme.dimens.spacing12,
+                        ),
                )
            }
        }
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ProviderItem.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ProviderItem.kt
@ -1,7 +1,6 @@
 package com.tangem.feature.swap.ui

 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
@ -35,9 +34,9 @@ private val GrayscaleColorFilter: ColorFilter
    get() = ColorFilter.colorMatrix(ColorMatrix().apply { setToSaturation(GRAY_SCALE_SATURATION) })

@Composable
-fun ProviderItemBlock(state: ProviderState) {
+fun ProviderItemBlock(state: ProviderState, modifier: Modifier = Modifier) {
    if (state !is ProviderState.Empty) {
-        BaseContainer(state) {
+        BaseContainer(modifier = modifier) {
            ProviderItem(
                state = state,
                modifier = Modifier.align(Alignment.CenterStart),
@ -279,17 +278,14 @@ private fun BoxScope.ProviderChevron(state: ProviderState.Content, isSelected: B
 }

@Composable
-private fun BaseContainer(state: ProviderState, content: @Composable BoxScope.() -> Unit) {
+private fun BaseContainer(modifier: Modifier = Modifier, content: @Composable BoxScope.() -> Unit) {
    Box(
-        modifier = Modifier
+        modifier = modifier
            .background(
                color = TangemTheme.colors.background.action,
                shape = TangemTheme.shapes.roundedCornersXMedium,
            )
-            .clickable(
-                enabled = state.onProviderClick != null,
-                onClick = { state.onProviderClick?.invoke(state.id) },
-            )
+            .clip(shape = TangemTheme.shapes.roundedCornersXMedium)
            .fillMaxWidth()
            .defaultMinSize(minHeight = TangemTheme.dimens.size68),
    ) {
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@ -270,6 +270,7 @@ internal class StateBuilder(
            providerState = swapProvider.convertToContentClickableProviderState(
                fromTokenInfo = quoteModel.fromTokenInfo,
                toTokenInfo = quoteModel.toTokenInfo,
+                selectionType = ProviderState.SelectionType.CLICK,
                onProviderClick = actions.onProviderClick,
            ),
        )
@ -759,6 +760,21 @@ internal class StateBuilder(
        )
    }

+    fun updateSelectedProvider(uiState: SwapStateHolder, selectedProviderId: String): SwapStateHolder {
+        val config = uiState.bottomSheetConfig?.content as? ChooseProviderBottomSheetConfig
+        return if (config != null) {
+            uiState.copy(
+                bottomSheetConfig = uiState.bottomSheetConfig.copy(
+                    content = config.copy(
+                        selectedProviderId = selectedProviderId,
+                    ),
+                ),
+            )
+        } else {
+            uiState
+        }
+    }
+
    private fun Map.Entry<SwapProvider, SwapState>.convertToProviderState(
        onProviderSelect: (String) -> Unit,
    ): ProviderState? {
@ -766,9 +782,10 @@ internal class StateBuilder(
        return when (val state = this.value) {
            is SwapState.EmptyAmountState -> null
            is SwapState.QuotesLoadedState -> provider.convertToContentClickableProviderState(
-                state.fromTokenInfo,
-                state.toTokenInfo,
+                fromTokenInfo = state.fromTokenInfo,
+                toTokenInfo = state.toTokenInfo,
                onProviderClick = onProviderSelect,
+                selectionType = ProviderState.SelectionType.SELECT,
            )
            is SwapState.SwapError -> null
        }
@ -806,6 +823,7 @@ internal class StateBuilder(
    private fun SwapProvider.convertToContentClickableProviderState(
        fromTokenInfo: TokenSwapInfo,
        toTokenInfo: TokenSwapInfo,
+        selectionType: ProviderState.SelectionType,
        onProviderClick: (String) -> Unit,
    ): ProviderState {
        val rate = toTokenInfo.tokenAmount.value.divide(
@ -818,12 +836,12 @@ internal class StateBuilder(
        val rateString = "1 $fromCurrencySymbol ≈ $rate $toCurrencySymbol"
        return ProviderState.Content(
            id = this.providerId,
-            name = this.name ?: "",
-            iconUrl = this.imageLarge ?: "",
+            name = this.name,
+            iconUrl = this.imageLarge,
            type = this.type.toString(),
            rate = rateString,
            additionalBadge = ProviderState.AdditionalBadge.BestTrade,
-            selectionType = ProviderState.SelectionType.CLICK,
+            selectionType = selectionType,
            percentLowerThenBest = null,
            onProviderClick = onProviderClick,
        )
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreen.kt
@ -1,7 +1,6 @@
 package com.tangem.feature.swap.ui

 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.*
 import androidx.compose.material3.*
@ -12,7 +11,6 @@ import com.tangem.feature.swap.models.SwapStateHolder
 import com.tangem.feature.swap.models.states.ChooseProviderBottomSheetConfig
 import com.tangem.feature.swap.models.states.GivePermissionBottomSheetConfig

-@OptIn(ExperimentalLayoutApi::class)
@Composable
 internal fun SwapScreen(stateHolder: SwapStateHolder) {
    BackHandler(onBack = stateHolder.onBackClicked)
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
@ -68,7 +68,14 @@ internal fun SwapScreenContent(state: SwapStateHolder, modifier: Modifier = Modi
            ) {
                MainInfo(state)

-                ProviderItemBlock(state = state.providerState)
+                ProviderItemBlock(
+                    state = state.providerState,
+                    modifier = Modifier
+                        .clickable(
+                            enabled = state.providerState.onProviderClick != null,
+                            onClick = { state.providerState.onProviderClick?.invoke(state.providerState.id) },
+                        ),
+                )

                FeeItem(feeState = state.fee, currency = state.networkCurrency)

--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@ -621,6 +621,7 @@ internal class SwapViewModel @Inject constructor(
                val swapState = dataState.lastLoadedSwapStates[provider]
                val fromToken = dataState.fromCryptoCurrency
                if (provider != null && swapState != null && fromToken != null) {
+                    uiState = stateBuilder.updateSelectedProvider(uiState, provider.providerId)
                    setupLoadedState(
                        provider = provider,
                        state = swapState,