diff --git a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java index e5af43c198..19517bfa25 100644 --- a/app/src/main/java/com/tangem/domain/wallet/TangemCard.java +++ b/app/src/main/java/com/tangem/domain/wallet/TangemCard.java @@ -103,8 +103,10 @@ public class TangemCard { if (Strings.isNullOrEmpty(token)) return; String oldName = getBlockchain().getOfficialName(); - String newName = String.format("%s (%s)", oldName, token); + //String newName = String.format("%s - %s ERC20 token", token, oldName); + String newName = token + "
" + oldName + " ERC20 token"; setBlockchainName(newName); + } private String blochchainName = ""; diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt index 30a60e3efb..24b6b0469a 100644 --- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt @@ -9,6 +9,7 @@ import android.nfc.Tag import android.nfc.tech.IsoDep import android.os.Bundle import android.support.v7.app.AppCompatActivity +import android.text.Html import android.view.View import android.widget.Toast import com.tangem.data.nfc.VerifyCardTask @@ -49,7 +50,13 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card card!!.loadFromBundle(intent.extras!!.getBundle("Card")) tvIssuer.text = card!!.issuerDescription - tvBlockchain.text = card!!.blockchainName + //tvBlockchain.text = card!!.blockchainName + if (card!!.tokenSymbol.length > 1) { + val html = Html.fromHtml(card!!.blockchainName) + tvBlockchain.text = html + } else + tvBlockchain.text = card!!.blockchainName + tvCardID.text = card!!.cidDescription imgBlockchain.setImageResource(card!!.blockchain.getImageResource(this, card!!.tokenSymbol)) diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt index 5f11040fdd..0ed543d656 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -38,6 +38,7 @@ import com.tangem.wallet.BuildConfig import com.tangem.wallet.R import kotlinx.android.synthetic.main.fr_loaded_wallet.* import org.json.JSONException +import java.math.BigDecimal import java.math.BigInteger import java.util.* @@ -110,12 +111,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific val engine = CoinEngineFactory.create(card!!.blockchain) val visibleFlag = engine?.inOutPutVisible() ?: true - try { - ivQR.setImageBitmap(UtilHelper.generateQrCode(engine.getShareWalletUri(card).toString())) - } catch (e: WriterException) { - e.printStackTrace() - } - btnExtract.isEnabled = false btnExtract.backgroundTintList = inactiveColor @@ -134,7 +129,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } btnCopy.setOnClickListener { doShareWallet(false) } tvWallet.setOnClickListener { doShareWallet(false) } - ivQR.setOnClickListener { doShareWallet(true) } btnLoad.setOnClickListener { //if (BuildConfig.DEBUG) { if (true) { @@ -842,9 +836,14 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific tvWallet.text = card!!.wallet - tvBlockchain.text = card!!.blockchainName +// tvBlockchain.text = card!!.blockchainName + if (card!!.tokenSymbol.length > 1) { + val html = Html.fromHtml(card!!.blockchainName) + tvBlockchain.text = html + } else + tvBlockchain.text = card!!.blockchainName - if (card!!.hasBalanceInfo() && (card!!.balance != 0L) && (card!!.balance != null)) { + if (card!!.hasBalanceInfo()) { btnExtract.isEnabled = true btnExtract.backgroundTintList = activeColor } else { diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt index 69ccb6e8b4..7b81635eac 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -7,6 +7,7 @@ import android.nfc.Tag import android.os.Bundle import android.support.v4.app.Fragment import android.support.v4.content.ContextCompat +import android.text.Html import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -287,7 +288,13 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { tvIssuer.text = card!!.issuerDescription tvCardRegistredDate.text = card!!.personalizationDateTimeDescription - tvBlockchain.text = card!!.blockchainName + //tvBlockchain.text = card!!.blockchainName + if (card!!.tokenSymbol.length > 1) { + val html = Html.fromHtml(card!!.blockchainName) + tvBlockchain.text = html + } else + tvBlockchain.text = card!!.blockchainName + tvValidationNode.text = card!!.validationNodeDescription ivBlockchain.setImageResource(card!!.blockchain.getLogoImageResource(card!!.blockchainID, card!!.tokenSymbol)) diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 71378145af..c33aa6d7d4 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -84,142 +84,161 @@ - + app:layout_constraintTop_toBottomOf="@+id/loCard"> + android:orientation="vertical" + app:layout_constraintBottom_toTopOf="@+id/guideline" + app:layout_constraintHeight_min="wrap" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed"> - - - + android:orientation="horizontal"> + + + + + + + + - - - - - - - - - + android:orientation="horizontal" + app:layout_constraintGuide_percent="0.5" /> + android:id="@+id/loWallet" + android:layout_width="match_parent" + android:layout_height="0dp" + android:gravity="top|center" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintHeight_min="wrap" + app:layout_constraintTop_toBottomOf="@+id/guideline"> - - - + android:gravity="center_vertical|center_horizontal" + android:orientation="vertical"> - + + + + + + + + + + + + - - + @@ -264,6 +283,13 @@ + +