Updated on 2026-08-14

This commit is contained in:
Tangem 2018-06-14 12:04:58 +03:00
parent 0b9d1fde18
commit e95bb06a29
9 changed files with 125 additions and 112 deletions

View file

@ -27,4 +27,5 @@ public class VerifyCardActivity extends AppCompatActivity {
setResult(Activity.RESULT_OK, data);
finish();
}
}
}

View file

@ -23,6 +23,7 @@
android:singleLine="false"
android:textAlignment="center"
android:textSize="36sp"
tools:ignore="TextViewEdits"
tools:text="12345"/>
<LinearLayout

View file

@ -22,7 +22,8 @@
android:paddingBottom="8dp"
android:singleLine="false"
android:textAlignment="center"
android:textSize="36sp"/>
android:textSize="36sp"
tools:ignore="TextViewEdits"/>
<TextView
android:id="@+id/pin_prompt"

View file

@ -45,4 +45,4 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.378"/>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>

View file

@ -2,7 +2,6 @@
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -14,10 +13,10 @@
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:text="This banknote has enforced security delay"
android:text="@string/this_banknote_has_enforced_security_delay"
android:textAlignment="center"
android:textColor="@color/primary"
android:textSize="14dp"
android:textSize="@dimen/text_size_1_small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -30,7 +29,7 @@
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:text="Please hold the banknote firmly\n until the operation is completed..."
android:text="@string/please_hold_banknote"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="@dimen/text_size_medium"
@ -64,10 +63,10 @@
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/raleway_r"
android:text="You may be required to repeat this operation a few times depending on the NFC performance of your smartphone.\n This is made for safety of your funds."
android:text="@string/you_may_be_required_to_repeat"
android:textAlignment="center"
android:textColor="@color/primary"
android:textSize="12dp"
android:textSize="@dimen/text_size_small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

View file

@ -1,25 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.tangem.presentation.fragment.Main"
tools:showIn="@layout/content_main">
<!--<android.support.v4.widget.SwipeRefreshLayout-->
<!--android:id="@+id/swipe_container"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent">-->
<android.support.v7.widget.RecyclerView
android:id="@+id/lvCards"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foregroundGravity="center_vertical"
android:paddingTop="14dp"/>
<!--</android.support.v4.widget.SwipeRefreshLayout>-->
<ProgressBar
android:id="@+id/progressBar"
@ -32,4 +25,4 @@
android:elevation="1dp"
android:visibility="invisible"/>
</RelativeLayout>
</RelativeLayout>

View file

