From de96b85fd44e47d9e5ef8cd891a1286c5cee30aa Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 1 Aug 2018 15:08:25 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 2 +- .../presentation/fragment/LoadedWallet.kt | 2 +- .../presentation/fragment/VerifyCard.kt | 12 +++- app/src/main/res/layout/fr_verify_card.xml | 69 ++++++++++++++++--- app/src/main/res/values/strings.xml | 26 ++++--- 5 files changed, 84 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4790d8e504..ed1c65144c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 52 + versionCode 53 versionName "0.87.3." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } 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 9f2dc59aed..5f06fa66bd 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -228,7 +228,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific else if (!engine.CheckUnspentTransaction(mCard)) showSingleToast(R.string.please_wait_for_confirmation) else if (mCard!!.remainingSignatures == 0) - showSingleToast(R.string.card_hasn_t_remaining_signature) + showSingleToast(R.string.card_has_no_remaining_signature) else { val intent = Intent(context, PreparePaymentActivity::class.java) intent.putExtra("UID", mCard!!.uid) 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 6af48d2ae9..0117c4f34d 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt @@ -290,10 +290,16 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { tvIssuer.text = mCard!!.issuerDescription tvIssuerData.text = mCard!!.issuerDataDescription - tvCardRegistredDate.text = mCard!!.personalizationDateTimeDescription - tvBlockchain.text = mCard!!.blockchainName + tvValidationNode.text = mCard!!.validationNodeDescription + tvInputs.text = mCard!!.inputsDescription + + when { + mCard!!.lastInputDescription.contains("awaiting") -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.not_confirmed)) + mCard!!.lastInputDescription.contains("None") -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.primary_dark)) + else -> tvInputs.setTextColor(ContextCompat.getColor(context!!, R.color.confirmed)) + } ivBlockchain.setImageResource(mCard!!.blockchain.getLogoImageResource(mCard!!.blockchainID, mCard!!.tokenSymbol)) @@ -389,7 +395,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback { if (mCard!!.useDevelopersFirmware()!!) { imgDeveloperVersion.setImageResource(R.drawable.ic_developer_version) imgDeveloperVersion.visibility = View.VISIBLE - imgDeveloperVersion.setOnClickListener { v -> Toast.makeText(context, R.string.unlocked_banknote_only_development_use, Toast.LENGTH_LONG).show() } + imgDeveloperVersion.setOnClickListener { Toast.makeText(context, R.string.unlocked_banknote_only_development_use, Toast.LENGTH_LONG).show() } } else imgDeveloperVersion.visibility = View.INVISIBLE diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index 6928a0e843..f618cd5043 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -15,7 +15,6 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="8dp" - android:padding="8dp" app:layout_constraintBottom_toTopOf="@+id/rlToolButtons1" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" @@ -31,8 +30,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/white" - android:orientation="vertical" - android:padding="8dp"> + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:orientation="vertical"> + android:textStyle="normal|bold" + tools:text="Allows change PIN1 and PIN2 \n Dynamic NDEF" /> @@ -296,17 +296,20 @@ + android:text="@string/issuer_data" + android:textSize="@dimen/text_size_1_small" /> + android:textStyle="normal|bold" + tools:text="Tangem" /> @@ -484,6 +487,56 @@ + + + + + + + + + + + + + + + + Reset PINs to default Erase wallet - + Tap Tangem card with your smartphone Scan a banknote with your \n %1$s \n as shown above phone @@ -89,16 +89,13 @@ Not enough funds for transaction fee (gas)! Please wait while previous transaction is confirmed in blockchain Could not obtain all inputs. Swipe down to refresh. - Card has no remaining signature! - REUSABLE WALLET - BANKNOTE - NON-TRANSFERABLE BANKNOTE - DEVELOPER KIT - DO NOT ACCEPT + Card has no remaining signature! + + + + + EXPLORE - Unspents - Issuer - Validation node Swipe down to refresh data Message! Error! @@ -133,6 +130,7 @@ to sign the payment to change PIN/PIN2 codes By tapping the card, you will permanently remove the blockchain wallet. Ensure there will be no further incoming transactions + Cannot erase wallet. Make sure you enter correct PIN2! enter wallet address @@ -145,9 +143,6 @@ Please wait while the payment is sent… - - Cannot erase wallet. Make sure you enter correct PIN2! - Not enough funds on your card Unknown amount format @@ -175,7 +170,6 @@ Remaining signatures Time of last signing Features - Allows change PIN1 and PIN2\nNeed CVC\nDynamic NDEF\nRecoverable\nBlockable\nAtomic command mode Manufacturer Card identity Attested @@ -190,7 +184,11 @@ Possession proved Possession NOT proved not available + Issuer Private key + Validation node + Issuer Data + Unspents Save