Updated on 2026-08-14

2022-12-07 16:56:59 +03:00 · 2022-12-07 16:56:59 +03:00 · 721010b489
commit 721010b489
parent 141c7d3936
39 changed files with 181 additions and 430 deletions
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
@ -20,7 +20,7 @@ class ApproveWcSessionDialog {
                session.peerMeta.url,
            )
            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                setMessage(message)
                setPositiveButton(context.getText(R.string.common_start)) { _, _ ->
                    store.dispatch(GlobalAction.HideDialog)
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
@ -26,14 +26,14 @@ class BnbTransactionDialog {
                        it.symbol,
                        it.price,
                        it.quantity,
-                        it.amount
+                        it.amount,
                    )
-                }.joinToString ( "\n\n" )
+                }.joinToString(separator = "\n\n")
                is BinanceMessageData.Transfer -> context.getString(
                    R.string.wallet_connect_bnb_transaction_message,
                    data.address,
                    data.outputAddress,
-                    data.amount
+                    data.amount,
                )
            }

@ -44,14 +44,16 @@ class BnbTransactionDialog {
            val positiveButtonTitle = context.getText(R.string.common_sign)

            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                setMessage(fullMessage)
                setPositiveButton(positiveButtonTitle) { _, _ ->
-                        store.dispatch(WalletConnectAction.BinanceTransaction.Sign(
+                    store.dispatch(
+                        WalletConnectAction.BinanceTransaction.Sign(
                            id = sessionId,
                            data = data.data,
-                            sessionData = session
-                        ))
+                            sessionData = session,
+                        ),
+                    )
                }
                setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
                    store.dispatch(WalletConnectAction.RejectRequest(session, sessionId))
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
@ -13,7 +13,7 @@ class ClipboardOrScanQrDialog {
    companion object {
        fun create(wcUri: String, context: Context): AlertDialog {
            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                setMessage(context.getText(R.string.wallet_connect_clipboard_alert))
                setPositiveButton(context.getText(R.string.wallet_connect_paste_from_clipboard)) { _, _ ->
                    store.dispatch(WalletConnectAction.OpenSession(wcUri))
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
@ -10,19 +10,10 @@ import com.trustwallet.walletconnect.models.session.WCSession

 class PersonalSignDialog {
    companion object {
-        fun create(
-            data: PersonalSignDialogData,
-            context: Context,
-        ): AlertDialog {
-            val message =
-                context.getString(R.string.wallet_connect_alert_sign_message) +
-                    context.getString(
-                        R.string.wallet_connect_personal_sign_message,
-                        data.dAppName,
-                        data.message,
-                    )
+        fun create(data: PersonalSignDialogData, context: Context): AlertDialog {
+            val message = context.getString(R.string.wallet_connect_alert_sign_message, data.message)
            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                setMessage(message)
                setPositiveButton(context.getText(R.string.common_sign)) { _, _ ->
                    store.dispatch(WalletConnectAction.SignMessage(data.session))
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
@ -22,7 +22,7 @@ class TransactionDialog {
                data.amount,
                data.gasAmount,
                data.totalAmount,
-                data.balance
+                data.balance,
            )

            val positiveButtonTitle = when (data.type) {
@ -30,7 +30,7 @@ class TransactionDialog {
                WcTransactionType.EthSendTransaction -> context.getText(R.string.common_sign_and_send)
            }
            return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                setMessage(message)
                setPositiveButton(positiveButtonTitle) { _, _ ->
                    if (data.isEnoughFundsToSend) {
--- a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
@ -51,7 +51,7 @@ fun HomeButtons(
            },
            content = {
                Text(
-                    text = stringResource(id = R.string.home_button_scan),
+                    text = stringResource(id = R.string.welcome_unlock_card),
                    fontWeight = FontWeight.Medium,
                    fontSize = 16.sp,
                    textAlign = TextAlign.Center,
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
@ -178,7 +178,7 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
    }

    private fun setupDoneState(state: OnboardingNoteState) = with(mainBinding.onboardingActionContainer) {
-        btnMainAction.setText(R.string.onboarding_done_button_continue)
+        btnMainAction.setText(R.string.common_continue)
        btnMainAction.setOnClickListener {
            showConfetti(false)
            store.dispatch(OnboardingNoteAction.Done)
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
@ -91,20 +91,20 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
    }

    private fun setupDoneState() = with(mainBinding.onboardingActionContainer) {
-        btnMainAction.setText(R.string.onboarding_done_button_continue)
+        btnMainAction.setText(R.string.common_continue)
        btnMainAction.setOnClickListener {
            showConfetti(false)
            store.dispatch(OnboardingOtherCardsAction.Done)
        }

        btnAlternativeAction.isVisible = false
-        btnAlternativeAction.setText("")
+        btnAlternativeAction.text = ""
        btnAlternativeAction.setOnClickListener { }

        tvHeader.setText(R.string.onboarding_done_header)
        tvBody.setText(R.string.onboarding_done_body)

-        mainBinding.onboardingTopContainer.imvCardBackground?.setBackgroundDrawable(
+        mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
            requireContext().getDrawableCompat(R.drawable.shape_rectangle_rounded_8),
        )
        updateConstraints(R.layout.lp_onboarding_done)
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
@ -352,7 +352,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
    }

    private fun setupDoneState(state: TwinCardsState) = with(mainBinding.onboardingActionContainer) {
-        btnMainAction.setText(R.string.onboarding_done_button_continue)
+        btnMainAction.setText(R.string.common_continue)
        btnMainAction.setOnClickListener {
            store.dispatch(TwinCardsAction.Confetti.Hide)
            store.dispatch(TwinCardsAction.Done)
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@ -331,7 +331,7 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
            tvBody.text = getString(R.string.onboarding_twins_interrupt_warning)
            layoutButtonsCommon.btnWalletMainAction.text = getText(R.string.onboarding_saltpay_button_backup_origin)
        } else {
-            tvHeader.text = getText(R.string.onboarding_title_prepare_origin)
+            tvHeader.text = getText(R.string.common_origin_card)
            tvBody.text = getString(
                R.string.onboarding_subtitle_scan_primary_card_format,
                state.primaryCardId?.let { cardIdFormatter.getFormattedCardId(it) },
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
@ -8,21 +8,21 @@ import com.tangem.tap.store
 import com.tangem.wallet.R

 class AddMoreBackupCardsDialog {
-        companion object {
-            fun create(context: Context): AlertDialog {
-                return AlertDialog.Builder(context).apply {
-                    setTitle(R.string.alert_title)
-                    setMessage(R.string.onboarding_alert_message_not_max_backup_cards_added)
-                    setPositiveButton(R.string.common_continue) { _, _ ->
-                        store.dispatch(BackupAction.ShowAccessCodeInfoScreen)
-                    }
-                    setNegativeButton(R.string.onboarding_button_add_more_cards) { _, _ ->
+    companion object {
+        fun create(context: Context): AlertDialog {
+            return AlertDialog.Builder(context).apply {
+                setTitle(R.string.alert_title)
+                setMessage(R.string.onboarding_alert_message_not_max_backup_cards_added)
+                setPositiveButton(R.string.common_continue) { _, _ ->
+                    store.dispatch(BackupAction.ShowAccessCodeInfoScreen)
+                }
+                setNegativeButton(R.string.common_cancel) { _, _ ->

-                    }
-                    setOnDismissListener {
-                        store.dispatch(GlobalAction.HideDialog)
-                    }
-                }.create()
-            }
+                }
+                setOnDismissListener {
+                    store.dispatch(GlobalAction.HideDialog)
+                }
+            }.create()
        }
+    }
 }
--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@ -230,12 +230,12 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :

        val balanceText = when (state.mainCurrency.type) {
            MainCurrencyType.FIAT -> fg.getString(
-                R.string.send_balance_subtitle_format,
-                state.viewBalanceValue, state.mainCurrency.currencySymbol,
+                R.string.common_balance,
+                "${state.viewBalanceValue} ${state.mainCurrency.currencySymbol}",
            ).remove(":")
            MainCurrencyType.CRYPTO -> fg.getString(
-                R.string.send_balance_subtitle_format,
-                state.mainCurrency.currencySymbol, state.viewBalanceValue,
+                R.string.common_balance,
+                "${state.mainCurrency.currencySymbol} ${state.viewBalanceValue}",
            )
        }

@ -304,7 +304,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :

                val willSent = getString(
                    R.string.send_total_subtitle_format,
-                    receipt.willSentCrypto, receipt.symbols.crypto,
+                    "${receipt.willSentCrypto} ${receipt.symbols.crypto}",
                )
                llTotalContainer.tvWillBeSentValue.update(willSent)
            }
@ -316,15 +316,13 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
                tvReceiptAmountValue.update("${receipt.amountCrypto} ${receipt.symbols.crypto}")
                tvReceiptFeeValue.update("${receipt.feeCrypto} ${receipt.symbols.crypto}")
                llTotalContainer.tvTotalValue.update("${receipt.totalCrypto} ${receipt.symbols.crypto}")
-
-                val willSent = SpannableStringBuilder()
-                    .bold {
-                        append(roughOrEmpty(receipt.willSentFiat)).append(" ")
-                        append(receipt.symbols.fiat)
-                        append(" (fee: ${receipt.feeFiat} ")
-                        append(receipt.symbols.fiat).append(")")
-                    }
-                llTotalContainer.tvWillBeSentValue.update(willSent.toString())
+                llTotalContainer.tvWillBeSentValue.update(
+                    getString(
+                        R.string.send_total_subtitle_fiat_format,
+                        "${roughOrEmpty(receipt.willSentFiat)} ${receipt.symbols.fiat}",
+                        "${receipt.feeFiat} ${receipt.symbols.fiat}",
+                    ),
+                )
            }
            ReceiptLayoutType.TOKEN_FIAT -> {
                val receipt = state.tokenFiat ?: return
@ -337,8 +335,8 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :

                val willSent = getString(
                    R.string.send_total_subtitle_asset_format,
-                    receipt.symbols.token ?: "", receipt.willSentToken,
-                    receipt.symbols.crypto, receipt.willSentFeeCoin,
+                    "${receipt.symbols.token ?: ""} ${receipt.willSentToken}",
+                    "${receipt.symbols.crypto} ${receipt.willSentFeeCoin}",
                )
                llTotalContainer.tvWillBeSentValue.update(willSent)
            }
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
@ -13,9 +13,9 @@ import com.tangem.wallet.R
@Composable
 fun SelectTokenNetworkDialog(dialog: DomainDialog.SelectTokenDialog, onDismissRequest: () -> Unit) {
    SimpleDialog(
-        title = stringResource(id = R.string.custom_token_type_network),
+        title = stringResource(id = R.string.custom_token_network_input_title),
        items = dialog.items,
        onSelect = dialog.onSelect,
-        onDismissRequest = onDismissRequest
+        onDismissRequest = onDismissRequest,
    ) { network -> TitleSubtitle(dialog.networkIdConverter(network.networkId), network.contractAddress ?: "") }
 }
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
@ -118,7 +118,7 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
    override fun newState(state: TokensState) {
        if (activity == null || view == null) return
        val toolbarTitle =
-            if (state.allowToAdd) R.string.add_tokens_title else R.string.search_tokens_title
+            if (state.allowToAdd) R.string.main_manage_tokens else R.string.search_tokens_title
        tokensState.value = state
        binding.toolbar.title = getString(toolbarTitle)
    }
@ -143,7 +143,7 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),

        val menuItem = menu.findItem(R.id.menu_search)
        val searchView: SearchView = menuItem.actionView as SearchView
-        searchView.queryHint = searchView.getString(R.string.add_token_search_hint)
+        searchView.queryHint = searchView.getString(R.string.common_search)
        searchView.maxWidth = android.R.attr.width
        searchView.inputtedTextAsFlow()
            .debounce(800)
--- 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
@ -91,8 +91,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
        (activity as? AppCompatActivity)?.setSupportActionBar(binding.toolbar)

        binding.toolbar.setNavigationOnClickListener {
-            Analytics.send(MainScreen.ButtonScanCard())
-            store.dispatch(WalletAction.Scan)
+            store.dispatch(NavigationAction.NavigateTo(AppScreen.Send))
        }
        setupWarningsRecyclerView()
        walletView.changeWalletView(this, binding)