From bd2be3c3f37ee54228ea7439f8233739f6061726 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 17 Jun 2020 12:49:04 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/data/Blockchain.java | 8 ++++++++ .../tangem/ui/fragment/wallet/LoadedWalletFragment.kt | 3 +-- app/src/main/res/layout/dialog_pay_id.xml | 3 ++- app/src/main/res/layout/fr_loaded_wallet.xml | 1 + app/src/main/res/values/strings.xml | 9 +++++---- .../java/com/tangem/ui/PrepareTransactionFragment.kt | 7 +++---- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/tangem/data/Blockchain.java b/app/src/main/java/com/tangem/data/Blockchain.java index 739e68334c..25117cc331 100644 --- a/app/src/main/java/com/tangem/data/Blockchain.java +++ b/app/src/main/java/com/tangem/data/Blockchain.java @@ -2,6 +2,8 @@ package com.tangem.data; import com.tangem.tangem_sdk.R; +import java.util.EnumSet; + /** * Created by dvol on 06.08.2017. */ @@ -36,6 +38,8 @@ public enum Blockchain { FlowDemo("FLOW/demo", "", 1.0, R.drawable.tangem2, "Flow demo"), TokenEmv("TTW", "ETH", 1.0, R.drawable.ic_logo_ethereum, "Ethereum"); + static private EnumSet payIdSupported = EnumSet.of(Blockchain.Ripple, Blockchain.Ethereum, Blockchain.Bitcoin); + Blockchain(String ID, String currency, double multiplier, int imageResource, String officialName) { mID = ID; mCurrency = currency; @@ -126,4 +130,8 @@ public enum Blockchain { return scheme; } + public Boolean isPayIdSupported() { + return payIdSupported.contains(this); + } + } 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 54117ddedb..0826d8bc3b 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 @@ -66,7 +66,6 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte companion object { val TAG: String = LoadedWalletFragment::class.java.simpleName const val PAY_ID_TANGEM = "\$payid.tangem.com" - val payIdSupported = setOf(Blockchain.Ripple, Blockchain.Ethereum, Blockchain.Bitcoin) } override val layoutId = R.layout.fr_loaded_wallet @@ -156,7 +155,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte getString(R.string.loaded_wallet_load_via_qr) ) - if (payIdSupported.contains(ctx.blockchain)) { + if (ctx.blockchain.isPayIdSupported) { ivPayId.visibility = View.VISIBLE ivPayId.imageAlpha = 100 ivPayId.setOnClickListener { createPayIdDialog() } diff --git a/app/src/main/res/layout/dialog_pay_id.xml b/app/src/main/res/layout/dialog_pay_id.xml index 3543687c36..e11c21fae7 100644 --- a/app/src/main/res/layout/dialog_pay_id.xml +++ b/app/src/main/res/layout/dialog_pay_id.xml @@ -17,7 +17,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:gravity="center"> + android:gravity="center" + android:layout_marginTop="40dp"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 78b38d6bb1..a9c32a643c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,11 +116,11 @@ Show QR-code LOAD - Create Pay ID + Create PayID Create - Enter Pay ID first - New Pay ID was created - Error creating Pay ID + Enter PayID first + New PayID was created + Error creating PayID @@ -189,6 +189,7 @@ enter wallet address + Address or PayID enter amount Verify Not enough funds diff --git a/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionFragment.kt b/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionFragment.kt index 1b5fa7d2c7..1e75eda210 100644 --- a/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionFragment.kt +++ b/app/src/tangemAccess/java/com/tangem/ui/PrepareTransactionFragment.kt @@ -2,7 +2,6 @@ package com.tangem.ui import android.app.Activity import android.content.Context -import android.net.Uri import android.nfc.NfcAdapter import android.nfc.Tag import android.os.Build @@ -13,7 +12,6 @@ import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.Toast import com.tangem.Constant -import com.tangem.data.Blockchain import com.tangem.ui.activity.MainActivity import com.tangem.ui.fragment.BaseFragment import com.tangem.ui.fragment.qr.CameraPermissionManager @@ -24,7 +22,6 @@ import com.tangem.wallet.R import com.tangem.wallet.TangemContext import kotlinx.android.synthetic.tangemAccess.fragment_prepare_transaction.* import java.io.IOException -import java.util.* class PrepareTransactionFragment : BaseFragment(), NavigationResultListener, NfcAdapter.ReaderCallback { companion object { @@ -48,6 +45,8 @@ class PrepareTransactionFragment : BaseFragment(), NavigationResultListener, Nfc Html.fromHtml(engine!!.balanceHTML) tvBalance.text = html + if (ctx.blockchain.isPayIdSupported) etWallet.hint = getString(R.string.prepare_transaction_hint_address_or_pay_id) + if (!engine.allowSelectFeeInclusion()) { rgIncFee.visibility = View.INVISIBLE } else { @@ -86,7 +85,7 @@ class PrepareTransactionFragment : BaseFragment(), NavigationResultListener, Nfc } btnVerify.setOnClickListener { - if (!UtilHelper.isOnline(context!!)) { + if (!UtilHelper.isOnline(requireContext())) { Toast.makeText(context, R.string.general_error_no_connection, Toast.LENGTH_LONG).show() return@setOnClickListener }