diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.java b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.java
index 4257b3bbd9..47791802cc 100644
--- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.java
+++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.java
@@ -27,4 +27,5 @@ public class VerifyCardActivity extends AppCompatActivity {
setResult(Activity.RESULT_OK, data);
finish();
}
-}
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_request_pin.xml b/app/src/main/res/layout/activity_request_pin.xml
index b5f4f7b885..b03538aaf7 100644
--- a/app/src/main/res/layout/activity_request_pin.xml
+++ b/app/src/main/res/layout/activity_request_pin.xml
@@ -23,6 +23,7 @@
android:singleLine="false"
android:textAlignment="center"
android:textSize="36sp"
+ tools:ignore="TextViewEdits"
tools:text="12345"/>
+ android:textSize="36sp"
+ tools:ignore="TextViewEdits"/>
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_wait_pin2.xml b/app/src/main/res/layout/dialog_wait_pin2.xml
index c5ef5f2652..d69a40ccbd 100644
--- a/app/src/main/res/layout/dialog_wait_pin2.xml
+++ b/app/src/main/res/layout/dialog_wait_pin2.xml
@@ -2,7 +2,6 @@
@@ -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"
diff --git a/app/src/main/res/layout/fr_main.xml b/app/src/main/res/layout/fr_main.xml
index 1f6aeafad3..c9d3a8322d 100644
--- a/app/src/main/res/layout/fr_main.xml
+++ b/app/src/main/res/layout/fr_main.xml
@@ -1,25 +1,18 @@
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml
index ba802c7447..8c939a4609 100644
--- a/app/src/main/res/layout/fr_verify_card.xml
+++ b/app/src/main/res/layout/fr_verify_card.xml
@@ -28,15 +28,15 @@
+ android:textSize="@dimen/text_size_medium"/>
@@ -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"/>
@@ -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"/>
+
@@ -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 @@
+ android:text="@string/signing_method"
+ android:textSize="@dimen/text_size_1_small"/>
+
+ android:text="@string/this_card_is"
+ android:textSize="@dimen/text_size_1_small"/>
+
+ android:text="@string/signed_transactions"
+ android:textSize="@dimen/text_size_1_small"/>
+ android:textSize="@dimen/text_size_1_small"
+ android:textStyle="normal|bold"
+ tools:text="100"/>
+
+ android:text="@string/remaining_signatures"
+ android:textSize="@dimen/text_size_1_small"/>
+ android:textSize="@dimen/text_size_1_small"
+ android:textStyle="normal|bold"
+ tools:text="0"/>
+
+ android:text="@string/time_of_last_signing"
+ android:textSize="@dimen/text_size_1_small"/>
+
+ android:text="@string/features"
+ android:textSize="@dimen/text_size_1_small"/>
+
+ android:textSize="@dimen/text_size_small"/>
+
+ android:text="@string/manufacturer"
+ android:textSize="@dimen/text_size_medium"/>
+
+ android:text="@string/card_identity"
+ android:textSize="@dimen/text_size_1_small"/>
+
+ android:text="@string/firmware"
+ android:textSize="@dimen/text_size_1_small"/>
+ android:textSize="@dimen/text_size_1_small"
+ android:textStyle="normal|bold"
+ tools:text="1.05"/>
+
+ android:text="@string/registration_date"
+ android:textSize="@dimen/text_size_1_small"/>
-
+ android:textSize="@dimen/text_size_1_small"
+ android:textStyle="normal|bold"
+ tools:text="29/09/2017"/>
+
+ android:text="@string/wallet"
+ android:textSize="@dimen/text_size_medium"/>
-
+
+ android:textSize="@dimen/text_size_1_small"/>
+
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 35edb4972f..2cd381fdb7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,17 +13,10 @@
132dp
144dp
- 24dp
- 18dp
- 14dp
140dp
-
-
-
16dp
-
10sp
12sp
14sp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af365fce10..acac43f935 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,6 +43,8 @@
(including fee)
mBTC
Scan again to verify the card
+ Smart Cash AG
+ Wallet
Your Android device is rooted. Security at risk!
@@ -50,6 +52,9 @@
Warning
The NFC adapter of the device does not support extended length APDU, it\'s possible that some functions will not work!
Your money is at risk!
+ This banknote has enforced security delay
+ Please hold the banknote firmly\n until the operation is completed…
+ 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.
Clean up
@@ -69,7 +74,6 @@
Tap Tangem card with your smartphone
Scan a banknote with your \n smartphone as shown above
- Wallet
Last unspent
NO WALLET
ERASED WALLET
@@ -114,7 +118,6 @@
BETA
- Smart Cash AG
Now touch the banknote with ID
@@ -149,14 +152,27 @@
payment amount
Fee
Send
-
Minimal
Normal
Priority
-
Wallet hasn\'t been yet created
Create Wallet
+
+ Card ID
+ Signing method
+ This card is
+ Signed transactions
+ 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
+ Firmware
+ Registration date
+
\ No newline at end of file