From 1ac0a591fc9b62aa934245bd4db1d0ff33cfb88b Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Tue, 5 Dec 2017 23:41:44 -0600 Subject: [PATCH] Added cross and arrow icons and improved view to match desired design --- .../fragments/SendTransactionFragment.java | 4 +-- .../main/res/drawable/ic_arrow_forward.xml | 9 ++++++ app/src/main/res/drawable/ic_close.xml | 9 ++++++ app/src/main/res/drawable/ic_people.xml | 2 +- .../drawable/send_transaction_send_view.xml | 7 +++++ .../drawable/send_transaction_top_view.xml | 4 +-- app/src/main/res/layout/send_transaction.xml | 31 ++++++++++++++++--- app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/values/strings.xml | 1 + 9 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/drawable/ic_arrow_forward.xml create mode 100644 app/src/main/res/drawable/ic_close.xml create mode 100644 app/src/main/res/drawable/send_transaction_send_view.xml diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java index 693628c..43e2ef7 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java @@ -150,7 +150,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat AlertDialog dialog = builder.create(); - dialog.setOnShowListener(new DialogInterface.OnShowListener() { + /*dialog.setOnShowListener(new DialogInterface.OnShowListener() { @Override public void onShow(DialogInterface dialog) { btnSend = ((AlertDialog)dialog).getButton(AlertDialog.BUTTON_POSITIVE); @@ -158,7 +158,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat btnSend.setEnabled(false); } - }); + });*/ return dialog; } diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml new file mode 100644 index 0000000..38f52cf --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_forward.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml new file mode 100644 index 0000000..2b9c759 --- /dev/null +++ b/app/src/main/res/drawable/ic_close.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_people.xml b/app/src/main/res/drawable/ic_people.xml index 4cdb005..d26694e 100644 --- a/app/src/main/res/drawable/ic_people.xml +++ b/app/src/main/res/drawable/ic_people.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/send_transaction_send_view.xml b/app/src/main/res/drawable/send_transaction_send_view.xml new file mode 100644 index 0000000..50501fb --- /dev/null +++ b/app/src/main/res/drawable/send_transaction_send_view.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/send_transaction_top_view.xml b/app/src/main/res/drawable/send_transaction_top_view.xml index 6af3667..d7ce80f 100644 --- a/app/src/main/res/drawable/send_transaction_top_view.xml +++ b/app/src/main/res/drawable/send_transaction_top_view.xml @@ -4,6 +4,6 @@ android:shape="rectangle"> + android:startColor="@color/send_light_orange" + android:endColor="@color/send_strong_orange"/> \ No newline at end of file diff --git a/app/src/main/res/layout/send_transaction.xml b/app/src/main/res/layout/send_transaction.xml index 4b7b631..43bc47f 100644 --- a/app/src/main/res/layout/send_transaction.xml +++ b/app/src/main/res/layout/send_transaction.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="24dp" - android:text="Send Assets" + android:text="@string/title_capital" android:textColor="@color/white" android:textSize="20sp" android:textStyle="bold" @@ -186,14 +186,36 @@ app:layout_constraintTop_toBottomOf="@id/tvScan" /> + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f25d51a..5bbb14a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -39,4 +39,6 @@ #ff56a9c7 #000000 #ffffff + #FF7063 + #FF9269 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d578600..6cf9e9c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -454,4 +454,5 @@ Hello blank fragment Scan a QR or NFC signal CANCEL + Send Assets