From 6c8c041c3d14001687f825b5271b51d6548baa25 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 10 Apr 2019 12:49:54 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../main/java/com/tangem/di/ToastHelper.kt | 18 +++++++++- .../com/tangem/di/ToastHelperComponent.kt | 6 ++++ .../tangem/ui/activity/EmptyWalletActivity.kt | 7 +++- .../ui/activity/LoadedWalletActivity.kt | 4 +++ .../com/tangem/ui/activity/MainActivity.kt | 4 +-- .../tangem/ui/activity/SettingsActivity.kt | 1 - .../com/tangem/ui/fragment/LoadedWallet.kt | 8 ++--- .../java/com/tangem/util/PhoneUtility.java | 35 ------------------- .../main/java/com/tangem/util/UtilHelper.kt | 27 +++++++------- ...prepare_cryptonit_other_api_withdrawal.xml | 2 +- .../activity_prepare_cryptonit_withdrawal.xml | 2 +- .../activity_prepare_kraken_withdrawal.xml | 2 +- app/src/main/res/layout/fr_loaded_wallet.xml | 10 +++--- .../main/res/layout/layout_btn_details.xml | 2 +- app/src/main/res/values/strings.xml | 14 ++++---- .../com/tangem/ui/SignTransactionActivity.kt | 1 + 16 files changed, 70 insertions(+), 73 deletions(-) delete mode 100644 app/src/main/java/com/tangem/util/PhoneUtility.java diff --git a/app/src/main/java/com/tangem/di/ToastHelper.kt b/app/src/main/java/com/tangem/di/ToastHelper.kt index 0f51a98478..c19cfe6cf9 100644 --- a/app/src/main/java/com/tangem/di/ToastHelper.kt +++ b/app/src/main/java/com/tangem/di/ToastHelper.kt @@ -5,12 +5,13 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.view.ViewGroup +import android.widget.Toast import com.google.android.material.snackbar.Snackbar import com.tangem.Constant import com.tangem.wallet.R +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) { @@ -44,4 +45,19 @@ class ToastHelper { snackbar.show() } + private var singleToast: Toast? = null + private var showTime: Date = Date() + + fun showSingleToast(context: Context?, text: String) { + if (singleToast == null || !singleToast!!.view.isShown || showTime.time + 2000 < Date().time) { + if (singleToast != null) + singleToast!!.cancel() + if (context != null) { + singleToast = Toast.makeText(context, text, Toast.LENGTH_LONG) + singleToast!!.show() + showTime = Date() + } + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/di/ToastHelperComponent.kt b/app/src/main/java/com/tangem/di/ToastHelperComponent.kt index 39907760eb..1957d59a6a 100644 --- a/app/src/main/java/com/tangem/di/ToastHelperComponent.kt +++ b/app/src/main/java/com/tangem/di/ToastHelperComponent.kt @@ -1,6 +1,8 @@ package com.tangem.di import com.tangem.ui.PrepareTransactionActivity +import com.tangem.ui.activity.EmptyWalletActivity +import com.tangem.ui.activity.LoadedWalletActivity import com.tangem.ui.activity.MainActivity import dagger.Component import javax.inject.Singleton @@ -11,6 +13,10 @@ interface ToastHelperComponent { fun inject(activity: MainActivity) + fun inject(activity: LoadedWalletActivity) + fun inject(activity: PrepareTransactionActivity) + fun inject(activity: EmptyWalletActivity) + } \ No newline at end of file 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 4c321ca647..0b6abbc166 100644 --- a/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/EmptyWalletActivity.kt @@ -36,6 +36,7 @@ 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 { @@ -49,6 +50,8 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card @Inject internal lateinit var navigator: Navigator + @Inject + internal lateinit var toastHelper: ToastHelper private lateinit var nfcManager: NfcManager private lateinit var ctx: TangemContext @@ -64,6 +67,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card setContentView(R.layout.activity_empty_wallet) App.navigatorComponent.inject(this) + App.toastHelperComponent.inject(this) nfcManager = NfcManager(this, this) lifecycle.addObserver(NfcLifecycleObserver(nfcManager)) @@ -98,11 +102,12 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card if (cardProtocol != null) navigator.showVerifyCard(this, ctx) else - UtilHelper.showSingleToast(this, getString(R.string.need_attach_card_again)) + toastHelper.showSingleToast(this, getString(R.string.need_attach_card_again)) } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) if (requestCode == Constant.REQUEST_CODE_CREATE_NEW_WALLET_ACTIVITY) { if (resultCode == Activity.RESULT_OK) { if (data != null) { diff --git a/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt index 1e7ab63b9a..2afa58290b 100644 --- a/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/LoadedWalletActivity.kt @@ -9,6 +9,7 @@ import androidx.appcompat.app.AppCompatActivity import com.tangem.App import com.tangem.Constant import com.tangem.di.Navigator +import com.tangem.di.ToastHelper import com.tangem.wallet.TangemContext import com.tangem.ui.fragment.LoadedWallet import com.tangem.wallet.R @@ -18,6 +19,8 @@ class LoadedWalletActivity : AppCompatActivity() { @Inject lateinit var navigator: Navigator + @Inject + internal lateinit var toastHelper: ToastHelper companion object { fun callingIntent(context: Context, lastTag: Tag, ctx: TangemContext): Intent { @@ -33,6 +36,7 @@ class LoadedWalletActivity : AppCompatActivity() { setContentView(R.layout.activity_loaded_wallet) App.navigatorComponent.inject(this) + App.toastHelperComponent.inject(this) if (intent.extras!!.containsKey(NfcAdapter.EXTRA_TAG)) { val tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) diff --git a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt index 9b0bbf7c24..7f8d9a7a1f 100644 --- a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt @@ -46,7 +46,7 @@ import com.tangem.ui.dialog.RootFoundDialog import com.tangem.ui.dialog.WaitSecurityDelayDialog import com.tangem.util.CommonUtil import com.tangem.util.LOG -import com.tangem.util.PhoneUtility +import com.tangem.util.UtilHelper import com.tangem.wallet.BuildConfig import com.tangem.wallet.R import kotlinx.android.synthetic.main.activity_main.* @@ -196,7 +196,7 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco f = Logger.collectLogs(this) if (f != null) { LOG.e(TAG, String.format("Collect %d log bytes", f.length())) - CommonUtil.sendEmail(this, zipFile, TAG, "Logs", PhoneUtility.getDeviceInfo(), arrayOf(f)) + CommonUtil.sendEmail(this, zipFile, TAG, "Logs", UtilHelper.getDeviceInfo(), arrayOf(f)) } else { LOG.e(TAG, "Can't create temporarily log file") } 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 46d52e2600..51c4aa2564 100644 --- a/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt @@ -8,7 +8,6 @@ import androidx.appcompat.widget.Toolbar import com.tangem.wallet.R class SettingsActivity : AppCompatActivity() { - companion object { fun callingIntent(context: Context) = Intent(context, SettingsActivity::class.java) } diff --git a/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt index 66f3fd126b..f694614e47 100644 --- a/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/ui/fragment/LoadedWallet.kt @@ -159,7 +159,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback intent.addCategory(Intent.CATEGORY_DEFAULT) startActivity(intent) } catch (e: ActivityNotFoundException) { - UtilHelper.showSingleToast(context, getString(R.string.no_compatible_wallet)) + (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.no_compatible_wallet)) } } @@ -195,9 +195,9 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback btnExtract.setOnClickListener { if (UtilHelper.isOnline(context as Activity)) if (!engine.isExtractPossible) - UtilHelper.showSingleToast(context, ctx.message) + (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, ctx.message) else if (ctx.card!!.remainingSignatures == 0) - UtilHelper.showSingleToast(context, getString(R.string.card_has_no_remaining_signature)) + (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.card_has_no_remaining_signature)) else (activity as LoadedWalletActivity).navigator.showPrepareTransaction(context as Activity, ctx) else @@ -208,7 +208,7 @@ class LoadedWallet : androidx.fragment.app.Fragment(), NfcAdapter.ReaderCallback if (cardProtocol != null) (activity as LoadedWalletActivity).navigator.showVerifyCard(context as Activity, ctx) else - UtilHelper.showSingleToast(context, getString(R.string.need_attach_card_again)) + (activity as LoadedWalletActivity).toastHelper.showSingleToast(context, getString(R.string.need_attach_card_again)) } btnNewScan.setOnClickListener { (activity as LoadedWalletActivity).navigator.showMain(context as Activity) } diff --git a/app/src/main/java/com/tangem/util/PhoneUtility.java b/app/src/main/java/com/tangem/util/PhoneUtility.java deleted file mode 100644 index 9bb2f92515..0000000000 --- a/app/src/main/java/com/tangem/util/PhoneUtility.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.tangem.util; - -import android.os.Build; - -/** - * Created by Ilia on 20.04.2018. - */ - -public class PhoneUtility { - public static String GetPhoneName() - { - return DeviceName.getDeviceName(); - - } - - public static String getDeviceInfo() { - StringBuilder stringBuilder = new StringBuilder(); - - stringBuilder.append("----------------------------------------\n"); - stringBuilder.append("MODEL: ").append(Build.MODEL).append("\n"); - stringBuilder.append("ID: ").append(Build.ID).append("\n"); - stringBuilder.append("Manufacturer: ").append(Build.MANUFACTURER).append("\n"); - stringBuilder.append("Brand: ").append(Build.BRAND).append("\n"); - stringBuilder.append("Hardware: ").append(Build.HARDWARE).append("\n"); - stringBuilder.append("Version: ").append(Build.VERSION.RELEASE).append(", ").append(Build.VERSION.INCREMENTAL).append("\n"); - stringBuilder.append("OS: ").append(Build.VERSION.BASE_OS).append("\n"); - stringBuilder.append("SDK: ").append(Build.VERSION.SDK_INT).append("\n"); - stringBuilder.append("BOARD: ").append(Build.BOARD).append("\n"); - stringBuilder.append("FINGERPRINT: ").append(Build.FINGERPRINT).append("\n"); - stringBuilder.append("----------------------------------------\n"); - - return stringBuilder.toString(); - - } -} diff --git a/app/src/main/java/com/tangem/util/UtilHelper.kt b/app/src/main/java/com/tangem/util/UtilHelper.kt index 060a82cf76..914520d6e2 100644 --- a/app/src/main/java/com/tangem/util/UtilHelper.kt +++ b/app/src/main/java/com/tangem/util/UtilHelper.kt @@ -5,6 +5,7 @@ import android.graphics.Bitmap import android.graphics.Color import android.net.ConnectivityManager import android.net.NetworkInfo +import android.os.Build import android.widget.Toast import com.google.zxing.BarcodeFormat import com.google.zxing.EncodeHintType @@ -48,19 +49,19 @@ object UtilHelper { } } - private var singleToast: Toast? = null - private var showTime: Date = Date() - - fun showSingleToast(context: Context?, text: String) { - if (singleToast == null || !singleToast!!.view.isShown || showTime.time + 2000 < Date().time) { - if (singleToast != null) - singleToast!!.cancel() - if (context != null) { - singleToast = Toast.makeText(context, text, Toast.LENGTH_LONG) - singleToast!!.show() - showTime = Date() - } - } + fun getDeviceInfo(): String { + return "----------------------------------------\n" + + "MODEL: " + Build.MODEL + "\n" + + "ID: " + Build.ID + "\n" + + "Manufacturer: " + Build.MANUFACTURER + "\n" + + "Brand: " + Build.BRAND + "\n" + + "Hardware: " + Build.HARDWARE + "\n" + + "Version: " + Build.VERSION.RELEASE + ", " + Build.VERSION.INCREMENTAL + "\n" + + "OS: " + Build.VERSION.BASE_OS + "\n" + + "SDK: " + Build.VERSION.SDK_INT + "\n" + + "BOARD: " + Build.BOARD + "\n" + + "FINGERPRINT: " + Build.FINGERPRINT + "\n" + + "----------------------------------------\n" } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml b/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml index 74111f7e87..09492326e2 100644 --- a/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml +++ b/app/src/main/res/layout/activity_prepare_cryptonit_other_api_withdrawal.xml @@ -385,7 +385,7 @@ android:layout_height="50dp" android:layout_marginBottom="16dp" android:fontFamily="@font/saira_condensed_bold" - android:text="@string/load" + android:text="@string/btn_load" android:textSize="@dimen/text_size_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml b/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml index 4e2e06de88..522b6355c1 100644 --- a/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml +++ b/app/src/main/res/layout/activity_prepare_cryptonit_withdrawal.xml @@ -369,7 +369,7 @@ android:layout_height="50dp" android:layout_marginBottom="16dp" android:fontFamily="@font/saira_condensed_bold" - android:text="@string/load" + android:text="@string/btn_load" android:textSize="@dimen/text_size_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml b/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml index 7b489a51a9..f3045882f0 100644 --- a/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml +++ b/app/src/main/res/layout/activity_prepare_kraken_withdrawal.xml @@ -333,7 +333,7 @@ android:layout_height="50dp" android:layout_marginBottom="16dp" android:fontFamily="@font/saira_condensed_bold" - android:text="@string/load" + android:text="@string/btn_load" android:textSize="@dimen/text_size_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 439fcf3690..19bbdc0db2 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -170,7 +170,7 @@ android:fontFamily="@font/saira_condensed_bold" android:paddingLeft="20dp" android:paddingRight="20dp" - android:text="@string/explore" + android:text="@string/btn_explore" android:textColor="@color/primary_dark" /> @@ -256,7 +256,7 @@ android:layout_marginBottom="10dp" android:layout_weight="1" android:fontFamily="@font/saira_condensed_bold" - android:text="@string/load" + android:text="@string/btn_load" android:textSize="@dimen/text_size_large" /> @@ -296,7 +296,7 @@ android:fontFamily="@font/saira_condensed_bold" android:paddingLeft="20dp" android:paddingRight="20dp" - android:text="@string/new_scan" + android:text="@string/btn_new_scan" android:textColor="@color/primary_dark" /> diff --git a/app/src/main/res/layout/layout_btn_details.xml b/app/src/main/res/layout/layout_btn_details.xml index b10556cf5f..c94248bb77 100644 --- a/app/src/main/res/layout/layout_btn_details.xml +++ b/app/src/main/res/layout/layout_btn_details.xml @@ -13,6 +13,6 @@ android:fontFamily="@font/saira_condensed_bold" android:paddingLeft="20dp" android:paddingRight="20dp" - android:text="@string/details" + android:text="@string/btn_details" android:textColor="@color/primary_dark" tools:showIn="@layout/fr_loaded_wallet" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4f1870fb91..dceb1d6cdd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,7 +125,7 @@ Swipe down to refresh data Message! Error! - SEND + Send If you forget your new PIN you will lose your money forever! If you use default PIN someone can steal your money! Cannot obtain data from blockchain @@ -142,12 +142,12 @@ This banknote will enforce %.0f seconds security delay for all operations requiring PIN2 code Share wallet address with: Copied to clipboard - EXTRACT - LOAD - EXPLORE - COPY - DETAILS - NEW SCAN + Extract + Load + Explore + Copy + Details + New scan Verifying in blockchain… diff --git a/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt b/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt index 5f75ed7671..3fb5f915ff 100644 --- a/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt +++ b/app/src/tangemAccess/java/com/tangem/ui/SignTransactionActivity.kt @@ -36,6 +36,7 @@ import com.tangem.card_android.data.EXTRA_TANGEM_CARD import com.tangem.card_android.data.EXTRA_TANGEM_CARD_UID import kotlinx.android.synthetic.tangemAccess.activity_prepare_transaction.* + class SignTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications { companion object {