From 1fd80738c6ee40c7b0679f713467226682416f1e Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 3 Apr 2019 16:30:59 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../main/java/com/tangem/di/ToastHelper.kt | 15 ++++++++++ .../com/tangem/di/ToastHelperComponent.kt | 3 ++ .../tangem/ui/PrepareTransactionActivity.kt | 30 ++++++++++++++++++- .../layout/activity_prepare_transaction.xml | 3 +- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/tangem/di/ToastHelper.kt b/app/src/main/java/com/tangem/di/ToastHelper.kt index 18a8fbfe64..92734b4055 100644 --- a/app/src/main/java/com/tangem/di/ToastHelper.kt +++ b/app/src/main/java/com/tangem/di/ToastHelper.kt @@ -9,6 +9,7 @@ import com.google.android.material.snackbar.Snackbar import com.tangem.Constant import com.tangem.wallet.R + class ToastHelper { fun showSnackbarUpdateVersion(context: Context, vg: ViewGroup, versionName: String) { @@ -24,6 +25,20 @@ class ToastHelper { }.show() } + fun showSnackbarSuccess(context: Context, vg: ViewGroup, message: String) { + val snackbar = Snackbar.make(vg, message, Snackbar.LENGTH_INDEFINITE) + snackbar.setAction(R.string.ok) { + snackbar.dismiss() + } + snackbar.show() + } + fun showSnackbarError(context: Context, vg: ViewGroup, message: String) { + val snackbar = Snackbar.make(vg, message, Snackbar.LENGTH_INDEFINITE) + snackbar.setAction(R.string.ok) { + snackbar.dismiss() + } + snackbar.show() + } } \ 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 b98d944333..39907760eb 100644 --- a/app/src/main/java/com/tangem/di/ToastHelperComponent.kt +++ b/app/src/main/java/com/tangem/di/ToastHelperComponent.kt @@ -1,5 +1,6 @@ package com.tangem.di +import com.tangem.ui.PrepareTransactionActivity import com.tangem.ui.activity.MainActivity import dagger.Component import javax.inject.Singleton @@ -10,4 +11,6 @@ interface ToastHelperComponent { fun inject(activity: MainActivity) + fun inject(activity: PrepareTransactionActivity) + } \ No newline at end of file diff --git a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt index 0500b04e72..46cbc54107 100644 --- a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt +++ b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt @@ -20,14 +20,18 @@ 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.dp.PrefsManager import com.tangem.di.Navigator +import com.tangem.di.ToastHelper import com.tangem.domain.wallet.CoinEngineFactory import com.tangem.domain.wallet.TangemContext +import com.tangem.ui.event.TransactionFinishWithError +import com.tangem.ui.event.TransactionFinishWithSuccess import com.tangem.util.UtilHelper import com.tangem.wallet.R import kotlinx.android.synthetic.tangemCardano.activity_prepare_transaction.* +import org.greenrobot.eventbus.EventBus +import org.greenrobot.eventbus.Subscribe import java.io.IOException import javax.inject.Inject @@ -43,15 +47,39 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac @Inject internal lateinit var navigator: Navigator + @Inject + internal lateinit var toastHelper: ToastHelper // private lateinit var ctx: TangemContext private lateinit var nfcManager: NfcManager + override fun onStart() { + super.onStart() + if (!EventBus.getDefault().isRegistered(this)) + EventBus.getDefault().register(this) + } + + override fun onDestroy() { + EventBus.getDefault().unregister(this) + super.onDestroy() + } + + @Subscribe + fun onTransactionFinishWithSuccess(transactionFinishWithSuccess: TransactionFinishWithSuccess) { + transactionFinishWithSuccess.message?.let { toastHelper.showSnackbarSuccess(this, cl, it) } + } + + @Subscribe + fun onTransactionFinishWithError(transactionFinishWithError: TransactionFinishWithError) { + transactionFinishWithError.message?.let { toastHelper.showSnackbarError(this, cl, it) } + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_prepare_transaction) App.navigatorComponent.inject(this) + App.toastHelperComponent.inject(this) nfcManager = NfcManager(this, this) lifecycle.addObserver(NfcLifecycleObserver(nfcManager)) diff --git a/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml b/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml index 629caa424f..6cf10efd5e 100644 --- a/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml +++ b/app/src/tangemCardano/res/layout/activity_prepare_transaction.xml @@ -2,6 +2,7 @@