@ -28,15 +28,15 @@
<TextView
android:id="@+id/tvOk"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:fontFamily="@font/raleway_r"
android:padding="8dp"
android:text="OK"
android:text="@string/ok"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="18dp"/>
android:textSize="@dimen/text_size_medium"/>
</LinearLayout>
@ -82,9 +82,9 @@
android:layout_marginBottom="24dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/raleway_r"
android:text="Card ID"
android:text="@string/card_id"
android:textAlignment="center"
android:textSize="@dimen/verify_card_font_normal"/>
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvCardID"
@ -95,10 +95,10 @@
android:layout_marginBottom="4dp"
android:layout_marginTop="32dp"
android:fontFamily="@font/montserrat_light"
android:text="---- ---- ---- ----"
android:text="@string/no_data_string_1"
android:textAlignment="center"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_normal"
android:textSize="@dimen/text_size_medium"
android:textStyle="normal|bold"/>
</RelativeLayout>
@ -120,18 +120,19 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="Issuer"
android:textSize="@dimen/verify_card_font_normal"/>
android:text="@string/issuer"
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="Smart Cash AG"
android:text="@string/smart_cash_ag"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_normal"
android:textSize="@dimen/text_size_medium"
android:textStyle="normal|bold"/>
</LinearLayout>
<android.support.constraint.ConstraintLayout
@ -144,8 +145,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:fontFamily="@font/montserrat_light"
android:text="Blockchain"
android:textSize="14dp"
android:text="@string/blockchain"
android:textSize="@dimen/text_size_1_small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -155,9 +156,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="Blockchain"
android:text="@string/blockchain"
android:textColor="@color/primary_dark"
android:textSize="14dp"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
app:layout_constraintLeft_toRightOf="@+id/tvBlockchainHeader"
app:layout_constraintTop_toTopOf="@+id/tvBlockchainHeader"/>
@ -180,10 +181,10 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Signing method"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/signing_method"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvSigningMethod"
@ -192,8 +193,9 @@
android:fontFamily="@font/montserrat_light"
android:text="Sign hash"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_small"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"/>
</LinearLayout>
<LinearLayout
@ -204,10 +206,10 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="This card is"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/this_card_is"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvReusable"
@ -216,8 +218,9 @@
android:fontFamily="@font/montserrat_light"
android:text="Reusable"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_small"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"/>
</LinearLayout>
<LinearLayout
@ -228,20 +231,21 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Signed transactions"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/signed_transactions"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvSignedTx"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="100"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_small"
android:textStyle="normal|bold"/>
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
tools:text="100"/>
</LinearLayout>
<LinearLayout
@ -252,20 +256,21 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Remaining signatures"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/remaining_signatures"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvRemainingSignatures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="0"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_small"
android:textStyle="normal|bold"/>
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
tools:text="0"/>
</LinearLayout>
<LinearLayout
@ -276,10 +281,10 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Time of last signing"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/time_of_last_signing"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvLastSigned"
@ -288,8 +293,9 @@
android:fontFamily="@font/montserrat_light"
android:text=""
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_small"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"/>
</LinearLayout>
<LinearLayout
@ -300,20 +306,21 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Features"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/features"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvFeatures"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="Allows change PIN1 and PIN2\nNeed CVC\nDynamic NDEF\nRecoverable\nBlockable\nAtomic command mode"
android:text="@string/allows_change_pin1_and_pin2"
android:textColor="@color/primary_dark"
android:textSize="10dp"
android:textSize="@dimen/text_size_2_small"
android:textStyle="normal|bold"/>
</LinearLayout>
<LinearLayout
@ -326,16 +333,16 @@
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text=""
android:textSize="12dp"/>
android:textSize="@dimen/text_size_small"/>
<TextView
android:id="@+id/tvIssuerData"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text=" "
android:textSize="@dimen/verify_card_font_small"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"/>
</LinearLayout>
<View
@ -356,17 +363,17 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="Manufacturer"
android:textSize="@dimen/verify_card_font_normal"/>
android:text="@string/manufacturer"
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvManufacturerInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="Smart Cash AG"
android:text="@string/smart_cash_ag"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_normal"
android:textSize="@dimen/text_size_medium"
android:textStyle="normal|bold"/>
<ImageView
@ -374,8 +381,9 @@
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:src="@drawable/tangem_logo_small_new"/>
</LinearLayout>
<LinearLayout
@ -386,20 +394,21 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Card identity"
android:textSize="14dp"/>
android:text="@string/card_identity"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvCardIdentity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="Attested"
android:text="@string/attested"
android:textColor="@color/confirmed"
android:textSize="14dp"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"/>
</LinearLayout>
<LinearLayout
@ -410,20 +419,21 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Firmware"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/firmware"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvFirmware"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="1.05"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_small"
android:textStyle="normal|bold"/>
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
tools:text="1.05"/>
</LinearLayout>
<LinearLayout
@ -433,22 +443,22 @@
<TextView
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Registration date"
android:textSize="@dimen/verify_card_font_small"/>
android:text="@string/registration_date"
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvCardRegistredDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/montserrat_light"
android:text="29/09/2017"
android:textColor="@color/primary_dark"
android:textSize="@dimen/verify_card_font_small"
android:textStyle="normal|bold"/>
</LinearLayout>
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"
tools:text="29/09/2017"/>
</LinearLayout>
<View
android:id="@+id/view3"
@ -468,21 +478,21 @@
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:fontFamily="@font/raleway_r"
android:text="Wallet"
android:textSize="@dimen/verify_card_font_normal"/>
android:text="@string/wallet"
android:textSize="@dimen/text_size_medium"/>
<TextView
android:id="@+id/tvWallet"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fontFamily="@font/montserrat_light"
android:gravity="left|center_vertical"
android:gravity="start|center_vertical"
android:text="address"
android:textColor="@color/primary_dark"
android:textSize="12dp"
android:textSize="@dimen/text_size_small"
android:textStyle="normal|bold"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@ -493,10 +503,10 @@
android:id="@+id/tvWalletIdentityLabel"
android:layout_width="@dimen/verify_card_left_col_width"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:fontFamily="@font/raleway_r"
android:text="Private key"
android:textSize="14dp"/>
android:textSize="@dimen/text_size_1_small"/>
<TextView
android:id="@+id/tvWalletIdentity"
@ -505,8 +515,9 @@
android:fontFamily="@font/montserrat_light"
android:text="Possession proved"
android:textColor="@color/confirmed"
android:textSize="14dp"
android:textSize="@dimen/text_size_1_small"
android:textStyle="normal|bold"/>
</LinearLayout>
<TextView
@ -546,7 +557,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="false"
android:layout_alignParentStart="false"
android:layout_toLeftOf="@+id/imgPIN2orSecurityDelay"
android:layout_toStartOf="@+id/imgPIN2orSecurityDelay"
android:src="@drawable/unlock_pin1"/>
<ImageView
@ -556,7 +567,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="false"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:src="@drawable/unlock_pin2"/>
<ImageView
@ -565,13 +576,11 @@
android:layout_height="24dp"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:src="@drawable/ic_developer_version"/>
</RelativeLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>

