diff --git a/app/src/main/java/com/tangem/di/ToastHelper.kt b/app/src/main/java/com/tangem/di/ToastHelper.kt
index 92734b4055..43490460ba 100644
--- a/app/src/main/java/com/tangem/di/ToastHelper.kt
+++ b/app/src/main/java/com/tangem/di/ToastHelper.kt
@@ -27,6 +27,8 @@ class ToastHelper {
fun showSnackbarSuccess(context: Context, vg: ViewGroup, message: String) {
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.dismiss()
}
@@ -35,6 +37,8 @@ class ToastHelper {
fun showSnackbarError(context: Context, vg: ViewGroup, message: String) {
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.dismiss()
}
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3d72001a11..2994fce01a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,8 +15,8 @@
#FF505050
@color/black
#4a763d
- #BF7FF27F
- #BFFF4444
+ #F27FF27F
+ #F2FF4444
#4a086e
#0c15c1
#e3e3e3
diff --git a/app/src/main/res/layout/activity_sign_transaction.xml b/app/src/tangemAccess/res/layout/activity_sign_transaction.xml
similarity index 100%
rename from app/src/main/res/layout/activity_sign_transaction.xml
rename to app/src/tangemAccess/res/layout/activity_sign_transaction.xml
diff --git a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
index 46cbc54107..bbda35b010 100644
--- a/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
+++ b/app/src/tangemCardano/java/com/tangem/ui/PrepareTransactionActivity.kt
@@ -53,40 +53,18 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
// 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))
-// ctx = TangemContext.loadFromBundle(this, intent.extras)
-
-// tvCardID.text = ctx.card?.cidDescription
val engine = CoinEngineFactory.createCardano(TangemContext())
@Suppress("DEPRECATION") val html = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
@@ -101,9 +79,6 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
rgIncFee.visibility = View.VISIBLE
}
-// if (ctx.card!!.remainingSignatures < 2)
-// etAmount.isEnabled = false
-
tvCurrency.text = engine.balance?.currency
etAmount.setText(engine.balance?.toValueString())
@@ -162,17 +137,11 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
} else
etWallet.error = null
-// if (etWallet.text.toString() == ctx.coinData!!.wallet) {
-// etWallet.error = getString(R.string.destination_wallet_address_equal_source_address)
-// return@setOnClickListener
-// }
-
if (!etAmount.error.isNullOrEmpty() || !etWallet.error.isNullOrEmpty()) {
return@setOnClickListener
}
val intent = Intent(baseContext, ConfirmTransactionActivity::class.java)
-// ctx.saveToIntent(intent)
intent.putExtra(Constant.EXTRA_TARGET_ADDRESS, etWallet!!.text.toString())
intent.putExtra(Constant.EXTRA_FEE_INCLUDED, (rgIncFee!!.checkedRadioButtonId == R.id.rbFeeIn))
intent.putExtra(Constant.EXTRA_AMOUNT, strAmount)
@@ -198,6 +167,27 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
})
}
+ 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 onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == Constant.REQUEST_CODE_SCAN_QR && resultCode == Activity.RESULT_OK && data != null && data.extras!!.containsKey("QRCode")) {
diff --git a/app/src/tangemCardano/res/layout/activity_sign_transaction.xml b/app/src/tangemCardano/res/layout/activity_sign_transaction.xml
new file mode 100644
index 0000000000..f16c5de3e5
--- /dev/null
+++ b/app/src/tangemCardano/res/layout/activity_sign_transaction.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file