diff --git a/app/src/main/res/drawable/ic_group_1258.xml b/app/src/main/res/drawable/ic_group_1258.xml new file mode 100644 index 0000000000..b15674c9de --- /dev/null +++ b/app/src/main/res/drawable/ic_group_1258.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_twin_cards_background_warning.xml b/app/src/main/res/drawable/ic_twin_cards_background_warning.xml new file mode 100644 index 0000000000..54cccb6fa8 --- /dev/null +++ b/app/src/main/res/drawable/ic_twin_cards_background_warning.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/app/src/main/res/drawable/rectangle_twin_background.xml b/app/src/main/res/drawable/rectangle_twin_background.xml new file mode 100644 index 0000000000..73ca08b417 --- /dev/null +++ b/app/src/main/res/drawable/rectangle_twin_background.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_chip.xml b/app/src/main/res/drawable/shape_chip.xml new file mode 100644 index 0000000000..9544d9916d --- /dev/null +++ b/app/src/main/res/drawable/shape_chip.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_details_twin_cards.xml b/app/src/main/res/layout/fragment_details_twin_cards.xml new file mode 100644 index 0000000000..02b5a83991 --- /dev/null +++ b/app/src/main/res/layout/fragment_details_twin_cards.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_details_twin_cards_warning.xml b/app/src/main/res/layout/fragment_details_twin_cards_warning.xml new file mode 100644 index 0000000000..35a4fdcf5a --- /dev/null +++ b/app/src/main/res/layout/fragment_details_twin_cards_warning.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_disclaimer.xml b/app/src/main/res/layout/fragment_disclaimer.xml index 3efa0e31fa..0c771b9995 100644 --- a/app/src/main/res/layout/fragment_disclaimer.xml +++ b/app/src/main/res/layout/fragment_disclaimer.xml @@ -28,7 +28,6 @@ android:id="@+id/cl_details_confirm" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:layout_marginBottom="33dp" app:layout_behavior="@string/appbar_scrolling_view_behavior"> @@ -36,7 +35,7 @@ android:id="@+id/sv_wallet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" + android:layout_marginBottom="8dp" android:fillViewport="true" android:overScrollMode="never" app:layout_constraintBottom_toTopOf="@id/btn_accept"> @@ -67,7 +66,6 @@ android:id="@+id/btn_accept" style="@style/TapButtonWithIcon" android:layout_width="0dp" - android:layout_height="48dp" android:layout_marginStart="7dp" android:layout_marginTop="30dp" android:layout_marginEnd="16dp" diff --git a/app/src/main/res/layout/fragment_twin_cards.xml b/app/src/main/res/layout/fragment_twin_cards.xml new file mode 100644 index 0000000000..690e785606 --- /dev/null +++ b/app/src/main/res/layout/fragment_twin_cards.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 1f139adb02..9ed6acedb3 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -1,6 +1,7 @@ + + + + + + + + app:layout_constraintTop_toBottomOf="@id/barrier" /> + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_twin_cards_orange.xml b/app/src/main/res/layout/layout_twin_cards_orange.xml new file mode 100644 index 0000000000..f524c5dd49 --- /dev/null +++ b/app/src/main/res/layout/layout_twin_cards_orange.xml @@ -0,0 +1,38 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1883882991..2b8a0270b6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -26,6 +26,8 @@ #F4F5F6 #DE000000 + #14181D + #F8F8FB #C7C7CC @@ -39,5 +41,7 @@ #0029FF #1F50FF #CBE4FF + #E0E6FA + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 574aa2d17c..c90c4534da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -204,8 +204,4 @@ To avoid paying an increased commission the next time you top up your wallet, reduce the amount by %s XTZ Reduce by %s XTZ No, send all - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml index fa4aa42ee7..dd823ac37c 100644 --- a/app/src/main/res/values/strings_untranslated.xml +++ b/app/src/main/res/values/strings_untranslated.xml @@ -3,4 +3,28 @@ Default Compatibility Legacy + + Tangem Twin + One wallet. Two cards. + This one that you are holding in your hands +and the other one with number %s.\n\nBoth cards can be used to extract funds from +this wallet. + + + Card %s of 2 + + Re-create twin wallet + This action is irreversible. If, after deleting the old wallet, someone sends funds to it, then you will not be able to withdraw them. + Re-create wallet + Step %s + Tap the #%s twin card + If the process of re-creating the wallet gets interrupted in any way, you’ll have to start over. + Tap the card #%s + You have already started the process of recreating twin wallet. If you interrupt it, you won\'t be able to use your twin cards until you start it again and complete recreating the wallet. + + The twin address was successfully created + + Start + Back +