View file

@ -13,17 +13,10 @@
<dimen name="card_info_height">132dp</dimen>
<dimen name="verify_card_left_col_width">144dp</dimen>
<dimen name="verify_card_font_large">24dp</dimen>
<dimen name="verify_card_font_normal">18dp</dimen>
<dimen name="verify_card_font_small">14dp</dimen>
<dimen name="empty_wallet_left_col_width">140dp</dimen>
<!--<dimen name="empty_wallet_font_large">24dp</dimen>-->
<!--<dimen name="empty_wallet_font_normal">14dp</dimen>-->
<!--<dimen name="empty_wallet_font_small">12dp</dimen>-->
<dimen name="empty_wallet_left_col_margin">16dp</dimen>
<dimen name="text_size_2_small">10sp</dimen>
<dimen name="text_size_small">12sp</dimen>
<dimen name="text_size_1_small">14sp</dimen>

View file

@ -43,6 +43,8 @@
<string name="including_fee">(including fee)</string>
<string name="m_btc">mBTC</string>
<string name="scan_again_to_verify_the_card">Scan again to verify the card</string>
<string name="smart_cash_ag">Smart Cash AG</string>
<string name="wallet">Wallet</string>
<!-- dialogs -->
<string name="device_is_rooted">Your Android device is rooted. Security at risk!</string>
@ -50,6 +52,9 @@
<string name="warning">Warning</string>
<string name="the_nfc_adapter_length_apdu">The NFC adapter of the device does not support extended length APDU, it\'s possible that some functions will not work!</string>
<string name="your_money_is_at_risk">Your money is at risk!</string>
<string name="this_banknote_has_enforced_security_delay">This banknote has enforced security delay</string>
<string name="please_hold_banknote">Please hold the banknote firmly\n until the operation is completed…</string>
<string name="you_may_be_required_to_repeat">You may be required to repeat this operation a few times depending on the NFC performance of your smartphone.\n This is made for safety of your funds.</string>
<!-- menu main -->
<string name="clean_up">Clean up</string>
@ -69,7 +74,6 @@
<!-- MainActivity, Main -->
<string name="tap_tangem_card">Tap Tangem card with your smartphone</string>
<string name="scan_banknote">Scan a banknote with your \n smartphone as shown above</string>
<string name="wallet">Wallet</string>
<string name="last_unspent">Last unspent</string>
<string name="no_wallet">NO WALLET</string>
<string name="erased_wallet">ERASED WALLET</string>
@ -114,7 +118,6 @@
<!-- LogoActivity -->
<string name="beta">BETA</string>
<string name="smart_cash_ag">Smart Cash AG</string>
<!-- CreateNewWalletActivity, PurgeActivity, SignPaymentActivity -->
<string name="now_touch_the_banknote_with_id">Now touch the banknote with ID</string>
@ -149,14 +152,27 @@
<string name="payment_amount">payment amount</string>
<string name="fee">Fee</string>
<string name="send_1">Send</string>
<string name="minimal">Minimal</string>
<string name="normal">Normal</string>
<string name="priority">Priority</string>
<!-- EmptyWalletActivity -->
<string name="wallet_has_not_been_yet_created">Wallet hasn\'t been yet created</string>
<string name="create_wallet">Create Wallet</string>
<!-- VerifyCardActivity -->
<string name="card_id">Card ID</string>
<string name="signing_method">Signing method</string>
<string name="this_card_is">This card is</string>
<string name="signed_transactions">Signed transactions</string>
<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>
<string name="firmware">Firmware</string>
<string name="registration_date">Registration date</string>
</resources>