From b4084866aeefddd26e80b05ba08f51aae512caec Mon Sep 17 00:00:00 2001 From: pokkst Date: Fri, 3 Feb 2023 20:23:23 -0600 Subject: [PATCH] UI/UX tweaks --- .../java/net/mynero/wallet/fragment/send/SendFragment.java | 4 ++++ app/src/main/res/layout/fragment_send.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java b/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java index 668837b..78acb02 100644 --- a/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java +++ b/app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java @@ -174,6 +174,7 @@ public class SendFragment extends Fragment { Toast.makeText(getActivity(), getString(R.string.creating_tx), Toast.LENGTH_SHORT).show(); createButton.setEnabled(false); + sendMaxButton.setEnabled(false); createTx(dests, sendAll, priority); }); @@ -317,6 +318,7 @@ public class SendFragment extends Fragment { EditText addressField = entryView.findViewById(R.id.address_edittext); addressField.setText(uriData.getAddress()); if (uriData.hasAmount()) { + sendMaxButton.setEnabled(false); EditText amountField = entryView.findViewById(R.id.amount_edittext); amountField.setText(uriData.getAmount()); } @@ -336,6 +338,7 @@ public class SendFragment extends Fragment { if (activity != null) { activity.runOnUiThread(() -> { createButton.setEnabled(true); + sendMaxButton.setEnabled(true); Toast.makeText(getActivity(), getString(R.string.error_creating_tx), Toast.LENGTH_SHORT).show(); }); } @@ -345,6 +348,7 @@ public class SendFragment extends Fragment { if (activity != null) { activity.runOnUiThread(() -> { createButton.setEnabled(true); + sendMaxButton.setEnabled(true); Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show(); }); } diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml index 428ca71..dfd07b5 100644 --- a/app/src/main/res/layout/fragment_send.xml +++ b/app/src/main/res/layout/fragment_send.xml @@ -51,7 +51,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/send_max_button" tools:ignore="SpeakableTextPresentCheck" - tools:visibility="visible" /> + tools:visibility="visible" + app:tint="@color/oled_textColorPrimary" />