Updated on 2026-08-14

This commit is contained in:
Tangem 2019-04-01 13:15:54 +03:00
parent 4e378e2e3d
commit ce7b5e9f84
5 changed files with 39 additions and 19 deletions

View file

@ -73,6 +73,10 @@ class Navigator {
context.startActivityForResult(PrepareTransactionActivity.callingIntent(context, ctx), Constant.REQUEST_CODE_SEND_TRANSACTION)
}
fun showPrepareTransaction(context: Activity) {
context.startActivity(PrepareTransactionActivity.callingIntent(context))
}
fun showCreateNewWallet(context: Activity, ctx: TangemContext) {
context.startActivityForResult(CreateNewWalletActivity.callingIntent(context, ctx), Constant.REQUEST_CODE_CREATE_NEW_WALLET_ACTIVITY)
}

View file

@ -61,7 +61,15 @@ class LogoActivity : AppCompatActivity() {
}
private fun hide() {
navigator.showMain(this)
when (BuildConfig.FLAVOR) {
Constant.FLAVOR_TANGEM_CARDANO -> {
navigator.showPrepareTransaction(this)
}
else -> {
navigator.showMain(this)
}
}
finish()
}

View file

@ -69,14 +69,14 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
rgIncFee.visibility = View.VISIBLE
}
if (ctx.card!!.remainingSignatures < 2)
etAmount.isEnabled = false
// if (ctx.card!!.remainingSignatures < 2)
// etAmount.isEnabled = false
tvCurrency.text = engine.balance.currency
etAmount.setText(engine.balance.toValueString())
// tvCurrency.text = engine.balance.currency
// etAmount.setText(engine.balance.toValueString())
// limit number of symbols after comma
etAmount.filters = engine.amountInputFilters
// etAmount.filters = engine.amountInputFilters
// set listeners
etAmount.setOnEditorActionListener { lv, actionId, _ ->

View file

@ -117,20 +117,22 @@ public class TangemContext {
TangemContext tangemContext = new TangemContext();
tangemContext.setContext(context);
if (bundle.containsKey(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID)) {
tangemContext.card = new TangemCard(bundle.getString(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID));
TangemCardExtensionsKt.loadFromBundle(tangemContext.card, bundle.getBundle(TangemCardExtensionsKt.EXTRA_TANGEM_CARD));
}
// if (bundle.containsKey(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID)) {
// tangemContext.card = new TangemCard(bundle.getString(TangemCardExtensionsKt.EXTRA_TANGEM_CARD_UID));
// TangemCardExtensionsKt.loadFromBundle(tangemContext.card, bundle.getBundle(TangemCardExtensionsKt.EXTRA_TANGEM_CARD));
// }
if (tangemContext.getBlockchain() != null) {
if (bundle.containsKey(Constant.EXTRA_BLOCKCHAIN_DATA)) {
tangemContext.coinData = CoinData.fromBundle(tangemContext.getBlockchain(), bundle.getBundle(Constant.EXTRA_BLOCKCHAIN_DATA));
} else {
tangemContext.coinData = CoinEngineFactory.INSTANCE.create(tangemContext).createCoinData();
}
}
tangemContext.error = bundle.getString("Error");
tangemContext.message = bundle.getString("Message");
tangemContext.coinData = CoinEngineFactory.INSTANCE.createCardano(tangemContext).createCoinData();
// if (tangemContext.getBlockchain() != null) {
// if (bundle.containsKey(Constant.EXTRA_BLOCKCHAIN_DATA)) {
// tangemContext.coinData = CoinData.fromBundle(tangemContext.getBlockchain(), bundle.getBundle(Constant.EXTRA_BLOCKCHAIN_DATA));
// } else {
// tangemContext.coinData = CoinEngineFactory.INSTANCE.create(tangemContext).createCoinData();
// }
// }
// tangemContext.error = bundle.getString("Error");
// tangemContext.message = bundle.getString("Message");
return tangemContext;
}

View file

@ -38,6 +38,12 @@ class PrepareTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallbac
ctx.saveToIntent(intent)
return intent
}
fun callingIntent(context: Context): Intent {
val intent = Intent(context, PrepareTransactionActivity::class.java)
// ctx.saveToIntent(intent)
return intent
}
}
@Inject