diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 33216fe278..f74247e6ba 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -58,6 +58,7 @@ app:rb_type="strokeRipple"> + + android:textSize="@dimen/text_size_medium"/> + android:textSize="@dimen/text_size_1_small"/> @@ -89,14 +90,14 @@ android:fontFamily="@font/montserrat_light" android:lines="1" android:maxLines="1" - android:text=" " android:textColor="@color/black" - android:textSize="@dimen/font_large" + android:textSize="@dimen/text_size_large" android:textStyle="normal|bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/imgBlockchain" app:layout_constraintStart_toEndOf="@+id/tvBalanceLabel" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" + tools:text="0 mBTC"/> @@ -122,33 +123,35 @@ android:layout_width="90dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginRight="20dp" + android:layout_marginEnd="20dp" android:background="@color/msg_okay" android:fontFamily="@font/montserrat_light" - android:text="verified offline" + android:text="@string/verified_offline" android:textAlignment="center" android:textColor="@color/white" - android:textSize="@dimen/font_small"/> + android:textSize="@dimen/text_size_small"/> + android:textSize="@dimen/text_size_medium" + android:textStyle="normal|bold" + tools:text="USD 0,00"/> + + android:textStyle="normal|bold" + tools:text="Bitcoin"/> + android:textSize="@dimen/text_size_1_small" + android:textStyle="normal|bold" + tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY"/> + + android:paddingRight="8dp" + > @@ -225,7 +229,7 @@ @@ -234,9 +238,6 @@ android:id="@+id/imgLookup" android:layout_width="40dp" android:layout_height="40dp" - android:layout_alignParentBottom="false" - android:layout_alignParentEnd="false" - android:layout_alignParentRight="false" android:layout_marginTop="15dp" android:baselineAlignBottom="false" android:src="@drawable/chain_lookup"/> @@ -247,10 +248,10 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:fontFamily="@font/raleway_el" - android:text="EXPLORE IN\nBLOCKCHAIN\nON WEB" + android:text="@string/explore_in_blockchain" android:textAlignment="center" android:textColor="@color/primary_dark" - android:textSize="10dp" + android:textSize="@dimen/text_size_2_small" android:textStyle="normal|bold"/> @@ -277,19 +278,20 @@ android:layout_width="110dp" android:layout_height="wrap_content" android:fontFamily="@font/raleway_r" - android:text="Unspents" + android:text="@string/unspents" android:textColor="@color/primary_dark" - android:textSize="12dp"/> + android:textSize="@dimen/text_size_small"/> + android:textSize="@dimen/text_size_small" + android:textStyle="normal|bold" + tools:text="@string/no_data_string"/> + + android:textSize="@dimen/text_size_small"/> + + android:textSize="@dimen/text_size_small"/> + android:textSize="@dimen/text_size_small" + android:textStyle="normal|bold" + tools:text="TANGEM"/> + android:textSize="@dimen/text_size_small"/> + android:textSize="@dimen/text_size_small" + android:textStyle="normal|bold" + tools:text="Electrum"/> + - - - - - - - - - - + android:textSize="@dimen/text_size_small"/> + @@ -422,7 +415,7 @@ android:elevation="2dp" android:fontFamily="@font/montserrat_light" android:padding="4dp" - android:text="Message!" + android:text="@string/message" android:textAlignment="center" android:textColor="@color/black" android:textStyle="normal|bold"/> @@ -438,10 +431,11 @@ android:fontFamily="@font/montserrat_light" android:padding="4dp" android:shadowColor="@color/cardview_shadow_start_color" - android:text="Error!" + android:text="@string/error" android:textAlignment="center" android:textColor="@color/white" android:textStyle="bold"/> + @@ -472,7 +466,7 @@ android:layout_alignParentEnd="true" android:layout_alignParentStart="false" android:layout_marginBottom="8dp" - android:layout_marginLeft="4dp" + android:layout_marginStart="4dp" android:elevation="0dp" android:src="@drawable/unlock_pin2"/> @@ -483,7 +477,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentStart="true" android:layout_marginBottom="8dp" - android:layout_marginLeft="4dp" + android:layout_marginStart="4dp" android:elevation="0dp" android:src="@drawable/ic_developer_version"/> @@ -496,11 +490,11 @@ android:layout_alignParentStart="true" android:layout_alignWithParentIfMissing="false" android:fontFamily="@font/montserrat_light" - android:text="---- ---- ---- ----" android:textAlignment="center" android:textColor="@color/primary_dark" - android:textSize="@dimen/font_normal" - android:textStyle="normal|bold"/> + android:textSize="@dimen/text_size_medium" + android:textStyle="normal|bold" + tools:text="@string/no_data_string_1"/> + android:textSize="@dimen/text_size_small"/> @@ -530,31 +524,28 @@ android:layout_height="match_parent" android:layout_alignParentStart="true" android:layout_alignParentTop="false" - android:layout_toLeftOf="@+id/tvPurge" - android:layout_weight="1" + android:layout_toStartOf="@+id/tvPurge" android:background="@color/colorPrimary" android:fontFamily="@font/raleway_r" android:padding="8dp" - android:text="SEND" + android:text="@string/send" android:textAlignment="center" android:textColor="@color/white" - android:textSize="18dp"/> + android:textSize="@dimen/text_size_medium"/> + android:textSize="@dimen/text_size_medium"/> diff --git a/app/src/main/res/layout/item_list_card.xml b/app/src/main/res/layout/item_list_card.xml index 88b6195fe3..c5934ab8e0 100644 --- a/app/src/main/res/layout/item_list_card.xml +++ b/app/src/main/res/layout/item_list_card.xml @@ -68,7 +68,7 @@ android:maxLines="1" android:textColor="@color/black" android:textSize="12sp" - tools:text=" DEVELOPER KIT "/> + tools:text="@string/developer_kit"/> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 5441af62a2..c4f645ff39 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -28,6 +28,7 @@ 16dp + 10sp 12sp 14sp 18sp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e0ee8be35..65499d2d8e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,6 +30,10 @@ LoadedWalletActivity Settings + Balance + verified offline + Blockchain + Last withdrawal Your Android device is rooted. Security at risk! @@ -56,15 +60,14 @@ Tap Tangem card with your smartphone Scan a banknote with your \n smartphone as shown above Try to scan again - Balance + Wallet Last unspent - Last withdrawal - Blockchain + NO WALLET ERASED WALLET INVALID CARD - verified offline +            DEVELOPER     KIT        BANKNOTE        BANKNOTE    REUSABLE       REUSABLE    @@ -75,6 +78,17 @@ Please wait while previous transaction is confirmed in blockchain Please wait for confirmation of incoming transaction! Card hasn\'t remaining signature! + BANKNOTE + DO NOT ACCEPT + EXPLORE IN \n BLOCKCHAIN \n ON WEB + Unspents + Issuer + Validation node + Swipe down to refresh data + Message! + Error! + Scan again to verify the card + SEND BETA diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml index 4a59eaa41e..35f87d54b1 100644 --- a/app/src/main/res/values/strings_untranslatable.xml +++ b/app/src/main/res/values/strings_untranslatable.xml @@ -6,6 +6,7 @@ !!  --  -- -- -- + ---- ---- ---- ---- <