Eliminato vecchio dialog di richiesta stampa (sostituito con DialogYesNo)

app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java

@@ -50,11 +50,12 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGExcep
 import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView;
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
-import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
 
 public class PickingResiActivity extends BaseActivity implements BottomSheetFragmentLUContentView.Listener, BottomSheetFragmentLUContentViewModel.Listener, PickingResiViewModel.Listener {
 
@@ -392,18 +393,22 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
     @Override
     public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
-        DialogAskShouldPrint.make(this, "Packing List", onComplete).show();
+        DialogYesNoView.newInstance(getString(R.string.action_print),
+                        String.format(getString(R.string.message_print_packing_list), "Packing List"),
+                        result -> {
+                            onComplete.run(result == DialogConsts.Results.YES);
+                        })
+                .show(getSupportFragmentManager(), "dialog-print");
     }
 
     @Override
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.onLoadingEnded();
-        DialogSimpleMessageView.makeErrorDialog(
+        DialogSimpleMessageView.makeErrorDialog(new SpannableString(ex.getMessage()),
-                new SpannableString(ex.getMessage()),
+                        null,
-                null,
+                        null,
-                null,
+                        R.string.button_ignore_print,
-                R.string.button_ignore_print,
+                        onComplete)
-                onComplete)
                 .show(getSupportFragmentManager(), "tag");
     }
 }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java

@@ -70,7 +70,6 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag
 import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
-import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint;
 import it.integry.integrywmsnative.view.dialogs.ask_vettore.DialogAskVettoreView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
@@ -81,7 +80,6 @@ import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAgg
 import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUView;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView;
 import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiView;
 import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
@@ -818,7 +816,12 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUPrintRequest(RunnableArgs<Boolean> onComplete) {
-        DialogAskShouldPrint.make(this, "Packing List", onComplete).show();
+        DialogYesNoView.newInstance(getString(R.string.action_print),
+                        String.format(getString(R.string.message_print_packing_list), "Packing List"),
+                        result -> {
+                            onComplete.run(result == DialogConsts.Results.YES);
+                        })
+                .show(getSupportFragmentManager(), "dialog-print");
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java

@@ -1,47 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.ask_should_print;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.LayoutInflater;
-
-import androidx.databinding.DataBindingUtil;
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.databinding.DialogAskShouldPrintBinding;
-
-public class DialogAskShouldPrint {
-
-    private Dialog currentDialog;
-
-    public static Dialog make(final Context context, final String nomeEtichettaEN, RunnableArgs<Boolean> onDialogDismiss) {
-        return new DialogAskShouldPrint(context, nomeEtichettaEN, onDialogDismiss).currentDialog;
-    }
-
-    private DialogAskShouldPrint(Context context, String nomeEtichettaEN, RunnableArgs<Boolean> onDialogDismiss) {
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        DialogAskShouldPrintBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_should_print, null, false);
-
-        currentDialog = new Dialog(context);
-        currentDialog.setContentView(bindings.getRoot());
-
-        currentDialog.setCanceledOnTouchOutside(false);
-        currentDialog.setCancelable(false);
-        currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        bindings.descriptionText.setText(String.format(context.getResources().getString(R.string.message_print_packing_list), nomeEtichettaEN));
-
-        bindings.buttonConfirm.setOnClickListener(v -> {
-            currentDialog.dismiss();
-            onDialogDismiss.run(true);
-        });
-
-        bindings.buttonAbort.setOnClickListener(v -> {
-            currentDialog.dismiss();
-            onDialogDismiss.run(false);
-        });
-
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java

@@ -11,6 +11,7 @@ import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogYesNoBinding;
@@ -56,10 +57,10 @@ public class DialogYesNoView extends DialogFragment {
         var alertDialog = new MaterialAlertDialogBuilder(requireContext())
                 .setView(binding.getRoot())
                 .setCancelable(false)
-                .setPositiveButton("Ok", (dialog, which) -> {
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
                     if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.YES);
                 })
-                .setNegativeButton("Annulla", (dialog, which) -> {
+                .setNegativeButton(R.string.no, (dialog, which) -> {
                     if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.NO);
                 })
                 .create();

app/src/main/res/values-it/strings.xml

@@ -313,7 +313,7 @@
     <string name="no">No</string>
 
     <string name="placement">Posizionamento</string>
-    <string name="message_print_packing_list">Vuoi procedere con la stampa di una %s</string>
+    <string name="message_print_packing_list">Vuoi procedere con la stampa di una %s?</string>
     <string name="message_print_packing_list_on_close_order">Vuoi stampare le packing list degli ordini chiusi?</string>
     <string name="message_print_SSCC_list_on_close_order">Vuoi stampare le etichette SSCC degli ordini chiusi?</string>
     <string name="action_print_SSCC_only_remaining">Stampa solo le nuove etichette</string>