diff --git a/app/src/main/java/com/tangem/tap/common/DialogManager.kt b/app/src/main/java/com/tangem/tap/common/DialogManager.kt index 19dd6168cb..8af2818c0a 100644 --- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt +++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt @@ -19,7 +19,11 @@ import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.AddMoreBack import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.BackupInProgressDialog import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.ConfirmDiscardingBackupDialog import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.UnfinishedBackupFoundDialog +import com.tangem.tap.features.wallet.redux.WalletDialog +import com.tangem.tap.features.wallet.ui.dialogs.AmountToSendBottomSheetDialog +import com.tangem.tap.features.wallet.ui.dialogs.ChooseTradeActionBottomSheetDialog import com.tangem.tap.features.wallet.ui.dialogs.ScanFailsDialog +import com.tangem.tap.features.wallet.ui.dialogs.SignedHashesWarningDialog import com.tangem.tap.features.wallet.ui.dialogs.SimpleOkDialog import com.tangem.tap.features.wallet.ui.wallet.CurrencySelectionDialog import com.tangem.tap.store @@ -60,8 +64,6 @@ class DialogManager : StoreSubscriber { is AppDialog.ScanFailsDialog -> ScanFailsDialog.create(context) is AppDialog.AddressInfoDialog -> AddressInfoBottomSheetDialog(state.dialog, context) is AppDialog.TestActionsDialog -> TestActionsBottomSheetDialog(state.dialog, context) - is AppDialog.CurrencySelectionDialog -> - CurrencySelectionDialog.create(state.dialog, context) is TwinCardsAction.Wallet.ShowInterruptDialog -> CreateWalletInterruptDialog.create(state.dialog, context) is WalletConnectDialog.UnsupportedCard -> @@ -105,6 +107,14 @@ class DialogManager : StoreSubscriber { is BackupDialog.BackupInProgress -> BackupInProgressDialog.create(context) is BackupDialog.UnfinishedBackupFound -> UnfinishedBackupFoundDialog.create(context) is BackupDialog.ConfirmDiscardingBackup -> ConfirmDiscardingBackupDialog.create(context) + is WalletDialog.CurrencySelectionDialog -> + CurrencySelectionDialog.create(state.dialog, context) + is WalletDialog.ChooseTradeActionDialog -> + ChooseTradeActionBottomSheetDialog(context) + is WalletDialog.SelectAmountToSendDialog -> + AmountToSendBottomSheetDialog(context, state.dialog) + is WalletDialog.SignedHashesMultiWalletDialog -> + SignedHashesWarningDialog.create(context) else -> null } dialog?.show() diff --git a/app/src/main/java/com/tangem/tap/common/redux/StateDialog.kt b/app/src/main/java/com/tangem/tap/common/redux/StateDialog.kt index 6181bbbc44..591a20e896 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/StateDialog.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/StateDialog.kt @@ -2,7 +2,6 @@ package com.tangem.tap.common.redux import com.tangem.common.extensions.VoidCallback import com.tangem.tap.common.TestAction -import com.tangem.tap.common.entities.FiatCurrency import com.tangem.tap.features.wallet.redux.AddressData import com.tangem.tap.features.wallet.redux.Currency @@ -28,9 +27,4 @@ sealed class AppDialog : StateDialog { data class TestActionsDialog( val actionsList: List ) : AppDialog() - - data class CurrencySelectionDialog( - val currenciesList: List, - val currentAppCurrency: FiatCurrency, - ) : AppDialog() } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/FirstStoriesContent.kt b/app/src/main/java/com/tangem/tap/features/home/compose/FirstStoriesContent.kt index 6bb3d25b87..30e72ec626 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/FirstStoriesContent.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/FirstStoriesContent.kt @@ -8,7 +8,11 @@ import androidx.compose.animation.core.tween import androidx.compose.animation.scaleIn import androidx.compose.animation.slideInVertically import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.mutableStateOf diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt index ce2ce4b63d..48712bb6d7 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt @@ -121,10 +121,8 @@ sealed class WalletAction : Action { data class Send(val amount: Amount? = null) : WalletAction() { data class ChooseCurrency(val amounts: List?) : WalletAction() - object Cancel : WalletAction() } - object EmptyField : WalletAction(), ErrorAction { override val error = TapError.PayIdEmptyField } @@ -137,13 +135,18 @@ sealed class WalletAction : Action { data class ShareAddress(val address: String, val context: Context) : WalletAction() - object ShowDialog : WalletAction() { - object QrCode : WalletAction() - object SignedHashesMultiWalletDialog : WalletAction() - object ChooseTradeActionDialog : WalletAction() - } + sealed class DialogAction : WalletAction() { + data class QrCode( + val currency: Currency, + val selectedAddress: AddressData, + ) : DialogAction() - object HideDialog : WalletAction() + object SignedHashesMultiWalletDialog : DialogAction() + object ChooseTradeActionDialog : DialogAction() + data class ChooseCurrency(val amounts: List?) : DialogAction() + + object Hide : DialogAction() + } data class ExploreAddress(val exploreUrl: String, val context: Context) : WalletAction() 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 f5b14fe589..df341d3e17 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 @@ -15,6 +15,7 @@ import com.tangem.domain.common.extensions.canHandleToken import com.tangem.domain.common.extensions.toCoinId import com.tangem.domain.features.addCustomToken.CustomCurrency import com.tangem.tap.common.entities.Button +import com.tangem.tap.common.entities.FiatCurrency import com.tangem.tap.common.extensions.toQrCode import com.tangem.tap.common.redux.StateDialog import com.tangem.tap.common.redux.global.CryptoCurrencyName @@ -47,7 +48,6 @@ data class WalletState( val error: ErrorType? = null, val cardImage: Artwork? = null, val hashesCountVerified: Boolean? = null, - val walletDialog: StateDialog? = null, val mainWarningsList: List = mutableListOf(), val wallets: List = listOf(), val isMultiwalletAllowed: Boolean = false, @@ -301,10 +301,14 @@ data class WalletState( } } -sealed class WalletDialog : StateDialog { - data class SelectAmountToSendDialog(val amounts: List?) : WalletDialog() - object SignedHashesMultiWalletDialog : WalletDialog() - object ChooseTradeActionDialog : WalletDialog() +sealed interface WalletDialog : StateDialog { + data class SelectAmountToSendDialog(val amounts: List?) : WalletDialog + object SignedHashesMultiWalletDialog : WalletDialog + object ChooseTradeActionDialog : WalletDialog + data class CurrencySelectionDialog( + val currenciesList: List, + val currentAppCurrency: FiatCurrency, + ) : WalletDialog } enum class ProgressState : WidgetState { Loading, Done, Error } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt index 3c9c87e9f8..904aecab65 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt @@ -5,10 +5,10 @@ import com.tangem.network.api.tangemTech.CurrenciesResponse import com.tangem.network.api.tangemTech.TangemTechService import com.tangem.tap.common.entities.FiatCurrency import com.tangem.tap.common.extensions.dispatchDialogShow -import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.domain.TapWalletManager import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.features.wallet.redux.WalletDialog import com.tangem.tap.persistence.FiatCurrenciesPrefStorage import com.tangem.tap.scope import com.tangem.tap.store @@ -31,7 +31,7 @@ class AppCurrencyMiddleware( val storedFiatCurrencies = fiatCurrenciesPrefStorage.restore() if (storedFiatCurrencies.isNotEmpty()) { store.dispatchDialogShow( - AppDialog.CurrencySelectionDialog( + WalletDialog.CurrencySelectionDialog( currenciesList = storedFiatCurrencies.mapToUiModel(), currentAppCurrency = appCurrencyProvider.invoke() ) @@ -47,7 +47,7 @@ class AppCurrencyMiddleware( ) { fiatCurrenciesPrefStorage.save(currenciesList) store.dispatchDialogShow( - AppDialog.CurrencySelectionDialog( + WalletDialog.CurrencySelectionDialog( currenciesList = currenciesList.mapToUiModel(), currentAppCurrency = appCurrencyProvider.invoke() ) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt new file mode 100644 index 0000000000..e495c55c94 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt @@ -0,0 +1,39 @@ +package com.tangem.tap.features.wallet.redux.middlewares + +import com.tangem.tap.common.extensions.dispatchDialogHide +import com.tangem.tap.common.extensions.dispatchDialogShow +import com.tangem.tap.common.redux.AppDialog +import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.features.wallet.redux.WalletDialog +import com.tangem.tap.store + +class WalletDialogsMiddleware { + fun handle(action: WalletAction.DialogAction) { + when (action) { + is WalletAction.DialogAction.SignedHashesMultiWalletDialog -> { + store.dispatchDialogShow(WalletDialog.SignedHashesMultiWalletDialog) + } + is WalletAction.DialogAction.ChooseTradeActionDialog -> { + store.dispatchDialogShow(WalletDialog.ChooseTradeActionDialog) + } + is WalletAction.DialogAction.QrCode -> { + store.dispatchDialogShow( + AppDialog.AddressInfoDialog( + currency = action.currency, + addressData = action.selectedAddress, + ) + ) + } + is WalletAction.DialogAction.ChooseCurrency -> { + store.dispatchDialogShow( + WalletDialog.SelectAmountToSendDialog( + amounts = action.amounts + ) + ) + } + is WalletAction.DialogAction.Hide -> { + store.dispatchDialogHide() + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt index e2d7c6d4b5..369a3955e0 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt @@ -17,12 +17,10 @@ import com.tangem.operations.attestation.OnlineCardVerifier import com.tangem.tap.common.analytics.Analytics import com.tangem.tap.common.extensions.copyToClipboard import com.tangem.tap.common.extensions.dispatchDebugErrorNotification -import com.tangem.tap.common.extensions.dispatchDialogShow import com.tangem.tap.common.extensions.dispatchOnMain import com.tangem.tap.common.extensions.onCardScanned import com.tangem.tap.common.extensions.shareText import com.tangem.tap.common.extensions.stripZeroPlainString -import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.common.redux.navigation.AppScreen @@ -58,6 +56,7 @@ class WalletMiddleware { private val tradeCryptoMiddleware = TradeCryptoMiddleware() private val warningsMiddleware = WarningsMiddleware() private val multiWalletMiddleware = MultiWalletMiddleware() + private val walletDialogMiddleware = WalletDialogsMiddleware() private val appCurrencyMiddleware by lazy(mode = LazyThreadSafetyMode.NONE) { AppCurrencyMiddleware( tangemTechService = store.state.domainNetworks.tangemTechService, @@ -91,6 +90,7 @@ class WalletMiddleware { globalState ) is WalletAction.AppCurrencyAction -> appCurrencyMiddleware.handle(action) + is WalletAction.DialogAction -> walletDialogMiddleware.handle(action) is WalletAction.LoadWallet -> { scope.launch { if (action.blockchain == null) { @@ -242,15 +242,6 @@ class WalletMiddleware { store.dispatch(NavigationAction.NavigateTo(AppScreen.Send)) } } - is WalletAction.ShowDialog.QrCode -> { - val selectedWalletData = - walletState.getWalletData(walletState.selectedCurrency) ?: return - val selectedAddressData = - selectedWalletData.walletAddresses?.selectedAddress ?: return - - val currency = selectedWalletData.currency - store.dispatchDialogShow(AppDialog.AddressInfoDialog(currency, selectedAddressData)) - } } } @@ -272,7 +263,7 @@ class WalletMiddleware { is Currency.Blockchain -> { val amountToSend = amounts?.find { it.currencySymbol == currency.blockchain.currency } - ?: return WalletAction.Send.ChooseCurrency(amounts) + ?: return WalletAction.DialogAction.ChooseCurrency(amounts) PrepareSendScreen( coinAmount = amountToSend, coinRate = selectedWalletData.fiatRate, @@ -282,7 +273,7 @@ class WalletMiddleware { is Currency.Token -> { val amountToSend = amounts?.find { it.currencySymbol == currency.token.symbol } - ?: return WalletAction.Send.ChooseCurrency(amounts) + ?: return WalletAction.DialogAction.ChooseCurrency(amounts) prepareSendActionForToken( amount = amountToSend, state = state, diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt index 65e89b0d83..7cf3776bd9 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt @@ -284,21 +284,6 @@ private fun internalReduce(action: Action, state: AppState): WalletState { } newState = newState.copy(cardImage = Artwork(artworkId = artworkUrl)) } - is WalletAction.ShowDialog.SignedHashesMultiWalletDialog -> { - newState = newState.copy(walletDialog = WalletDialog.SignedHashesMultiWalletDialog) - } - is WalletAction.ShowDialog.ChooseTradeActionDialog -> { - newState = newState.copy(walletDialog = WalletDialog.ChooseTradeActionDialog) - } - is WalletAction.HideDialog -> { - newState = newState.copy(walletDialog = null) - } - is WalletAction.Send.ChooseCurrency -> { - newState = newState.copy( - walletDialog = WalletDialog.SelectAmountToSendDialog(action.amounts) - ) - } - is WalletAction.Send.Cancel -> newState = newState.copy(walletDialog = null) is WalletAction.TradeCryptoAction -> return newState is WalletAction.ChangeSelectedAddress -> { val selectedWalletData = newState.getWalletData(newState.selectedCurrency) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt index 1613621c1c..6c652d40c8 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt @@ -1,8 +1,11 @@ package com.tangem.tap.features.wallet.ui -import android.app.Dialog import android.os.Bundle -import android.view.* +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup import android.widget.TextView import androidx.activity.OnBackPressedCallback import androidx.annotation.ColorRes @@ -15,17 +18,28 @@ import by.kirich1409.viewbindingdelegate.viewBinding import com.squareup.picasso.Picasso import com.tangem.tap.common.SnackbarHandler import com.tangem.tap.common.TestActions -import com.tangem.tap.common.extensions.* +import com.tangem.tap.common.extensions.appendIfNotNull +import com.tangem.tap.common.extensions.beginDelayedTransition +import com.tangem.tap.common.extensions.fitChipsByGroupWidth +import com.tangem.tap.common.extensions.getColor +import com.tangem.tap.common.extensions.getString +import com.tangem.tap.common.extensions.hide +import com.tangem.tap.common.extensions.loadCurrenciesIcon +import com.tangem.tap.common.extensions.show +import com.tangem.tap.common.extensions.toQrCode import com.tangem.tap.common.recyclerView.SpaceItemDecoration -import com.tangem.tap.common.redux.StateDialog import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.domain.tokens.BlockchainNetwork import com.tangem.tap.features.onboarding.getQRReceiveMessage import com.tangem.tap.features.wallet.models.PendingTransaction -import com.tangem.tap.features.wallet.redux.* +import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.features.wallet.redux.ErrorType +import com.tangem.tap.features.wallet.redux.ProgressState +import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.features.wallet.redux.WalletData +import com.tangem.tap.features.wallet.redux.WalletState import com.tangem.tap.features.wallet.ui.adapters.PendingTransactionsAdapter import com.tangem.tap.features.wallet.ui.adapters.WalletDetailWarningMessagesAdapter -import com.tangem.tap.features.wallet.ui.dialogs.AmountToSendDialog import com.tangem.tap.features.wallet.ui.test.TestWalletDetails import com.tangem.tap.store import com.tangem.wallet.R @@ -37,7 +51,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), private lateinit var pendingTransactionAdapter: PendingTransactionsAdapter private lateinit var warningMessagesAdapter: WalletDetailWarningMessagesAdapter - private var dialog: Dialog? = null private val binding: FragmentWalletDetailsBinding by viewBinding(FragmentWalletDetailsBinding::bind) @@ -128,7 +141,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), setupBalanceData(selectedWallet.currencyData) setupButtons(selectedWallet) - handleDialogs(state.walletDialog) handleCurrencyIcon(selectedWallet) handleWarnings(selectedWallet) @@ -174,7 +186,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), rowButtons.updateButtonsVisibility( buyAllowed = selectedWallet.tradeCryptoState.buyingAllowed, sellAllowed = selectedWallet.tradeCryptoState.sellingAllowed, - sendAllowed = selectedWallet.mainButton.enabled + sendAllowed = selectedWallet.mainButton.enabled, ) } @@ -298,21 +310,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), } } - private fun handleDialogs(walletDialog: StateDialog?) { - when (walletDialog) { - is WalletDialog.SelectAmountToSendDialog -> { - if (dialog == null) dialog = AmountToSendDialog(requireContext()).apply { - this.show(walletDialog.amounts) - } - } - null -> { - dialog?.dismiss() - dialog = null - } - } - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { R.id.menu_remove -> { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt index 946e347a65..9014d5d4ff 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt @@ -10,7 +10,12 @@ import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.google.android.play.core.review.ReviewManagerFactory import com.tangem.tap.common.analytics.AnalyticsEvent -import com.tangem.tap.common.extensions.* +import com.tangem.tap.common.extensions.dispatchOpenUrl +import com.tangem.tap.common.extensions.getActivity +import com.tangem.tap.common.extensions.getColor +import com.tangem.tap.common.extensions.getString +import com.tangem.tap.common.extensions.hide +import com.tangem.tap.common.extensions.show import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.domain.configurable.warningMessage.WarningMessage import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager @@ -87,7 +92,7 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi when { warning.titleResId == R.string.warning_important_security_info -> { View.OnClickListener { - store.dispatch(WalletAction.ShowDialog.SignedHashesMultiWalletDialog) + store.dispatch(WalletAction.DialogAction.SignedHashesMultiWalletDialog) } } warning.messageResId == R.string.alert_funds_restoration_message -> { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendBottomSheetDialog.kt similarity index 80% rename from app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendDialog.kt rename to app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendBottomSheetDialog.kt index 69219eff90..2f9e597096 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/AmountToSendBottomSheetDialog.kt @@ -5,17 +5,25 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.ViewGroup import androidx.appcompat.view.ContextThemeWrapper -import androidx.recyclerview.widget.* +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView import com.google.android.material.bottomsheet.BottomSheetDialog import com.tangem.blockchain.common.Amount import com.tangem.tap.common.extensions.toFormattedString import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.features.wallet.redux.WalletDialog import com.tangem.tap.store import com.tangem.wallet.R import com.tangem.wallet.databinding.DialogWalletSendBinding import com.tangem.wallet.databinding.ItemWalletAmountToSendBinding -class AmountToSendDialog(context: Context) : BottomSheetDialog(context) { +class AmountToSendBottomSheetDialog( + context: Context, + private val dialog: WalletDialog.SelectAmountToSendDialog, +) : BottomSheetDialog(context) { var binding: DialogWalletSendBinding? = null @@ -25,12 +33,12 @@ class AmountToSendDialog(context: Context) : BottomSheetDialog(context) { setContentView(binding!!.root) } - fun show(amounts: List?) { + override fun show() { super.show() setOnDismissListener { binding = null - store.dispatch(WalletAction.Send.Cancel) + store.dispatch(WalletAction.DialogAction.Hide) } binding!!.rvAmountsToSend.layoutManager = LinearLayoutManager(context) @@ -43,7 +51,7 @@ class AmountToSendDialog(context: Context) : BottomSheetDialog(context) { val viewAdapter = ChooseAmountAdapter() binding!!.rvAmountsToSend.adapter = viewAdapter - viewAdapter.submitList(amounts) + viewAdapter.submitList(dialog.amounts) } } @@ -79,7 +87,7 @@ class ChooseAmountAdapter tvCurrencySymbol.text = amount.currencySymbol tvAmount.text = amount.value?.toFormattedString(amount.decimals) root.setOnClickListener { - store.dispatch(WalletAction.Send.Cancel) + store.dispatch(WalletAction.DialogAction.Hide) store.dispatch(WalletAction.Send(amount)) } } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt similarity index 87% rename from app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionDialog.kt rename to app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt index 93baaf29a3..1c65315d3a 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ChooseTradeActionBottomSheetDialog.kt @@ -8,7 +8,7 @@ import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.store import com.tangem.wallet.databinding.DialogWalletTradeBinding -class ChooseTradeActionDialog(context: Context) : BottomSheetDialog(context) { +class ChooseTradeActionBottomSheetDialog(context: Context) : BottomSheetDialog(context) { var binding: DialogWalletTradeBinding? = null @@ -23,7 +23,7 @@ class ChooseTradeActionDialog(context: Context) : BottomSheetDialog(context) { this.setOnDismissListener { binding = null - store.dispatch(WalletAction.HideDialog) + store.dispatch(WalletAction.DialogAction.Hide) } binding!!.dialogBtnBuy.setOnClickListener { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt index 9aaf4b88d6..609537bbaf 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt @@ -24,7 +24,7 @@ class SignedHashesWarningDialog { } setNegativeButton(R.string.common_cancel) { _, _ -> } setOnDismissListener { - store.dispatch(WalletAction.HideDialog) + store.dispatch(WalletAction.DialogAction.Hide) } }.create() } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt index f4da3e86ce..12efe010c8 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt @@ -33,13 +33,15 @@ internal class WalletDetailsButtonsRow @JvmOverloads constructor( } } - fun renderButtons( + fun updateButtonsVisibility( buyAllowed: Boolean, sellAllowed: Boolean, + sendAllowed: Boolean ) = with(binding) { btnBuy.isVisible = (buyAllowed && !sellAllowed) || (!buyAllowed && !sellAllowed) btnBuy.isEnabled = buyAllowed btnSell.isVisible = !buyAllowed && sellAllowed btnTrade.isVisible = buyAllowed && sellAllowed + btnSend.isEnabled = sendAllowed } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt index deab5c4759..78b665cde6 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt @@ -3,14 +3,14 @@ package com.tangem.tap.features.wallet.ui.wallet import android.content.Context import androidx.appcompat.app.AlertDialog import com.tangem.tap.common.extensions.dispatchDialogHide -import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.features.wallet.redux.WalletDialog import com.tangem.tap.store import com.tangem.wallet.R object CurrencySelectionDialog { fun create( - dialog: AppDialog.CurrencySelectionDialog, + dialog: WalletDialog.CurrencySelectionDialog, context: Context ): AlertDialog { val currenciesToShow = dialog.currenciesList diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt index 623f19e85d..b777d3ef00 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt @@ -1,6 +1,5 @@ package com.tangem.tap.features.wallet.ui.wallet -import android.app.Dialog import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import com.tangem.common.card.Card @@ -10,19 +9,16 @@ import com.tangem.tap.common.extensions.animateVisibility import com.tangem.tap.common.extensions.formatAmountAsSpannedString import com.tangem.tap.common.extensions.hide import com.tangem.tap.common.extensions.show -import com.tangem.tap.common.redux.StateDialog import com.tangem.tap.common.redux.navigation.AppScreen import com.tangem.tap.common.redux.navigation.NavigationAction import com.tangem.tap.currenciesRepository import com.tangem.tap.features.tokens.redux.TokensAction import com.tangem.tap.features.wallet.models.TotalBalance import com.tangem.tap.features.wallet.redux.WalletAction -import com.tangem.tap.features.wallet.redux.WalletDialog import com.tangem.tap.features.wallet.redux.WalletState import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.WalletFragment import com.tangem.tap.features.wallet.ui.adapters.WalletAdapter -import com.tangem.tap.features.wallet.ui.dialogs.SignedHashesWarningDialog import com.tangem.tap.store import com.tangem.wallet.R import com.tangem.wallet.databinding.FragmentWalletBinding @@ -32,7 +28,6 @@ class MultiWalletView : WalletView { private var fragment: WalletFragment? = null private var binding: FragmentWalletBinding? = null - private var dialog: Dialog? = null private lateinit var walletsAdapter: WalletAdapter @@ -122,7 +117,6 @@ class MultiWalletView : WalletView { store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens)) } handleErrorStates(state = state, binding = binding, fragment = fragment) - handleDialogs(state.walletDialog) } private fun handleTotalBalance( @@ -200,20 +194,4 @@ class MultiWalletView : WalletView { lButtonsLong.btnConfirmLong.text = fragment?.getText(R.string.wallet_button_create_wallet) } - - private fun handleDialogs(walletDialog: StateDialog?) { - val fragment = fragment ?: return - val context = fragment.context ?: return - when (walletDialog) { - is WalletDialog.SignedHashesMultiWalletDialog -> { - if (dialog == null) { - dialog = SignedHashesWarningDialog.create(context).apply { show() } - } - } - else -> { - dialog?.dismiss() - dialog = null - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt index d89a51f8c5..4fb9b0ca0b 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt @@ -1,6 +1,5 @@ package com.tangem.tap.features.wallet.ui.wallet -import android.app.Dialog import android.view.View import android.view.ViewGroup import android.widget.Button @@ -10,23 +9,18 @@ import com.tangem.tap.common.extensions.beginDelayedTransition import com.tangem.tap.common.extensions.fitChipsByGroupWidth import com.tangem.tap.common.extensions.hide import com.tangem.tap.common.extensions.show -import com.tangem.tap.common.redux.StateDialog import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState import com.tangem.tap.features.wallet.models.PendingTransaction import com.tangem.tap.features.wallet.redux.Currency import com.tangem.tap.features.wallet.redux.TradeCryptoState import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.features.wallet.redux.WalletData -import com.tangem.tap.features.wallet.redux.WalletDialog import com.tangem.tap.features.wallet.redux.WalletMainButton import com.tangem.tap.features.wallet.redux.WalletState import com.tangem.tap.features.wallet.ui.BalanceWidget import com.tangem.tap.features.wallet.ui.MultipleAddressUiHelper import com.tangem.tap.features.wallet.ui.WalletFragment import com.tangem.tap.features.wallet.ui.adapters.PendingTransactionsAdapter -import com.tangem.tap.features.wallet.ui.dialogs.AmountToSendDialog -import com.tangem.tap.features.wallet.ui.dialogs.ChooseTradeActionDialog -import com.tangem.tap.features.wallet.ui.dialogs.SignedHashesWarningDialog import com.tangem.tap.store import com.tangem.wallet.R import com.tangem.wallet.databinding.FragmentWalletBinding @@ -36,7 +30,6 @@ class SingleWalletView : WalletView { private lateinit var pendingTransactionAdapter: PendingTransactionsAdapter private var fragment: WalletFragment? = null private var binding: FragmentWalletBinding? = null - private var dialog: Dialog? = null override fun setFragment(fragment: WalletFragment, binding: FragmentWalletBinding) { this.fragment = fragment @@ -85,7 +78,6 @@ class SingleWalletView : WalletView { setupAddressCard(state.primaryWallet, binding) showPendingTransactionsIfPresent(state.primaryWallet.pendingTransactions) setupBalance(state, state.primaryWallet) - handleDialogs(state.walletDialog, fragment) } private fun showPendingTransactionsIfPresent(pendingTransactions: List) { @@ -158,7 +150,14 @@ class SingleWalletView : WalletView { } } lAddress.btnShowQr.setOnClickListener { - store.dispatch(WalletAction.ShowDialog.QrCode) + state.walletAddresses?.selectedAddress?.let { selectedAddress -> + store.dispatch( + WalletAction.DialogAction.QrCode( + currency = state.currency, + selectedAddress = selectedAddress + ) + ) + } } setupTradeButton(binding, state.tradeCryptoState) @@ -170,7 +169,7 @@ class SingleWalletView : WalletView { val action = when { allowedToBuy && !allowedToSell -> WalletAction.TradeCryptoAction.Buy !allowedToBuy && allowedToSell -> WalletAction.TradeCryptoAction.Sell - allowedToBuy && allowedToSell -> WalletAction.ShowDialog.ChooseTradeActionDialog + allowedToBuy && allowedToSell -> WalletAction.DialogAction.ChooseTradeActionDialog else -> null } val text = when { @@ -262,28 +261,4 @@ class SingleWalletView : WalletView { binding.lAddress.root.hide() } } - - private fun handleDialogs(walletDialog: StateDialog?, fragment: WalletFragment) { - val context = fragment.context ?: return - when (walletDialog) { - is WalletDialog.SelectAmountToSendDialog -> { - if (dialog == null) dialog = AmountToSendDialog(context).apply { - this.show(walletDialog.amounts) - } - } - is WalletDialog.SignedHashesMultiWalletDialog -> { - if (dialog == null) { - dialog = SignedHashesWarningDialog.create(context).apply { show() } - } - } - is WalletDialog.ChooseTradeActionDialog -> { - if (dialog == null) dialog = ChooseTradeActionDialog(context).apply { show() } - } - null -> { - dialog?.dismiss() - dialog = null - } - } - } - } \ No newline at end of file