From f51ee2eb30882e45e0a6779ce612764b3d0b2918 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 3 Dec 2020 14:02:18 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../details/ui/twins/CreateTwinWalletFragment.kt | 14 ++++++++++++++ .../details/ui/twins/TwinWalletWarningFragment.kt | 14 ++++++++++++++ .../tap/features/wallet/redux/WalletReducer.kt | 7 +++++++ .../tap/features/wallet/redux/WalletState.kt | 2 ++ .../wallet/ui/dialogs/TwinsOnboardingFragment.kt | 15 +++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/twins/CreateTwinWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/twins/CreateTwinWalletFragment.kt index 10c7bb5b43..01924048e8 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/twins/CreateTwinWalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/twins/CreateTwinWalletFragment.kt @@ -8,12 +8,14 @@ import androidx.core.content.ContextCompat.getColor import androidx.fragment.app.Fragment import androidx.transition.TransitionInflater import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.squareup.picasso.Picasso import com.tangem.Message import com.tangem.tap.domain.TwinCardNumber import com.tangem.tap.features.details.redux.DetailsAction import com.tangem.tap.features.details.redux.DetailsState import com.tangem.tap.features.details.redux.twins.CreateTwinWallet import com.tangem.tap.features.details.redux.twins.CreateTwinWalletStep +import com.tangem.tap.features.wallet.redux.Artwork import com.tangem.tap.store import com.tangem.wallet.R import kotlinx.android.synthetic.main.fragment_details_twin_cards.* @@ -56,6 +58,18 @@ class CreateTwinWalletFragment : Fragment(R.layout.fragment_details_twin_cards), toolbar.setNavigationOnClickListener { store.dispatch(DetailsAction.CreateTwinWalletAction.Cancel) } + + Picasso.get() + .load(Artwork.TWIN_CARD_1) + .placeholder(R.drawable.card_placeholder) + ?.error(R.drawable.card_placeholder) + ?.into(iv_card_1) + + Picasso.get() + .load(Artwork.TWIN_CARD_2) + .placeholder(R.drawable.card_placeholder) + ?.error(R.drawable.card_placeholder) + ?.into(iv_card_2) } diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/twins/TwinWalletWarningFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/twins/TwinWalletWarningFragment.kt index 9896b988f7..40d31fc11e 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/twins/TwinWalletWarningFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/twins/TwinWalletWarningFragment.kt @@ -5,12 +5,15 @@ import android.view.View import androidx.activity.OnBackPressedCallback import androidx.fragment.app.Fragment import androidx.transition.TransitionInflater +import com.squareup.picasso.Picasso import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.features.details.redux.DetailsAction import com.tangem.tap.features.details.redux.twins.CreateTwinWallet +import com.tangem.tap.features.wallet.redux.Artwork import com.tangem.tap.store import com.tangem.wallet.R import kotlinx.android.synthetic.main.fragment_details_twin_cards_warning.* +import kotlinx.android.synthetic.main.layout_twin_cards_orange.* class TwinWalletWarningFragment : Fragment(R.layout.fragment_details_twin_cards_warning) { @@ -35,6 +38,17 @@ class TwinWalletWarningFragment : Fragment(R.layout.fragment_details_twin_cards_ null, createTwinWallet = CreateTwinWallet.RecreateWallet )) } + Picasso.get() + .load(Artwork.TWIN_CARD_1) + .placeholder(R.drawable.card_placeholder) + ?.error(R.drawable.card_placeholder) + ?.into(iv_twin_card_1) + + Picasso.get() + .load(Artwork.TWIN_CARD_2) + .placeholder(R.drawable.card_placeholder) + ?.error(R.drawable.card_placeholder) + ?.into(iv_twin_card_2) } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt index 05436a495a..7fe82a18f5 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt @@ -11,6 +11,7 @@ import com.tangem.tap.common.extensions.toFormattedString import com.tangem.tap.common.extensions.toQrCode import com.tangem.tap.common.redux.AppState import com.tangem.tap.domain.TapError +import com.tangem.tap.domain.TwinCardNumber import com.tangem.tap.domain.getFirstToken import com.tangem.tap.features.wallet.models.removeUnknownTransactions import com.tangem.tap.features.wallet.models.toPendingTransactions @@ -164,6 +165,12 @@ private fun internalReduce(action: Action, state: AppState): WalletState { Artwork.SERGIO_CARD_URL } else if (action.card.cardId.startsWith(Artwork.MARTA_CARD_ID)) { Artwork.MARTA_CARD_URL + } else if (newState.twinCardsState?.cardNumber != null) { + when (newState.twinCardsState?.cardNumber) { + TwinCardNumber.First -> Artwork.TWIN_CARD_1 + TwinCardNumber.Second -> Artwork.TWIN_CARD_2 + null -> Artwork.DEFAULT_IMG_URL + } } else { Artwork.DEFAULT_IMG_URL } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt index 7593182093..29ef153b3d 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt @@ -93,6 +93,8 @@ data class Artwork( const val MARTA_CARD_URL = "https://app.tangem.com/cards/card_tg083.png" const val SERGIO_CARD_ID = "BC01" const val MARTA_CARD_ID = "BC02" + const val TWIN_CARD_1 = "https://app.tangem.com/cards/card_tg085.png" + const val TWIN_CARD_2 = "https://app.tangem.com/cards/card_tg086.png" } } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/TwinsOnboardingFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/TwinsOnboardingFragment.kt index 799b4e0789..dde5046558 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/TwinsOnboardingFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/TwinsOnboardingFragment.kt @@ -5,12 +5,15 @@ import android.view.View import androidx.activity.OnBackPressedCallback import androidx.fragment.app.Fragment import androidx.transition.TransitionInflater +import com.squareup.picasso.Picasso import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction +import com.tangem.tap.features.wallet.redux.Artwork import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.store import com.tangem.wallet.R import kotlinx.android.synthetic.main.fragment_twin_cards.* +import kotlinx.android.synthetic.main.layout_twin_cards.* class TwinsOnboardingFragment : Fragment(R.layout.fragment_twin_cards) { @@ -36,6 +39,18 @@ class TwinsOnboardingFragment : Fragment(R.layout.fragment_twin_cards) { tv_twin_cards_description_1.text = text setOnClickListeners() + + Picasso.get() + .load(Artwork.TWIN_CARD_1) + .placeholder(R.drawable.card_placeholder) + ?.error(R.drawable.card_placeholder) + ?.into(iv_twin_card_1) + + Picasso.get() + .load(Artwork.TWIN_CARD_2) + .placeholder(R.drawable.card_placeholder) + ?.error(R.drawable.card_placeholder) + ?.into(iv_twin_card_2) } private fun setOnClickListeners() {