diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt index fb75bc6474..41076760dc 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconRequest.kt @@ -5,7 +5,6 @@ import android.widget.TextView import androidx.constraintlayout.utils.widget.ImageFilterView import coil.imageLoader import coil.request.ImageRequest -import coil.transform.RoundedCornersTransformation import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.IconsUtil import com.tangem.blockchain.common.Token @@ -21,13 +20,13 @@ private const val QCX = "QCX" private const val VOYR = "VOYRME" fun loadCurrencyIcon( - currencyImageView: ImageFilterView, + currencyImageView: CurrencyIconView, currencyTextView: TextView, token: Token?, blockchain: Blockchain, ) { CurrencyIconLoader( - currencyImageView = currencyImageView, + currencyImageView = currencyImageView.imageView, currencyTextView = currencyTextView, token = token, blockchain = blockchain @@ -135,14 +134,6 @@ private inline fun ImageView.loadIcon( .placeholder(placeholderRes) .error(placeholderRes) .fallback(placeholderRes) - .transformations( - RoundedCornersTransformation( - topLeft = 32f, - topRight = 32f, - bottomLeft = 32f, - bottomRight = 32f - ) - ) .listener( onStart = { onStart() }, onSuccess = { _, _ -> onSuccess() }, diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt new file mode 100644 index 0000000000..35d89aaa27 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt @@ -0,0 +1,30 @@ +package com.tangem.tap.features.wallet.ui.images + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.utils.widget.ImageFilterView +import com.google.android.material.card.MaterialCardView +import com.tangem.tangem_sdk_new.extensions.dpToPx +import com.tangem.wallet.databinding.ViewCurrencyIconBinding + +class CurrencyIconView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, +) : MaterialCardView(context, attrs, defStyleAttr) { + private val binding = ViewCurrencyIconBinding.inflate( + LayoutInflater.from(context), + this + ) + + val imageView: ImageFilterView + get() = binding.iv + + init { + elevation = 0f + cardElevation = 0f + radius = dpToPx(8f) + background = null + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rectangle_rounded_8.xml b/app/src/main/res/drawable/shape_rectangle_rounded_8.xml index a788f39093..4f20cb0e64 100644 --- a/app/src/main/res/drawable/shape_rectangle_rounded_8.xml +++ b/app/src/main/res/drawable/shape_rectangle_rounded_8.xml @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_currency_wallet.xml b/app/src/main/res/layout/item_currency_wallet.xml index 7f145c3e1d..9ac49b1ad9 100644 --- a/app/src/main/res/layout/item_currency_wallet.xml +++ b/app/src/main/res/layout/item_currency_wallet.xml @@ -16,34 +16,32 @@ android:elevation="3dp"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:animateLayoutChanges="true" + android:clipToPadding="false"> - + - + app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/view_currency_icon.xml b/app/src/main/res/layout/view_currency_icon.xml new file mode 100644 index 0000000000..6859d75600 --- /dev/null +++ b/app/src/main/res/layout/view_currency_icon.xml @@ -0,0 +1,21 @@ + + + + + +