From 09a070248593d950d0da345f8ca25aa293c4b3f3 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 30 Aug 2019 13:05:04 +0300 Subject: [PATCH 01/14] Updated on 2026-08-14 --- .../ConfirmWithFingerprintTask.java | 2 +- .../data/network/ServerApiElectrum.java | 29 +- .../tangem/data/network/ServerApiStellar.java | 4 +- .../main/java/com/tangem/di/ToastHelper.kt | 8 +- .../ui/activity/CreateNewWalletActivity.kt | 14 +- .../tangem/ui/activity/EmptyWalletActivity.kt | 21 +- .../com/tangem/ui/activity/LogoActivity.kt | 8 +- .../tangem/ui/activity/PinRequestActivity.kt | 38 +- .../com/tangem/ui/activity/PinSaveActivity.kt | 16 +- .../com/tangem/ui/activity/PinSwapActivity.kt | 16 +- ...pareCryptonitOtherApiWithdrawalActivity.kt | 10 +- .../PrepareCryptonitWithdrawalActivity.kt | 12 +- .../PrepareKrakenWithdrawalActivity.kt | 20 +- .../com/tangem/ui/activity/PurgeActivity.kt | 18 +- .../ui/activity/SendTransactionActivity.kt | 22 +- .../tangem/ui/activity/SettingsActivity.kt | 2 +- .../dialog/NoExtendedLengthSupportDialog.kt | 4 +- .../ui/dialog/PINSwapWarningDialog.java | 6 +- .../com/tangem/ui/dialog/RootFoundDialog.kt | 4 +- .../tangem/ui/dialog/ShowQRCodeDialog.java | 10 +- .../ui/dialog/WaitSecurityDelayDialog.java | 12 +- .../ui/dialog/WaitSecurityDelayDialogNew.kt | 4 +- .../ui/fragment/LoadedWalletFragment.kt | 44 +- .../com/tangem/ui/fragment/MainFragment.kt | 11 +- .../java/com/tangem/ui/fragment/VerifyCard.kt | 44 +- .../com/tangem/wallet/bch/BtcCashEngine.java | 34 +- .../tangem/wallet/binance/BinanceEngine.java | 6 +- .../java/com/tangem/wallet/btc/BtcEngine.java | 8 +- .../tangem/wallet/cardano/CardanoEngine.java | 20 +- .../tangem/wallet/ducatus/DucatusEngine.java | 24 +- .../java/com/tangem/wallet/eos/EosEngine.java | 9 +- .../java/com/tangem/wallet/eth/EthEngine.java | 20 +- .../java/com/tangem/wallet/ltc/LtcEngine.java | 26 +- .../tangem/wallet/matic/MaticTokenEngine.java | 7 +- .../java/com/tangem/wallet/rsk/RskEngine.java | 4 +- .../com/tangem/wallet/rsk/RskTokenEngine.java | 10 +- .../com/tangem/wallet/token/TokenEngine.java | 18 +- .../java/com/tangem/wallet/xlm/XlmEngine.java | 6 +- .../java/com/tangem/wallet/xrp/XrpEngine.java | 12 +- .../main/res/layout/activity_empty_wallet.xml | 10 +- app/src/main/res/layout/activity_logo.xml | 6 +- .../main/res/layout/activity_pin_request.xml | 4 +- app/src/main/res/layout/activity_pin_save.xml | 8 +- ...prepare_cryptonit_other_api_withdrawal.xml | 18 +- .../activity_prepare_cryptonit_withdrawal.xml | 20 +- .../activity_prepare_kraken_withdrawal.xml | 16 +- app/src/main/res/layout/activity_purge.xml | 2 +- .../res/layout/activity_send_transaction.xml | 2 +- .../dialog_fingerprint_confirmation.xml | 2 +- app/src/main/res/layout/dialog_wait_pin2.xml | 6 +- app/src/main/res/layout/fr_loaded_wallet.xml | 10 +- app/src/main/res/layout/fr_verify_card.xml | 44 +- .../main/res/layout/layout_btn_details.xml | 2 +- .../main/res/layout/layout_tangem_card.xml | 2 +- app/src/main/res/layout/layout_touch_card.xml | 2 +- app/src/main/res/layout/main_fragment.xml | 2 +- app/src/main/res/menu/menu_loaded_wallet.xml | 12 +- app/src/main/res/menu/menu_main.xml | 10 +- app/src/main/res/values/strings.xml | 421 ++++++++---------- app/src/main/res/xml/pref_main.xml | 12 +- .../tangem/ui/ConfirmTransactionActivity.kt | 24 +- .../tangem/ui/PrepareTransactionActivity.kt | 18 +- .../com/tangem/ui/SignTransactionActivity.kt | 22 +- .../layout/activity_confirm_transaction.xml | 30 +- .../layout/activity_prepare_transaction.xml | 22 +- app/src/tangemAccess/res/values/strings.xml | 2 +- .../tangem/ui/ConfirmTransactionActivity.kt | 14 +- .../tangem/ui/PrepareTransactionActivity.kt | 12 +- .../com/tangem/ui/SignTransactionActivity.kt | 10 +- .../layout/activity_confirm_transaction.xml | 28 +- .../layout/activity_prepare_transaction.xml | 20 +- app/src/tangemCardano/res/values/strings.xml | 2 +- .../android/ui/NfcEnableDialog.kt | 6 +- card-android/src/main/res/values/strings.xml | 6 +- 74 files changed, 682 insertions(+), 728 deletions(-) diff --git a/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java b/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java index e9d02d158a..a2d9a4b1a8 100644 --- a/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java +++ b/app/src/main/java/com/tangem/data/fingerprint/ConfirmWithFingerprintTask.java @@ -43,7 +43,7 @@ public class ConfirmWithFingerprintTask extends AsyncTask { onCancelled(); if (!success) { - Toast.makeText(pinSaveActivity, R.string.pin_save_fail, Toast.LENGTH_LONG).show(); + Toast.makeText(pinSaveActivity, R.string.pin_save_notification_failed, Toast.LENGTH_LONG).show(); } else { pinSaveActivity.getFingerprintHelper().startAuth(pinSaveActivity.getFingerprintManager(), pinSaveActivity.getCryptoObject()); } diff --git a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java index 81437febfa..b2e8f91540 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiElectrum.java @@ -3,13 +3,13 @@ package com.tangem.data.network; import android.util.Log; import com.tangem.App; -import com.tangem.wallet.TangemContext; import com.tangem.data.Blockchain; +import com.tangem.wallet.R; +import com.tangem.wallet.TangemContext; import com.tangem.wallet.bch.BitcoinCashNode; import com.tangem.wallet.btc.BitcoinNode; import com.tangem.wallet.btc.BitcoinNodeTestNet; import com.tangem.wallet.ltc.LitecoinNode; -import com.tangem.wallet.R; import java.io.BufferedReader; import java.io.IOException; @@ -32,7 +32,6 @@ import java.util.Random; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; @@ -139,7 +138,7 @@ public class ServerApiElectrum { requestsCount--; Log.e(TAG, "requestData " + electrumRequest.getMethod() + " onError " + e.getMessage()); Log.e(TAG, String.format("%d requests left in processing",requestsCount)); - electrumRequest.setError(ctx.getString(R.string.cannot_obtain_data_from_blockchain)); + electrumRequest.setError(ctx.getString(R.string.loaded_wallet_error_obtaining_blockchain_data)); //setErrorOccurred(e.getMessage());//; responseListener.onFail(electrumRequest); } @@ -252,18 +251,18 @@ public class ServerApiElectrum { if( (electrumRequest.getError()!=null && electrumRequest.getError().startsWith(ERROR_STARTS_WITH_CODE_32601)) ) { // method unknown error??? - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_obtaining_blockchain_data)); electrumRequest.answerData=null; } } else { - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_no_answer)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_empty_answer)); Log.i(TAG, ">> "); } } catch (ConnectException e) { //e.printStackTrace(); //responseListener.onFail(e.getMessage()); - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_no_connection)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_connection_refused)); Log.e(TAG, "doElectrumRequestTcp " + electrumRequest.getMethod() + " ConnectException " + e.getMessage()); } finally { Log.i(TAG, "doElectrumRequestTcp " + electrumRequest.getMethod() + " socket.close"); @@ -274,13 +273,13 @@ public class ServerApiElectrum { { e.printStackTrace(); Log.e(TAG,"Can't close socket"); - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_communication_error)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_communication_error)); } } } catch (IOException e) { //e.printStackTrace(); //responseListener.onFail(e.getMessage()); - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_communication_error)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_communication_error)); Log.e(TAG, "doElectrumRequestTcp " + electrumRequest.getMethod() + " IOException " + e.getMessage()); } } @@ -343,17 +342,17 @@ public class ServerApiElectrum { if( (electrumRequest.getError()!=null && electrumRequest.getError().startsWith(ERROR_STARTS_WITH_CODE_32601)) ) { // method unknown error??? - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_obtaining_blockchain_data)); electrumRequest.answerData=null; } } else { - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_no_answer)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_empty_answer)); Log.i(TAG, ">> "); } } catch (ConnectException e) { e.printStackTrace(); - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_no_connection)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_connection_refused)); Log.e(TAG, "doElectrumRequestSsl " + electrumRequest.getMethod() + " ConnectException " + e.getMessage()); } finally { Log.i(TAG, "doElectrumRequestSsl " + electrumRequest.getMethod() + " socket.close"); @@ -362,7 +361,7 @@ public class ServerApiElectrum { } catch (Exception e) { - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_communication_error)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_communication_error)); e.printStackTrace(); Log.e(TAG, "Can't close ssl socket"); } @@ -370,11 +369,11 @@ public class ServerApiElectrum { } catch (IOException e) { e.printStackTrace(); - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_communication_error)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_communication_error)); Log.e(TAG, "doElectrumRequestSsl " + electrumRequest.getMethod() + " IOException " + e.getMessage()); } } catch (NoSuchAlgorithmException | KeyManagementException e) { - electrumRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain)); + electrumRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_obtaining_blockchain_data)); Log.e(TAG, e.getMessage()); } } diff --git a/app/src/main/java/com/tangem/data/network/ServerApiStellar.java b/app/src/main/java/com/tangem/data/network/ServerApiStellar.java index af38916d5d..18541956a1 100644 --- a/app/src/main/java/com/tangem/data/network/ServerApiStellar.java +++ b/app/src/main/java/com/tangem/data/network/ServerApiStellar.java @@ -114,7 +114,7 @@ public class ServerApiStellar { requestsCount--; LOG.e(TAG, "requestData " + stellarRequest.getClass().getSimpleName() + " onError " + e.getMessage()); LOG.e(TAG, String.format("%d requests left in processing", requestsCount)); - stellarRequest.setError(ctx.getString(R.string.cannot_obtain_data_from_blockchain)); + stellarRequest.setError(ctx.getString(R.string.loaded_wallet_error_obtaining_blockchain_data)); //setErrorOccurred(e.getMessage());//; listener.onFail(stellarRequest); } @@ -161,7 +161,7 @@ public class ServerApiStellar { } } catch (Exception e) { e.printStackTrace(); - stellarRequest.setError(App.Companion.getInstance().getString(R.string.cannot_obtain_data_from_blockchain_communication_error)); + stellarRequest.setError(App.Companion.getInstance().getString(R.string.loaded_wallet_error_blockchain_communication_error)); throw e; } } diff --git a/app/src/main/java/com/tangem/di/ToastHelper.kt b/app/src/main/java/com/tangem/di/ToastHelper.kt index 664a83d479..e18d8f2734 100644 --- a/app/src/main/java/com/tangem/di/ToastHelper.kt +++ b/app/src/main/java/com/tangem/di/ToastHelper.kt @@ -13,8 +13,8 @@ import java.util.* class ToastHelper { fun showSnackbarUpdateVersion(context: Context, vg: ViewGroup, versionName: String) { - Snackbar.make(vg, String.format(context.getString(R.string.new_app_version), versionName), Snackbar.LENGTH_INDEFINITE) - .setAction(R.string.update) { + Snackbar.make(vg, String.format(context.getString(R.string.main_screen_new_version_toast), versionName), Snackbar.LENGTH_INDEFINITE) + .setAction(R.string.main_screen_btn_update) { try { val intent = Intent(Intent.ACTION_VIEW) intent.data = Uri.parse(Constant.URL_TANGEM) @@ -29,7 +29,7 @@ class ToastHelper { val snackbar = Snackbar.make(vg, message, Snackbar.LENGTH_INDEFINITE) val snackView = snackbar.view snackView.setBackgroundColor(context.resources.getColor(R.color.msg_okay)) - snackbar.setAction(R.string.ok) { + snackbar.setAction(R.string.general_ok) { snackbar.dismiss() } snackbar.show() @@ -39,7 +39,7 @@ class ToastHelper { val snackbar = Snackbar.make(vg, message, Snackbar.LENGTH_INDEFINITE) val snackView = snackbar.view snackView.setBackgroundColor(context.resources.getColor(R.color.msg_err)) - snackbar.setAction(R.string.ok) { + snackbar.setAction(R.string.general_ok) { snackbar.dismiss() } snackbar.show() diff --git a/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt index 1c78b0f103..6653371d35 100644 --- a/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/CreateNewWalletActivity.kt @@ -14,23 +14,23 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.wallet.TangemContext -import com.tangem.ui.dialog.NoExtendedLengthSupportDialog -import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.card_android.android.reader.NfcReader +import com.tangem.card_android.data.EXTRA_TANGEM_CARD +import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID import com.tangem.card_android.data.asBundle import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.CreateNewWalletTask import com.tangem.card_common.util.Util +import com.tangem.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_create_new_wallet.* import kotlinx.android.synthetic.main.layout_progress_horizontal.* import kotlinx.android.synthetic.main.layout_touch_card.* -import com.tangem.card_android.data.EXTRA_TANGEM_CARD -import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications { @@ -129,7 +129,7 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY) progressBar?.visibility = View.INVISIBLE val intent = Intent() - intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.cannot_create_wallet)) + intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.nfc_error_cannot_create_wallet)) intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid) intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card!!.asBundle) setResult(Constant.RESULT_INVALID_PIN, intent) @@ -145,7 +145,7 @@ class CreateNewWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, NoExtendedLengthSupportDialog().show(supportFragmentManager, NoExtendedLengthSupportDialog.TAG) } } else - Toast.makeText(this, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show() + Toast.makeText(this, R.string.general_notification_scan_again, Toast.LENGTH_SHORT).show() progressBar?.progress = 100 progressBar?.progressTintList = ColorStateList.valueOf(Color.RED) diff --git a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt index 0b6abbc166..11f83f1327 100644 --- a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt @@ -10,33 +10,32 @@ import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Build import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity import android.text.Html import android.view.View import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.di.Navigator -import com.tangem.wallet.TangemContext -import com.tangem.ui.dialog.NoExtendedLengthSupportDialog -import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.card_android.android.reader.NfcReader +import com.tangem.card_android.data.EXTRA_TANGEM_CARD +import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID import com.tangem.card_android.data.asBundle import com.tangem.card_android.data.loadFromBundle import com.tangem.card_common.data.TangemCard import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.VerifyCardTask import com.tangem.card_common.util.Util -import com.tangem.util.UtilHelper +import com.tangem.di.Navigator +import com.tangem.di.ToastHelper +import com.tangem.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_empty_wallet.* import kotlinx.android.synthetic.main.layout_tangem_card.* import javax.inject.Inject -import com.tangem.card_android.data.EXTRA_TANGEM_CARD -import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID -import com.tangem.di.ToastHelper class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications { companion object { @@ -102,7 +101,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card if (cardProtocol != null) navigator.showVerifyCard(this, ctx) else - toastHelper.showSingleToast(this, getString(R.string.need_attach_card_again)) + toastHelper.showSingleToast(this, getString(R.string.general_notification_scan_again_to_verify)) } } @@ -191,7 +190,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card if (!NoExtendedLengthSupportDialog.allReadyShowed) NoExtendedLengthSupportDialog().show(supportFragmentManager, NoExtendedLengthSupportDialog.TAG) } else - Toast.makeText(this@EmptyWalletActivity, R.string.try_to_scan_again, Toast.LENGTH_LONG).show() + Toast.makeText(this@EmptyWalletActivity, R.string.general_notification_scan_again, Toast.LENGTH_LONG).show() progressBar?.progress = 100 progressBar?.progressTintList = ColorStateList.valueOf(Color.RED) diff --git a/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt index 841440d8f8..72aa74090a 100644 --- a/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/LogoActivity.kt @@ -8,9 +8,9 @@ import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator -import com.tangem.wallet.TangemContext import com.tangem.wallet.BuildConfig import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_logo.* import javax.inject.Inject @@ -42,15 +42,15 @@ class LogoActivity : AppCompatActivity() { // set beta version name if (BuildConfig.DEBUG) - tvAppVersion.text = String.format(getString(R.string.version_name_debug), BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) + tvAppVersion.text = String.format(getString(R.string.splash_version_name_debug), BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) else - tvAppVersion.text = String.format(getString(R.string.version_name_release), BuildConfig.VERSION_NAME) + tvAppVersion.text = String.format(getString(R.string.splash_version_name_release), BuildConfig.VERSION_NAME) // set flavor app name when (BuildConfig.FLAVOR) { Constant.FLAVOR_TANGEM_CARDANO -> { tvExtension.visibility = View.VISIBLE - tvExtension.text = getString(R.string.cardano) + tvExtension.text = getString(R.string.splash_cardano) } else -> { tvExtension.visibility = View.GONE diff --git a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt index a881cc687d..1e24f87c7c 100644 --- a/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PinRequestActivity.kt @@ -13,25 +13,25 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Build import android.os.Bundle -import androidx.core.app.ActivityCompat -import androidx.appcompat.app.AppCompatActivity import android.text.TextUtils import android.util.Log import android.view.View import android.widget.Button +import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityCompat import com.tangem.Constant -import com.tangem.data.fingerprint.StartFingerprintReaderTask -import com.tangem.card_android.android.reader.NfcManager -import com.tangem.data.fingerprint.FingerprintHelper -import com.tangem.wallet.TangemContext import com.tangem.card_android.android.data.PINStorage import com.tangem.card_android.android.nfc.NfcLifecycleObserver -import com.tangem.card_android.data.loadFromBundle +import com.tangem.card_android.android.reader.NfcManager import com.tangem.card_android.data.EXTRA_TANGEM_CARD import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID +import com.tangem.card_android.data.loadFromBundle import com.tangem.card_common.data.TangemCard +import com.tangem.data.fingerprint.FingerprintHelper +import com.tangem.data.fingerprint.StartFingerprintReaderTask import com.tangem.util.LOG import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_pin_request.* import kotlinx.android.synthetic.main.layout_pin_buttons.* import java.io.IOException @@ -108,25 +108,25 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge if (mode == Mode.RequestNewPIN) if (PINStorage.haveEncryptedPIN()) { allowFingerprint = true - tvPinPrompt.setText(R.string.enter_new_pin_or_use_fingerprint_scanner) + tvPinPrompt.setText(R.string.pin_request_enter_new_pin_or_use_fingerprint_scanner) } else - tvPinPrompt.setText(R.string.enter_new_pin) + tvPinPrompt.setText(R.string.pin_request_enter_new_pin) else if (mode == Mode.ConfirmNewPIN) - tvPinPrompt.setText(R.string.confirm_new_pin) + tvPinPrompt.setText(R.string.pin_request_confirm_new_pin) else if (mode == Mode.RequestPIN) if (PINStorage.haveEncryptedPIN()) { allowFingerprint = true - tvPinPrompt.setText(R.string.enter_pin_or_use_fingerprint_scanner) + tvPinPrompt.setText(R.string.pin_request_enter_pin_or_use_fingerprint_scanner) } else - tvPinPrompt.setText(R.string.enter_pin) + tvPinPrompt.setText(R.string.pin_request_enter_pin) else if (mode == Mode.RequestNewPIN2) if (PINStorage.haveEncryptedPIN2()) { allowFingerprint = true - tvPinPrompt.setText(R.string.enter_new_pin_2_or_use_fingerprint_scanner) + tvPinPrompt.setText(R.string.pin_request_prompt_new_pin_2_or_fingerprint) } else - tvPinPrompt.setText(R.string.enter_new_pin_2) + tvPinPrompt.setText(R.string.pin_request_new_pin_2) else if (mode == Mode.ConfirmNewPIN2) - tvPinPrompt.setText(R.string.confirm_new_pin_2) + tvPinPrompt.setText(R.string.pin_request_confirm_new_pin_2) else if (mode == Mode.RequestPIN2) { val uid = intent.getStringExtra(EXTRA_TANGEM_CARD_UID) val card = TangemCard(uid) @@ -142,9 +142,9 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge if (PINStorage.haveEncryptedPIN2()) { allowFingerprint = true - tvPinPrompt.setText(R.string.enter_pin_2_or_use_fingerprint_scanner) + tvPinPrompt.setText(R.string.pin_request_enter_pin_2_or_use_fingerprint_scanner) } else - tvPinPrompt.setText(R.string.enter_pin_2) + tvPinPrompt.setText(R.string.pin_request_prompt_enter_pin_2) } if (!allowFingerprint) @@ -298,13 +298,13 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge if (mode == Mode.ConfirmNewPIN) { if (pin != intent.getStringExtra(Constant.EXTRA_NEW_PIN)) { - tvPin!!.error = getString(R.string.error_pin_confirmation_failed) + tvPin!!.error = getString(R.string.pin_request_error_pin_confirmation_failed) focusView = tvPin cancel = true } } else if (mode == Mode.ConfirmNewPIN2) { if (pin != intent.getStringExtra(Constant.EXTRA_NEW_PIN_2)) { - tvPin!!.error = getString(R.string.error_pin_confirmation_failed) + tvPin!!.error = getString(R.string.pin_request_error_pin_confirmation_failed) focusView = tvPin cancel = true } diff --git a/app/src/main/java/com/tangem/ui/activity/PinSaveActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinSaveActivity.kt index 3b51be1a15..c08ef980bc 100644 --- a/app/src/main/java/com/tangem/ui/activity/PinSaveActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PinSaveActivity.kt @@ -14,16 +14,16 @@ import android.os.Bundle import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyPermanentlyInvalidatedException import android.security.keystore.KeyProperties -import androidx.core.app.ActivityCompat -import androidx.appcompat.app.AppCompatActivity import android.text.TextUtils import android.view.View import android.widget.Button import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityCompat import com.tangem.Constant +import com.tangem.card_android.android.data.PINStorage import com.tangem.data.fingerprint.ConfirmWithFingerprintTask import com.tangem.data.fingerprint.FingerprintHelper -import com.tangem.card_android.android.data.PINStorage import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_save.* import kotlinx.android.synthetic.main.layout_pin_buttons.* @@ -70,9 +70,9 @@ class PinSaveActivity : AppCompatActivity(), FingerprintHelper.FingerprintHelper usePIN2 = intent.getBooleanExtra(Constant.EXTRA_PIN2, false) if (usePIN2) - tvPinPrompt.text = getString(R.string.enter_pin2_and_use_fingerprint_to_save_it) + tvPinPrompt.text = getString(R.string.pin_save_title_enter_pin2_and_save) else - tvPinPrompt.text = getString(R.string.enter_pin_and_use_fingerprint_to_save_it) + tvPinPrompt.text = getString(R.string.pin_save_title_enter_pin_and_save) if (usePIN2) { cbUseFingerprint.isChecked = true @@ -358,17 +358,17 @@ class PinSaveActivity : AppCompatActivity(), FingerprintHelper.FingerprintHelper fingerprintManager = getSystemService(Context.FINGERPRINT_SERVICE) as FingerprintManager if (!keyguardManager.isKeyguardSecure) { - Toast.makeText(baseContext, R.string.user_has_not_enabled_lock_screen, Toast.LENGTH_LONG).show() + Toast.makeText(baseContext, R.string.pin_save_toast_lock_screen_not_enabled, Toast.LENGTH_LONG).show() return false } if (ActivityCompat.checkSelfPermission(this, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) { - Toast.makeText(baseContext, R.string.user_has_not_granted_permission_to_use_fingerprint, Toast.LENGTH_LONG).show() + Toast.makeText(baseContext, R.string.pin_save_toast_no_permission_to_use_fingerprint, Toast.LENGTH_LONG).show() return false } if (!fingerprintManager!!.hasEnrolledFingerprints()) { - Toast.makeText(baseContext, R.string.user_has_not_registered_any_fingerprints, Toast.LENGTH_LONG).show() + Toast.makeText(baseContext, R.string.pin_save_toast_no_fingerprints_registered, Toast.LENGTH_LONG).show() return false } diff --git a/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt b/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt index 813d237ea9..aceafc7645 100644 --- a/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PinSwapActivity.kt @@ -9,27 +9,27 @@ import android.nfc.NfcAdapter import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity import android.view.View import android.widget.ProgressBar import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.ui.dialog.NoExtendedLengthSupportDialog -import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.card_android.android.reader.NfcReader -import com.tangem.card_android.data.* +import com.tangem.card_android.data.EXTRA_TANGEM_CARD +import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID +import com.tangem.card_android.data.asBundle +import com.tangem.card_android.data.loadFromBundle import com.tangem.card_common.data.TangemCard import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.SwapPINTask import com.tangem.card_common.util.Util -import com.tangem.util.LOG +import com.tangem.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_pin_swap.* -import com.tangem.card_android.data.EXTRA_TANGEM_CARD -import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications { companion object { @@ -152,7 +152,7 @@ class PinSwapActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProt NoExtendedLengthSupportDialog().show(supportFragmentManager, NoExtendedLengthSupportDialog.TAG) } } else { - Toast.makeText(baseContext, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show() + Toast.makeText(baseContext, R.string.general_notification_scan_again, Toast.LENGTH_SHORT).show() } progressBar!!.progress = 100 progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED) diff --git a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt index b7a279ea90..5af29baf23 100644 --- a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitOtherApiWithdrawalActivity.kt @@ -7,18 +7,18 @@ import android.graphics.Color import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity import android.view.View +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant +import com.tangem.card_android.android.nfc.NfcLifecycleObserver +import com.tangem.card_android.android.reader.NfcManager import com.tangem.data.Blockchain import com.tangem.data.network.CryptonitOtherApi import com.tangem.di.Navigator import com.tangem.wallet.CoinEngineFactory -import com.tangem.wallet.TangemContext -import com.tangem.card_android.android.nfc.NfcLifecycleObserver -import com.tangem.card_android.android.reader.NfcManager import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_prepare_cryptonit_other_api_withdrawal.* import java.io.IOException import javax.inject.Inject @@ -77,7 +77,7 @@ class PrepareCryptonitOtherApiWithdrawalActivity : AppCompatActivity(), NfcAdapt cryptonit!!.requestCryptoWithdrawal(ctx.blockchain.currency, dblAmount.toString(), ctx.coinData!!.wallet) } catch (e: Exception) { - etAmount.error = getString(R.string.unknown_amount_format) + etAmount.error = getString(R.string.prepare_transaction_error_unknown_amount_format) } //Toast.makeText(this, strAmount, Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt index 798d1eff9a..6568c2cd6b 100644 --- a/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareCryptonitWithdrawalActivity.kt @@ -6,20 +6,20 @@ import android.graphics.Color import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity import android.text.InputFilter import android.view.View import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.Toast -import com.tangem.data.network.Cryptonit +import androidx.appcompat.app.AppCompatActivity +import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.data.Blockchain -import com.tangem.wallet.CoinEngineFactory -import com.tangem.wallet.TangemContext -import com.tangem.card_android.android.nfc.NfcLifecycleObserver +import com.tangem.data.network.Cryptonit import com.tangem.util.DecimalDigitsInputFilter +import com.tangem.wallet.CoinEngineFactory import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_prepare_cryptonit_withdrawal.* import java.io.IOException @@ -99,7 +99,7 @@ class PrepareCryptonitWithdrawalActivity : AppCompatActivity(), NfcAdapter.Reade cryptonit!!.requestWithdrawCoins(ctx.blockchain.currency, dblAmount, ctx.coinData!!.wallet) } catch (e: Exception) { - etAmount.error = getString(R.string.unknown_amount_format) + etAmount.error = getString(R.string.prepare_transaction_error_unknown_amount_format) } } diff --git a/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt b/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt index 3609aa8f8e..a60536fa38 100644 --- a/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PrepareKrakenWithdrawalActivity.kt @@ -10,21 +10,21 @@ import android.graphics.Color import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity import android.view.View import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.data.network.Kraken +import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.data.Blockchain +import com.tangem.data.network.Kraken import com.tangem.di.Navigator import com.tangem.wallet.CoinEngineFactory -import com.tangem.wallet.TangemContext -import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_prepare_kraken_withdrawal.* import java.io.IOException import java.math.BigDecimal @@ -95,7 +95,7 @@ class PrepareKrakenWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCa kraken!!.requestWithdrawInfo(ctx.blockchain.currency, dblAmount.toString(), ctx.coinData!!.wallet) } catch (e: Exception) { - etAmount.error = getString(R.string.unknown_amount_format) + etAmount.error = getString(R.string.prepare_transaction_error_unknown_amount_format) } } @@ -170,7 +170,7 @@ class PrepareKrakenWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCa val builder = AlertDialog.Builder(this) // Set a title for alert dialog - builder.setTitle(R.string.please_confirm_withdraw) + builder.setTitle(R.string.kraken_please_confirm_withdraw) // Set a message for alert dialog builder.setMessage(String.format("Continue with fee %s %s?", fee!!.toString().trimEnd('0'), ctx.blockchain.currency)) @@ -191,20 +191,20 @@ class PrepareKrakenWithdrawalActivity : AppCompatActivity(), NfcAdapter.ReaderCa kraken!!.requestWithdraw(ctx.blockchain.currency, dblAmount.toString(), ctx.coinData!!.wallet) } catch (e: Exception) { - etAmount.error = getString(R.string.unknown_amount_format) + etAmount.error = getString(R.string.prepare_transaction_error_unknown_amount_format) } } DialogInterface.BUTTON_NEGATIVE -> { - Toast.makeText(this, R.string.operation_canceled, Toast.LENGTH_LONG).show() + Toast.makeText(this, R.string.kraken_operation_canceled, Toast.LENGTH_LONG).show() } } } // Set the alert dialog positive/yes button - builder.setPositiveButton(R.string.yes, dialogClickListener) + builder.setPositiveButton(R.string.general_yes, dialogClickListener) // Set the alert dialog negative/no button - builder.setNegativeButton(R.string.no, dialogClickListener) + builder.setNegativeButton(R.string.general_no, dialogClickListener) // Initialize the AlertDialog using builder object diff --git a/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt index c4eec4af3b..1cbbc38e83 100644 --- a/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/PurgeActivity.kt @@ -15,26 +15,26 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.wallet.TangemContext -import com.tangem.ui.dialog.NoExtendedLengthSupportDialog -import com.tangem.ui.dialog.WaitSecurityDelayDialog -import com.tangem.ui.dialog.WaitSecurityDelayDialogNew -import com.tangem.ui.event.DeletingWalletFinish import com.tangem.card_android.android.nfc.NfcDeviceAntennaLocation import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.card_android.android.reader.NfcReader +import com.tangem.card_android.data.EXTRA_TANGEM_CARD +import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID import com.tangem.card_android.data.asBundle import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.PurgeTask import com.tangem.card_common.util.Util +import com.tangem.ui.dialog.NoExtendedLengthSupportDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialog +import com.tangem.ui.dialog.WaitSecurityDelayDialogNew +import com.tangem.ui.event.DeletingWalletFinish import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.activity_purge.* import kotlinx.android.synthetic.main.layout_touch_card.* import org.greenrobot.eventbus.EventBus import javax.inject.Inject -import com.tangem.card_android.data.EXTRA_TANGEM_CARD -import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications { companion object { @@ -175,7 +175,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc val intent = Intent() intent.putExtra(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid) intent.putExtra(EXTRA_TANGEM_CARD, cardProtocol.card.asBundle) - intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.cannot_erase_wallet)) + intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.nfc_error_cannot_erase_wallet)) setResult(RESULT_INVALID_PIN, intent) finish() } catch (e: Exception) { @@ -188,7 +188,7 @@ class PurgeActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoc if (!NoExtendedLengthSupportDialog.allReadyShowed) NoExtendedLengthSupportDialog().show(supportFragmentManager, NoExtendedLengthSupportDialog.TAG) } else - Toast.makeText(baseContext, R.string.try_to_scan_again, Toast.LENGTH_LONG).show() + Toast.makeText(baseContext, R.string.general_notification_scan_again_to_verify, Toast.LENGTH_LONG).show() progressBar?.progress = 100 progressBar?.progressTintList = ColorStateList.valueOf(Color.RED) diff --git a/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt index c5614cc845..61975f7e9a 100644 --- a/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt @@ -4,21 +4,21 @@ import android.content.Intent import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity import android.view.KeyEvent import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant -import com.tangem.wallet.CoinEngine -import com.tangem.wallet.CoinEngineFactory -import com.tangem.wallet.TangemContext -import com.tangem.ui.event.TransactionFinishWithError -import com.tangem.ui.event.TransactionFinishWithSuccess import com.tangem.card_android.android.nfc.NfcLifecycleObserver import com.tangem.card_android.android.reader.NfcManager import com.tangem.card_common.util.Util +import com.tangem.ui.event.TransactionFinishWithError +import com.tangem.ui.event.TransactionFinishWithSuccess import com.tangem.util.UtilHelper +import com.tangem.wallet.CoinEngine +import com.tangem.wallet.CoinEngineFactory import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import org.greenrobot.eventbus.EventBus import java.io.IOException @@ -65,7 +65,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { when (keyCode) { KeyEvent.KEYCODE_BACK -> { - Toast.makeText(this, R.string.please_wait, Toast.LENGTH_LONG).show() + Toast.makeText(this, R.string.send_transaction_notification_wait, Toast.LENGTH_LONG).show() return true } } @@ -82,22 +82,22 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { private fun finishWithSuccess() { val transactionFinishWithSuccess = TransactionFinishWithSuccess() - transactionFinishWithSuccess.message = getString(R.string.transaction_has_been_successfully_signed) + transactionFinishWithSuccess.message = getString(R.string.send_transaction_success) EventBus.getDefault().post(transactionFinishWithSuccess) val intent = Intent() - intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.transaction_has_been_successfully_signed)) + intent.putExtra(Constant.EXTRA_MESSAGE, getString(R.string.send_transaction_success)) setResult(RESULT_OK, intent) finish() } private fun finishWithError(message: String) { val transactionFinishWithError = TransactionFinishWithError() - transactionFinishWithError.message = String.format(getString(R.string.try_again_failed_to_send_transaction), message) + transactionFinishWithError.message = String.format(getString(R.string.send_transaction_error_failed_to_send), message) EventBus.getDefault().post(transactionFinishWithError) val intent = Intent() - intent.putExtra(Constant.EXTRA_MESSAGE, String.format(getString(R.string.try_again_failed_to_send_transaction), message)) + intent.putExtra(Constant.EXTRA_MESSAGE, String.format(getString(R.string.send_transaction_error_failed_to_send), message)) setResult(RESULT_CANCELED, intent) finish() } diff --git a/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt index 51c4aa2564..2866c42f54 100644 --- a/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt @@ -21,7 +21,7 @@ class SettingsActivity : AppCompatActivity() { private fun initToolbar() { val toolbar = findViewById(R.id.toolbar) - toolbar.setTitle(R.string.settings) + toolbar.setTitle(R.string.settings_title) toolbar.setNavigationIcon(android.R.drawable.ic_menu_close_clear_cancel) setSupportActionBar(toolbar) toolbar.setNavigationOnClickListener { finish() } diff --git a/app/src/main/java/com/tangem/ui/dialog/NoExtendedLengthSupportDialog.kt b/app/src/main/java/com/tangem/ui/dialog/NoExtendedLengthSupportDialog.kt index d931e86360..eb3f1c8357 100644 --- a/app/src/main/java/com/tangem/ui/dialog/NoExtendedLengthSupportDialog.kt +++ b/app/src/main/java/com/tangem/ui/dialog/NoExtendedLengthSupportDialog.kt @@ -18,9 +18,9 @@ class NoExtendedLengthSupportDialog : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return AlertDialog.Builder(activity) .setIcon(R.drawable.tangem_logo_small_new) - .setTitle(R.string.warning) + .setTitle(R.string.dialog_warning) .setMessage(message) - .setPositiveButton(R.string.got_it) { _, _ -> NoExtendedLengthSupportDialog.allReadyShowed = false } + .setPositiveButton(R.string.dialog_btn_got_it) { _, _ -> NoExtendedLengthSupportDialog.allReadyShowed = false } .create() } diff --git a/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java b/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java index a977511814..1a28371634 100644 --- a/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java +++ b/app/src/main/java/com/tangem/ui/dialog/PINSwapWarningDialog.java @@ -38,11 +38,11 @@ public class PINSwapWarningDialog extends DialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { return new AlertDialog.Builder(getActivity()) .setIcon(R.drawable.tangem_logo_small_new) - .setTitle(R.string.your_money_is_at_risk) + .setTitle(R.string.dialog_title_money_is_at_risk) .setMessage(message) .setCancelable(true) - .setNegativeButton(R.string.cancel, (dialog, which) -> dismiss()) - .setPositiveButton(R.string.contin, (dialog, whichButton) -> mOnPositiveButton.onRefresh()) + .setNegativeButton(R.string.general_cancel, (dialog, which) -> dismiss()) + .setPositiveButton(R.string.general_continue, (dialog, whichButton) -> mOnPositiveButton.onRefresh()) .create(); } diff --git a/app/src/main/java/com/tangem/ui/dialog/RootFoundDialog.kt b/app/src/main/java/com/tangem/ui/dialog/RootFoundDialog.kt index 3882cf74dc..d8650844e3 100644 --- a/app/src/main/java/com/tangem/ui/dialog/RootFoundDialog.kt +++ b/app/src/main/java/com/tangem/ui/dialog/RootFoundDialog.kt @@ -16,9 +16,9 @@ class RootFoundDialog : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return AlertDialog.Builder(activity) .setIcon(R.drawable.tangem_logo_small_new) - .setTitle(R.string.device_is_rooted) + .setTitle(R.string.dialog_device_is_rooted) .setCancelable(false) - .setPositiveButton(R.string.got_it, null) + .setPositiveButton(R.string.dialog_btn_got_it, null) .create() } diff --git a/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java b/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java index 119c2a6e49..06e8627054 100644 --- a/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java +++ b/app/src/main/java/com/tangem/ui/dialog/ShowQRCodeDialog.java @@ -11,12 +11,12 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; -import com.tangem.util.UtilHelper; -import com.tangem.wallet.R; - import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.DialogFragment; +import com.tangem.util.UtilHelper; +import com.tangem.wallet.R; + /** * Created by dvol on 06.03.2018. */ @@ -49,9 +49,9 @@ public class ShowQRCodeDialog extends DialogFragment { return new AlertDialog.Builder(getActivity()) .setIcon(R.drawable.tangem_logo_small_new) - .setTitle(R.string.show_wallet_qr_code) + .setTitle(R.string.loaded_wallet_dialog_show_qr) .setView(v) - .setPositiveButton(R.string.ok, (dialog,which)->dismiss() ) + .setPositiveButton(R.string.general_ok, (dialog, which)->dismiss() ) .create(); } diff --git a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java index 3186affc30..697369b719 100644 --- a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java +++ b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java @@ -10,17 +10,17 @@ import android.view.View; import android.view.WindowManager; import android.widget.ProgressBar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.DialogFragment; + import com.tangem.card_common.util.Log; import com.tangem.wallet.R; import java.util.Timer; import java.util.TimerTask; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.DialogFragment; - /** * Created by dvol on 06.03.2018. */ @@ -67,7 +67,7 @@ public class WaitSecurityDelayDialog extends DialogFragment { }, 1000, 1000); return new AlertDialog.Builder(getActivity()) .setIcon(R.drawable.tangem_logo_small_new) - .setTitle(R.string.security_delay) + .setTitle(R.string.dialog_security_delay) .setView(v) .setCancelable(false) .create(); diff --git a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialogNew.kt b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialogNew.kt index b9421af27d..c55657a9d4 100644 --- a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialogNew.kt +++ b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialogNew.kt @@ -4,8 +4,8 @@ import android.annotation.SuppressLint import android.app.AlertDialog import android.app.Dialog import android.os.Bundle -import androidx.appcompat.app.AppCompatDialogFragment import android.widget.ProgressBar +import androidx.appcompat.app.AppCompatDialogFragment import com.tangem.ui.event.ReadAfterRequest import com.tangem.ui.event.ReadBeforeRequest import com.tangem.ui.event.ReadWait @@ -54,7 +54,7 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() { return AlertDialog.Builder(activity) .setIcon(R.drawable.tangem_logo_small_new) - .setTitle(R.string.security_delay) + .setTitle(R.string.dialog_security_delay) .setView(v) .setCancelable(false) .create() diff --git a/app/src/main/java/com/tangem/ui/fragment/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/LoadedWalletFragment.kt index 40d2e51edb..9329d79222 100644 --- a/app/src/main/java/com/tangem/ui/fragment/LoadedWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/LoadedWalletFragment.kt @@ -149,36 +149,36 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader btnCopy.setOnClickListener { doShareWallet(false) } btnLoad.setOnClickListener { - val items = arrayOf(getString(R.string.in_app), getString(R.string.load_via_share_address), getString(R.string.load_via_qr))//, getString(R.string.via_cryptonit), getString(R.string.via_kraken)) + val items = arrayOf(getString(R.string.loaded_wallet_load_via_app), getString(R.string.loaded_wallet_load_via_share_address), getString(R.string.loaded_wallet_load_via_qr))//, getString(R.string.via_cryptonit), getString(R.string.via_kraken)) val cw = android.view.ContextThemeWrapper(activity, R.style.AlertDialogTheme) val dialog = AlertDialog.Builder(cw).setItems(items ) { _, which -> when (items[which]) { - getString(R.string.in_app) -> { + getString(R.string.loaded_wallet_load_via_app) -> { try { val intent = Intent(Intent.ACTION_VIEW, engine.shareWalletUri) intent.addCategory(Intent.CATEGORY_DEFAULT) startActivity(intent) } catch (e: ActivityNotFoundException) { - (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.no_compatible_wallet)) + (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.loaded_wallet_no_compatible_wallet)) } } - getString(R.string.load_via_share_address) -> { + getString(R.string.loaded_wallet_load_via_share_address) -> { doShareWallet(true) } - getString(R.string.load_via_qr) -> { + getString(R.string.loaded_wallet_load_via_qr) -> { ShowQRCodeDialog.show(activity as AppCompatActivity?, engine.shareWalletUri.toString()) } - getString(R.string.via_cryptonit) -> { + getString(R.string.loaded_wallet_load_via_cryptonit) -> { val intent = Intent(activity, PrepareCryptonitWithdrawalActivity::class.java) ctx.saveToIntent(intent) startActivityForResult(intent, Constant.REQUEST_CODE_RECEIVE_TRANSACTION) } - getString(R.string.via_kraken) -> { + getString(R.string.loaded_wallet_load_via_kraken) -> { val intent = Intent(activity, PrepareKrakenWithdrawalActivity::class.java) ctx.saveToIntent(intent) startActivityForResult(intent, Constant.REQUEST_CODE_RECEIVE_TRANSACTION) @@ -198,18 +198,18 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader if (!engine.isExtractPossible) (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, ctx.message) else if (ctx.card!!.remainingSignatures == 0) - (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.card_has_no_remaining_signature)) + (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.loaded_wallet_warning_no_signature)) else (activity as LoadedWalletActivity).navigator.showPrepareTransaction(context as Activity, ctx) else - Toast.makeText(activity, getString(R.string.no_connection), Toast.LENGTH_SHORT).show() + Toast.makeText(activity, getString(R.string.general_error_no_connection), Toast.LENGTH_SHORT).show() } btnDetails.setOnClickListener { if (cardProtocol != null) (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx) else - (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.need_attach_card_again)) + (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.general_notification_scan_again_to_verify)) } btnNewScan.setOnClickListener { (activity as LoadedWalletActivity).navigator.showMain(context as Activity) } @@ -371,9 +371,9 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader pinSwapWarningDialog.setOnRefreshPage { (activity as LoadedWalletActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) } val bundle = Bundle() if (!CardProtocol.isDefaultPIN(newPIN) || !CardProtocol.isDefaultPIN2(newPIN2)) - bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_forget)) + bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.loaded_wallet_warning_dont_forget_pin)) else - bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_use_default)) + bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.loaded_wallet_warning_default_pin)) pinSwapWarningDialog.arguments = bundle activity?.supportFragmentManager?.let { pinSwapWarningDialog.show(it, PINSwapWarningDialog.TAG) } } @@ -491,7 +491,7 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader if (!NoExtendedLengthSupportDialog.allReadyShowed) activity?.supportFragmentManager?.let { NoExtendedLengthSupportDialog().show(it, NoExtendedLengthSupportDialog.TAG) } else - Toast.makeText(activity, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show() + Toast.makeText(activity, R.string.general_notification_scan_again, Toast.LENGTH_SHORT).show() } } } @@ -573,7 +573,7 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader if (srl.isRefreshing) { tvBalanceLine1.setTextColor(resources.getColor(R.color.primary)) - tvBalanceLine1.text = getString(R.string.verifying_in_blockchain) + tvBalanceLine1.text = getString(R.string.loaded_wallet_verifying_in_blockchain) tvBalanceLine2.text = "" tvBalance.text = "" tvBalanceEquivalent.text = "" @@ -707,7 +707,7 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader } ) } else { - ctx.error = getString(R.string.no_connection) + ctx.error = getString(R.string.general_error_no_connection) updateViews() } } @@ -715,9 +715,9 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader private fun showWarningIfPendingTransactionIsPossible() { if (ctx.card.signedHashes > 0 && isNewCid(ctx.card.cidDescription)) { AlertDialog.Builder(context) - .setTitle(R.string.warning) - .setMessage(R.string.card_signed_transactions_warning) - .setPositiveButton(R.string.ok) { _, _ -> } + .setTitle(R.string.dialog_warning) + .setMessage(R.string.loaded_wallet_warning_card_signed_transactions) + .setPositiveButton(R.string.general_ok) { _, _ -> } .create() .show() } @@ -734,7 +734,7 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader serverApiTangem.cardVerifyAndGetInfo(ctx.card) } } else { - ctx.error = getString(R.string.no_connection) + ctx.error = getString(R.string.general_error_no_connection) updateViews() } } @@ -776,7 +776,7 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader if (isIntentSafe) { // create intent to show chooser - val chooser = Intent.createChooser(intent, getString(R.string.share_wallet_address_with)) + val chooser = Intent.createChooser(intent, getString(R.string.loaded_wallet_chooser_share)) // verify the intent will resolve to at least one activity if (intent.resolveActivity(activity!!.packageManager) != null) { @@ -785,13 +785,13 @@ class LoadedWalletFragment : androidx.fragment.app.Fragment(), NfcAdapter.Reader } else { val clipboard = activity?.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager clipboard.primaryClip = ClipData.newPlainText(txtShare, txtShare) - Toast.makeText(activity, R.string.copied_clipboard, Toast.LENGTH_LONG).show() + Toast.makeText(activity, R.string.loaded_wallet_toast_copied, Toast.LENGTH_LONG).show() } } else { val txtShare = ctx.coinData.wallet val clipboard = activity?.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager clipboard.primaryClip = ClipData.newPlainText(txtShare, txtShare) - Toast.makeText(activity, R.string.copied_clipboard, Toast.LENGTH_LONG).show() + Toast.makeText(activity, R.string.loaded_wallet_toast_copied, Toast.LENGTH_LONG).show() } } diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt index 0772abc5ab..4588b6de9d 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -28,7 +28,6 @@ import com.tangem.card_common.reader.CardProtocol import com.tangem.card_common.tasks.CustomReadCardTask import com.tangem.card_common.tasks.ReadCardInfoTask import com.tangem.data.Logger -import com.tangem.data.network.ServerApiCommon import com.tangem.ui.activity.MainActivity import com.tangem.ui.activity.PinRequestActivity import com.tangem.ui.dialog.NoExtendedLengthSupportDialog @@ -81,9 +80,9 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific // set phone name if (nfcDeviceAntenna.fullName != "") - tvNFCHint.text = String.format(getString(R.string.scan_banknote), nfcDeviceAntenna.fullName) + tvNFCHint.text = String.format(getString(R.string.main_screen_scan_banknote), nfcDeviceAntenna.fullName) else - tvNFCHint.text = String.format(getString(R.string.scan_banknote), getString(R.string.phone)) + tvNFCHint.text = String.format(getString(R.string.main_screen_scan_banknote), getString(R.string.main_screen_phone)) // set listeners fab.setOnClickListener { showMenu(it) } @@ -183,8 +182,8 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } } card.status == TangemCard.Status.Empty -> (activity as MainActivity).navigator.showEmptyWallet(activity!!, ctx) - card.status == TangemCard.Status.Purged -> Toast.makeText(context, R.string.erased_wallet, Toast.LENGTH_SHORT).show() - card.status == TangemCard.Status.NotPersonalized -> Toast.makeText(context, R.string.not_personalized, Toast.LENGTH_SHORT).show() + card.status == TangemCard.Status.Purged -> Toast.makeText(context, R.string.main_screen_erased_wallet, Toast.LENGTH_SHORT).show() + card.status == TangemCard.Status.NotPersonalized -> Toast.makeText(context, R.string.main_screen_not_personalized, Toast.LENGTH_SHORT).show() else -> { // val bundle = Bundle() @@ -200,7 +199,7 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } else { // remove last UIDs because of error and no card read rlProgressBar.post { - Toast.makeText(context, R.string.try_to_scan_again, Toast.LENGTH_SHORT).show() + Toast.makeText(context, R.string.general_notification_scan_again, Toast.LENGTH_SHORT).show() unsuccessReadCount++ if (cardProtocol.error is CardProtocol.TangemException_InvalidPIN) diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt index f11b61e502..9a9ec4c22f 100644 --- a/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCard.kt @@ -25,14 +25,14 @@ import com.tangem.card_android.data.loadFromBundle import com.tangem.card_common.data.TangemCard import com.tangem.card_common.reader.CardProtocol import com.tangem.data.Blockchain -import com.tangem.wallet.CoinEngineFactory -import com.tangem.wallet.TangemContext import com.tangem.ui.activity.PinRequestActivity import com.tangem.ui.activity.VerifyCardActivity import com.tangem.ui.dialog.PINSwapWarningDialog import com.tangem.ui.event.DeletingWalletFinish import com.tangem.wallet.BuildConfig +import com.tangem.wallet.CoinEngineFactory import com.tangem.wallet.R +import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.main.fr_verify_card.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe @@ -75,7 +75,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { btnOk.setOnClickListener { val data = prepareResultIntent() - data.putExtra(Constant.EXTRA_MODIFICATION, getString(R.string.update)) + data.putExtra(Constant.EXTRA_MODIFICATION, getString(R.string.main_screen_btn_update)) activity?.finish() } } @@ -142,9 +142,9 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { pinSwapWarningDialog.setOnRefreshPage { (activity as VerifyCardActivity).navigator.showPinSwap(context as Activity, newPIN, newPIN2) } val bundle = Bundle() if (!CardProtocol.isDefaultPIN(newPIN) || !CardProtocol.isDefaultPIN2(newPIN2)) - bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_forget)) + bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.loaded_wallet_warning_dont_forget_pin)) else - bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.if_you_use_default)) + bundle.putString(Constant.EXTRA_MESSAGE, getString(R.string.loaded_wallet_warning_default_pin)) pinSwapWarningDialog.arguments = bundle activity?.supportFragmentManager?.let { pinSwapWarningDialog.show(it, PINSwapWarningDialog.TAG) } } @@ -237,11 +237,11 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { tvManufacturerInfo.text = ctx.card!!.manufacturer.officialName if (ctx.card!!.isManufacturerConfirmed && ctx.card!!.isCardPublicKeyValid) { - tvCardIdentity.setText(R.string.attested) + tvCardIdentity.setText(R.string.details_attested) tvCardIdentity.setTextColor(ContextCompat.getColor(context!!, R.color.confirmed)) } else { - tvCardIdentity.setText(R.string.not_confirmed) + tvCardIdentity.setText(R.string.details_not_confirmed) tvCardIdentity.setTextColor(ContextCompat.getColor(context!!, R.color.not_confirmed)) } @@ -264,9 +264,9 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { ivBlockchain.setImageResource(Blockchain.getLogoImageResource(ctx.card!!.blockchainID, ctx.card!!.tokenSymbol)) if (ctx.card!!.isReusable!!) - tvReusable.setText(R.string.reusable) + tvReusable.setText(R.string.details_reusable) else - tvReusable.setText(R.string.one_off_banknote) + tvReusable.setText(R.string.details_one_off_banknote) var s="" for(signingM in ctx.card!!.allowedSigningMethod) { @@ -289,15 +289,15 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { when { ctx.card!!.remainingSignatures == 0 -> { tvRemainingSignatures.setTextColor(ContextCompat.getColor(context!!, R.color.not_confirmed)) - tvRemainingSignatures.setText(R.string.none) + tvRemainingSignatures.setText(R.string.details_none) } ctx.card!!.remainingSignatures == 1 -> { tvRemainingSignatures.setTextColor(ContextCompat.getColor(context!!, R.color.not_confirmed)) - tvRemainingSignatures.setText(R.string.last_one) + tvRemainingSignatures.setText(R.string.details_last_one) } ctx.card!!.remainingSignatures > 1000 -> { tvRemainingSignatures.setTextColor(ContextCompat.getColor(context!!, R.color.confirmed)) - tvRemainingSignatures.setText(R.string.unlimited) + tvRemainingSignatures.setText(R.string.details_unlimited) } else -> { tvRemainingSignatures.setTextColor(ContextCompat.getColor(context!!, R.color.confirmed)) @@ -348,41 +348,41 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { if (ctx.card!!.useDefaultPIN1()) { imgPIN.setImageResource(R.drawable.unlock_pin1) - imgPIN.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN1_code, Toast.LENGTH_LONG).show() } + imgPIN.setOnClickListener { Toast.makeText(context, R.string.details_protected_by_default_pin_1, Toast.LENGTH_LONG).show() } } else { imgPIN.setImageResource(R.drawable.lock_pin1) - imgPIN.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_user_PIN1_code, Toast.LENGTH_LONG).show() } + imgPIN.setOnClickListener { Toast.makeText(context, R.string.details_protected_by_user_pin_1, Toast.LENGTH_LONG).show() } } if (ctx.card!!.pauseBeforePIN2 > 0 && (ctx.card!!.useDefaultPIN2()!! || !ctx.card!!.useSmartSecurityDelay())) { imgPIN2orSecurityDelay.setImageResource(R.drawable.timer) - imgPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, String.format(getString(R.string.this_banknote_will_enforce), ctx.card!!.pauseBeforePIN2 / 1000.0), Toast.LENGTH_LONG).show() } + imgPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, String.format(getString(R.string.details_security_delay), ctx.card!!.pauseBeforePIN2 / 1000.0), Toast.LENGTH_LONG).show() } } else if (ctx.card!!.useDefaultPIN2()!!) { imgPIN2orSecurityDelay.setImageResource(R.drawable.unlock_pin2) - imgPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_default_PIN2_code, Toast.LENGTH_LONG).show() } + imgPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.details_protected_by_default_pin_2, Toast.LENGTH_LONG).show() } } else { imgPIN2orSecurityDelay.setImageResource(R.drawable.lock_pin2) - imgPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.this_banknote_protected_user_PIN2_code, Toast.LENGTH_LONG).show() } + imgPIN2orSecurityDelay.setOnClickListener { Toast.makeText(context, R.string.details_protected_by_user_pin_2, Toast.LENGTH_LONG).show() } } if (ctx.card!!.useDevelopersFirmware()!!) { imgDeveloperVersion.setImageResource(R.drawable.ic_developer_version) imgDeveloperVersion.visibility = View.VISIBLE - imgDeveloperVersion.setOnClickListener { Toast.makeText(context, R.string.unlocked_banknote_only_development_use, Toast.LENGTH_LONG).show() } + imgDeveloperVersion.setOnClickListener { Toast.makeText(context, R.string.details_unlocked_banknote, Toast.LENGTH_LONG).show() } } else imgDeveloperVersion.visibility = View.INVISIBLE if (ctx.card!!.status == TangemCard.Status.Loaded) { tvWallet.text = ctx.coinData!!.shortWalletString if (ctx.card!!.isWalletPublicKeyValid) { - tvWalletIdentity.setText(R.string.possession_proved) + tvWalletIdentity.setText(R.string.details_possession_proved) tvWalletIdentity.setTextColor(ContextCompat.getColor(context!!, R.color.confirmed)) } else { - tvWalletIdentity.setText(R.string.possession_not_proved) + tvWalletIdentity.setText(R.string.details_possession_not_proved) tvWalletIdentity.setTextColor(ContextCompat.getColor(context!!, R.color.not_confirmed)) } } else { - tvWallet!!.setText(R.string.not_available) + tvWallet!!.setText(R.string.details_not_available) tvWalletIdentity.setText(R.string.no_data_string) } } catch (e: Exception) { @@ -444,7 +444,7 @@ class VerifyCard : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback { if (!engine!!.hasBalanceInfo()) { return } else if (engine.isBalanceNotZero) { - Toast.makeText(context, R.string.cannot_erase_wallet_with_non_zero_balance, Toast.LENGTH_LONG).show() + Toast.makeText(context, R.string.general_error_cannot_erase_wallet_with_non_zero_balance, Toast.LENGTH_LONG).show() return } diff --git a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java index c0b936d269..021e7ee389 100644 --- a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java @@ -4,25 +4,25 @@ import android.net.Uri; import android.text.InputFilter; import android.util.Log; +import com.tangem.card_common.data.TangemCard; +import com.tangem.card_common.reader.CardProtocol; +import com.tangem.card_common.tasks.SignTask; +import com.tangem.card_common.util.Util; import com.tangem.data.network.ElectrumRequest; import com.tangem.data.network.ServerApiElectrum; -import com.tangem.wallet.BCHUtils; -import com.tangem.wallet.BTCUtils; -import com.tangem.card_common.reader.CardProtocol; -import com.tangem.wallet.BalanceValidator; -import com.tangem.wallet.btc.BtcData; -import com.tangem.wallet.CoinData; -import com.tangem.wallet.CoinEngine; -import com.tangem.card_common.data.TangemCard; -import com.tangem.wallet.TangemContext; -import com.tangem.wallet.Transaction; -import com.tangem.wallet.UnspentOutputInfo; -import com.tangem.card_common.tasks.SignTask; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; -import com.tangem.card_common.util.Util; +import com.tangem.wallet.BCHUtils; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.CoinData; +import com.tangem.wallet.CoinEngine; import com.tangem.wallet.R; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.Transaction; +import com.tangem.wallet.UnspentOutputInfo; +import com.tangem.wallet.btc.BtcData; import org.json.JSONArray; import org.json.JSONException; @@ -105,13 +105,13 @@ public class BtcCashEngine extends CoinEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else if (coinData.getUnspentTransactions().size() == 0) { - ctx.setMessage(R.string.please_wait_for_confirmation); + ctx.setMessage(R.string.loaded_wallet_message_refresh); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java index 4936c28295..5327f3f62e 100644 --- a/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java +++ b/app/src/main/java/com/tangem/wallet/binance/BinanceEngine.java @@ -124,11 +124,11 @@ public class BinanceEngine extends CoinEngine { public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java index 22d1075ccc..925401cabc 100644 --- a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java @@ -117,13 +117,13 @@ public class BtcEngine extends CoinEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else if (coinData.getUnspentTransactions().size() == 0) { - ctx.setMessage(R.string.please_wait_for_confirmation); + ctx.setMessage(R.string.loaded_wallet_message_refresh); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java index 73d154ee51..0b7bc6544a 100644 --- a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java +++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java @@ -7,24 +7,24 @@ import android.util.Log; import com.tangem.App; import com.tangem.Constant; +import com.tangem.card_common.data.TangemCard; +import com.tangem.card_common.tasks.SignTask; +import com.tangem.card_common.util.Util; import com.tangem.data.local.PendingTransactionsStorage; import com.tangem.data.network.ServerApiAdalite; import com.tangem.data.network.model.AdaliteResponse; import com.tangem.data.network.model.AdaliteResponseUtxo; import com.tangem.data.network.model.AdaliteTxData; import com.tangem.data.network.model.AdaliteUtxoData; +import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.BalanceValidator; import com.tangem.wallet.Base58; +import com.tangem.wallet.BuildConfig; import com.tangem.wallet.CoinData; import com.tangem.wallet.CoinEngine; -import com.tangem.wallet.TangemContext; -import com.tangem.card_common.data.TangemCard; -import com.tangem.card_common.tasks.SignTask; -import com.tangem.card_common.util.Util; -import com.tangem.util.DecimalDigitsInputFilter; -import com.tangem.wallet.BuildConfig; import com.tangem.wallet.R; +import com.tangem.wallet.TangemContext; import org.spongycastle.crypto.Digest; import org.spongycastle.crypto.util.DigestFactory; @@ -119,13 +119,13 @@ public class CardanoEngine extends CoinEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else if (coinData.getUnspentOutputs().size() == 0) { - ctx.setMessage(R.string.please_wait_for_confirmation); + ctx.setMessage(R.string.loaded_wallet_message_refresh); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java index b3c3853da9..9189a0b2e9 100644 --- a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java +++ b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java @@ -4,25 +4,25 @@ import android.net.Uri; import android.text.InputFilter; import android.util.Log; +import com.tangem.card_common.data.TangemCard; +import com.tangem.card_common.reader.CardProtocol; +import com.tangem.card_common.tasks.SignTask; +import com.tangem.card_common.util.Util; import com.tangem.data.network.ServerApiInsight; import com.tangem.data.network.model.InsightResponse; +import com.tangem.util.CryptoUtil; +import com.tangem.util.DecimalDigitsInputFilter; +import com.tangem.util.DerEncodingUtil; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.BalanceValidator; import com.tangem.wallet.Base58; import com.tangem.wallet.CoinData; +import com.tangem.wallet.R; import com.tangem.wallet.TangemContext; import com.tangem.wallet.Transaction; import com.tangem.wallet.UnspentOutputInfo; import com.tangem.wallet.btc.BtcData; import com.tangem.wallet.btc.BtcEngine; -import com.tangem.card_common.data.TangemCard; -import com.tangem.card_common.reader.CardProtocol; -import com.tangem.card_common.tasks.SignTask; -import com.tangem.card_common.util.Util; -import com.tangem.util.CryptoUtil; -import com.tangem.util.DecimalDigitsInputFilter; -import com.tangem.util.DerEncodingUtil; -import com.tangem.wallet.R; import java.io.ByteArrayOutputStream; import java.math.BigDecimal; @@ -102,13 +102,13 @@ public class DucatusEngine extends BtcEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else if (coinData.getUnspentTransactions().size() == 0) { - ctx.setMessage(R.string.please_wait_for_confirmation); + ctx.setMessage(R.string.loaded_wallet_message_refresh); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java index 17f281efad..e2cf155dba 100644 --- a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java +++ b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java @@ -5,7 +5,6 @@ import android.text.InputFilter; import android.util.Log; import com.fasterxml.jackson.core.JsonProcessingException; -import com.google.common.primitives.Bytes; import com.google.gson.Gson; import com.tangem.Constant; import com.tangem.card_common.data.TangemCard; @@ -16,7 +15,6 @@ import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiEos; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; -import com.tangem.util.DerEncodingUtil; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.BalanceValidator; import com.tangem.wallet.BuildConfig; @@ -24,7 +22,6 @@ import com.tangem.wallet.CoinData; import com.tangem.wallet.CoinEngine; import com.tangem.wallet.R; import com.tangem.wallet.TangemContext; -import com.tangem.wallet.eos.utilities.EOSFormatter; import org.apache.commons.lang3.SerializationUtils; import org.apache.commons.lang3.StringUtils; @@ -230,11 +227,11 @@ public class EosEngine extends CoinEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java index bfc7238d51..96e33d75f2 100644 --- a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java @@ -5,23 +5,23 @@ import android.text.InputFilter; import android.util.Log; import com.tangem.Constant; +import com.tangem.card_common.data.TangemCard; +import com.tangem.card_common.tasks.SignTask; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiInfura; import com.tangem.data.network.model.InfuraResponse; +import com.tangem.util.CryptoUtil; +import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.BuildConfig; import com.tangem.wallet.CoinData; import com.tangem.wallet.CoinEngine; import com.tangem.wallet.ECDSASignatureETH; import com.tangem.wallet.EthTransaction; import com.tangem.wallet.Keccak256; -import com.tangem.wallet.TangemContext; -import com.tangem.card_common.data.TangemCard; -import com.tangem.card_common.tasks.SignTask; -import com.tangem.util.CryptoUtil; -import com.tangem.util.DecimalDigitsInputFilter; -import com.tangem.wallet.BuildConfig; import com.tangem.wallet.R; +import com.tangem.wallet.TangemContext; import org.bitcoinj.core.ECKey; @@ -241,11 +241,11 @@ public class EthEngine extends CoinEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else { return true; } @@ -560,7 +560,7 @@ public class EthEngine extends CoinEngine { @Override public void onFail(String method, String message) { - ctx.setError(ctx.getContext().getString(R.string.cannot_calculate_fee_wrong_data_received_from_node)); + ctx.setError(ctx.getContext().getString(R.string.confirm_transaction_error_cannot_calculate_fee)); blockchainRequestsCallbacks.onComplete(false); } }; diff --git a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java index 680c112119..2aca8f2f43 100644 --- a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java @@ -3,15 +3,6 @@ package com.tangem.wallet.ltc; import android.net.Uri; import android.text.InputFilter; -import com.tangem.wallet.BTCUtils; -import com.tangem.wallet.BalanceValidator; -import com.tangem.wallet.Base58; -import com.tangem.wallet.CoinData; -import com.tangem.wallet.TangemContext; -import com.tangem.wallet.Transaction; -import com.tangem.wallet.UnspentOutputInfo; -import com.tangem.wallet.btc.BtcData; -import com.tangem.wallet.btc.BtcEngine; import com.tangem.card_common.data.TangemCard; import com.tangem.card_common.reader.CardProtocol; import com.tangem.card_common.tasks.SignTask; @@ -19,7 +10,16 @@ import com.tangem.card_common.util.Util; import com.tangem.util.CryptoUtil; import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.util.DerEncodingUtil; +import com.tangem.wallet.BTCUtils; +import com.tangem.wallet.BalanceValidator; +import com.tangem.wallet.Base58; +import com.tangem.wallet.CoinData; import com.tangem.wallet.R; +import com.tangem.wallet.TangemContext; +import com.tangem.wallet.Transaction; +import com.tangem.wallet.UnspentOutputInfo; +import com.tangem.wallet.btc.BtcData; +import com.tangem.wallet.btc.BtcEngine; import java.io.ByteArrayOutputStream; import java.math.BigDecimal; @@ -98,13 +98,13 @@ public class LtcEngine extends BtcEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else if (coinData.getUnspentTransactions().size() == 0) { - ctx.setMessage(R.string.please_wait_for_confirmation); + ctx.setMessage(R.string.loaded_wallet_message_refresh); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java b/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java index 6282a9b854..523f9dd1cc 100644 --- a/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java @@ -1,7 +1,6 @@ package com.tangem.wallet.matic; import android.net.Uri; -import android.util.Log; import com.tangem.card_common.tasks.SignTask; import com.tangem.data.Blockchain; @@ -74,11 +73,11 @@ public class MaticTokenEngine extends TokenEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java b/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java index 0ca4fe7892..c1eee2ed17 100644 --- a/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java +++ b/app/src/main/java/com/tangem/wallet/rsk/RskEngine.java @@ -9,9 +9,9 @@ import com.tangem.data.network.model.InfuraResponse; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.CoinEngine; import com.tangem.wallet.EthTransaction; +import com.tangem.wallet.R; import com.tangem.wallet.TangemContext; import com.tangem.wallet.eth.EthEngine; -import com.tangem.wallet.R; import java.math.BigInteger; @@ -162,7 +162,7 @@ public class RskEngine extends EthEngine { @Override public void onFail(String method, String message) { - ctx.setError(ctx.getContext().getString(R.string.cannot_calculate_fee_wrong_data_received_from_node)); + ctx.setError(ctx.getContext().getString(R.string.confirm_transaction_error_cannot_calculate_fee)); blockchainRequestsCallbacks.onComplete(false); } }; diff --git a/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java b/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java index 1692916d68..cf07726bb0 100644 --- a/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/rsk/RskTokenEngine.java @@ -9,9 +9,9 @@ import com.tangem.data.network.model.InfuraResponse; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.CoinEngine; import com.tangem.wallet.EthTransaction; +import com.tangem.wallet.R; import com.tangem.wallet.TangemContext; import com.tangem.wallet.token.TokenEngine; -import com.tangem.wallet.R; import java.math.BigInteger; @@ -50,13 +50,13 @@ public class RskTokenEngine extends TokenEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else if (!isBalanceAlterNotZero()) { - ctx.setMessage(ctx.getString(R.string.not_enough_rbtc_for_fee)); + ctx.setMessage(ctx.getString(R.string.confirm_transaction_error_not_enough_rbtc_for_fee)); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java index c207da2832..93cfb1fa37 100644 --- a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java @@ -6,9 +6,13 @@ import android.text.InputFilter; import android.util.Log; import com.google.common.base.Strings; +import com.tangem.card_common.data.TangemCard; +import com.tangem.card_common.tasks.SignTask; import com.tangem.data.Blockchain; import com.tangem.data.network.ServerApiInfura; import com.tangem.data.network.model.InfuraResponse; +import com.tangem.util.CryptoUtil; +import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.BalanceValidator; import com.tangem.wallet.CoinData; @@ -16,13 +20,9 @@ import com.tangem.wallet.CoinEngine; import com.tangem.wallet.ECDSASignatureETH; import com.tangem.wallet.EthTransaction; import com.tangem.wallet.Keccak256; +import com.tangem.wallet.R; import com.tangem.wallet.TangemContext; import com.tangem.wallet.eth.EthData; -import com.tangem.card_common.data.TangemCard; -import com.tangem.card_common.tasks.SignTask; -import com.tangem.util.CryptoUtil; -import com.tangem.util.DecimalDigitsInputFilter; -import com.tangem.wallet.R; import org.bitcoinj.core.ECKey; @@ -308,13 +308,13 @@ public class TokenEngine extends CoinEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else if (!isBalanceAlterNotZero()) { - ctx.setMessage(ctx.getString(R.string.not_enough_eth_for_fee)); + ctx.setMessage(ctx.getString(R.string.confirm_transaction_error_not_enough_eth_for_fee)); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java index ad3946d022..50728fec26 100644 --- a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java +++ b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java @@ -105,11 +105,11 @@ public class XlmEngine extends CoinEngine { @Override public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else { return true; } diff --git a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java index 9a7bb12594..f7276a1f92 100644 --- a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java @@ -15,14 +15,14 @@ import com.tangem.card_common.tasks.SignTask; import com.tangem.card_common.util.Util; import com.tangem.data.network.ServerApiRipple; import com.tangem.data.network.model.RippleResponse; +import com.tangem.util.CryptoUtil; +import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.BTCUtils; import com.tangem.wallet.BalanceValidator; import com.tangem.wallet.CoinData; import com.tangem.wallet.CoinEngine; -import com.tangem.wallet.TangemContext; -import com.tangem.util.CryptoUtil; -import com.tangem.util.DecimalDigitsInputFilter; import com.tangem.wallet.R; +import com.tangem.wallet.TangemContext; import java.math.BigDecimal; import java.math.BigInteger; @@ -94,11 +94,11 @@ public class XrpEngine extends CoinEngine { public boolean isExtractPossible() { if (!hasBalanceInfo()) { - ctx.setMessage(R.string.cannot_obtain_data_from_blockchain); + ctx.setMessage(R.string.loaded_wallet_error_obtaining_blockchain_data); } else if (!isBalanceNotZero()) { - ctx.setMessage(R.string.wallet_empty); + ctx.setMessage(R.string.general_wallet_empty); } else if (awaitingConfirmation()) { - ctx.setMessage(R.string.please_wait_while_previous); + ctx.setMessage(R.string.loaded_wallet_message_wait); } else { return true; } diff --git a/app/src/main/res/layout/activity_empty_wallet.xml b/app/src/main/res/layout/activity_empty_wallet.xml index dd9c16da57..ea1fe4af9a 100644 --- a/app/src/main/res/layout/activity_empty_wallet.xml +++ b/app/src/main/res/layout/activity_empty_wallet.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/maax" android:gravity="center_vertical" - android:text="@string/wallet_has_not_been_yet_created" + android:text="@string/empty_wallet_not_created" android:textAlignment="center" android:textSize="@dimen/text_size_1_small" app:layout_constraintBottom_toTopOf="@+id/btnNewWallet" @@ -48,7 +48,7 @@ android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:fontFamily="@font/saira_condensed_bold" - android:text="@string/create_wallet" + android:text="@string/empty_wallet_btn_create" android:textSize="@dimen/text_size_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -83,7 +83,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/empty_wallet_left_col_margin" android:fontFamily="@font/maax" - android:text="@string/blockchain" + android:text="@string/general_blockchain" android:textColor="@color/primary_dark" android:textSize="@dimen/text_size_1_small" /> @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/empty_wallet_left_col_margin" android:fontFamily="@font/maax" - android:text="@string/issuer" + android:text="@string/details_category_issuer" android:textColor="@color/primary_dark" android:textSize="@dimen/text_size_1_small" /> @@ -160,7 +160,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/scan_again_to_verify_the_card" + android:text="@string/general_notification_scan_again_to_verify" android:textAlignment="center" android:textColor="@android:color/darker_gray" android:textSize="@dimen/text_size_small" /> diff --git a/app/src/main/res/layout/activity_logo.xml b/app/src/main/res/layout/activity_logo.xml index 7c7e1de15a..f0ddbec1a9 100644 --- a/app/src/main/res/layout/activity_logo.xml +++ b/app/src/main/res/layout/activity_logo.xml @@ -23,7 +23,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/ivLogo" - tools:text="@string/cardano" + tools:text="@string/splash_cardano" tools:visibility="visible" /> @@ -53,7 +53,7 @@ android:layout_alignParentStart="true" android:layout_gravity="bottom" android:layout_marginBottom="16dp" - android:text="@string/ok" /> + android:text="@string/general_ok" /> diff --git a/app/src/main/res/layout/activity_pin_save.xml b/app/src/main/res/layout/activity_pin_save.xml index c9c3d906bc..1a0bd8198b 100644 --- a/app/src/main/res/layout/activity_pin_save.xml +++ b/app/src/main/res/layout/activity_pin_save.xml @@ -26,7 +26,7 @@ android:fontFamily="@font/maax" android:paddingBottom="16dp" android:paddingTop="16dp" - android:text="@string/enter_pin_and_use_fingerprint_to_save_it" + android:text="@string/pin_save_title_enter_pin_and_save" android:textAlignment="center" android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> @@ -52,7 +52,7 @@ android:layout_marginBottom="4dp" android:drawableEnd="@mipmap/ic_fp" android:drawablePadding="8dp" - android:text="@string/protect_with_fingerprint" /> + android:text="@string/pin_save_checkbox_protect_with_fingerprint" />