From 8a9008dbe8325e77df344a960c82fed6933c00fe Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 15 Feb 2023 15:51:22 +0800 Subject: [PATCH] Updated on 2026-08-14 --- .../domain/configurable/warningMessage/WarningMessage.kt | 1 + .../configurable/warningMessage/WarningMessagesManager.kt | 1 + .../features/wallet/ui/adapters/WarningMessagesAdapter.kt | 7 ++++++- .../wallet/ui/dialogs/SignedHashesWarningDialog.kt | 2 +- core/res/src/main/res/values-de/strings.xml | 2 +- core/res/src/main/res/values-fr/strings.xml | 2 +- core/res/src/main/res/values-it/strings.xml | 2 +- core/res/src/main/res/values-ru/strings.xml | 2 +- core/res/src/main/res/values-zh-rTW/strings.xml | 2 +- core/res/src/main/res/values/strings.xml | 2 +- 10 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt index ddadfcfc70..9800be1707 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessage.kt @@ -18,6 +18,7 @@ data class WarningMessage( @StringRes val messageResId: Int? = null, val origin: Origin = Origin.Remote, @StringRes val buttonTextId: Int? = null, + val titleFormatArg: String? = null, val messageFormatArg: String? = null ) { val blockchainList: List? by lazy { diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt index a0e382136a..996032f7d6 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt @@ -107,6 +107,7 @@ class WarningMessagesManager { messageResId = R.string.warning_signed_tx_previously, origin = WarningMessage.Origin.Local, buttonTextId = R.string.warning_button_learn_more, + titleFormatArg = "\u26A0" ) fun appRatingWarning(): WarningMessage = WarningMessage( 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 090a503220..c22f00de55 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 @@ -60,7 +60,12 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi fun getString(resId: Int?, default: String, formatArgs: String? = null) = if (resId == null) default else root.getString(resId, formatArgs) - tvTitle.text = getString(warning.titleResId, warning.title) + tvTitle.text = getString( + resId = warning.titleResId, + default = warning.title, + formatArgs = warning.titleFormatArg, + ) + tvMessage.text = getString( resId = warning.messageResId, default = warning.message, 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 b419a42b81..b9996b1c18 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 @@ -11,7 +11,7 @@ import com.tangem.wallet.R object SignedHashesWarningDialog { fun create(context: Context): AlertDialog { return AlertDialog.Builder(context).apply { - setTitle(context.getString(R.string.warning_important_security_info)) + setTitle(context.getString(R.string.warning_important_security_info, "\u26A0")) setMessage(R.string.alert_signed_hashes_message) setPositiveButton(R.string.common_understand) { _, _ -> store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId) diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml index 3862000c49..391645934b 100644 --- a/core/res/src/main/res/values-de/strings.xml +++ b/core/res/src/main/res/values-de/strings.xml @@ -458,7 +458,7 @@ %1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed. This card might be a production sample or counterfeit Authenticity check failed - Important security information \U26A0 + Important security information %s There are only %s signatures available on this card. You must withdraw all of your funds. How do you like Tangem? One question diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml index 1a31505a3e..5cd98f4603 100644 --- a/core/res/src/main/res/values-fr/strings.xml +++ b/core/res/src/main/res/values-fr/strings.xml @@ -458,7 +458,7 @@ %1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed. This card might be a production sample or counterfeit Authenticity check failed - Important security information \U26A0 + Important security information %s There are only %s signatures available on this card. You must withdraw all of your funds. How do you like Tangem? One question diff --git a/core/res/src/main/res/values-it/strings.xml b/core/res/src/main/res/values-it/strings.xml index 21e7723360..eeb90417f3 100644 --- a/core/res/src/main/res/values-it/strings.xml +++ b/core/res/src/main/res/values-it/strings.xml @@ -458,7 +458,7 @@ %1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed. This card might be a production sample or counterfeit Authenticity check failed - Important security information \U26A0 + Important security information %s There are only %s signatures available on this card. You must withdraw all of your funds. How do you like Tangem? One question diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index b73c0cd578..a185cbd9f0 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -458,7 +458,7 @@ Сеть %1$s использует концепцию экзистенциального депозита. Если баланс вашего счета опустится ниже %2$s, он будет деактивирован, а все оставшиеся средства будут уничтожены. Эта карта может быть производственным образцом или подделкой Проверка подлинности не удалась - Важная информация о безопасности \U26A0 + Важная информация о безопасности %s На этой карте осталось только %s подписей. Вы должны вывести все свои средства. Как вам Tangem? Один вопрос diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml index 0ee86509c4..355e8b4cd2 100644 --- a/core/res/src/main/res/values-zh-rTW/strings.xml +++ b/core/res/src/main/res/values-zh-rTW/strings.xml @@ -458,7 +458,7 @@ %1$s 網絡有一個 Existential Deposit 的概念。如果您的帳戶低於 %2$s，它將被停用，所有剩餘資金將被銷毀 此卡可能是生產樣本或偽造品 認證檢查失敗 - 重要安全信息\U26A0 + 重要安全信息%s 此卡上只有 %s 個簽名可用。您必須提取所有資金 你喜歡 Tangem 嗎？ 一個問題 diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index dc9d444a4d..679519b741 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -458,7 +458,7 @@ %1$s network has a concept of Existential Deposit. If your account drops below %2$s it will be deactivated and any remaining funds will be destroyed. This card might be a production sample or counterfeit Authenticity check failed - Important security information \U26A0 + Important security information %s There are only %s signatures available on this card. You must withdraw all of your funds. How do you like Tangem? One question