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 ebcf22e73f..e4562d7688 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(pinSaveFragment.getContext(), R.string.pin_save_fail, Toast.LENGTH_LONG).show(); + Toast.makeText(pinSaveFragment.getContext(), R.string.pin_save_notification_failed, Toast.LENGTH_LONG).show(); } else { pinSaveFragment.getFingerprintHelper().startAuth(pinSaveFragment.getFingerprintManager(), pinSaveFragment.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/SendTransactionActivity.kt b/app/src/main/java/com/tangem/ui/activity/SendTransactionActivity.kt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt new file mode 100644 index 0000000000..e69de29bb2 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 b7a8555c3e..f1f542e8ae 100644 --- a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java +++ b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java @@ -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/LogoFragment.kt b/app/src/main/java/com/tangem/ui/fragment/LogoFragment.kt index 0ee9038dfb..080f917a41 100644 --- a/app/src/main/java/com/tangem/ui/fragment/LogoFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/LogoFragment.kt @@ -29,15 +29,15 @@ class LogoFragment : BaseFragment() { clLogoContainer.setOnClickListener { hide() } // 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/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt index 0c5c05d317..58db14f868 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -74,9 +74,9 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader // 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) } @@ -181,8 +181,8 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader val bundle = Bundle().apply { ctx.saveToBundle(this) } navigateToDestination(R.id.action_main_to_emptyWalletFragment, bundle) } - 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() diff --git a/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt b/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt index ceb8baf9ee..dc12ed4860 100644 --- a/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/PurgeFragment.kt @@ -165,7 +165,7 @@ class PurgeFragment : BaseFragment(), NfcAdapter.ReaderCallback, CardProtocol.No val data = bundleOf( EXTRA_TANGEM_CARD_UID to cardProtocol.card.uid, EXTRA_TANGEM_CARD to cardProtocol.card.asBundle, - Constant.EXTRA_MESSAGE to getString(R.string.cannot_erase_wallet) + Constant.EXTRA_MESSAGE to getString(R.string.nfc_error_cannot_erase_wallet) ) navigateBackWithResult(RESULT_INVALID_PIN, data) return@postDelayed @@ -179,7 +179,7 @@ class PurgeFragment : BaseFragment(), NfcAdapter.ReaderCallback, CardProtocol.No if (!NoExtendedLengthSupportDialog.allReadyShowed) NoExtendedLengthSupportDialog().show(activity!!.supportFragmentManager, NoExtendedLengthSupportDialog.TAG) } else - Toast.makeText(context, R.string.try_to_scan_again, Toast.LENGTH_LONG).show() + Toast.makeText(context, 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/fragment/SendTransactionFragment.kt b/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt index 4df01cc933..7d709ee662 100644 --- a/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/SendTransactionFragment.kt @@ -56,7 +56,7 @@ class SendTransactionFragment : BaseFragment(), NfcAdapter.ReaderCallback { val callback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { - Toast.makeText(context, R.string.please_wait, Toast.LENGTH_LONG).show() + Toast.makeText(context, R.string.send_transaction_notification_wait, Toast.LENGTH_LONG).show() } } @@ -76,13 +76,13 @@ class SendTransactionFragment : BaseFragment(), NfcAdapter.ReaderCallback { EventBus.getDefault().post(transactionFinishWithSuccess) val data = Bundle() - data.putString(Constant.EXTRA_MESSAGE, getString(R.string.transaction_has_been_successfully_signed)) + data.putString(Constant.EXTRA_MESSAGE, getString(R.string.send_transaction_success)) navigateBackWithResult(Activity.RESULT_OK, data, R.id.loadedWalletFragment) } private fun finishWithError(message: String) { val data = Bundle() - data.putString(Constant.EXTRA_MESSAGE, String.format(getString(R.string.try_again_failed_to_send_transaction), message)) + data.putString(Constant.EXTRA_MESSAGE, String.format(getString(R.string.send_transaction_error_failed_to_send), message)) navigateBackWithResult(Activity.RESULT_CANCELED, data, R.id.loadedWalletFragment) } diff --git a/app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt b/app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt index 8f42341a40..52fa224f03 100644 --- a/app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt @@ -32,7 +32,7 @@ class SettingsFragment : PreferenceFragmentCompat() { } private fun initToolbar() { - toolbar?.setTitle(R.string.settings) + toolbar?.setTitle(R.string.settings_title) toolbar?.setNavigationIcon(android.R.drawable.ic_menu_close_clear_cancel) (activity as AppCompatActivity).setSupportActionBar(toolbar) toolbar?.setNavigationOnClickListener { diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt index 9f32c21aae..cf8e7642dc 100644 --- a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt @@ -58,7 +58,7 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. val callback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { val data = prepareResultIntent() - data.putExtra(Constant.EXTRA_MODIFICATION, getString(R.string.update)) + data.putExtra(Constant.EXTRA_MODIFICATION, getString(R.string.main_screen_btn_update)) navigateUp() } } @@ -76,7 +76,7 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. 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)) navigateUp() } } @@ -154,9 +154,9 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. } 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) } } @@ -254,11 +254,11 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. 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)) } @@ -281,9 +281,9 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. 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) { @@ -306,15 +306,15 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. 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)) @@ -365,41 +365,41 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. 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) { @@ -466,7 +466,7 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. 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/ui/fragment/additional/PrepareCryptonitOtherApiWithdrawalFragment.kt b/app/src/main/java/com/tangem/ui/fragment/additional/PrepareCryptonitOtherApiWithdrawalFragment.kt index 28eed1f53a..9c21c5fb41 100644 --- a/app/src/main/java/com/tangem/ui/fragment/additional/PrepareCryptonitOtherApiWithdrawalFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/additional/PrepareCryptonitOtherApiWithdrawalFragment.kt @@ -58,7 +58,7 @@ class PrepareCryptonitOtherApiWithdrawalFragment : BaseFragment(), NavigationRes 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/fragment/additional/PrepareCryptonitWithdrawalFragment.kt b/app/src/main/java/com/tangem/ui/fragment/additional/PrepareCryptonitWithdrawalFragment.kt index e8febb42e1..3ff76912db 100644 --- a/app/src/main/java/com/tangem/ui/fragment/additional/PrepareCryptonitWithdrawalFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/additional/PrepareCryptonitWithdrawalFragment.kt @@ -88,7 +88,7 @@ class PrepareCryptonitWithdrawalFragment : BaseFragment(), NfcAdapter.ReaderCall 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/fragment/additional/PrepareKrakenWithdrawalFragment.kt b/app/src/main/java/com/tangem/ui/fragment/additional/PrepareKrakenWithdrawalFragment.kt index 0dfde6f7ec..00685a48df 100644 --- a/app/src/main/java/com/tangem/ui/fragment/additional/PrepareKrakenWithdrawalFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/additional/PrepareKrakenWithdrawalFragment.kt @@ -78,7 +78,7 @@ class PrepareKrakenWithdrawalFragment : BaseFragment(), NavigationResultListener 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) } } @@ -153,7 +153,7 @@ class PrepareKrakenWithdrawalFragment : BaseFragment(), NavigationResultListener val builder = AlertDialog.Builder(context) // 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)) @@ -174,20 +174,20 @@ class PrepareKrakenWithdrawalFragment : BaseFragment(), NavigationResultListener 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(context, R.string.operation_canceled, Toast.LENGTH_LONG).show() + Toast.makeText(context, 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/fragment/pin/PinRequestFragment.kt b/app/src/main/java/com/tangem/ui/fragment/pin/PinRequestFragment.kt index 023e9c5e8a..dc4206c2a1 100644 --- a/app/src/main/java/com/tangem/ui/fragment/pin/PinRequestFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/pin/PinRequestFragment.kt @@ -101,25 +101,25 @@ class PinRequestFragment : BaseFragment(), NfcAdapter.ReaderCallback, Fingerprin 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 = arguments?.getString(EXTRA_TANGEM_CARD_UID) val card = TangemCard(uid) @@ -134,9 +134,9 @@ class PinRequestFragment : BaseFragment(), NfcAdapter.ReaderCallback, Fingerprin 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) @@ -287,13 +287,13 @@ class PinRequestFragment : BaseFragment(), NfcAdapter.ReaderCallback, Fingerprin if (mode == Mode.ConfirmNewPIN) { if (pin != arguments?.getString(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 != arguments?.getString(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/fragment/pin/PinSaveFragment.kt b/app/src/main/java/com/tangem/ui/fragment/pin/PinSaveFragment.kt index 72d8503cf9..b1a5fd70d8 100644 --- a/app/src/main/java/com/tangem/ui/fragment/pin/PinSaveFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/pin/PinSaveFragment.kt @@ -64,9 +64,9 @@ class PinSaveFragment : BaseFragment(), FingerprintHelper.FingerprintHelperListe usePIN2 = arguments?.getBoolean(Constant.EXTRA_PIN2, false) ?: 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 @@ -352,17 +352,17 @@ class PinSaveFragment : BaseFragment(), FingerprintHelper.FingerprintHelperListe fingerprintManager = activity?.getSystemService(Context.FINGERPRINT_SERVICE) as FingerprintManager if (!keyguardManager.isKeyguardSecure) { - Toast.makeText(context, R.string.user_has_not_enabled_lock_screen, Toast.LENGTH_LONG).show() + Toast.makeText(context, R.string.pin_save_toast_lock_screen_not_enabled, Toast.LENGTH_LONG).show() return false } - if (ActivityCompat.checkSelfPermission(context!!, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) { - Toast.makeText(context, R.string.user_has_not_granted_permission_to_use_fingerprint, Toast.LENGTH_LONG).show() + if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) { + Toast.makeText(context, R.string.pin_save_toast_no_permission_to_use_fingerprint, Toast.LENGTH_LONG).show() return false } if (!fingerprintManager!!.hasEnrolledFingerprints()) { - Toast.makeText(context, R.string.user_has_not_registered_any_fingerprints, Toast.LENGTH_LONG).show() + Toast.makeText(context, R.string.pin_save_toast_no_fingerprints_registered, Toast.LENGTH_LONG).show() return false } diff --git a/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt b/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt index b694970a0d..04b12813ba 100644 --- a/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/pin/PinSwapFragment.kt @@ -148,7 +148,7 @@ class PinSwapFragment : BaseFragment(), NfcAdapter.ReaderCallback, CardProtocol. NoExtendedLengthSupportDialog.TAG) } } else { - 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() } progressBar!!.progress = 100 progressBar!!.progressTintList = ColorStateList.valueOf(Color.RED) diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt index 1923b8c8da..5496044e70 100644 --- a/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/wallet/CreateNewWalletFragment.kt @@ -113,7 +113,7 @@ class CreateNewWalletFragment : BaseFragment(), NfcAdapter.ReaderCallback, CardP progressBar?.progressTintList = ColorStateList.valueOf(Color.DKGRAY) progressBar?.visibility = View.INVISIBLE val data = Bundle() - data.putString(Constant.EXTRA_MESSAGE, getString(R.string.cannot_create_wallet)) + data.putString(Constant.EXTRA_MESSAGE, getString(R.string.nfc_error_cannot_create_wallet)) data.putString(EXTRA_TANGEM_CARD_UID, cardProtocol.card.uid) data.putBundle(EXTRA_TANGEM_CARD, cardProtocol.card!!.asBundle) navigateBackWithResult(Constant.RESULT_INVALID_PIN, data) @@ -129,7 +129,7 @@ class CreateNewWalletFragment : BaseFragment(), NfcAdapter.ReaderCallback, CardP NoExtendedLengthSupportDialog().show(activity!!.supportFragmentManager, NoExtendedLengthSupportDialog.TAG) } } else - 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() progressBar?.progress = 100 progressBar?.progressTintList = ColorStateList.valueOf(Color.RED) diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt index 90afb78d2a..65461743c6 100644 --- a/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/wallet/EmptyWalletFragment.kt @@ -93,7 +93,7 @@ class EmptyWalletFragment : BaseFragment(), NavigationResultListener, R.id.action_emptyWalletFragment_to_verifyCard, data) } else { (activity as MainActivity).toastHelper - .showSingleToast(context, getString(R.string.need_attach_card_again)) + .showSingleToast(context, getString(R.string.general_notification_scan_again_to_verify)) } } } @@ -188,7 +188,7 @@ class EmptyWalletFragment : BaseFragment(), NavigationResultListener, if (!NoExtendedLengthSupportDialog.allReadyShowed) NoExtendedLengthSupportDialog().show(activity!!.supportFragmentManager, NoExtendedLengthSupportDialog.TAG) } else - Toast.makeText(context, R.string.try_to_scan_again, Toast.LENGTH_LONG).show() + Toast.makeText(context, 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/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt index 0462c8ff3d..70fa44d1fd 100644 --- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt @@ -88,11 +88,16 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte resources.getColorStateList(R.color.btn_dark) } private val activeColor: ColorStateList by lazy { + val color = if( (Util.bytesToHex(ctx.card?.cid)?.startsWith("10") == true)) { + R.color.start2coin_orange + } else { + R.color.colorAccent + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) - resources.getColorStateList(R.color.colorAccent, activity?.theme) + resources.getColorStateList(color, activity?.theme) else @Suppress("DEPRECATION") - resources.getColorStateList(R.color.colorAccent) + resources.getColorStateList(color) } private var requestCounter: Int = 0 set(value) { @@ -144,31 +149,35 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte btnCopy.setOnClickListener { doShareWallet(false) } + if (Util.bytesToHex(ctx.card?.cid)?.startsWith("10") == true) { + btnLoad?.visibility = View.GONE + } + 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 MainActivity).toastHelper.showSingleToast(context, getString(R.string.no_compatible_wallet)) + (activity as MainActivity).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) -> { navigateForResult( Constant.REQUEST_CODE_RECEIVE_TRANSACTION, R.id.action_loadedWalletFragment_to_prepareCryptonitWithdrawalFragment, @@ -176,7 +185,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte ) } - getString(R.string.via_kraken) -> { + getString(R.string.loaded_wallet_load_via_kraken) -> { navigateForResult( Constant.REQUEST_CODE_RECEIVE_TRANSACTION, R.id.action_loadedWalletFragment_to_prepareKrakenWithdrawalFragment, @@ -198,14 +207,14 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte if (!engine.isExtractPossible) { (activity as MainActivity).toastHelper.showSingleToast(context, ctx.message) } else if (ctx.card!!.remainingSignatures == 0) { - (activity as MainActivity).toastHelper.showSingleToast(context, getString(R.string.card_has_no_remaining_signature)) + (activity as MainActivity).toastHelper.showSingleToast(context, getString(R.string.loaded_wallet_warning_no_signature)) } else { val bundle = Bundle().apply { ctx.saveToBundle(this) } navigateForResult(Constant.REQUEST_CODE_SEND_TRANSACTION, R.id.action_loadedWalletFragment_to_prepareTransactionFragment, bundle) } 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 { @@ -215,7 +224,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte R.id.action_loadedWalletFragment_to_verifyCard, bundle) } else { (activity as MainActivity).toastHelper - .showSingleToast(context, getString(R.string.need_attach_card_again)) + .showSingleToast(context, getString(R.string.general_notification_scan_again_to_verify)) } } @@ -395,9 +404,9 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte } 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) } } @@ -528,7 +537,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte 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() } } } @@ -610,7 +619,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte 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 = "" @@ -744,7 +753,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte } ) } else { - ctx.error = getString(R.string.no_connection) + ctx.error = getString(R.string.general_error_no_connection) updateViews() } } @@ -752,9 +761,9 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte 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() } @@ -771,7 +780,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte serverApiTangem.cardVerifyAndGetInfo(ctx.card) } } else { - ctx.error = getString(R.string.no_connection) + ctx.error = getString(R.string.general_error_no_connection) updateViews() } } @@ -814,7 +823,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte 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) { @@ -823,13 +832,13 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte } 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/wallet/bch/BtcCashEngine.java b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java index 731dfc620f..25d5aa6cc2 100644 --- a/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/wallet/bch/BtcCashEngine.java @@ -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 efc81cac43..e61cb7115f 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 d2247214d8..818006bcca 100644 --- a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java @@ -124,13 +124,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 44b283296d..6cf578abe3 100644 --- a/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java +++ b/app/src/main/java/com/tangem/wallet/cardano/CardanoEngine.java @@ -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 0e07b1f913..fa48a81bd5 100644 --- a/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java +++ b/app/src/main/java/com/tangem/wallet/ducatus/DucatusEngine.java @@ -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 b5b2d7b463..235923561e 100644 --- a/app/src/main/java/com/tangem/wallet/eos/EosEngine.java +++ b/app/src/main/java/com/tangem/wallet/eos/EosEngine.java @@ -227,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 fa0ad71a18..d0d50fa172 100644 --- a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java +++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java @@ -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 a5c138ae57..e57578e274 100644 --- a/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java +++ b/app/src/main/java/com/tangem/wallet/ltc/LtcEngine.java @@ -111,13 +111,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 f4af03ccd9..b6ebf6c762 100644 --- a/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/matic/MaticTokenEngine.java @@ -73,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 08fcab5dbd..4021a462f3 100644 --- a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java +++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java @@ -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 fcda3eb2b3..e8ad0ce1d2 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 6cb75e3c72..99a2474c86 100644 --- a/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java +++ b/app/src/main/java/com/tangem/wallet/xrp/XrpEngine.java @@ -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/dialog_fingerprint_confirmation.xml b/app/src/main/res/layout/dialog_fingerprint_confirmation.xml index 454546705d..ea43edf1d4 100644 --- a/app/src/main/res/layout/dialog_fingerprint_confirmation.xml +++ b/app/src/main/res/layout/dialog_fingerprint_confirmation.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_margin="16dp" - android:text="@string/touch_fingerprint_scanner_to_confirm" + android:text="@string/pin_save_dialog_touch_fingerprint_scanner" android:textAlignment="center" android:textSize="@dimen/text_size_medium" /> diff --git a/app/src/main/res/layout/dialog_wait_pin2.xml b/app/src/main/res/layout/dialog_wait_pin2.xml index 88c50d8038..82e34a2349 100644 --- a/app/src/main/res/layout/dialog_wait_pin2.xml +++ b/app/src/main/res/layout/dialog_wait_pin2.xml @@ -13,7 +13,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="16dp" android:fontFamily="@font/maax" - android:text="@string/this_banknote_has_enforced_security_delay" + android:text="@string/dialog_this_banknote_has_enforced_security_delay" android:textAlignment="center" android:textColor="@color/primary" android:textSize="@dimen/text_size_1_small" @@ -29,7 +29,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="16dp" android:fontFamily="@font/maax" - android:text="@string/please_hold_banknote" + android:text="@string/dialog_hold_banknote" android:textAlignment="center" android:textColor="@color/black" android:textSize="@dimen/text_size_medium" @@ -63,7 +63,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="16dp" android:fontFamily="@font/maax" - android:text="@string/you_may_be_required_to_repeat" + android:text="@string/dialog_you_may_be_required_to_repeat" android:textAlignment="center" android:textColor="@color/primary" android:textSize="@dimen/text_size_small" diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 22bd8bfbf2..7c19a82299 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -169,7 +169,7 @@ android:fontFamily="@font/saira_condensed_bold" android:paddingLeft="20dp" android:paddingRight="20dp" - android:text="@string/btn_explore" + android:text="@string/loaded_wallet_btn_explore" android:textColor="@color/primary_dark" /> @@ -255,7 +255,7 @@ android:layout_marginBottom="10dp" android:layout_weight="1" android:fontFamily="@font/saira_condensed_bold" - android:text="@string/btn_load" + android:text="@string/loaded_wallet_btn_load" android:textSize="@dimen/text_size_large" /> @@ -295,7 +295,7 @@ android:fontFamily="@font/saira_condensed_bold" android:paddingLeft="20dp" android:paddingRight="20dp" - android:text="@string/btn_new_scan" + android:text="@string/loaded_wallet_btn_new_scan" android:textColor="@color/primary_dark" /> diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index 598319bddf..e139453c5e 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -46,7 +46,7 @@ android:layout_marginTop="8dp" android:layout_marginBottom="24dp" android:fontFamily="@font/maaxmedium" - android:text="@string/card_id" + android:text="@string/details_title_card_id" android:textAlignment="center" android:textSize="@dimen/text_size_medium" /> @@ -84,7 +84,7 @@ android:layout_width="@dimen/verify_card_left_col_width" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/issuer" + android:text="@string/details_category_issuer" android:textSize="@dimen/text_size_medium" /> @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:fontFamily="@font/maax" - android:text="@string/blockchain" + android:text="@string/general_blockchain" android:textSize="@dimen/text_size_1_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" 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" android:textStyle="normal|bold" @@ -149,7 +149,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:fontFamily="@font/maax" - android:text="@string/signing_method" + android:text="@string/details_signing_method" android:textSize="@dimen/text_size_1_small" /> @@ -341,7 +341,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:fontFamily="@font/maax" - android:text="@string/card_identity" + android:text="@string/details_card_identity" android:textSize="@dimen/text_size_1_small" /> @@ -366,7 +366,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:fontFamily="@font/maax" - android:text="@string/firmware" + android:text="@string/details_firmware" android:textSize="@dimen/text_size_1_small" /> diff --git a/app/src/main/res/layout/fragment_empty_wallet.xml b/app/src/main/res/layout/fragment_empty_wallet.xml index edce3a6f52..05edcadd54 100644 --- a/app/src/main/res/layout/fragment_empty_wallet.xml +++ b/app/src/main/res/layout/fragment_empty_wallet.xml @@ -31,7 +31,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" @@ -47,7 +47,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" @@ -82,7 +82,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" /> @@ -114,7 +114,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" /> @@ -159,7 +159,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/fragment_logo.xml b/app/src/main/res/layout/fragment_logo.xml index b6efa61fed..87e0b35db0 100644 --- a/app/src/main/res/layout/fragment_logo.xml +++ b/app/src/main/res/layout/fragment_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" /> @@ -52,7 +52,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/fragment_pin_save.xml b/app/src/main/res/layout/fragment_pin_save.xml index de89649194..03fcbae8f5 100644 --- a/app/src/main/res/layout/fragment_pin_save.xml +++ b/app/src/main/res/layout/fragment_pin_save.xml @@ -25,7 +25,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" /> @@ -51,7 +51,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" />