diff --git a/app/build.gradle b/app/build.gradle index 446c060d9f..3dcd68f4e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -170,6 +170,8 @@ dependencies { implementation 'androidx.compose.ui:ui-tooling:1.1.1' implementation "com.google.accompanist:accompanist-appcompat-theme:0.23.0" + implementation "com.github.skydoves:androidveil:1.1.2" + implementation("io.coil-kt:coil:2.0.0-rc01") implementation("io.coil-kt:coil-compose:2.0.0-rc01") @@ -180,4 +182,4 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' -} \ No newline at end of file +} 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/extensions/Specific.kt b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt index ea112781c3..b431b780ad 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Specific.kt @@ -108,24 +108,22 @@ fun BigDecimal.isLessThanOrEqual(value: BigDecimal): Boolean { fun BigDecimal.formatAmountAsSpannedString( currencySymbol: String, - integerPartSizeProportion: Float = 1.4f + reminderPartSizeProportion: Float = 0.7f ): SpannedString { val amount = this .setScale(2, RoundingMode.HALF_UP) - .toString() + .formatWithSpaces() val integer = amount.substringBefore('.') val reminder = amount.substringAfter('.') return buildSpannedString { + append(integer) + append('.') append( - integer, - RelativeSizeSpan(integerPartSizeProportion), + "$reminder $currencySymbol", + RelativeSizeSpan(reminderPartSizeProportion), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE ) - append('.') - append(reminder) - append(' ') - append(currencySymbol) } } 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 0e4e83be59..020819f132 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 @@ -8,6 +8,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 @@ -32,7 +33,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, @@ -184,11 +184,11 @@ data class WalletState( .distinct().map { getWalletStore(it) }.mapNotNull { it?.updateWallets(walletsData) } return updateWalletStores(walletStores) - } fun updateWalletStore(walletStore: WalletStore?): WalletState { return copy(wallets = replaceWalletInWallets(walletStore)) + .updateTotalBalance() } private fun updateWalletStores(walletStores: List): WalletState { @@ -205,6 +205,7 @@ data class WalletState( } } return copy(wallets = updatedWallets + walletStoresMutable) + .updateTotalBalance() } fun removeWallet(walletData: WalletData?): WalletState { @@ -266,19 +267,30 @@ data class WalletState( } } - fun updateTotalBalance( - totalBalance: TotalBalance? - ): WalletState { - return this.copy( - totalBalance = totalBalance + private fun updateTotalBalance(): WalletState { + return if (wallets.isNotEmpty()) { + val walletsData = wallets.flatMap(WalletStore::walletsData) + this.copy( + totalBalance = TotalBalance( + state = walletsData.findTotalBalanceState(), + fiatAmount = walletsData.calculateTotalFiatAmount(), + fiatCurrency = store.state.globalState.appCurrency + ) + ) + } else this.copy( + totalBalance = null ) } } -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 a64e4a5368..e7e76c6226 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 @@ -15,7 +15,12 @@ import com.tangem.domain.common.extensions.withMainContext import com.tangem.operations.attestation.Attestation import com.tangem.operations.attestation.OnlineCardVerifier import com.tangem.tap.common.analytics.Analytics -import com.tangem.tap.common.extensions.* +import com.tangem.tap.common.extensions.copyToClipboard +import com.tangem.tap.common.extensions.dispatchDebugErrorNotification +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 @@ -28,7 +33,6 @@ import com.tangem.tap.features.home.redux.HomeAction import com.tangem.tap.features.send.redux.PrepareSendScreen import com.tangem.tap.features.wallet.models.PendingTransactionType import com.tangem.tap.features.wallet.models.getPendingTransactions -import com.tangem.tap.features.wallet.models.getSendableAmounts import com.tangem.tap.features.wallet.redux.* import com.tangem.tap.network.NetworkStateChanged import com.tangem.tap.preferencesStorage @@ -48,6 +52,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, @@ -81,6 +86,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) { @@ -232,15 +238,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)) - } } } @@ -262,7 +259,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, @@ -272,7 +269,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/MultiWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt index 054a46cf8a..40f046dc81 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt @@ -11,7 +11,13 @@ import com.tangem.tap.domain.tokens.BlockchainNetwork import com.tangem.tap.features.wallet.models.filterByToken import com.tangem.tap.features.wallet.models.getPendingTransactions import com.tangem.tap.features.wallet.models.removeUnknownTransactions -import com.tangem.tap.features.wallet.redux.* +import com.tangem.tap.features.wallet.models.toPendingTransactions +import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.features.wallet.redux.WalletData +import com.tangem.tap.features.wallet.redux.WalletMainButton +import com.tangem.tap.features.wallet.redux.WalletState +import com.tangem.tap.features.wallet.redux.WalletStore import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.BalanceWidgetData import com.tangem.tap.features.wallet.ui.TokenData @@ -126,7 +132,7 @@ class MultiWalletReducer { ), fiatAmountFormatted = tokenWalletData.fiatRate?.let { action.amount.value - ?.toFiatString(it, store.state.globalState.appCurrency.code) + ?.toFiatString(it, store.state.globalState.appCurrency.symbol) }, blockchainAmount = wallet.amounts[AmountType.Coin]?.value ?: BigDecimal.ZERO ), diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt index 34b6277cb6..29c21af331 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt @@ -12,7 +12,12 @@ import com.tangem.tap.domain.tokens.BlockchainNetwork import com.tangem.tap.features.wallet.models.filterByToken import com.tangem.tap.features.wallet.models.getPendingTransactions import com.tangem.tap.features.wallet.models.removeUnknownTransactions -import com.tangem.tap.features.wallet.redux.* +import com.tangem.tap.features.wallet.models.toPendingTransactions +import com.tangem.tap.features.wallet.redux.Currency +import com.tangem.tap.features.wallet.redux.ProgressState +import com.tangem.tap.features.wallet.redux.TradeCryptoState +import com.tangem.tap.features.wallet.redux.WalletMainButton +import com.tangem.tap.features.wallet.redux.WalletState import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.BalanceWidgetData import com.tangem.tap.features.wallet.ui.TokenData @@ -95,7 +100,7 @@ class OnWalletLoadedReducer { token.symbol ), fiatAmount = tokenFiatAmount, - fiatAmountFormatted = tokenFiatAmount?.toFormattedFiatValue(fiatCurrency.code) + fiatAmountFormatted = tokenFiatAmount?.toFormattedFiatValue(fiatCurrency.symbol) ), pendingTransactions = tokenPendingTransactions.removeUnknownTransactions(), mainButton = WalletMainButton.SendButton(isTokenSendButtonEnabled), @@ -112,9 +117,6 @@ class OnWalletLoadedReducer { } return walletState .updateWalletsData(wallets) - .updateTotalBalance( - totalBalance = obtainTotalBalance(wallets, fiatCurrency) - ) .copy( state = state, error = null diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt index b949fe11d9..06d91d7db0 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt @@ -1,37 +1,21 @@ package com.tangem.tap.features.wallet.redux.reducers -import com.tangem.tap.common.entities.FiatCurrency import com.tangem.tap.features.wallet.models.TotalBalance import com.tangem.tap.features.wallet.redux.WalletData import com.tangem.tap.features.wallet.ui.BalanceStatus import java.math.BigDecimal -fun obtainTotalBalance( - wallets: List, - appCurrency: FiatCurrency -): TotalBalance? { - return if (wallets.isNotEmpty()) { - TotalBalance( - state = wallets.findTotalBalanceState(), - fiatAmount = wallets.calculateTotalFiatAmount(), - fiatCurrency = appCurrency - ) - } else null -} - -private fun List.findTotalBalanceState(): TotalBalance.State { +fun List.findTotalBalanceState(): TotalBalance.State { return this.mapToTotalBalanceState() - .fold(initial = TotalBalance.State.Loading) { accState, newState -> - accState or newState - } + .reduce(TotalBalance.State::or) } -private fun List.calculateTotalFiatAmount(): BigDecimal { +fun List.calculateTotalFiatAmount(): BigDecimal { return this.map { it.currencyData.fiatAmount ?: BigDecimal.ZERO } .reduce(BigDecimal::plus) } -private fun List.mapToTotalBalanceState(): List { +fun List.mapToTotalBalanceState(): List { return this.map { when (it.currencyData.status) { BalanceStatus.VerifiedOnline, @@ -50,9 +34,9 @@ private fun List.mapToTotalBalanceState(): List infix fun TotalBalance.State.or(newState: TotalBalance.State): TotalBalance.State { return when (this) { TotalBalance.State.Loading -> when (newState) { - TotalBalance.State.Loading -> this + TotalBalance.State.Loading, TotalBalance.State.SomeTokensFailed, - TotalBalance.State.Success -> newState + TotalBalance.State.Success -> this } TotalBalance.State.Success, TotalBalance.State.SomeTokensFailed -> when (newState) { 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 e4126a3f8c..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 @@ -16,12 +16,24 @@ import com.tangem.tap.domain.extensions.getArtworkUrl import com.tangem.tap.domain.getFirstToken import com.tangem.tap.domain.tokens.BlockchainNetwork import com.tangem.tap.features.wallet.models.WalletRent -import com.tangem.tap.features.wallet.redux.* +import com.tangem.tap.features.wallet.redux.AddressData +import com.tangem.tap.features.wallet.redux.Artwork +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.TradeCryptoState +import com.tangem.tap.features.wallet.redux.WalletAction +import com.tangem.tap.features.wallet.redux.WalletAddresses +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.redux.WalletStore import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.BalanceWidgetData import com.tangem.tap.store -import org.rekotlin.Action import java.math.BigDecimal +import org.rekotlin.Action class WalletReducer { companion object { @@ -272,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) @@ -436,9 +433,6 @@ private fun setMultiWalletFiatRate( return state .updateWalletsData(newWalletsData) - .updateTotalBalance( - totalBalance = obtainTotalBalance(newWalletsData, appCurrency) - ) } private fun setSingleWalletFiatRate( 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 f267c25f89..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) @@ -92,14 +105,18 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), } private fun setupButtons() = with(binding) { - btnConfirm.text = getString(R.string.wallet_button_send) - btnConfirm.setOnClickListener { store.dispatch(WalletAction.Send()) } - - binding.lWalletDetails.btnShare.setOnClickListener { store.dispatch(WalletAction.ShowDialog.QrCode) } - - btnTrade.setOnClickListener { store.dispatch(WalletAction.TradeCryptoAction.Buy) } - - btnSell.setOnClickListener { store.dispatch(WalletAction.TradeCryptoAction.Sell) } + rowButtons.onBuyClick = { + store.dispatch(WalletAction.TradeCryptoAction.Buy) + } + rowButtons.onSellClick = { + store.dispatch(WalletAction.TradeCryptoAction.Sell) + } + rowButtons.onTradeClick = { + store.dispatch(WalletAction.DialogAction.ChooseTradeActionDialog) + } + rowButtons.onSendClick = { + store.dispatch(WalletAction.Send()) + } } private fun setupTestActionButton() { @@ -124,7 +141,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), setupBalanceData(selectedWallet.currencyData) setupButtons(selectedWallet) - handleDialogs(state.walletDialog) handleCurrencyIcon(selectedWallet) handleWarnings(selectedWallet) @@ -156,7 +172,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), } private fun setupButtons(selectedWallet: WalletData) = with(binding) { - btnConfirm.isEnabled = selectedWallet.mainButton.enabled lWalletDetails.btnCopy.setOnClickListener { selectedWallet.walletAddresses?.selectedAddress?.address?.let { addressString -> store.dispatch(WalletAction.CopyAddress(addressString, requireContext())) @@ -167,8 +182,12 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), store.dispatch(WalletAction.ShareAddress(addressString, requireContext())) } } - btnTrade.isEnabled = selectedWallet.tradeCryptoState.buyingAllowed - btnSell.show(selectedWallet.tradeCryptoState.sellingAllowed) + + rowButtons.updateButtonsVisibility( + buyAllowed = selectedWallet.tradeCryptoState.buyingAllowed, + sellAllowed = selectedWallet.tradeCryptoState.sellingAllowed, + sendAllowed = selectedWallet.mainButton.enabled, + ) } private fun handleWarnings(selectedWallet: WalletData) = with(binding) { @@ -291,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/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt index 9c4661dbb8..24473568ef 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt @@ -24,7 +24,11 @@ import com.tangem.tap.domain.statePrinter.printScanResponseState import com.tangem.tap.domain.statePrinter.printWalletState import com.tangem.tap.domain.termsOfUse.CardTou import com.tangem.tap.features.details.redux.DetailsAction -import com.tangem.tap.features.wallet.redux.* +import com.tangem.tap.features.wallet.redux.Artwork +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.WalletState import com.tangem.tap.features.wallet.ui.adapters.WarningMessagesAdapter import com.tangem.tap.features.wallet.ui.wallet.MultiWalletView import com.tangem.tap.features.wallet.ui.wallet.SingleWalletView @@ -78,7 +82,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber { + root.getString(R.string.wallet_balance_tx_in_progress) + } + BalanceStatus.Unreachable -> { + root.getString(R.string.wallet_balance_blockchain_unreachable) + } + BalanceStatus.NoAccount -> { + root.getString(R.string.wallet_error_no_account) + } + BalanceStatus.VerifiedOnline, + BalanceStatus.SameCurrencyTransactionInProgress, + BalanceStatus.EmptyCard, + BalanceStatus.UnknownBlockchain, + BalanceStatus.Loading, + null -> null } - val blockchain = wallet.currency.blockchain - val token = (wallet.currency as? Currency.Token)?.token - val isCustom = wallet.currency - .isCustomCurrency(store.state.globalState.scanResponse?.card?.derivationStyle) - tvExchangeRate.show(!isCustom) - tvCustomCurrency.show(isCustom) + if (status == null || status == BalanceStatus.Loading) { + lContent.root.hide() + lShimmer.root.veil() + } else { + lShimmer.root.unVeil() + lContent.root.show() + } Picasso.get().loadCurrenciesIcon( imageView = ivCurrency, textView = tvTokenLetter, - token = token, blockchain = blockchain, + token = (wallet.currency as? Currency.Token)?.token, + blockchain = wallet.currency.blockchain, ) - when (wallet.currencyData.status) { - BalanceStatus.VerifiedOnline, - BalanceStatus.SameCurrencyTransactionInProgress -> hideMessage() - BalanceStatus.Loading -> if (wallet.currencyData.amountFormatted == null) { - showMessage(root.getString(R.string.wallet_balance_loading)) - } - BalanceStatus.TransactionInProgress -> - showMessage(root.getString(R.string.wallet_balance_tx_in_progress)) - BalanceStatus.Unreachable -> - showMessage(root.getString(R.string.wallet_balance_blockchain_unreachable)) + lContent.tvCurrency.text = wallet.currencyData.currency + lContent.tvAmountFiat.text = wallet.currencyData.fiatAmountFormatted ?: "—" + lContent.tvAmount.text = wallet.currencyData.amountFormatted ?: "—" - BalanceStatus.NoAccount -> - showMessage(root.getString(R.string.wallet_error_no_account)) - else -> { - } + lContent.tvStatus.isVisible = statusMessage != null + lContent.tvStatus.text = statusMessage + + lContent.tvExchangeRate.isVisible = statusMessage == null + lContent.tvExchangeRate.text = if (isCustomCurrency) { + root.getString(id = R.string.token_item_no_rate) + } else { + wallet.fiatRateString } - } - private fun showMessage(message: String) { - toggleMessage(true) - binding.tvStatus.text = message - } - - private fun hideMessage() { - toggleMessage(false) - } - - private fun toggleMessage(show: Boolean) { - binding.tvAmount.show(!show) - binding.tvStatus.show(show) + cardWallet.setOnClickListener { + store.dispatch(WalletAction.MultiWallet.SelectWallet(wallet)) + } } } } \ No newline at end of file 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 new file mode 100644 index 0000000000..12efe010c8 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/view/WalletDetailsButtonsRow.kt @@ -0,0 +1,47 @@ +package com.tangem.tap.features.wallet.ui.view + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.LinearLayout +import androidx.core.view.isVisible +import com.tangem.wallet.databinding.ViewWalletDetailsButtonsRowBinding + +internal class WalletDetailsButtonsRow @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0, +) : LinearLayout(context, attrs, defStyleAttr) { + private val binding = ViewWalletDetailsButtonsRowBinding.inflate( + LayoutInflater.from(context), + this + ) + + var onBuyClick: (() -> Unit)? = null + var onSellClick: (() -> Unit)? = null + var onTradeClick: (() -> Unit)? = null + var onSendClick: (() -> Unit)? = null + + init { + orientation = HORIZONTAL + + with(binding) { + btnBuy.setOnClickListener { onBuyClick?.invoke() } + btnSell.setOnClickListener { onSellClick?.invoke() } + btnTrade.setOnClickListener { onTradeClick?.invoke() } + btnSend.setOnClickListener { onSendClick?.invoke() } + } + } + + 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 8c4a49b1fb..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,7 +1,6 @@ package com.tangem.tap.features.wallet.ui.wallet -import android.app.Dialog -import android.view.View +import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import com.tangem.common.card.Card import com.tangem.domain.common.TapWorkarounds.derivationStyle @@ -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 @@ -41,7 +36,6 @@ class MultiWalletView : WalletView { setFragment(fragment, binding) onViewCreated() showMultiWalletView(binding) - setupButtons(binding) } @@ -52,7 +46,6 @@ class MultiWalletView : WalletView { lAddress.root.hide() lButtonsShort.root.hide() lButtonsLong.root.hide() - btnScanMultiwallet.show() rvMultiwallet.show() btnAddToken.show() setupWalletCardNumber(binding) @@ -70,11 +63,6 @@ class MultiWalletView : WalletView { } } - - private fun setupButtons(binding: FragmentWalletBinding) = with(binding) { - btnScanMultiwallet.setOnClickListener { store.dispatch(WalletAction.Scan) } - } - override fun setFragment(fragment: WalletFragment, binding: FragmentWalletBinding) { this.fragment = fragment this.binding = binding @@ -129,36 +117,32 @@ class MultiWalletView : WalletView { store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens)) } handleErrorStates(state = state, binding = binding, fragment = fragment) - handleDialogs(state.walletDialog) } private fun handleTotalBalance( binding: FragmentWalletBinding, totalBalance: TotalBalance?, ) = with(binding.lCardTotalBalance) { - if (totalBalance == null) { - this.root.hide() - return@with - } + root.isVisible = totalBalance != null + if (totalBalance != null) { + if (totalBalance.state == TotalBalance.State.Loading) { + veilBalance.veil() + } else { + veilBalance.unVeil() + } + tvProcessing.animateVisibility( + show = totalBalance.state == TotalBalance.State.SomeTokensFailed + ) - tvBalance.animateVisibility( - show = totalBalance.state != TotalBalance.State.Loading, - hiddenVisibility = View.INVISIBLE - ) - pbLoading.animateVisibility( - show = totalBalance.state == TotalBalance.State.Loading - ) - tvProcessing.animateVisibility( - show = totalBalance.state == TotalBalance.State.SomeTokensFailed - ) + tvBalance.text = if (totalBalance.state == TotalBalance.State.SomeTokensFailed) "—" + else totalBalance.fiatAmount.formatAmountAsSpannedString( + currencySymbol = totalBalance.fiatCurrency.symbol + ) + tvCurrencyName.text = totalBalance.fiatCurrency.code - tvBalance.text = totalBalance.fiatAmount.formatAmountAsSpannedString( - currencySymbol = totalBalance.fiatCurrency.symbol - ) - tvCurrencyName.text = totalBalance.fiatCurrency.code - - tvCurrencyName.setOnClickListener { - store.dispatch(WalletAction.AppCurrencyAction.ChooseAppCurrency) + tvCurrencyName.setOnClickListener { + store.dispatch(WalletAction.AppCurrencyAction.ChooseAppCurrency) + } } } @@ -204,27 +188,10 @@ class MultiWalletView : WalletView { private fun configureButtonsForEmptyWalletState(binding: FragmentWalletBinding) = with(binding) { - btnScanMultiwallet.hide() lButtonsLong.root.show() lButtonsLong.btnScanLong.setOnClickListener { store.dispatch(WalletAction.Scan) } lButtonsLong.btnConfirmLong.setOnClickListener { store.dispatch(WalletAction.CreateWallet) } 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 a26f2582fb..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,17 +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.* +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.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 @@ -30,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 @@ -51,7 +50,6 @@ class SingleWalletView : WalletView { private fun showSingleWalletView(binding: FragmentWalletBinding) = with(binding) { rvMultiwallet.hide() btnAddToken.hide() - btnScanMultiwallet.hide() rvPendingTransaction.hide() lCardBalance.root.show() lAddress.root.show() @@ -80,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) { @@ -153,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) @@ -165,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 { @@ -257,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 diff --git a/app/src/main/res/drawable/ic_more_vertical_24.xml b/app/src/main/res/drawable/ic_more_vertical_24.xml new file mode 100644 index 0000000000..fd51d1fbf2 --- /dev/null +++ b/app/src/main/res/drawable/ic_more_vertical_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_scan_card_24.xml b/app/src/main/res/drawable/ic_scan_card_24.xml new file mode 100644 index 0000000000..b77d547233 --- /dev/null +++ b/app/src/main/res/drawable/ic_scan_card_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/card_total_balance.xml b/app/src/main/res/layout/card_total_balance.xml index 0b0d382e71..196dc167e1 100644 --- a/app/src/main/res/layout/card_total_balance.xml +++ b/app/src/main/res/layout/card_total_balance.xml @@ -22,10 +22,10 @@ - + tools:veilLayout_veiled="false"> - + + + + + + + + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 30dfad0768..7a95116cd8 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -8,4 +8,4 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 829a1f019b..3b962facaf 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -18,12 +18,13 @@ app:liftOnScroll="true"> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:menu="@menu/wallet" + app:navigationIcon="@drawable/ic_scan_card_24" + app:navigationIconTint="@color/iconGray" + app:title="@string/wallet_title" /> @@ -41,19 +42,20 @@ android:overScrollMode="never"> - - + + - - - - - - - - - + android:layout_marginTop="30dp" + app:layout_constraintTop_toBottomOf="@id/l_address" + app:layout_constraintVertical_bias="1" + app:layout_constraintBottom_toBottomOf="parent" /> @@ -214,4 +179,19 @@ + + diff --git a/app/src/main/res/layout/fragment_wallet_details.xml b/app/src/main/res/layout/fragment_wallet_details.xml index cd51f4c2fa..04649efe6b 100644 --- a/app/src/main/res/layout/fragment_wallet_details.xml +++ b/app/src/main/res/layout/fragment_wallet_details.xml @@ -105,78 +105,27 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/l_wallet_details" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/l_wallet_details" /> + android:id="@+id/barrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="bottom" + app:constraint_referenced_ids="l_wallet_details" /> - - - - - - - - - + @@ -184,4 +133,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 c2d664e182..ddb13e5666 100644 --- a/app/src/main/res/layout/item_currency_wallet.xml +++ b/app/src/main/res/layout/item_currency_wallet.xml @@ -21,7 +21,8 @@ android:layout_marginTop="12dp" android:layout_marginBottom="12dp" android:layout_marginStart="16dp" - android:layout_marginEnd="16dp"> + android:layout_marginEnd="16dp" + android:animateLayoutChanges="true"> - - - - - - - - - - - - + app:layout_constraintEnd_toEndOf="parent" + tools:visibility="visible" /> - - - + app:layout_constraintStart_toEndOf="@id/iv_currency" + app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/item_currency_wallet_content.xml b/app/src/main/res/layout/item_currency_wallet_content.xml new file mode 100644 index 0000000000..18249f4c63 --- /dev/null +++ b/app/src/main/res/layout/item_currency_wallet_content.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_currency_wallet_shimmer.xml b/app/src/main/res/layout/item_currency_wallet_shimmer.xml new file mode 100644 index 0000000000..a37bd8c956 --- /dev/null +++ b/app/src/main/res/layout/item_currency_wallet_shimmer.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/view_wallet_details_buttons_row.xml b/app/src/main/res/layout/view_wallet_details_buttons_row.xml new file mode 100644 index 0000000000..bb5bd190b0 --- /dev/null +++ b/app/src/main/res/layout/view_wallet_details_buttons_row.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/menu/wallet.xml b/app/src/main/res/menu/wallet.xml index c4947ea75b..7f6107b331 100644 --- a/app/src/main/res/menu/wallet.xml +++ b/app/src/main/res/menu/wallet.xml @@ -2,8 +2,9 @@ - \ No newline at end of file + android:id="@+id/details_menu" + android:title="@string/details_title" + android:icon="@drawable/ic_more_vertical_24" + app:iconTint="@color/iconGray" + app:showAsAction="ifRoom" /> + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index bc04e7cf38..c45da10b0e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -382,6 +382,4 @@ Привет, команда поддержки, Пожалуйста, расскажите нам больше о Вашей проблеме. Каждая деталь может быть полезной. Информация ниже не является обязательной. Вы можете стереть её, если хотите. - Баланс - Обработка полной суммы… diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml index 8ce3f1256a..ea424b57b6 100644 --- a/app/src/main/res/values-ru/strings_final.xml +++ b/app/src/main/res/values-ru/strings_final.xml @@ -40,10 +40,14 @@ Доступные сети Внимание! Валюты на разных сетях имеют разные адреса. Убедитесь, что адрес соответствует сети, в которой вы отправляете средства. Токены в сети Solana не поддерживаются этой картой из-за ограничений прошивки. - Не осуществляйте перевод на токены в данной сети иначе это может привести к их безвозвратной утере. + Не осуществляйте перевод на токены в данной сети, иначе это может привести к их безвозвратной утере. Адрес контракта скопирован! Если вы совершили ошибку с выбором сети при переводе средств с биржи, эта инструкция поможет вам восстановить средства Пользовательский - \ No newline at end of file + Баланс + Обработка полной суммы… + Управление токенами + Нет цены + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index ce2c35b5fb..63924e74c0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -30,6 +30,7 @@ 135dp 4dp + 8dp 44dp 32sp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c3caa853e1..520b7bc183 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -206,6 +206,4 @@ To avoid paying an increased commission the next time you top up your wallet, reduce the amount by %s XTZ Reduce by %s XTZ No, send all - Total balance - Processing full amount… diff --git a/app/src/main/res/values/strings_final.xml b/app/src/main/res/values/strings_final.xml index de09eb54fd..2478dee488 100644 --- a/app/src/main/res/values/strings_final.xml +++ b/app/src/main/res/values/strings_final.xml @@ -46,4 +46,8 @@ Custom - \ No newline at end of file + Total balance + Some networks are unreachable + Manage tokens + No rate + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 49c8fefbbb..f36d1cd4bf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -160,7 +160,6 @@ -