From d1b9e226738e45c65c4aec49fd167dae0db1e77a Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 27 May 2025 17:51:02 +0200 Subject: [PATCH] Refactoring dialog filtro ultime consegne --- .../ultime_consegne_cliente/UltimeConsegneClienteFragment.java | 3 +-- .../dialog/DialogUltimeConsegneFiltroAvanzatoView.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java index 16cc702e..acab2dce 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java @@ -112,9 +112,8 @@ public class UltimeConsegneClienteFragment extends BaseFragment implements Ultim handler.post(() -> { DialogUltimeConsegneFiltroAvanzatoView.newInstance(gtbAnags, filterResult -> { - if (filterResult == null || filterResult.isAborted()) { - + popMe(); } else refreshConsegne(filterResult.getGtbAnag()); }) .show(requireActivity().getSupportFragmentManager(), "dialog-filtro-ultime-consegne"); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzatoView.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzatoView.java index 03a67a15..79eb588d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzatoView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/dialog/DialogUltimeConsegneFiltroAvanzatoView.java @@ -67,6 +67,9 @@ public class DialogUltimeConsegneFiltroAvanzatoView extends BaseDialogFragment { .setView(mBindings.getRoot()) .setCancelable(isCancelable()) .setPositiveButton(R.string.ok, (dialog, which) -> onOk()) + .setNegativeButton(R.string.abort, (dialog, which) -> { + if (onConfirm != null) onConfirm.run(Result.aborted()); + }) .create(); alertDialog.setCanceledOnTouchOutside(isCancelable());