Updated on 2026-08-14

2024-06-26 19:09:46 +04:00 · 2024-06-26 19:09:46 +04:00 · 1fbf2debcd
commit 1fbf2debcd
parent e2403d5f5f
35 changed files with 169 additions and 156 deletions
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
@ -1,6 +1,6 @@
 package com.tangem.feature.swap.converters

-import com.tangem.core.ui.components.currency.tokenicon.TokenIconState
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.utils.BigDecimalFormatter
 import com.tangem.domain.appcurrency.model.AppCurrency
@ -11,8 +11,8 @@ import com.tangem.feature.swap.models.CurrenciesGroupWithFromCurrency
 import com.tangem.feature.swap.models.SwapSelectTokenStateHolder
 import com.tangem.feature.swap.models.TokenBalanceData
 import com.tangem.feature.swap.models.TokenToSelectState
-import com.tangem.utils.Provider
 import com.tangem.feature.swap.presentation.R
+import com.tangem.utils.Provider
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.toImmutableList

@ -76,10 +76,10 @@ class TokensDataConverter(
        )
    }

-    private fun convertIcon(currency: CryptoCurrency, isAvailable: Boolean): TokenIconState {
+    private fun convertIcon(currency: CryptoCurrency, isAvailable: Boolean): CurrencyIconState {
        return when (currency) {
            is CryptoCurrency.Coin -> {
-                TokenIconState.CoinIcon(
+                CurrencyIconState.CoinIcon(
                    url = currency.iconUrl,
                    fallbackResId = currency.networkIconResId,
                    isGrayscale = !isAvailable,
@ -90,11 +90,11 @@ class TokensDataConverter(
                val isGrayscale = currency.network.isTestnet
                val background = currency.tryGetBackgroundForTokenIcon(isGrayscale)
                val tint = getTintForTokenIcon(background)
-                TokenIconState.TokenIcon(
+                CurrencyIconState.TokenIcon(
                    url = currency.iconUrl,
                    isGrayscale = !isAvailable,
                    showCustomBadge = currency.isCustom,
-                    networkBadgeIconResId = currency.networkIconResId,
+                    topBadgeIconResId = currency.networkIconResId,
                    fallbackTint = tint,
                    fallbackBackground = background,
                )
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSelectTokenStateHolder.kt
@ -1,6 +1,6 @@
 package com.tangem.feature.swap.models

-import com.tangem.core.ui.components.currency.tokenicon.TokenIconState
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.extensions.TextReference
 import kotlinx.collections.immutable.ImmutableList

@ -20,7 +20,7 @@ sealed class TokenToSelectState {
        val id: String,
        val name: String,
        val symbol: String,
-        val tokenIcon: TokenIconState,
+        val tokenIcon: CurrencyIconState,
        val available: Boolean = true,
        val addedTokenBalanceData: TokenBalanceData? = null,
    ) : TokenToSelectState()
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSuccessStateHolder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapSuccessStateHolder.kt
@ -1,6 +1,6 @@
 package com.tangem.feature.swap.models

-import com.tangem.core.ui.components.currency.tokenicon.TokenIconState
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.extensions.TextReference

 data class SwapSuccessStateHolder(
@ -16,8 +16,8 @@ data class SwapSuccessStateHolder(
    val toTokenAmount: TextReference,
    val fromTokenFiatAmount: TextReference,
    val toTokenFiatAmount: TextReference,
-    val fromTokenIconState: TokenIconState?,
-    val toTokenIconState: TokenIconState?,
+    val fromTokenIconState: CurrencyIconState?,
+    val toTokenIconState: CurrencyIconState?,
    val onExploreButtonClick: () -> Unit,
    val onStatusButtonClick: () -> Unit,
 )
--- 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
@ -4,7 +4,7 @@ import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import com.tangem.common.ui.bottomsheets.state.*
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
-import com.tangem.core.ui.components.currency.tokenicon.converter.CryptoCurrencyToIconStateConverter
+import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
 import com.tangem.core.ui.components.notifications.NotificationConfig
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.utils.BigDecimalFormatter
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
@ -10,7 +10,7 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
@ -18,16 +18,19 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import com.tangem.core.ui.components.*
+import com.tangem.core.ui.components.SpacerH12
+import com.tangem.core.ui.components.SpacerW2
 import com.tangem.core.ui.components.appbar.ExpandableSearchView
-import com.tangem.core.ui.components.currency.tokenicon.TokenIcon
-import com.tangem.core.ui.components.currency.tokenicon.TokenIconState
+import com.tangem.core.ui.components.currency.icon.CurrencyIcon
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.decorations.roundedShapeItemDecoration
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.feature.swap.models.*
+import com.tangem.feature.swap.models.SwapSelectTokenStateHolder
+import com.tangem.feature.swap.models.TokenBalanceData
+import com.tangem.feature.swap.models.TokenToSelectState
 import com.tangem.feature.swap.presentation.R
 import com.tangem.utils.Strings
 import kotlinx.collections.immutable.ImmutableList
@ -212,7 +215,7 @@ private fun TokenItem(
            ),
        verticalAlignment = Alignment.CenterVertically,
    ) {
-        TokenIcon(
+        CurrencyIcon(
            state = token.tokenIcon,
            shouldDisplayNetwork = true,
        )
@ -280,7 +283,7 @@ private fun TokenItem(
 }

 private val token = TokenToSelectState.TokenToSelect(
-    tokenIcon = TokenIconState.CoinIcon(
+    tokenIcon = CurrencyIconState.CoinIcon(
        url = "",
        fallbackResId = 0,
        isGrayscale = false,
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
@ -12,7 +12,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.tangem.core.ui.components.*
 import com.tangem.core.ui.components.appbar.AppBarWithBackButton
-import com.tangem.core.ui.components.currency.tokenicon.TokenIconState
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.inputrow.InputRowBestRate
 import com.tangem.core.ui.components.inputrow.InputRowDefault
 import com.tangem.core.ui.components.inputrow.InputRowImage
@ -65,7 +65,7 @@ private fun SwapSuccessScreenContent(state: SwapSuccessStateHolder, padding: Pad
            title = TextReference.Res(R.string.swapping_from_title),
            subtitle = state.fromTokenAmount,
            caption = state.fromTokenFiatAmount,
-            tokenIconState = state.fromTokenIconState ?: TokenIconState.Loading,
+            tokenIconState = state.fromTokenIconState ?: CurrencyIconState.Loading,
            modifier = Modifier
                .clip(TangemTheme.shapes.roundedCornersXMedium)
                .background(TangemTheme.colors.background.action),
@ -76,7 +76,7 @@ private fun SwapSuccessScreenContent(state: SwapSuccessStateHolder, padding: Pad
            title = TextReference.Res(R.string.swapping_to_title),
            subtitle = state.toTokenAmount,
            caption = state.toTokenFiatAmount,
-            tokenIconState = state.toTokenIconState ?: TokenIconState.Loading,
+            tokenIconState = state.toTokenIconState ?: CurrencyIconState.Loading,
            modifier = Modifier
                .clip(TangemTheme.shapes.roundedCornersXMedium)
                .background(TangemTheme.colors.background.action),
@ -161,8 +161,8 @@ private val state = SwapSuccessStateHolder(
    toTokenAmount = TextReference.Str("1 000 MATIC"),
    fromTokenFiatAmount = TextReference.Str("1 000 $"),
    toTokenFiatAmount = TextReference.Str("1 000 $"),
-    fromTokenIconState = TokenIconState.Loading,
-    toTokenIconState = TokenIconState.Loading,
+    fromTokenIconState = CurrencyIconState.Loading,
+    toTokenIconState = CurrencyIconState.Loading,
    rate = TextReference.Str("1 000 DAI ~ 1 000 MATIC"),
    onExploreButtonClick = {},
    onStatusButtonClick = {},