From 8430f7a4103d7c1c482c3fe431cd78d8d8bfb868 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 31 Aug 2020 10:39:22 +0300 Subject: [PATCH 1/5] Updated on 2026-08-14 --- app/build.gradle | 10 +- .../res/color/selector_chip_background.xml | 10 + .../main/res/color/selector_chip_stroke.xml | 9 + app/src/main/res/drawable/ic_arrow_right.xml | 9 + .../main/res/drawable/ic_arrow_up_down.xml | 9 + .../main/res/drawable/ic_collapse_arrow.xml | 11 + app/src/main/res/drawable/ic_paste.xml | 9 + app/src/main/res/drawable/ic_qr_code.xml | 9 + app/src/main/res/drawable/shape_ellipse.xml | 18 ++ app/src/main/res/layout/btn_arrow_up_down.xml | 22 ++ .../main/res/layout/btn_expand_collapse.xml | 24 +++ app/src/main/res/layout/btn_paste.xml | 23 +++ app/src/main/res/layout/btn_qr_code.xml | 21 ++ app/src/main/res/layout/fragment_extract.xml | 55 +++++ .../layout/layout_extract_address_payid.xml | 52 +++++ .../res/layout/layout_extract_currency.xml | 93 +++++++++ .../res/layout/layout_extract_network_fee.xml | 76 +++++++ .../main/res/layout/layout_extract_total.xml | 146 ++++++++++++++ app/src/main/res/values/res_extract.xml | 34 ++++ app/src/main/res/values/styles.xml | 189 +++++++++--------- 20 files changed, 730 insertions(+), 99 deletions(-) create mode 100644 app/src/main/res/color/selector_chip_background.xml create mode 100644 app/src/main/res/color/selector_chip_stroke.xml create mode 100644 app/src/main/res/drawable/ic_arrow_right.xml create mode 100644 app/src/main/res/drawable/ic_arrow_up_down.xml create mode 100644 app/src/main/res/drawable/ic_collapse_arrow.xml create mode 100644 app/src/main/res/drawable/ic_paste.xml create mode 100644 app/src/main/res/drawable/ic_qr_code.xml create mode 100644 app/src/main/res/drawable/shape_ellipse.xml create mode 100644 app/src/main/res/layout/btn_arrow_up_down.xml create mode 100644 app/src/main/res/layout/btn_expand_collapse.xml create mode 100644 app/src/main/res/layout/btn_paste.xml create mode 100644 app/src/main/res/layout/btn_qr_code.xml create mode 100644 app/src/main/res/layout/fragment_extract.xml create mode 100644 app/src/main/res/layout/layout_extract_address_payid.xml create mode 100644 app/src/main/res/layout/layout_extract_currency.xml create mode 100644 app/src/main/res/layout/layout_extract_network_fee.xml create mode 100644 app/src/main/res/layout/layout_extract_total.xml create mode 100644 app/src/main/res/values/res_extract.xml diff --git a/app/build.gradle b/app/build.gradle index e80024ee8a..82ff78dad4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,13 +90,13 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime:2.2.0" implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.fragment:fragment:1.2.4' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.fragment:fragment:1.2.5' + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' implementation "androidx.preference:preference:1.1.1" implementation 'androidx.biometric:biometric:1.0.1' - implementation 'androidx.core:core-ktx:1.3.0' - implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.core:core-ktx:1.3.1' + implementation 'com.google.android.material:material:1.2.0' implementation 'com.google.dagger:dagger:2.24' kapt 'com.google.dagger:dagger-compiler:2.21' diff --git a/app/src/main/res/color/selector_chip_background.xml b/app/src/main/res/color/selector_chip_background.xml new file mode 100644 index 0000000000..d940368726 --- /dev/null +++ b/app/src/main/res/color/selector_chip_background.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/selector_chip_stroke.xml b/app/src/main/res/color/selector_chip_stroke.xml new file mode 100644 index 0000000000..83739f997b --- /dev/null +++ b/app/src/main/res/color/selector_chip_stroke.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml new file mode 100644 index 0000000000..e0329e1862 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_up_down.xml b/app/src/main/res/drawable/ic_arrow_up_down.xml new file mode 100644 index 0000000000..c49a7941da --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_up_down.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_collapse_arrow.xml b/app/src/main/res/drawable/ic_collapse_arrow.xml new file mode 100644 index 0000000000..5311e45d76 --- /dev/null +++ b/app/src/main/res/drawable/ic_collapse_arrow.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_paste.xml b/app/src/main/res/drawable/ic_paste.xml new file mode 100644 index 0000000000..5697018aec --- /dev/null +++ b/app/src/main/res/drawable/ic_paste.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml new file mode 100644 index 0000000000..34a2bf62a8 --- /dev/null +++ b/app/src/main/res/drawable/ic_qr_code.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/shape_ellipse.xml b/app/src/main/res/drawable/shape_ellipse.xml new file mode 100644 index 0000000000..b5f3fc7939 --- /dev/null +++ b/app/src/main/res/drawable/shape_ellipse.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/btn_arrow_up_down.xml b/app/src/main/res/layout/btn_arrow_up_down.xml new file mode 100644 index 0000000000..6a2ef33ebf --- /dev/null +++ b/app/src/main/res/layout/btn_arrow_up_down.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/btn_expand_collapse.xml b/app/src/main/res/layout/btn_expand_collapse.xml new file mode 100644 index 0000000000..828bf856fc --- /dev/null +++ b/app/src/main/res/layout/btn_expand_collapse.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/btn_paste.xml b/app/src/main/res/layout/btn_paste.xml new file mode 100644 index 0000000000..01c27a3bfc --- /dev/null +++ b/app/src/main/res/layout/btn_paste.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/btn_qr_code.xml b/app/src/main/res/layout/btn_qr_code.xml new file mode 100644 index 0000000000..267a46d2a6 --- /dev/null +++ b/app/src/main/res/layout/btn_qr_code.xml @@ -0,0 +1,21 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_extract.xml b/app/src/main/res/layout/fragment_extract.xml new file mode 100644 index 0000000000..c1ee86b6e2 --- /dev/null +++ b/app/src/main/res/layout/fragment_extract.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_extract_address_payid.xml b/app/src/main/res/layout/layout_extract_address_payid.xml new file mode 100644 index 0000000000..e8b24240b2 --- /dev/null +++ b/app/src/main/res/layout/layout_extract_address_payid.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_extract_currency.xml b/app/src/main/res/layout/layout_extract_currency.xml new file mode 100644 index 0000000000..eb705c2391 --- /dev/null +++ b/app/src/main/res/layout/layout_extract_currency.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_extract_network_fee.xml b/app/src/main/res/layout/layout_extract_network_fee.xml new file mode 100644 index 0000000000..6cef597ff8 --- /dev/null +++ b/app/src/main/res/layout/layout_extract_network_fee.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_extract_total.xml b/app/src/main/res/layout/layout_extract_total.xml new file mode 100644 index 0000000000..fc33390c3e --- /dev/null +++ b/app/src/main/res/layout/layout_extract_total.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/res_extract.xml b/app/src/main/res/values/res_extract.xml new file mode 100644 index 0000000000..f08d1d3244 --- /dev/null +++ b/app/src/main/res/values/res_extract.xml @@ -0,0 +1,34 @@ + + + + + + #0022D4 + #1C1C1E + #8E8E93 + #C7C7CC + + #14212121 + + Network fee + Low + Normal + Priority + Send + + Total + Amount + Fee + will be sent + + + Address or PayID + Balance: + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 27f8e896b2..762cd23e34 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,94 +1,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7b798fff4a08986bc0e887b4fae38e7867246606 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 31 Aug 2020 12:53:15 +0300 Subject: [PATCH 2/5] Updated on 2026-08-14 --- app/build.gradle | 2 +- app/src/main/res/drawable-hdpi/ic_payid.png | Bin 0 -> 2545 bytes app/src/main/res/drawable-mdpi/ic_payid.png | Bin 0 -> 1655 bytes app/src/main/res/drawable-xhdpi/ic_payid.png | Bin 0 -> 3721 bytes app/src/main/res/drawable-xxhdpi/ic_payid.png | Bin 0 -> 5997 bytes .../main/res/drawable-xxxhdpi/ic_payid.png | Bin 0 -> 8820 bytes .../res/drawable/ic_angle_bracket_right.xml | 9 +++ ...apse_arrow.xml => ic_angle_bracket_up.xml} | 0 app/src/main/res/drawable/ic_arrow.xml | 9 --- app/src/main/res/drawable/ic_arrow_right.xml | 6 +- ...rrow_up_down.xml => ic_arrows_up_down.xml} | 0 .../drawable/ic_baseline_arrow_back_24.xml | 11 +++ .../{ic_qrcode.xml => ic_qr_code_create.xml} | 0 .../{ic_qr_code.xml => ic_qr_code_scan.xml} | 0 app/src/main/res/drawable/round_button.xml | 10 --- app/src/main/res/layout/btn_arrow_up_down.xml | 2 +- .../main/res/layout/btn_expand_collapse.xml | 2 +- app/src/main/res/layout/btn_qr_code.xml | 2 +- app/src/main/res/layout/fragment_extract.xml | 10 +-- app/src/main/res/layout/fragment_home.xml | 4 +- app/src/main/res/layout/fragment_wallet.xml | 22 +++--- app/src/main/res/layout/layout_address.xml | 6 +- .../main/res/layout/layout_balance_error.xml | 1 - .../res/layout/layout_extract_currency.xml | 6 +- .../main/res/layout/layout_extract_total.xml | 14 ++-- app/src/main/res/values/colors.xml | 69 +++++++++--------- app/src/main/res/values/dimens.xml | 66 +++++++++-------- app/src/main/res/values/res_extract.xml | 34 --------- app/src/main/res/values/strings.xml | 13 ++++ app/src/main/res/values/styles.xml | 19 +++-- 30 files changed, 149 insertions(+), 168 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_payid.png create mode 100644 app/src/main/res/drawable-mdpi/ic_payid.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_payid.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_payid.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_payid.png create mode 100644 app/src/main/res/drawable/ic_angle_bracket_right.xml rename app/src/main/res/drawable/{ic_collapse_arrow.xml => ic_angle_bracket_up.xml} (100%) delete mode 100644 app/src/main/res/drawable/ic_arrow.xml rename app/src/main/res/drawable/{ic_arrow_up_down.xml => ic_arrows_up_down.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_baseline_arrow_back_24.xml rename app/src/main/res/drawable/{ic_qrcode.xml => ic_qr_code_create.xml} (100%) rename app/src/main/res/drawable/{ic_qr_code.xml => ic_qr_code_scan.xml} (100%) delete mode 100644 app/src/main/res/drawable/round_button.xml delete mode 100644 app/src/main/res/values/res_extract.xml diff --git a/app/build.gradle b/app/build.gradle index d1716ff095..04a330ca2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,6 +94,6 @@ dependencies { testImplementation 'junit:junit:4.13' testImplementation "com.google.truth:truth:1.0.1" androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_payid.png b/app/src/main/res/drawable-hdpi/ic_payid.png new file mode 100644 index 0000000000000000000000000000000000000000..79c7f1ec4f3e9b21a3aed81ec83f22fbc2c2ce5b GIT binary patch literal 2545 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_payid.png b/app/src/main/res/drawable-xxhdpi/ic_payid.png new file mode 100644 index 0000000000000000000000000000000000000000..f7dbee29050ebebdcc7bec30c2cb06df3060ef8d GIT binary patch literal 5997 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 bQyc#UTN_zmdwOe#00000NkvXXu0mjf29L?& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_payid.png b/app/src/main/res/drawable-xxxhdpi/ic_payid.png new file mode 100644 index 0000000000000000000000000000000000000000..bb99030d50bc84a8fb21bbad2dd83aa6c158c88f GIT binary patch literal 8820 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 + + diff --git a/app/src/main/res/drawable/ic_collapse_arrow.xml b/app/src/main/res/drawable/ic_angle_bracket_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_collapse_arrow.xml rename to app/src/main/res/drawable/ic_angle_bracket_up.xml diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml deleted file mode 100644 index e61733ce60..0000000000 --- a/app/src/main/res/drawable/ic_arrow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml index e0329e1862..f45f66f818 100644 --- a/app/src/main/res/drawable/ic_arrow_right.xml +++ b/app/src/main/res/drawable/ic_arrow_right.xml @@ -3,7 +3,7 @@ android:height="11dp" android:viewportWidth="14" android:viewportHeight="11"> - + diff --git a/app/src/main/res/drawable/ic_arrow_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_up_down.xml rename to app/src/main/res/drawable/ic_arrows_up_down.xml diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml new file mode 100644 index 0000000000..b33d1ca408 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_qrcode.xml b/app/src/main/res/drawable/ic_qr_code_create.xml similarity index 100% rename from app/src/main/res/drawable/ic_qrcode.xml rename to app/src/main/res/drawable/ic_qr_code_create.xml diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code_scan.xml similarity index 100% rename from app/src/main/res/drawable/ic_qr_code.xml rename to app/src/main/res/drawable/ic_qr_code_scan.xml diff --git a/app/src/main/res/drawable/round_button.xml b/app/src/main/res/drawable/round_button.xml deleted file mode 100644 index 0f10393497..0000000000 --- a/app/src/main/res/drawable/round_button.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/btn_arrow_up_down.xml b/app/src/main/res/layout/btn_arrow_up_down.xml index 6a2ef33ebf..1aedcead47 100644 --- a/app/src/main/res/layout/btn_arrow_up_down.xml +++ b/app/src/main/res/layout/btn_arrow_up_down.xml @@ -17,6 +17,6 @@ android:layout_gravity="center" android:background="?selectableItemBackgroundBorderless" android:padding="4dp" - app:srcCompat="@drawable/ic_arrow_up_down" /> + app:srcCompat="@drawable/ic_arrows_up_down" /> \ No newline at end of file diff --git a/app/src/main/res/layout/btn_expand_collapse.xml b/app/src/main/res/layout/btn_expand_collapse.xml index 828bf856fc..17ab5b0e2c 100644 --- a/app/src/main/res/layout/btn_expand_collapse.xml +++ b/app/src/main/res/layout/btn_expand_collapse.xml @@ -19,6 +19,6 @@ android:layout_gravity="center" android:background="?selectableItemBackgroundBorderless" android:padding="5dp" - app:srcCompat="@drawable/ic_collapse_arrow" /> + app:srcCompat="@drawable/ic_angle_bracket_up" /> \ No newline at end of file diff --git a/app/src/main/res/layout/btn_qr_code.xml b/app/src/main/res/layout/btn_qr_code.xml index 267a46d2a6..ec3f704035 100644 --- a/app/src/main/res/layout/btn_qr_code.xml +++ b/app/src/main/res/layout/btn_qr_code.xml @@ -16,6 +16,6 @@ android:layout_gravity="center" android:background="?selectableItemBackgroundBorderless" android:padding="4dp" - app:srcCompat="@drawable/ic_qr_code" /> + app:srcCompat="@drawable/ic_qr_code_scan" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_extract.xml b/app/src/main/res/layout/fragment_extract.xml index c1ee86b6e2..cce01b7664 100644 --- a/app/src/main/res/layout/fragment_extract.xml +++ b/app/src/main/res/layout/fragment_extract.xml @@ -38,18 +38,14 @@ android:layout_marginBottom="24dp" /> + app:icon="@drawable/ic_arrow_right" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 1c6c9986e0..982303e7e0 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -70,7 +70,6 @@ android:layout_marginStart="30dp" android:layout_marginBottom="33dp" android:text="@string/home_button_yes" - app:cornerRadius="4dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -82,9 +81,8 @@ android:layout_marginStart="7dp" android:layout_marginEnd="30dp" android:layout_marginBottom="33dp" - android:drawableEnd="@drawable/ic_shop" android:text="@string/home_button_shop" - app:cornerRadius="4dp" + app:icon="@drawable/ic_shop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/btn_yes" /> diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index a134b0b981..111e2e1016 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -27,20 +27,20 @@ android:src="@drawable/card_default" app:layout_constraintTop_toBottomOf="@id/toolbar" /> - + android:layout_height="wrap_content" + app:layout_constraintTop_toBottomOf="@id/iv_card" /> - + android:layout_height="wrap_content" + app:layout_constraintTop_toBottomOf="@id/l_card_balance" /> @@ -64,9 +63,8 @@ android:layout_marginStart="7dp" android:layout_marginEnd="30dp" android:layout_marginBottom="33dp" - android:drawableEnd="@drawable/ic_send" android:text="@string/wallet_button_send" - app:cornerRadius="4dp" + app:icon="@drawable/ic_send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/btn_scan" /> diff --git a/app/src/main/res/layout/layout_address.xml b/app/src/main/res/layout/layout_address.xml index 387887b460..2c2ccf9e00 100644 --- a/app/src/main/res/layout/layout_address.xml +++ b/app/src/main/res/layout/layout_address.xml @@ -54,7 +54,7 @@ android:textColor="@color/darkGray6" android:textSize="12sp" android:textStyle="bold" - app:drawableEndCompat="@drawable/ic_arrow" + app:drawableEndCompat="@drawable/ic_angle_bracket_right" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_address" /> @@ -81,7 +81,7 @@ android:background="@drawable/ic_btn_round_background" android:elevation="3dp" android:padding="10dp" - android:src="@drawable/ic_qrcode" + android:src="@drawable/ic_qr_code_create" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -114,7 +114,7 @@ android:textColor="@color/darkGray6" android:textSize="12sp" android:textStyle="bold" - app:drawableEndCompat="@drawable/ic_arrow" + app:drawableEndCompat="@drawable/ic_angle_bracket_right" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/v_payid_divider" /> diff --git a/app/src/main/res/layout/layout_balance_error.xml b/app/src/main/res/layout/layout_balance_error.xml index 6e0c0b3f71..6f2ed067ac 100644 --- a/app/src/main/res/layout/layout_balance_error.xml +++ b/app/src/main/res/layout/layout_balance_error.xml @@ -25,7 +25,6 @@ android:paddingStart="18dp" android:paddingTop="16dp" android:paddingEnd="16dp" - android:textColor="@color/darkGray6" android:textSize="20sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/layout_extract_currency.xml b/app/src/main/res/layout/layout_extract_currency.xml index eb705c2391..b1afc7a942 100644 --- a/app/src/main/res/layout/layout_extract_currency.xml +++ b/app/src/main/res/layout/layout_extract_currency.xml @@ -71,21 +71,21 @@ android:layout_height="wrap_content" android:paddingEnd="5dp" android:text="@string/extract_balance" - android:textColor="@color/text_color_gray_dark" /> + android:textColor="@color/darkGray1" /> diff --git a/app/src/main/res/layout/layout_extract_total.xml b/app/src/main/res/layout/layout_extract_total.xml index fc33390c3e..d983048902 100644 --- a/app/src/main/res/layout/layout_extract_total.xml +++ b/app/src/main/res/layout/layout_extract_total.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/extract_total_fee" - android:textColor="@color/text_color_gray_dark" + android:textColor="@color/darkGray1" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvAmount" /> @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="5dp" - android:textColor="@color/text_color_gray_dark" + android:textColor="@color/darkGray1" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tvFeeCurrency" app:layout_constraintTop_toTopOf="@+id/tvFeeCurrency" @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAllCaps="true" - android:textColor="@color/text_color_gray_dark" + android:textColor="@color/darkGray1" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/tvFee" @@ -74,7 +74,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="10dp" - android:background="@color/delimiter_color" + android:background="@color/separatorGrey2" app:layout_constraintTop_toBottomOf="@+id/tvFee" tools:layout_editor_absoluteX="0dp" /> @@ -116,7 +116,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="5dp" - android:textColor="@color/text_color_gray_light" + android:textColor="@color/lightGray4" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tvSentCurrency" app:layout_constraintTop_toTopOf="@+id/tvWillBeSent" @@ -127,7 +127,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="5dp" - android:textColor="@color/text_color_gray_light" + android:textColor="@color/lightGray4" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tvWillBeSent" app:layout_constraintTop_toTopOf="@+id/tvWillBeSent" @@ -139,7 +139,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/extract_total_will_be_sent" - android:textColor="@color/text_color_gray_light" + android:textColor="@color/lightGray4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTotal" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 64b9056fe7..88c6c121e4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,35 +1,36 @@ - - - - #1ACE80 - #46D799 - #D0F5E5 - - #5AC461 - #C4291C - #FFB71B - - #8E8E93 - #636366 - #48484A - #3A3A3C - #2C2C2E - #1C1C1E - - #F9F9FA - #F4F5F6 - - - #F8F8FB - #C7C7CC - #D1D1D6 - #F2F2F7 - - #1F000000 - - #0022D4 - #0029FF - #1F50FF - #CBE4FF - + + + + #1ACE80 + #46D799 + #D0F5E5 + + #5AC461 + #C4291C + #FFB71B + + #8E8E93 + #636366 + #48484A + #3A3A3C + #2C2C2E + #1C1C1E + + #F9F9FA + #F4F5F6 + + + #F8F8FB + #C7C7CC + #D1D1D6 + #F2F2F7 + + #1F000000 + #14212121 + + #0022D4 + #0029FF + #1F50FF + #CBE4FF + \ 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 1612a3d2a4..3941e9fb33 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,32 +1,34 @@ - - - 0.8dp - 4dp - 8dp - 4dp - 4dp - 8dp - 8dp - 80dp - 8dp - 168dp - 132dp - - 144dp - - 140dp - 16dp - - 11dp - 13dp - 15dp - 19dp - 23dp - 26dp - 34dp - - 180dp - 30dp - 135dp - - + + + 0.8dp + 4dp + 8dp + 4dp + 4dp + 8dp + 8dp + 80dp + 8dp + 168dp + 132dp + + 144dp + + 140dp + 16dp + + 11dp + 13dp + 15dp + 19dp + 23dp + 26dp + 34dp + + 180dp + 30dp + 135dp + + 4dp + + diff --git a/app/src/main/res/values/res_extract.xml b/app/src/main/res/values/res_extract.xml deleted file mode 100644 index f08d1d3244..0000000000 --- a/app/src/main/res/values/res_extract.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - #0022D4 - #1C1C1E - #8E8E93 - #C7C7CC - - #14212121 - - Network fee - Low - Normal - Priority - Send - - Total - Amount - Fee - will be sent - - - Address or PayID - Balance: - - \ 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 c0e4f023fb..434c27428c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,4 +20,17 @@ Account is not created Tokens + + Address or PayID + Network fee + Low + Normal + Priority + Send + Total + Amount + Fee + will be sent + Balance: + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 53b10c11b5..219f695136 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,7 +5,7 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent - @color/text_color_primary + @color/darkGray6 true false @@ -26,21 +26,28 @@ 0dp 0dp 14sp + bold false 0 - @android:color/white - 3dp + @dimen/btn_corner_radius @font/saira_semi_condensed_regular - - + \ No newline at end of file From d08c5f873824c20afe451ffb6372fee5ca9eace4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 31 Aug 2020 13:44:08 +0300 Subject: [PATCH 3/5] Updated on 2026-08-14 --- app/src/debug_beta/AndroidManifest.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/debug_beta/AndroidManifest.xml b/app/src/debug_beta/AndroidManifest.xml index 8cf74b318f..2784e858d0 100644 --- a/app/src/debug_beta/AndroidManifest.xml +++ b/app/src/debug_beta/AndroidManifest.xml @@ -1,18 +1,17 @@ - - + + + + + + From 7f6c6af6d6b50c76baa06c41cc1e29fa0a757c3e Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 31 Aug 2020 14:18:24 +0300 Subject: [PATCH 4/5] Updated on 2026-08-14 --- .../main/res/drawable/ic_arrows_up_down.xml | 2 +- ...fragment_extract.xml => fragment_send.xml} | 10 ++++----- ...ayid.xml => layout_send_address_payid.xml} | 2 +- ..._currency.xml => layout_send_currency.xml} | 4 ++-- ...rk_fee.xml => layout_send_network_fee.xml} | 8 +++---- ...xtract_total.xml => layout_send_total.xml} | 8 +++---- app/src/main/res/values/strings.xml | 22 +++++++++---------- 7 files changed, 28 insertions(+), 28 deletions(-) rename app/src/main/res/layout/{fragment_extract.xml => fragment_send.xml} (86%) rename app/src/main/res/layout/{layout_extract_address_payid.xml => layout_send_address_payid.xml} (97%) rename app/src/main/res/layout/{layout_extract_currency.xml => layout_send_currency.xml} (97%) rename app/src/main/res/layout/{layout_extract_network_fee.xml => layout_send_network_fee.xml} (91%) rename app/src/main/res/layout/{layout_extract_total.xml => layout_send_total.xml} (96%) diff --git a/app/src/main/res/drawable/ic_arrows_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml index c49a7941da..6e7d34d5e6 100644 --- a/app/src/main/res/drawable/ic_arrows_up_down.xml +++ b/app/src/main/res/drawable/ic_arrows_up_down.xml @@ -4,6 +4,6 @@ android:viewportWidth="14" android:viewportHeight="19"> diff --git a/app/src/main/res/layout/fragment_extract.xml b/app/src/main/res/layout/fragment_send.xml similarity index 86% rename from app/src/main/res/layout/fragment_extract.xml rename to app/src/main/res/layout/fragment_send.xml index cce01b7664..f0b7ab503a 100644 --- a/app/src/main/res/layout/fragment_extract.xml +++ b/app/src/main/res/layout/fragment_send.xml @@ -6,20 +6,20 @@ android:orientation="vertical"> @@ -31,7 +31,7 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/layout_extract_address_payid.xml b/app/src/main/res/layout/layout_send_address_payid.xml similarity index 97% rename from app/src/main/res/layout/layout_extract_address_payid.xml rename to app/src/main/res/layout/layout_send_address_payid.xml index e8b24240b2..3f48a6131d 100644 --- a/app/src/main/res/layout/layout_extract_address_payid.xml +++ b/app/src/main/res/layout/layout_send_address_payid.xml @@ -11,7 +11,7 @@ android:id="@+id/tilAddressOrPayId" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/extract_address_or_payid" + android:hint="@string/send_address_or_payid" app:boxBackgroundColor="@android:color/transparent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/layout_extract_currency.xml b/app/src/main/res/layout/layout_send_currency.xml similarity index 97% rename from app/src/main/res/layout/layout_extract_currency.xml rename to app/src/main/res/layout/layout_send_currency.xml index b1afc7a942..a59a0d0ecb 100644 --- a/app/src/main/res/layout/layout_extract_currency.xml +++ b/app/src/main/res/layout/layout_send_currency.xml @@ -49,7 +49,7 @@ android:focusableInTouchMode="true" android:fontFamily="sans-serif-light" android:textAllCaps="true" - android:textColor="@color/colorPrimary" + android:textColor="@color/blue" android:textSize="32sp" app:layout_constraintBottom_toBottomOf="@+id/tilAmount" app:layout_constraintEnd_toStartOf="@+id/flArrowUpDown" @@ -70,7 +70,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingEnd="5dp" - android:text="@string/extract_balance" + android:text="@string/send_balance" android:textColor="@color/darkGray1" /> + android:text="@string/send_network_chip_fee_low" /> + android:text="@string/send_network_chip_fee_normal" /> + android:text="@string/send_network_chip_fee_priority" /> diff --git a/app/src/main/res/layout/layout_extract_total.xml b/app/src/main/res/layout/layout_send_total.xml similarity index 96% rename from app/src/main/res/layout/layout_extract_total.xml rename to app/src/main/res/layout/layout_send_total.xml index d983048902..83ca437a9e 100644 --- a/app/src/main/res/layout/layout_extract_total.xml +++ b/app/src/main/res/layout/layout_send_total.xml @@ -11,7 +11,7 @@ android:id="@+id/tvAmount" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/extract_total_amount" + android:text="@string/send_total_amount" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/extract_total_fee" + android:text="@string/send_total_fee" android:textColor="@color/darkGray1" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/extract_total" + android:text="@string/send_total" android:textSize="20sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -138,7 +138,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4dp" - android:text="@string/extract_total_will_be_sent" + android:text="@string/send_total_will_be_sent" android:textColor="@color/lightGray4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvTotal" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 434c27428c..5c52903a64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,16 +21,16 @@ Tokens - Address or PayID - Network fee - Low - Normal - Priority - Send - Total - Amount - Fee - will be sent - Balance: + Address or PayID + Network fee + Low + Normal + Priority + Send + Total + Amount + Fee + will be sent + Balance: \ No newline at end of file From d620046c6a1ef74a94bd1570d9c2d58864276afb Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 31 Aug 2020 15:31:09 +0300 Subject: [PATCH 5/5] Updated on 2026-08-14 --- app/src/main/res/color/selector_chip_background.xml | 4 ++-- app/src/main/res/color/selector_chip_stroke.xml | 4 ++-- app/src/main/res/layout/layout_balance.xml | 2 +- app/src/main/res/values/colors.xml | 11 +++++++---- app/src/main/res/values/styles.xml | 6 +++--- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/color/selector_chip_background.xml b/app/src/main/res/color/selector_chip_background.xml index d940368726..14a32680dd 100644 --- a/app/src/main/res/color/selector_chip_background.xml +++ b/app/src/main/res/color/selector_chip_background.xml @@ -1,8 +1,8 @@ - - + + diff --git a/app/src/main/res/color/selector_chip_stroke.xml b/app/src/main/res/color/selector_chip_stroke.xml index 83739f997b..e4a5d64acc 100644 --- a/app/src/main/res/color/selector_chip_stroke.xml +++ b/app/src/main/res/color/selector_chip_stroke.xml @@ -1,7 +1,7 @@ - - + + diff --git a/app/src/main/res/layout/layout_balance.xml b/app/src/main/res/layout/layout_balance.xml index 89ff8bada0..20002d5f26 100644 --- a/app/src/main/res/layout/layout_balance.xml +++ b/app/src/main/res/layout/layout_balance.xml @@ -30,7 +30,7 @@ android:paddingTop="4dp" android:paddingEnd="16dp" android:paddingBottom="16dp" - android:textColor="@color/colorPrimary" + android:textColor="@color/accent" android:textSize="12sp" app:drawableStartCompat="@drawable/ic_ok" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 88c6c121e4..4552b02d4e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,9 +1,12 @@ - #1ACE80 - #46D799 - #D0F5E5 + #0029FF + #0022D4 + #1ACE80 + + @color/accent + @color/darkGray6 #5AC461 #C4291C @@ -28,7 +31,7 @@ #1F000000 #14212121 - #0022D4 + @color/colorSecondary #0029FF #1F50FF #CBE4FF diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 219f695136..24e04d7247 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,8 +3,7 @@ @@ -39,7 +39,7 @@