Merge branch 'develop' into feature/FastPickingSpedizione

# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java

@@ -1,17 +1,16 @@
 package it.integry.integrywmsnative.view.dialogs.scan_art;
 
+import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -19,6 +18,7 @@ import javax.inject.Inject;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
@@ -37,6 +37,8 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
     @Inject
     DialogScanArtViewModel mViewModel;
 
+    private Context mContext;
+
     private final boolean mForceOnlyUL;
 
     private DialogScanArtBinding mBindings;
@@ -53,44 +55,57 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
 
     private DialogScanArtView(boolean forceOnlyUL, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, MtbColr> onItemChoosed, RunnableArgs<MtbDepoPosizione> onMagazzinoAutomaticoPickingRequest) {
         super();
+
         mForceOnlyUL = forceOnlyUL;
         onPickingCompleted = onItemChoosed;
         this.onMagazzinoAutomaticoPickingRequest = onMagazzinoAutomaticoPickingRequest;
-    }
 
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        this.initBarcode();
-
-        mBindings = DialogScanArtBinding.inflate(inflater, container, false);
-        mBindings.setLifecycleOwner(this);
 
         MainApplication.appComponent
                 .dialogScanArtComponent()
                 .create()
                 .inject(this);
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        this.initBarcode();
+
+        mBindings = DialogScanArtBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
 
         this.mViewModel
                 .setForceOnlyUL(mForceOnlyUL)
                 .setListener(this);
 
-        getDialog().setCanceledOnTouchOutside(false);
+        setCancelable(false);
-        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
-        mBindings.buttonNo.setOnClickListener(v -> {
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setNegativeButton(R.string.abort, (dialogInterfact, i) -> {
                     onPickingCompleted.run(DialogConsts.Results.ABORT, null, null, null);
-            dismiss();
+                })
-        });
+                .create();
 
-        return mBindings.getRoot();
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+
+        return alertDialog;
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
     }
 
 
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         BarcodeManager.removeCallback(mBarcodeScannerInstanceID);
-        BarcodeManager.enable(mBarcodeScannerInstanceID);
         super.onDismiss(dialog);
     }
 
@@ -99,7 +114,6 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
         mBarcodeScannerInstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessfull)
                 .setOnScanFailed(this::onError));
-        BarcodeManager.enable(mBarcodeScannerInstanceID);
         setBarcodeListener(true);
     }
 
@@ -140,11 +154,4 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA
             dismiss();
         });
     };
-
-
-    @Override
-    public void onError(Exception ex) {
-        super.onError(ex);
-        BarcodeManager.enable(mBarcodeScannerInstanceID);
-    }
 }

app/src/main/res/layout/dialog_scan_art.xml

@@ -11,11 +11,6 @@
         app:cardCornerRadius="16dp"
         app:cardElevation="0dp">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
@@ -48,7 +43,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:indeterminate="true"
-                        app:trackCornerRadius="4dp"/>
+                    app:trackCornerRadius="4dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/AppTheme.NewMaterial.Text"
@@ -62,21 +57,8 @@
                     android:textSize="16sp" />
             </androidx.appcompat.widget.LinearLayoutCompat>
 
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/button_no"
-                    style="@style/Button.DangerOutline"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="16dp"
-                    android:text="@string/abort"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:strokeColor="@color/red_400" />
-
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.cardview.widget.CardView>