Updated on 2026-08-14
This commit is contained in:
Tangem
parent
cf7f4017b2
commit
de96b85fd4
5 changed files with 84 additions and 27 deletions
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -281,10 +281,10 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/montserrat_light"
|
||||
android:text="@string/allows_change_pin1_and_pin2"
|
||||
android:textColor="@color/primary_dark"
|
||||
android:textSize="@dimen/text_size_2_small"
|
||||
android:textStyle="normal|bold" />
|
||||
android:textStyle="normal|bold"
|
||||
tools:text="Allows change PIN1 and PIN2 \n Dynamic NDEF" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -296,17 +296,20 @@
|
|||
<TextView
|
||||
android:layout_width="@dimen/verify_card_left_col_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="20dp"
|
||||
android:fontFamily="@font/raleway_r"
|
||||
android:text=""
|
||||
android:textSize="@dimen/text_size_small" />
|
||||
android:text="@string/issuer_data"
|
||||
android:textSize="@dimen/text_size_1_small" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvIssuerData"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/montserrat_light"
|
||||
android:textColor="@color/primary_dark"
|
||||
android:textSize="@dimen/text_size_1_small"
|
||||
android:textStyle="normal|bold" />
|
||||
android:textStyle="normal|bold"
|
||||
tools:text="Tangem" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -484,6 +487,56 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="@dimen/verify_card_left_col_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="20dp"
|
||||
android:fontFamily="@font/raleway_r"
|
||||
android:text="@string/validation_node"
|
||||
android:textSize="@dimen/text_size_1_small" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvValidationNode"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/montserrat_light"
|
||||
android:textColor="@color/primary_dark"
|
||||
android:textSize="@dimen/text_size_1_small"
|
||||
android:textStyle="normal|bold"
|
||||
tools:text="Electrum" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="@dimen/verify_card_left_col_width"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="20dp"
|
||||
android:fontFamily="@font/raleway_r"
|
||||
android:text="@string/unspents"
|
||||
android:textSize="@dimen/text_size_1_small" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvInputs"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@font/montserrat_light"
|
||||
android:textColor="@color/primary_dark"
|
||||
android:textSize="@dimen/text_size_1_small"
|
||||
android:textStyle="normal|bold"
|
||||
tools:text="1 unspent" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tvError"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
<string name="reset_pins_to_default">Reset PINs to default</string>
|
||||
<string name="erase_wallet">Erase wallet</string>
|
||||
|
||||
<!-- MainActivity, Main -->
|
||||
<!-- MainActivity -->
|
||||
<string name="tap_tangem_card">Tap Tangem card with your smartphone</string>
|
||||
<string name="scan_banknote">Scan a banknote with your \n %1$s \n as shown above</string>
|
||||
<string name="phone">phone</string>
|
||||
|
|
@ -89,16 +89,13 @@
|
|||
<string name="not_enough_funds">Not enough funds for transaction fee (gas)!</string>
|
||||
<string name="please_wait_while_previous">Please wait while previous transaction is confirmed in blockchain</string>
|
||||
<string name="please_wait_for_confirmation">Could not obtain all inputs. Swipe down to refresh.</string>
|
||||
<string name="card_hasn_t_remaining_signature">Card has no remaining signature!</string>
|
||||
<string name="reusable_wallet">REUSABLE WALLET</string>
|
||||
<string name="banknote">BANKNOTE</string>
|
||||
<string name="not_transferable_banknote">NON-TRANSFERABLE BANKNOTE</string>
|
||||
<string name="developer_kit">DEVELOPER KIT</string>
|
||||
<string name="do_not_accept">DO NOT ACCEPT</string>
|
||||
<string name="card_has_no_remaining_signature">Card has no remaining signature!</string>
|
||||
<!--<string name="reusable_wallet">REUSABLE WALLET</string>-->
|
||||
<!--<string name="banknote">BANKNOTE</string>-->
|
||||
<!--<string name="not_transferable_banknote">NON-TRANSFERABLE BANKNOTE</string>-->
|
||||
<!--<string name="developer_kit">DEVELOPER KIT</string>-->
|
||||
<!--<string name="do_not_accept">DO NOT ACCEPT</string>-->
|
||||
<string name="explore_in_blockchain">EXPLORE</string>
|
||||
<string name="unspents">Unspents</string>
|
||||
<string name="issuer">Issuer</string>
|
||||
<string name="validation_node">Validation node</string>
|
||||
<string name="swipe_down_to_refresh_data">Swipe down to refresh data</string>
|
||||
<string name="message">Message!</string>
|
||||
<string name="error">Error!</string>
|
||||
|
|
@ -133,6 +130,7 @@
|
|||
<string name="to_sign_the_payment">to sign the payment</string>
|
||||
<string name="to_change_pin_codes">to change PIN/PIN2 codes</string>
|
||||
<string name="by_tapping_the_card">By tapping the card, you will permanently remove the blockchain wallet. Ensure there will be no further incoming transactions</string>
|
||||
<string name="cannot_erase_wallet">Cannot erase wallet. Make sure you enter correct PIN2!</string>
|
||||
|
||||
<!-- PreparePaymentActivity -->
|
||||
<string name="enter_wallet_address">enter wallet address</string>
|
||||
|
|
@ -145,9 +143,6 @@
|
|||
<!-- SendTransactionActivity -->
|
||||
<string name="please_wait">Please wait while the payment is sent…</string>
|
||||
|
||||
<!-- PurgeActivity -->
|
||||
<string name="cannot_erase_wallet">Cannot erase wallet. Make sure you enter correct PIN2!</string>
|
||||
|
||||
<!-- PreparePaymentActivity -->
|
||||
<string name="not_enough_funds_on_your_card">Not enough funds on your card</string>
|
||||
<string name="unknown_amount_format">Unknown amount format</string>
|
||||
|
|
@ -175,7 +170,6 @@
|
|||
<string name="remaining_signatures">Remaining signatures</string>
|
||||
<string name="time_of_last_signing">Time of last signing</string>
|
||||
<string name="features">Features</string>
|
||||
<string name="allows_change_pin1_and_pin2">Allows change PIN1 and PIN2\nNeed CVC\nDynamic NDEF\nRecoverable\nBlockable\nAtomic command mode</string>
|
||||
<string name="manufacturer">Manufacturer</string>
|
||||
<string name="card_identity">Card identity</string>
|
||||
<string name="attested">Attested</string>
|
||||
|
|
@ -190,7 +184,11 @@
|
|||
<string name="possession_proved">Possession proved</string>
|
||||
<string name="possession_not_proved">Possession NOT proved</string>
|
||||
<string name="not_available">not available</string>
|
||||
<string name="issuer">Issuer</string>
|
||||
<string name="private_key">Private key</string>
|
||||
<string name="validation_node">Validation node</string>
|
||||
<string name="issuer_data">Issuer Data</string>
|
||||
<string name="unspents">Unspents</string>
|
||||
|
||||
<!-- SavePINActivity -->
|
||||
<string name="save">Save</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue