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/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 @@ - - + + + + + + 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..14a32680dd --- /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..e4a5d64acc --- /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-hdpi/ic_payid.png b/app/src/main/res/drawable-hdpi/ic_payid.png new file mode 100644 index 0000000000..79c7f1ec4f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_payid.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_payid.png b/app/src/main/res/drawable-mdpi/ic_payid.png new file mode 100644 index 0000000000..1af851efc8 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_payid.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_payid.png b/app/src/main/res/drawable-xhdpi/ic_payid.png new file mode 100644 index 0000000000..914e7f67b9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_payid.png differ 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 0000000000..f7dbee2905 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_payid.png differ 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 0000000000..bb99030d50 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_payid.png differ diff --git a/app/src/main/res/drawable/ic_angle_bracket_right.xml b/app/src/main/res/drawable/ic_angle_bracket_right.xml new file mode 100644 index 0000000000..1cfb0d7374 --- /dev/null +++ b/app/src/main/res/drawable/ic_angle_bracket_right.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_angle_bracket_up.xml b/app/src/main/res/drawable/ic_angle_bracket_up.xml new file mode 100644 index 0000000000..5311e45d76 --- /dev/null +++ b/app/src/main/res/drawable/ic_angle_bracket_up.xml @@ -0,0 +1,11 @@ + + + + + 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 new file mode 100644 index 0000000000..f45f66f818 --- /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_arrows_up_down.xml b/app/src/main/res/drawable/ic_arrows_up_down.xml new file mode 100644 index 0000000000..6e7d34d5e6 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrows_up_down.xml @@ -0,0 +1,9 @@ + + + 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_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_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_scan.xml b/app/src/main/res/drawable/ic_qr_code_scan.xml new file mode 100644 index 0000000000..34a2bf62a8 --- /dev/null +++ b/app/src/main/res/drawable/ic_qr_code_scan.xml @@ -0,0 +1,9 @@ + + + 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/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..1aedcead47 --- /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..17ab5b0e2c --- /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..ec3f704035 --- /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_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_send.xml b/app/src/main/res/layout/fragment_send.xml new file mode 100644 index 0000000000..f0b7ab503a --- /dev/null +++ b/app/src/main/res/layout/fragment_send.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + \ 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 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.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/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_send_address_payid.xml b/app/src/main/res/layout/layout_send_address_payid.xml new file mode 100644 index 0000000000..3f48a6131d --- /dev/null +++ b/app/src/main/res/layout/layout_send_address_payid.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_send_currency.xml b/app/src/main/res/layout/layout_send_currency.xml new file mode 100644 index 0000000000..a59a0d0ecb --- /dev/null +++ b/app/src/main/res/layout/layout_send_currency.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_send_network_fee.xml b/app/src/main/res/layout/layout_send_network_fee.xml new file mode 100644 index 0000000000..156e8a2016 --- /dev/null +++ b/app/src/main/res/layout/layout_send_network_fee.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_send_total.xml b/app/src/main/res/layout/layout_send_total.xml new file mode 100644 index 0000000000..83ca437a9e --- /dev/null +++ b/app/src/main/res/layout/layout_send_total.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 64b9056fe7..4552b02d4e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,35 +1,39 @@ - - - - #1ACE80 - #46D799 - #D0F5E5 - - #5AC461 - #C4291C - #FFB71B - - #8E8E93 - #636366 - #48484A - #3A3A3C - #2C2C2E - #1C1C1E - - #F9F9FA - #F4F5F6 - - - #F8F8FB - #C7C7CC - #D1D1D6 - #F2F2F7 - - #1F000000 - - #0022D4 - #0029FF - #1F50FF - #CBE4FF - + + + + #0029FF + #0022D4 + #1ACE80 + + @color/accent + @color/darkGray6 + + #5AC461 + #C4291C + #FFB71B + + #8E8E93 + #636366 + #48484A + #3A3A3C + #2C2C2E + #1C1C1E + + #F9F9FA + #F4F5F6 + + + #F8F8FB + #C7C7CC + #D1D1D6 + #F2F2F7 + + #1F000000 + #14212121 + + @color/colorSecondary + #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/strings.xml b/app/src/main/res/values/strings.xml index c0e4f023fb..5c52903a64 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 55f380c237..24e04d7247 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,45 +1,53 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file