From 967e2bc58ccec7b253caeb2f0ef095438ab97e2d Mon Sep 17 00:00:00 2001 From: pokkst Date: Sat, 8 Oct 2022 01:01:16 -0500 Subject: [PATCH] Fix UI issue when sending tx from UTXOs fragment --- .../wallet/fragment/dialog/SendBottomSheetDialog.java | 8 +++++++- .../mynero/wallet/fragment/utxos/UtxosFragment.java | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java b/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java index 7900543..7c62fc9 100644 --- a/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java +++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java @@ -56,6 +56,7 @@ public class SendBottomSheetDialog extends BottomSheetDialogFragment { public LiveData pendingTransaction = _pendingTransaction; public UriData uriData = null; public boolean isChurning = false; + public Listener listener = null; public PendingTransaction.Priority priority; private EditText addressEditText; private EditText amountEditText; @@ -252,6 +253,9 @@ public class SendBottomSheetDialog extends BottomSheetDialogFragment { activity.runOnUiThread(() -> { if (success) { Toast.makeText(getActivity(), getString(R.string.sent_tx), Toast.LENGTH_SHORT).show(); + if(listener != null) { + listener.onSentTransaction(); + } dismiss(); } else { sendButton.setEnabled(true); @@ -337,5 +341,7 @@ public class SendBottomSheetDialog extends BottomSheetDialogFragment { } } - + public interface Listener { + void onSentTransaction(); + } } \ No newline at end of file diff --git a/app/src/main/java/net/mynero/wallet/fragment/utxos/UtxosFragment.java b/app/src/main/java/net/mynero/wallet/fragment/utxos/UtxosFragment.java index e22a2d1..32ec277 100644 --- a/app/src/main/java/net/mynero/wallet/fragment/utxos/UtxosFragment.java +++ b/app/src/main/java/net/mynero/wallet/fragment/utxos/UtxosFragment.java @@ -24,7 +24,7 @@ import net.mynero.wallet.util.UriData; import java.util.ArrayList; import java.util.Collections; -public class UtxosFragment extends Fragment implements CoinsInfoAdapter.CoinsInfoAdapterListener { +public class UtxosFragment extends Fragment implements CoinsInfoAdapter.CoinsInfoAdapterListener, SendBottomSheetDialog.Listener { private UtxosViewModel mViewModel; private final ArrayList selectedUtxos = new ArrayList<>(); @@ -53,11 +53,13 @@ public class UtxosFragment extends Fragment implements CoinsInfoAdapter.CoinsInf churnUtxosButton.setVisibility(View.GONE); sendUtxosButton.setOnClickListener(view1 -> { SendBottomSheetDialog sendDialog = new SendBottomSheetDialog(); + sendDialog.listener = this; sendDialog.selectedUtxos = selectedUtxos; sendDialog.show(getActivity().getSupportFragmentManager(), null); }); churnUtxosButton.setOnClickListener(view1 -> { SendBottomSheetDialog sendDialog = new SendBottomSheetDialog(); + sendDialog.listener = this; sendDialog.isChurning = true; sendDialog.uriData = UriData.parse(AddressService.getInstance().currentSubaddress().getAddress()); sendDialog.selectedUtxos = selectedUtxos; @@ -108,4 +110,10 @@ public class UtxosFragment extends Fragment implements CoinsInfoAdapter.CoinsInf adapter.updateSelectedUtxos(selectedUtxos); } + + @Override + public void onSentTransaction() { + churnUtxosButton.setVisibility(View.GONE); + sendUtxosButton.setVisibility(View.GONE); + } } \ No newline at end of file