Merge branch 'release/v1.29.13(317)'

la gestione approvv. linee prod crasha a fine caricamento

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 306
-    def appVersionName = '1.29.2'
+    def appVersionCode = 317
+    def appVersionName = '1.29.13'
 
     signingConfigs {
         release {
@@ -83,6 +83,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'it.integry.integrywmsnative'
 
 
 }
@@ -93,7 +94,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.orhanobut:logger:2.2.0'
+    implementation 'com.github.lupaulus:logger:2.3.2'
 
     //Firebase
 
@@ -106,21 +107,25 @@ dependencies {
     implementation 'com.google.android.gms:play-services-basement:18.1.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+
+    implementation('androidx.preference:preference-ktx:1.2.0') {
+        exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
+        exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
+    }
+
     implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.annimon:stream:1.2.2'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.5.1'
+//    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="it.integry.integrywmsnative">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java

@@ -17,6 +17,7 @@ import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.DocumentiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
@@ -207,4 +208,10 @@ public class MainApplicationModule {
         return new ProductionLinesRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    DocumentiRESTConsumer provideDocumentiRESTConsumer() {
+        return new DocumentiRESTConsumer();
+    }
+
 }

app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java

@@ -1,14 +1,21 @@
 package it.integry.integrywmsnative.core.barcode_reader;
 
 import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Pair;
 import android.view.KeyEvent;
 
+import androidx.preference.PreferenceManager;
+
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
+import it.integry.barcode_base_android_library.model.BarcodeSetting;
 import it.integry.honeywellscannerlibrary.HoneyWellBarcodeReader;
+import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.keyobardemulatorscannerlibrary.KeyboardEmulatorBarcodeReader;
 import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
 import it.integry.zebrascannerlibrary.ZebraBarcodeReader;
@@ -21,12 +28,7 @@ public class BarcodeManager {
     private static boolean mEnabled = true;
 
 
-    private static final Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{
-            PointMobileBarcodeReader.class,
-            ZebraBarcodeReader.class,
-            HoneyWellBarcodeReader.class,
-            KeyboardEmulatorBarcodeReader.class
-    };
+    private static final Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{PointMobileBarcodeReader.class, ZebraBarcodeReader.class, HoneyWellBarcodeReader.class, KeyboardEmulatorBarcodeReader.class};
 
 
     public static void init(Context applicationContext) throws Exception {
@@ -65,6 +67,18 @@ public class BarcodeManager {
                     }
                 });
 
+                SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
+                var additionalSettings = new ArrayList<Pair<String, Object>>();
+                var scanDelay = sharedPreferences.getString(MainSettingsFragment.KEY_TRIGGER_SCAN_DELAY, null);
+                var scanDelaySetting = new Pair<String, Object>(BarcodeSetting.P_TRIGGER_SCAN_DELAY, scanDelay);
+                additionalSettings.add(scanDelaySetting);
+
+                var scanMode = sharedPreferences.getString(MainSettingsFragment.KEY_TRIGGER_SCAN_MODE, null);
+                var scanModeSetting = new Pair<String, Object>(BarcodeSetting.P_TRIGGER_SCAN_MODE, scanMode);
+                additionalSettings.add(scanModeSetting);
+                
+                BarcodeManager.changeSettings(additionalSettings);
+
             });
         }
     }
@@ -81,8 +95,7 @@ public class BarcodeManager {
     }
 
     public static boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
-        if (mCurrentBarcodeInterface != null)
-            mCurrentBarcodeInterface.onKeyEvent(keyEvent);
+        if (mCurrentBarcodeInterface != null) mCurrentBarcodeInterface.onKeyEvent(keyEvent);
         return true;
     }
 
@@ -123,16 +136,21 @@ public class BarcodeManager {
 
     public static void disable() {
         mEnabled = false;
+        UtilityLogger.trace("Barcode reader disabled");
     }
 
     public static void enable() {
         mEnabled = true;
+        UtilityLogger.trace("Barcode reader enabled");
     }
 
     public static boolean isEnabled() {
         return mEnabled;
     }
 
+    public static void changeSettings(List<Pair<String, Object>> settings) {
+        mCurrentBarcodeInterface.changeSettings(settings);
+    }
 
     public static boolean isKeyboardEmulator() {
         return mCurrentBarcodeInterface instanceof KeyboardEmulatorBarcodeReader;

app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java

@@ -4,8 +4,11 @@ import android.content.Context;
 
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.AndroidLogAdapter;
+import com.orhanobut.logger.DiskLogAdapter;
 import com.orhanobut.logger.Logger;
 
+import java.io.File;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -36,8 +39,6 @@ public class AppContext {
     }
 
 
-
-
     @Inject
     public void init() {
         this.initUtilities();
@@ -56,10 +57,10 @@ public class AppContext {
     }
 
     private void initCrashlytics() {
-        if(!BuildConfig.DEBUG) {
+        if (!BuildConfig.DEBUG) {
             FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
 
-            if(     SettingsManager.isInstanceAvailable() &&
+            if (SettingsManager.isInstanceAvailable() &&
                     (SettingsManager.i().getUserSession() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB())) &&
                     (SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()))) {
 
@@ -77,6 +78,11 @@ public class AppContext {
 
     private void initLogger() {
         Logger.addLogAdapter(new AndroidLogAdapter());
+
+        File logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
+        int maxBytesSize = 5000;
+        Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize));
+
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java

@@ -39,7 +39,7 @@ public class MainContext {
         try {
             BarcodeManager.init(applicationContext);
         } catch (Exception exception) {
-
+            exception.printStackTrace();
         }
 
         this.initDBData(() -> {

app/src/main/java/it/integry/integrywmsnative/core/exception/EmptyLUException.java

@@ -0,0 +1,10 @@
+package it.integry.integrywmsnative.core.exception;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
+
+public final class EmptyLUException extends Exception {
+    public EmptyLUException() {
+        super(UtilityResources.getString(R.string.empty_lu));
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java

@@ -38,7 +38,7 @@ public class ExceptionsHandler implements Thread.UncaughtExceptionHandler {
     @Override
     public void uncaughtException(final Thread thread, final Throwable ex) {
         try {
-            UtilityLogger.errorMe(new Exception(ex));
+            UtilityLogger.error(new Exception(ex));
         } catch (Exception e) {
             Log.e(TAG, "Exception Logger failed!", e);
             MainApplication.exit();

app/src/main/java/it/integry/integrywmsnative/core/exception/NoArtsFoundException.java

@@ -5,6 +5,6 @@ import it.integry.integrywmsnative.core.utility.UtilityResources;
 
 public final class NoArtsFoundException extends Exception {
     public NoArtsFoundException() {
-        super(UtilityResources.getString(R.string.no_result_from_barcode));
+        super(UtilityResources.getString(R.string.no_arts_found));
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java

@@ -49,7 +49,7 @@ public class BaseActivity extends AppCompatActivity {
     public void onError(Exception ex) {
         this.runOnUiThread(() -> {
             this.closeProgress();
-            UtilityExceptions.defaultException(this, ex, mCurrentProgress);
+            UtilityExceptions.defaultException(this, ex);
             BarcodeManager.enable();
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java

@@ -76,7 +76,7 @@ public abstract class BaseFragment extends Fragment {
         if (progressOpened) {
             this.progressOpened = false;
             requireActivity().runOnUiThread(() -> {
-                mCurrentProgress.dismiss();
+                mCurrentProgress.dismissAllowingStateLoss();
             });
         }
     }
@@ -84,7 +84,7 @@ public abstract class BaseFragment extends Fragment {
     public void onError(Exception ex) {
         requireActivity().runOnUiThread(() -> {
             this.closeProgress();
-            UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
+            UtilityExceptions.defaultException(getActivity(), ex);
             BarcodeManager.enable();
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/model/MtbCols.java

@@ -1,122 +0,0 @@
-package it.integry.integrywmsnative.core.model;
-
-import java.util.Date;
-
-import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-
-public class MtbCols extends EntityBase {
-
-    private String dataCollo;
-    private String gestione;
-    private Integer idRiga;
-    private Integer numCollo;
-    private String serCollo;
-    private String codMdep;
-    private String dataMove;
-    private String modificatoDa;
-    private String posizione;
-    private String causale;
-
-    public MtbCols() {
-        type = "mtb_cols";
-        setCodMdep(SettingsManager.i().getUserSession().getDepo().getCodMdep());
-        setModificatoDa(SettingsManager.i().getUser().getFullname());
-        //setDataMove(UtilityDate.getDateInstance());
-    }
-
-    public String getDataCollo() {
-        return dataCollo;
-    }
-
-    public MtbCols setDataCollo(String dataCollo) {
-        this.dataCollo = dataCollo;
-        return this;
-    }
-
-    public String getGestione() {
-        return gestione;
-    }
-
-    public MtbCols setGestione(String gestione) {
-        this.gestione = gestione;
-        return this;
-    }
-
-    public Integer getIdRiga() {
-        return idRiga;
-    }
-
-    public MtbCols setIdRiga(Integer idRiga) {
-        this.idRiga = idRiga;
-        return this;
-    }
-
-    public Integer getNumCollo() {
-        return numCollo;
-    }
-
-    public MtbCols setNumCollo(Integer numCollo) {
-        this.numCollo = numCollo;
-        return this;
-    }
-
-    public String getSerCollo() {
-        return serCollo;
-    }
-
-    public MtbCols setSerCollo(String serCollo) {
-        this.serCollo = serCollo;
-        return this;
-    }
-
-    public String getCodMdep() {
-        return codMdep;
-    }
-
-    public MtbCols setCodMdep(String codMdep) {
-        this.codMdep = codMdep;
-        return this;
-    }
-
-    public String getDataMove() {
-        return dataMove;
-    }
-
-    public MtbCols setDataMove(String dataMove) {
-        this.dataMove = dataMove;
-        return this;
-    }
-
-    public MtbCols setDataMove(Date dataMove) {
-        this.dataMove = UtilityDate.formatDate(dataMove, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH);
-        return this;
-    }
-
-    public String getModificatoDa() {
-        return modificatoDa;
-    }
-
-    public MtbCols setModificatoDa(String modificatoDa) {
-        this.modificatoDa = modificatoDa;
-        return this;
-    }
-
-    public String getPosizione() {
-        return posizione;
-    }
-
-    public MtbCols setPosizione(String posizione) {
-        this.posizione = posizione;
-        return this;
-    }
-
-    public String getCausale() {
-        return causale;
-    }
-
-    public MtbCols setCausale(String causale) {
-        this.causale = causale;
-        return this;
-    }
-}

app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java

@@ -63,7 +63,6 @@ public class MtbColt extends EntityBase {
     private BigDecimal altezzaCm;
     private String codJcom;
 
-    private List<MtbCols> mtbCols;
     private MtbTCol mtbTCol;
 
     private Boolean disablePrint;
@@ -175,7 +174,7 @@ public class MtbColt extends EntityBase {
         try {
             dataColloD = getDataColloD();
         } catch (Exception ex) {
-            UtilityLogger.errorMe(ex);
+            UtilityLogger.error(ex);
         }
 
         if (dataColloD != null) {
@@ -526,16 +525,6 @@ public class MtbColt extends EntityBase {
         return this;
     }
 
-
-    public List<MtbCols> getMtbCols() {
-        return mtbCols;
-    }
-
-    public MtbColt setMtbCols(List<MtbCols> mtbCols) {
-        this.mtbCols = mtbCols;
-        return this;
-    }
-
     public Boolean getDisablePrint() {
         return disablePrint == null ? false : disablePrint;
     }

app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.core.model;
 
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityLogger;
 
 public class MtbDepoPosizione {
@@ -19,7 +18,7 @@ public class MtbDepoPosizione {
             return (MtbDepoPosizione) super.clone();
         } catch (CloneNotSupportedException e) {
             e.printStackTrace();
-            UtilityLogger.errorMe(e);
+            UtilityLogger.error(e);
         }
 
         return null;

app/src/main/java/it/integry/integrywmsnative/core/model/dto/StatoArticoloDTO.java

@@ -0,0 +1,93 @@
+package it.integry.integrywmsnative.core.model.dto;
+
+import java.util.Date;
+
+public class StatoArticoloDTO {
+    private String codMart;
+
+    private String partitaMag;
+
+    private Date dataScad;
+
+    private Integer ggScadPartita;
+
+    private Integer ggMax;
+
+    private Integer ggScadEffettivi;
+
+    private Integer ggUtili;
+
+    private Integer statoArt;
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public StatoArticoloDTO setCodMart(String codMart) {
+        this.codMart = codMart;
+        return this;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public StatoArticoloDTO setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+        return this;
+    }
+
+    public Date getDataScad() {
+        return dataScad;
+    }
+
+    public StatoArticoloDTO setDataScad(Date dataScad) {
+        this.dataScad = dataScad;
+        return this;
+    }
+
+    public Integer getGgScadPartita() {
+        return ggScadPartita;
+    }
+
+    public StatoArticoloDTO setGgScadPartita(Integer ggScadPartita) {
+        this.ggScadPartita = ggScadPartita;
+        return this;
+    }
+
+    public Integer getGgMax() {
+        return ggMax;
+    }
+
+    public StatoArticoloDTO setGgMax(Integer ggMax) {
+        this.ggMax = ggMax;
+        return this;
+    }
+
+    public Integer getGgScadEffettivi() {
+        return ggScadEffettivi;
+    }
+
+    public StatoArticoloDTO setGgScadEffettivi(Integer ggScadEffettivi) {
+        this.ggScadEffettivi = ggScadEffettivi;
+        return this;
+    }
+
+    public Integer getGgUtili() {
+        return ggUtili;
+    }
+
+    public StatoArticoloDTO setGgUtili(Integer ggUtili) {
+        this.ggUtili = ggUtili;
+        return this;
+    }
+
+    public Integer getStatoArt() {
+        return statoArt;
+    }
+
+    public StatoArticoloDTO setStatoArt(Integer statoArt) {
+        this.statoArt = statoArt;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/model/secondary/StatoPartitaMag.java

@@ -0,0 +1,26 @@
+package it.integry.integrywmsnative.core.model.secondary;
+
+public enum StatoPartitaMag {
+
+    IN_SCADENZA(1),
+    SCADUTO(2),
+    NON_IN_SCADENZA(3);
+
+    private final int text;
+
+    StatoPartitaMag(int text) {
+        this.text = text;
+    }
+
+    public int getText() {
+        return this.text;
+    }
+
+    public static StatoPartitaMag from(int text) {
+        for (StatoPartitaMag b : StatoPartitaMag.values()) {
+            if (b.text == text) return b;
+        }
+        return null;
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumer.java

@@ -14,6 +14,7 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbGrup;
+import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.utility.UtilityQuery;
@@ -32,7 +33,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
     public void getByBarcodeProd(String barcodeProd, RunnableArgs<List<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
         ArticoloRESTConsumerService articoloRESTConsumerService = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumerService.getByBarcodeProd(barcodeProd).enqueue(new Callback<ServiceRESTResponse<MtbAart>>() {
+        articoloRESTConsumerService.getByBarcodeProd(barcodeProd).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
                 analyzeAnswer(response, "getByBarcodeProd", (m) -> {
@@ -61,7 +62,7 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
 
         ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer.getByCodMart(joinedCods).enqueue(new Callback<ServiceRESTResponse<MtbAart>>() {
+        articoloRESTConsumer.getByCodMart(joinedCods).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
                 analyzeAnswer(response, "getByCodMart", (m) -> {
@@ -77,11 +78,28 @@ public class ArticoloRESTConsumer extends _BaseRESTConsumer {
 
     }
 
+    public void getStatoPartita(String codMart, String partitaMag, RunnableArgs<List<StatoArticoloDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+
+        ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
+        articoloRESTConsumer.getStatoPartita(codMart, partitaMag).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<StatoArticoloDTO>>> call, Response<ServiceRESTResponse<List<StatoArticoloDTO>>> response) {
+                analyzeAnswer(response, "getStatoPartita", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<StatoArticoloDTO>>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+
+    }
+
 
     public void getByCodMart(String codMartToFind, RunnableArgs<MtbAart> onComplete, RunnableArgs<Exception> onFailed) {
 
         ArticoloRESTConsumerService articoloRESTConsumer = RESTBuilder.getService(ArticoloRESTConsumerService.class);
-        articoloRESTConsumer.getByCodMart(codMartToFind).enqueue(new Callback<ServiceRESTResponse<MtbAart>>() {
+        articoloRESTConsumer.getByCodMart(codMartToFind).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbAart>> call, Response<ServiceRESTResponse<MtbAart>> response) {
                 analyzeAnswer(response, "getByCodMart", (m) -> {

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ArticoloRESTConsumerService.java

@@ -1,7 +1,10 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
-import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import java.util.List;
+
 import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
@@ -16,4 +19,7 @@ public interface ArticoloRESTConsumerService {
     @GET("SM2getArticoloByCodMart")
     Call<ServiceRESTResponse<MtbAart>> getByCodMart(@Query("codMart") String barcodeProd);
 
+    @GET("getProductLotStatus")
+    Call<ServiceRESTResponse<List<StatoArticoloDTO>>> getStatoPartita(@Query("codMart") String codMart, @Query("partitaMag") String partitaMag);
+
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java

@@ -20,7 +20,7 @@ public class BarcodeRESTConsumer extends _BaseRESTConsumer {
 
         IBarcodeCustomization barcodeCustomization = ClassRouter.getInstance(ClassRouter.PATH.BARCODE_CUSTOMIZATION);
 
-        if(barcodeCustomization != null && barcodeCustomization.shouldForceToEan13(barcodeObj.getStringValue())){
+        if (barcodeCustomization != null && barcodeCustomization.shouldForceToEan13(barcodeObj.getStringValue())) {
             Ean128Model ean128Model = new Ean128Model();
             ean128Model.Gtin = barcodeObj.getStringValue();
             onComplete.run(ean128Model);
@@ -30,7 +30,7 @@ public class BarcodeRESTConsumer extends _BaseRESTConsumer {
         String ean128 = barcodeObj.getStringValue().replaceAll("" + ((char) 29), "|");
 
         BarcodeRESTConsumerService barcodeRESTConsumerService = RESTBuilder.getService(BarcodeRESTConsumerService.class);
-        barcodeRESTConsumerService.decodeEan128(ean128).enqueue(new Callback<ServiceRESTResponse<Ean128Model>>() {
+        barcodeRESTConsumerService.decodeEan128(ean128).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<Ean128Model>> call, Response<ServiceRESTResponse<Ean128Model>> response) {
                 analyzeAnswer(response, "DecodeEan128", onComplete, onFailed);

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java

@@ -89,8 +89,6 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
     public void saveColli(List<MtbColt> mtbColtsToSave, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed) {
 
         for (MtbColt mtbColt : mtbColtsToSave) {
-            mtbColt.setMtbCols(null);
-
             for (int i = 0; i < mtbColt.getMtbColr().size(); i++) {
                 mtbColt.getMtbColr().get(i)
                         .setMtbAart(null)
@@ -700,6 +698,27 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void confirmGiacenzaUL(MtbColt sourceMtbColt, Runnable onComplete, RunnableArgs<Exception> onFailed) {
+        MtbColt sourceMtbColtClone = (MtbColt) sourceMtbColt.clone();
+        sourceMtbColtClone.setMtbColr(new ObservableArrayList<>());
+
+        ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
+        colliMagazzinoRESTConsumerService.confirmGiacenzaUL(sourceMtbColtClone).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<Object>> call, Response<ServiceRESTResponse<Object>> response) {
+                analyzeAnswer(response, "confirmGiacenzaUL", data -> {
+                    onComplete.run();
+
+                }, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<Object>> call, Throwable t) {
+                if (onFailed != null) onFailed.run(new Exception(t));
+            }
+        });
+    }
+
     public void loadShipmentUlFromProductionUL(MtbColt mtbColt, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
 
         HashMap<String, Object> params = new HashMap<>();

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumerService.java

@@ -46,4 +46,7 @@ public interface ColliMagazzinoRESTConsumerService {
     @POST("wms/versamentoAutomaticoUL")
     Call<ServiceRESTResponse<VersamentoAutomaticoULResponseDTO>> versamentoAutomaticoUL(@Body MtbColt mtbColt);
 
+    @POST("wms/confirmGiacenzaUL")
+    Call<ServiceRESTResponse<Object>> confirmGiacenzaUL(@Body MtbColt mtbColt);
+
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumer.java

@@ -0,0 +1,51 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import javax.inject.Singleton;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.DtbDoct;
+import it.integry.integrywmsnative.core.rest.RESTBuilder;
+import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+@Singleton
+public class DocumentiRESTConsumer extends _BaseRESTConsumer {
+    
+
+    public void createDocsFromColli(List<LoadColliDTO> listColli, RunnableArgs<List<DtbDoct>> onComplete, RunnableArgs<Exception> onFailed) {
+        DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        documentiRESTConsumerService.createDocsFromColli(listColli).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<List<DtbDoct>>> call, Response<ServiceRESTResponse<List<DtbDoct>>> response) {
+                analyzeAnswer(response, "createDocsFromColli", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<List<DtbDoct>>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+    public void createDocFromColli(LoadColliDTO loadColliDTO, RunnableArgs<DtbDoct> onComplete, RunnableArgs<Exception> onFailed) {
+        DocumentiRESTConsumerService documentiRESTConsumerService = RESTBuilder.getService(DocumentiRESTConsumerService.class);
+        documentiRESTConsumerService.createDocFromColli(loadColliDTO).enqueue(new Callback<>() {
+            @Override
+            public void onResponse(Call<ServiceRESTResponse<DtbDoct>> call, Response<ServiceRESTResponse<DtbDoct>> response) {
+                analyzeAnswer(response, "createDocFromColli", onComplete, onFailed);
+            }
+
+            @Override
+            public void onFailure(Call<ServiceRESTResponse<DtbDoct>> call, Throwable t) {
+                onFailed.run(new Exception(t));
+            }
+        });
+    }
+
+
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java

@@ -0,0 +1,20 @@
+package it.integry.integrywmsnative.core.rest.consumers;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.DtbDoct;
+import it.integry.integrywmsnative.core.rest.model.LoadColliDTO;
+import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+public interface DocumentiRESTConsumerService {
+
+    @POST("getDatiColliForDocs")
+    Call<ServiceRESTResponse<List<DtbDoct>>> createDocsFromColli(@Body List<LoadColliDTO> listColli);
+
+    @POST("createDocFromColli")
+    Call<ServiceRESTResponse<DtbDoct>> createDocFromColli(@Body LoadColliDTO listColli);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java

@@ -61,7 +61,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
             @Override
             public void onFailure(Call<ServiceRESTResponse<GestSetupDTO>> call, Throwable t) {
                 Log.e("PrintCollo", t.toString());
-                UtilityLogger.errorMe(new Exception(t));
+                UtilityLogger.error(new Exception(t));
                 if (onFailed != null) onFailed.run(new Exception(t));
             }
         });
@@ -88,7 +88,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer {
 
             @Override
             public void onFailure(Call<ServiceRESTResponse<List<StbGestSetup>>> call, Throwable t) {
-                UtilityLogger.errorMe(new Exception(t));
+                UtilityLogger.error(new Exception(t));
                 if (onFailed != null) onFailed.run(new Exception(t));
             }
         });

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java

@@ -109,7 +109,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<List<PickingObjectDTO>>> call, Throwable t) {
-                        UtilityLogger.errorMe(new Exception(t));
+                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -174,7 +174,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
             @Override
             public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.errorMe(new Exception(t));
+                UtilityLogger.error(new Exception(t));
                 onFailed.run(new Exception(t));
             }
         });

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java

@@ -79,7 +79,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     @Override
                     public void onFailure(Call<ServiceRESTResponse<GrigliaDTO>> call, Throwable t) {
                         Log.e("getArticoliListino_pv", t.toString());
-                        UtilityLogger.errorMe(new Exception(t));
+                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });
@@ -130,7 +130,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                     @Override
                     public void onFailure(Call<List<ServiceRESTResponse<DtbOrdt>>> call, Throwable t) {
                         Log.e("saveOrdineTerminale_pv", t.toString());
-                        UtilityLogger.errorMe(new Exception(t));
+                        UtilityLogger.error(new Exception(t));
                         onFailed.run(new Exception(t));
                     }
                 });

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 import javax.inject.Singleton;
 
+import it.integry.integrywmsnative.BuildConfig;
 import it.integry.integrywmsnative.core.exception.NoPrintersFoundException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
@@ -51,7 +52,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
             @Override
             public void onFailure(Call<ServiceRESTResponse<List<String>>> call, Throwable t) {
                 Log.e("GetAvailablePrinters", t.toString());
-                UtilityLogger.errorMe(new Exception(t));
+                UtilityLogger.error(new Exception(t));
                 onFailed.run(new Exception(t));
             }
         });
@@ -59,10 +60,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
     public void printCollo(MtbColt testataColloToPrint, Runnable onComplete, RunnableArgs<Exception> onFailed) {
 
-//        if (BuildConfig.DEBUG) {
-//            onComplete.run();
-//            return;
-//        }
+        if (BuildConfig.DEBUG) {
+            onComplete.run();
+            return;
+        }
 
         PrinterRESTConsumerService printerService = RESTBuilder.getService(PrinterRESTConsumerService.class);
         Call<ServiceRESTResponse<Object>> callable = null;
@@ -87,10 +88,10 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer {
 
 
     public void printReport(String printerName, String reportName, HashMap<String, Object> params, int quantity, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-//        if (BuildConfig.DEBUG) {
-//            onComplete.run();
-//            return;
-//        }
+        if (BuildConfig.DEBUG) {
+            onComplete.run();
+            return;
+        }
 
         JasperDTO jasperDTO = new JasperDTO();
         jasperDTO.setReportName(reportName);

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java

@@ -115,7 +115,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer {
             public void onFailure(Call<ServiceRESTResponse<List<String>>> call, final Throwable t) {
                 Log.e("ProfilesAvailable", t.toString());
                 onFailed.run(new Exception(t));
-                UtilityLogger.errorMe(new Exception(t));
+                UtilityLogger.error(new Exception(t));
             }
         });
 

app/src/main/java/it/integry/integrywmsnative/core/rest/model/LoadColliDTO.java

@@ -0,0 +1,182 @@
+package it.integry.integrywmsnative.core.rest.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class LoadColliDTO {
+
+    private String gestione;
+    private String codDtip;
+    private String codAnag;
+    private String codVdes;
+    private Date dataDoc;
+    private String serDoc;
+    private Integer numDoc;
+    private String codMdep;
+    private String calcPrz;
+    private boolean datiOrd;
+    private Date dataOrd;
+    private Integer numOrd;
+    private String flagEvasoForzato;
+    private Date dataVers;
+    private String note;
+    private boolean saveDoc = true;
+
+    private List<MtbColt> colli = new ArrayList<>();
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public LoadColliDTO setGestione(String gestione) {
+        this.gestione = gestione;
+        return this;
+    }
+
+    public String getCodDtip() {
+        return codDtip;
+    }
+
+    public LoadColliDTO setCodDtip(String codDtip) {
+        this.codDtip = codDtip;
+        return this;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public LoadColliDTO setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+        return this;
+    }
+
+    public String getCodVdes() {
+        return codVdes;
+    }
+
+    public LoadColliDTO setCodVdes(String codVdes) {
+        this.codVdes = codVdes;
+        return this;
+    }
+
+    public Date getDataDoc() {
+        return dataDoc;
+    }
+
+    public LoadColliDTO setDataDoc(Date dataDoc) {
+        this.dataDoc = dataDoc;
+        return this;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public LoadColliDTO setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+        return this;
+    }
+
+    public Integer getNumDoc() {
+        return numDoc;
+    }
+
+    public LoadColliDTO setNumDoc(Integer numDoc) {
+        this.numDoc = numDoc;
+        return this;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public LoadColliDTO setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+        return this;
+    }
+
+    public String getCalcPrz() {
+        return calcPrz;
+    }
+
+    public LoadColliDTO setCalcPrz(String calcPrz) {
+        this.calcPrz = calcPrz;
+        return this;
+    }
+
+    public boolean isDatiOrd() {
+        return datiOrd;
+    }
+
+    public LoadColliDTO setDatiOrd(boolean datiOrd) {
+        this.datiOrd = datiOrd;
+        return this;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public LoadColliDTO setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+        return this;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public LoadColliDTO setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+        return this;
+    }
+
+    public String getFlagEvasoForzato() {
+        return flagEvasoForzato;
+    }
+
+    public LoadColliDTO setFlagEvasoForzato(String flagEvasoForzato) {
+        this.flagEvasoForzato = flagEvasoForzato;
+        return this;
+    }
+
+    public Date getDataVers() {
+        return dataVers;
+    }
+
+    public LoadColliDTO setDataVers(Date dataVers) {
+        this.dataVers = dataVers;
+        return this;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public LoadColliDTO setNote(String note) {
+        this.note = note;
+        return this;
+    }
+
+    public boolean isSaveDoc() {
+        return saveDoc;
+    }
+
+    public LoadColliDTO setSaveDoc(boolean saveDoc) {
+        this.saveDoc = saveDoc;
+        return this;
+    }
+
+    public List<MtbColt> getColli() {
+        return colli;
+    }
+
+    public LoadColliDTO setColli(List<MtbColt> colli) {
+        this.colli = colli;
+        return this;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/rest/model/OrdineUscitaInevasoDTO.java

@@ -45,6 +45,8 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
     private String nomeAgente;
     private String codJfas;
     private List<AvailableClassMerc> availableClassMerc;
+    private boolean ordTrasf;
+
 
     public Integer getIdViaggio() {
         return idViaggio;
@@ -56,7 +58,6 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
     }
 
 
-
     public String getListino() {
         return listino;
     }
@@ -371,6 +372,14 @@ public class OrdineUscitaInevasoDTO extends OrdineInevasoDTO {
         return this;
     }
 
+    public boolean isOrdTrasf() {
+        return ordTrasf;
+    }
+
+    public OrdineUscitaInevasoDTO setOrdTrasf(boolean ordTrasf) {
+        this.ordTrasf = ordTrasf;
+        return this;
+    }
 
     @Override
     public boolean equals(Object o) {

app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java

@@ -27,6 +27,7 @@ public class SitArtOrdDTO {
     private String codMsfa;
     private String descrizioneMsfa;
     private String untord;
+    private BigDecimal qtaOmg;
 
     private final HashMap<String, Object> extraInfo = new HashMap<>();
 
@@ -222,4 +223,13 @@ public class SitArtOrdDTO {
         this.untord = untord;
         return this;
     }
+
+    public BigDecimal getQtaOmg() {
+        return qtaOmg;
+    }
+
+    public SitArtOrdDTO setQtaOmg(BigDecimal qtaOmg) {
+        this.qtaOmg = qtaOmg;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java

@@ -50,6 +50,8 @@ public class DBSettingsModel {
     private boolean flagPickLiberoAllowEmptyDest = false;
     private boolean flagAskInfoAggiuntiveSpedizione = false;
     private String filterFornitoreProd;
+    private String codDtipOrdTrasfV;
+    private boolean notifyLotStatus = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -384,4 +386,22 @@ public class DBSettingsModel {
         this.filterFornitoreProd = filterFornitoreProd;
         return this;
     }
+
+    public String getCodDtipOrdTrasfV() {
+        return codDtipOrdTrasfV;
+    }
+
+    public DBSettingsModel setCodDtipOrdTrasfV(String codDtipOrdTrasfV) {
+        this.codDtipOrdTrasfV = codDtipOrdTrasfV;
+        return this;
+    }
+
+    public boolean isNotifyLotStatus() {
+        return notifyLotStatus;
+    }
+
+    public DBSettingsModel setNotifyLotStatus(boolean notifyLotStatus) {
+        this.notifyLotStatus = notifyLotStatus;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java

@@ -326,6 +326,14 @@ public class SettingsManager {
                 .setGestName("PICKING")
                 .setSection("SPEDIZIONE")
                 .setKeySection("FLAG_ASK_INFO_AGGIUNTIVE"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("COD_DTIP_ORD_TRASF"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("SPEDIZIONE")
+                .setKeySection("FLAG_NOTIFICA_STATO_PARTITA"));
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
         GestSetupRESTConsumer.getValues(codMdep, stbGestSetupList, list -> {
@@ -357,6 +365,8 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagPrintEtichetteOnOrderClose(getValueFromList(list, "SPEDIZIONE", "FLAG_PRINT_ETICHETTE_ON_CLOSE", Boolean.class));
             dbSettingsModelIstance.setFlagAskInfoAggiuntiveSpedizione(getValueFromList(list, "SPEDIZIONE", "FLAG_ASK_INFO_AGGIUNTIVE", Boolean.class));
             dbSettingsModelIstance.setFilterFornitoreProd(getValueFromList(list, "PRODUZIONE", "FILTER_FORNTIORE_PROD", String.class));
+            dbSettingsModelIstance.setCodDtipOrdTrasfV(getValueFromList(list, "SPEDIZIONE", "COD_DTIP_ORD_TRASF", String.class));
+            dbSettingsModelIstance.setNotifyLotStatus(getValueFromList(list, "SPEDIZIONE", "FLAG_NOTIFICA_STATO_PARTITA", Boolean.class));
 
             String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
             if (notePerdita != null)

app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java

@@ -61,8 +61,8 @@ public class UpdatesManager {
 
         String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
 
-        var progressDialog = DialogProgressView.newInstance("Download", null, false);
-        progressDialog.show(mContext.getSupportFragmentManager(), "tag");
+        var progressDialogBuilder = new DialogProgressView("Download", null, false);
+        progressDialogBuilder.show(mContext.getSupportFragmentManager(), "tag");
 
 
         var fileDownloader = new FileDownloader()
@@ -70,13 +70,13 @@ public class UpdatesManager {
                 .setUrlString(downloadURL)
                 .setOnProgressUpdate(progress -> {
                     mContext.runOnUiThread(() -> {
-                        progressDialog.setProgress(progress);
+                        progressDialogBuilder.setProgress(progress);
                     });
                 })
                 .setOnDownloadCompleted(destPath -> {
 
                     mContext.runOnUiThread(() -> {
-                        progressDialog.dismiss();
+                        progressDialogBuilder.dismiss();
 
                         Uri fileLoc;
                         Intent intent;

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java

@@ -130,7 +130,7 @@ public class UtilityBarcode {
     private static String getEAN13CheckDigit(String ean) {
 
         if (ean.length() != 12) {
-            UtilityLogger.errorMe(new Exception("Please provide an input string of 12 chars. Current lenght: " + ean.length()));
+            UtilityLogger.error(new Exception("Please provide an input string of 12 chars. Current lenght: " + ean.length()));
             return null;
         }
         long tot = 0;

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java

@@ -37,7 +37,7 @@ public class UtilityDate {
         try{
             return UtilityDate.recognizeDate(dateString);
         } catch (ParseException | DateNotRecognizedException | TimeNotRecognizedException pex){
-            UtilityLogger.errorMe(pex);
+            UtilityLogger.error(pex);
             return null;
         }
     }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java

@@ -15,7 +15,6 @@ import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
 import it.integry.integrywmsnative.core.exception.InvalidLUException;
 import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
 import it.integry.integrywmsnative.core.rest.CommonRESTException;
-import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
 public class UtilityExceptions {
@@ -25,12 +24,6 @@ public class UtilityExceptions {
             InvalidLUGestioneException.class,
             InvalidLUException.class
     };
-
-    public static void defaultException(Context context, Exception ex, DialogProgressView progressDialog) {
-        defaultException(context, ex);
-        if (progressDialog != null && progressDialog.isVisible()) progressDialog.dismiss();
-    }
-
     public static void defaultException(Context context, Exception ex) {
         defaultException(context, ex, false);
     }
@@ -68,7 +61,7 @@ public class UtilityExceptions {
                 Stream.of(FIREBASE_IGNORED_EXCEPTIONS).anyMatch(x -> x.isAssignableFrom(ex.getClass()));
 
         if (!BuildConfig.DEBUG && !toIgnore) {
-            if (sendEmail) UtilityLogger.errorMe(ex);
+            if (sendEmail) UtilityLogger.error(ex);
             FirebaseCrashlytics.getInstance().recordException(ex);
         }
     }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java

@@ -3,48 +3,30 @@ package it.integry.integrywmsnative.core.utility;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.Logger;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-
 import it.integry.integrywmsnative.BuildConfig;
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
 
 public class UtilityLogger {
 
-    public static void logMe(String message) {
-        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-
-        String caller = "UtilityLogger";
-
-        for (int i = 0; i < stackTraceElements.length; i++) {
-
-            if (stackTraceElements[i].getMethodName().equalsIgnoreCase("logMe")) {
-                caller = stackTraceElements[i + 1].getFileName() + "->" + stackTraceElements[i + 1].getMethodName();
+    public static void trace(String message) {
+        Logger.d(message, getPreviousStackTraceElement());
     }
 
+    public static void info(String message) {
+        Logger.i(message);
     }
 
+    public static void debug(String message) {
         Logger.d(message);
     }
 
-    public static void errorMe(Exception ex) {
-        errorMe(ex, null, null, null);
+    public static void error(Exception ex) {
+        error(ex, "");
     }
 
-    public static void errorMe(Exception ex, String additionalText) {
-        errorMe(ex, additionalText, null, null);
-    }
+    public static void error(Exception ex, String additionalText) {
+        if (!BuildConfig.DEBUG) FirebaseCrashlytics.getInstance().recordException(ex);
 
-    public static void errorMe(Exception ex, String additionalText, Runnable onComplete, RunnableArgs<Exception> onFailed) {
-        if(!BuildConfig.DEBUG) FirebaseCrashlytics.getInstance().recordException(ex);
-
-        logMe(ex.getMessage());
+        Logger.e(ex, additionalText);
 
 //        if ((!(ex instanceof SocketTimeoutException) && !(ex.getCause() instanceof SocketTimeoutException)) ||
 //                (!(ex instanceof SocketException) && !(ex.getCause() instanceof SocketException)) ||
@@ -82,4 +64,52 @@ public class UtilityLogger {
 //        }
     }
 
+    private static String getPreviousStackTraceElement() {
+        StackTraceElement[] stackTraceElementsArr = Thread.currentThread().getStackTrace();
+        String caller = "UtilityLogger";
+        StringBuilder callerNew = new StringBuilder();
+
+        int found = 0;
+
+        for (int i = 0; i < stackTraceElementsArr.length; i++) {
+
+            if(!stackTraceElementsArr[i].getClassName().startsWith("it.integry"))
+                continue;
+
+            if (stackTraceElementsArr[i].getMethodName().equalsIgnoreCase("getPreviousStackTraceElement")) {
+                found = i;
+            }
+
+            if (found > 0 && i >= found + 2) {
+                callerNew
+                        .append(stackTraceElementsArr[i].getClassName())
+                        .append("->")
+                        .append(stackTraceElementsArr[i].getMethodName())
+                        .append(":")
+                        .append(stackTraceElementsArr[i].getLineNumber())
+                        .append("\n");
+            }
+
+        }
+
+        return callerNew.length() > 0 ? callerNew.toString() : caller;
+    }
+
+
+//    public static void logMe(String message) {
+//        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+//
+//        String caller = "UtilityLogger";
+//
+//        for (int i = 0; i < stackTraceElements.length; i++) {
+//
+//            if (stackTraceElements[i].getMethodName().equalsIgnoreCase("logMe")) {
+//                caller = stackTraceElements[i + 1].getFileName() + "->" + stackTraceElements[i + 1].getMethodName();
+//            }
+//
+//        }
+//
+//        Logger.d(message);
+//    }
+
 }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java

@@ -7,7 +7,7 @@ import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 public class UtilityProgress {
 
     public static DialogProgressView createDefaultProgressDialog(FragmentActivity mContext) {
-        var progress = DialogProgressView.newInstance();
+        var progress = DialogProgressView.newInstance(null, null, true);
         progress.show(mContext.getSupportFragmentManager(), "tag");
         return progress;
     }

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumer.java

@@ -55,7 +55,7 @@ public class OrdiniAccettazioneRESTConsumer extends _BaseRESTConsumer {
 
             @Override
             public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.errorMe(new Exception(t));
+                UtilityLogger.error(new Exception(t));
                 onFailed.run(new Exception(t));
             }
         });

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java

@@ -798,7 +798,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
-            UtilityExceptions.defaultException(this, ex, mCurrentProgress);
+            UtilityExceptions.defaultException(this, ex);
         }
 
         BarcodeManager.enable();

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java

@@ -319,17 +319,12 @@ public class AccettazionePickingViewModel {
     }
 
     private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
-        if (barcodeProd.length() == 14) {
-            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
-        }
-
-        String finalBarcodeProd = barcodeProd;
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
 
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete);
             } else {
-                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+                this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
 
         }, this::sendError);

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java

@@ -43,7 +43,7 @@ public class AccettazionePickingRESTConsumer {
 
                         whereCondListMap.add(whereCondMap);
                     } catch (Exception ex) {
-                        UtilityLogger.errorMe(ex);
+                        UtilityLogger.error(ex);
                     }
                 });
 

app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java

@@ -49,7 +49,7 @@ import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.databinding.ActivityMainBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
-import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
 
 public class MainActivity extends BaseActivity
         implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity {
@@ -71,9 +71,8 @@ public class MainActivity extends BaseActivity
     @Inject
     UpdatesManager updatesManager;
 
-
     @Inject
-    DialogInputQuantityV2View mDialogInputQuantityV2View;
+    DialogProgressView mDialogProgressView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -81,6 +80,7 @@ public class MainActivity extends BaseActivity
 
         MainApplication.appComponent
                 .mainActivityComponent()
+
                 .create()
                 .inject(this);
 
@@ -108,14 +108,6 @@ public class MainActivity extends BaseActivity
 
         init();
 
-
-//        mDialogInputQuantityV2View
-//                .setDialogInputQuantityV2DTO(new DialogInputQuantityV2DTO()
-//                        .setMtbAart(new MtbAart()
-//                                .setCodMart("AAAA")
-//                                .setFlagQtaCnfFissa("S")))
-//                .show(getSupportFragmentManager(), "tag");
-
     }
 
     private void startLoginActivity() {

app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java

@@ -241,18 +241,18 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private void initGestMenu() {
         int menuSpanCount = 2;
-        if(UtilityDimension.getDisplayInchs(this.getActivity()) > 8) menuSpanCount = 4;
-        else if(UtilityDimension.getDisplayInchs(this.getActivity()) > 6.5) menuSpanCount = 3;
+        if (UtilityDimension.getDisplayInchs(this.getActivity()) > 8) menuSpanCount = 4;
+        else if (UtilityDimension.getDisplayInchs(this.getActivity()) > 6.5) menuSpanCount = 3;
 
         MenuConfiguration baseMenuConfiguration = new MenuConfiguration();
         List<MenuConfiguration.MenuGroup> menuGroups = baseMenuConfiguration.getGroups();
 
-        for(int i = 0; i < menuGroups.size(); i++) {
+        for (int i = 0; i < menuGroups.size(); i++) {
             try {
 
                 BaseMenuConfiguration.MenuGroup menuGroup = menuGroups.get(i);
 
-                if(menuService.isGroupEnabled(menuGroup)) {
+                if (menuService.isGroupEnabled(menuGroup)) {
 
                     FragmentMainMenuGroupLayoutBinding groupBinding = DataBindingUtil.inflate(mLayoutInflater, R.layout.fragment_main_menu_group_layout, null, false);
 
@@ -261,8 +261,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
                     List<BaseMenuConfiguration.MenuItem> enableMenuItems = new ArrayList<>();
 
-                    for(int j = 0; j < menuGroup.getItems().size(); j++) {
-                        if(menuService.isItemEnabled(menuGroup.getItems().get(j))) {
+                    for (int j = 0; j < menuGroup.getItems().size(); j++) {
+                        if (menuService.isItemEnabled(menuGroup.getItems().get(j))) {
                             enableMenuItems.add(menuGroup.getItems().get(j));
                         }
                     }

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java

@@ -171,10 +171,10 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     private void initRecyclerView() {
         mBindings.pickingLiberoMainList.setNestedScrollingEnabled(false);
         mBindings.pickingLiberoMainList.setHasFixedSize(true);
-        mBindings.pickingLiberoMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
+        mBindings.pickingLiberoMainList.setLayoutManager(new LinearLayoutManager(requireActivity()));
 
-        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL);
-        itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider));
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireActivity(), SimpleDividerItemDecoration.VERTICAL);
+        itemDecorator.setDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.divider));
         mBindings.pickingLiberoMainList.addItemDecoration(itemDecorator);
     }
 
@@ -277,7 +277,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
             if (ex instanceof InvalidPesoKGException) {
                 UtilityToast.showToast(ex.getMessage());
             } else {
-                UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress);
+                UtilityExceptions.defaultException(getActivity(), ex);
             }
 
             BarcodeManager.enable();

app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java

@@ -200,12 +200,6 @@ public class PickingLiberoViewModel {
     }
 
     private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Runnable onComplete) {
-        if (barcodeProd.length() == 14) {
-//            barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd);
-            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
-        }
-
-        String finalBarcodeProd = barcodeProd;
         mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 MtbAart articolo = mtbAartList.get(0);
@@ -217,11 +211,11 @@ public class PickingLiberoViewModel {
                     this.dispatchArt(articolo, ean128Model);
                     onComplete.run();
                 } else {
-                    this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+                    this.sendError(new NoResultFromBarcodeException(barcodeProd));
                 }
 
             } else {
-                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+                this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
 
         }, this::sendError);

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

@@ -287,7 +287,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
         if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
-            UtilityExceptions.defaultException(this, ex, mCurrentProgress);
+            UtilityExceptions.defaultException(this, ex);
         }
 
         BarcodeManager.enable();

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

@@ -17,8 +17,8 @@ import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.exception.InvalidLUException;
-import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
+import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUBaseOperationsListener;
@@ -333,7 +333,7 @@ public class PickingResiViewModel {
                     searchArtFromUL(mtbColt, onComplete);
                 } else this.sendError(new InvalidLUException());
             } else {
-                this.sendError(new NoArtsFoundException());
+                this.sendError(new NoResultFromBarcodeException(SSCC));
             }
 
         }, this::sendError);
@@ -417,7 +417,7 @@ public class PickingResiViewModel {
 
     private void loadMatchedRows(List<WithdrawableDtbDocr> matchedRows) {
         if (matchedRows == null || matchedRows.size() == 0) {
-            this.sendError(new NoArtsFoundException());
+            this.sendError(new NoResultFromBarcodeException());
         } else if (matchedRows.size() == 1) {
             WithdrawableDtbDocr matchedItem = matchedRows.get(0);
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java

@@ -18,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.annimon.stream.Stream;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -291,10 +292,11 @@ public class ProdOrdineProduzioneElencoFragment extends BaseFragment implements
         } else {
             tmpList = mViewModel.getOrderList().getValue();
         }
-
         this.mOrdiniInevasiMutableData.clear();
+        if (tmpList != null) {
             this.mOrdiniInevasiMutableData.addAll(convertDataModelToListModel(tmpList));
         }
+    }
 
     private List<MainListProdOrdineProduzioneElencoListModel> convertDataModelToListModel(List<OrdineAccettazioneInevasoDTO> dataList) {
 
@@ -384,6 +386,11 @@ public class ProdOrdineProduzioneElencoFragment extends BaseFragment implements
 
 
     private void initJtbComtCache(Runnable onComplete) {
+        if (this.mViewModel.getOrderList().getValue() == null) {
+            this.jtbComtCache = new ArrayList<>();
+            onComplete.run();
+            return;
+        }
         var jtbComts = Stream.of(Objects.requireNonNull(this.mViewModel.getOrderList().getValue()))
                 .flatMap(x -> Stream.of(x.getCodJcom()))
                 .toList();

app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java

@@ -55,7 +55,7 @@ public class ProdOrdineProduzioneRESTConsumer extends _BaseRESTConsumer {
 
             @Override
             public void onFailure(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Throwable t) {
-                UtilityLogger.errorMe(new Exception(t));
+                UtilityLogger.error(new Exception(t));
                 onFailed.run(new Exception(t));
             }
         });

app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java

@@ -42,7 +42,7 @@ import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.Versamento
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ui.ChooseOrdsLavFromListAdapter;
 import it.integry.integrywmsnative.view.dialogs.DialogCommon;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
-import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU;
+import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView;
 
@@ -197,7 +197,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
     }
 
     private void choosePosition() {
-        DialogAskPositionOfLU.makeBase(requireActivity(), true, (status, mtbDepoPosizione) -> {
+        DialogAskPositionOfLUView.makeBase(true, (status, mtbDepoPosizione) -> {
 
             if (status == DialogConsts.Results.ABORT) {
                 popMe();
@@ -205,7 +205,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
                 mViewModel.setPosizione(mtbDepoPosizione);
             }
 
-        }, this::onError).show();
+        }, this::onError).show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java

@@ -10,7 +10,6 @@ import android.widget.Toast;
 
 import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ObservableArrayList;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.ravikoradiya.liveadapter.LiveAdapter;
@@ -34,7 +33,6 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.databinding.ActivityPvOrdineAcquistoEditBinding;
 import it.integry.integrywmsnative.databinding.FragmentPvArticoliOrdineAcquistoListSingleItemBinding;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloView;
-import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.ui.OrdineAcquistoArtListModel;
 import it.integry.integrywmsnative.ui.FabMenuCustomAnimations;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.dialogs.DialogAskAction;
@@ -53,8 +51,6 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity implements PVOrdi
     @Inject
     PVOrdineAcquistoEditViewModel mViewModel;
 
-    private final ObservableArrayList<OrdineAcquistoArtListModel> mArticoliMutableData = new ObservableArrayList<>();
-
 
     public static Intent newInstance(Context context, Ordine ordine) {
         Intent myIntent = new Intent(context, PVOrdineAcquistoEditActivity.class);

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java

@@ -117,6 +117,27 @@ public class PVOrdineAcquistoEditViewModel {
         this.mArticoli.postValue(newList);
     }
 
+    public void saveArticoli(List<ArticoloOrdine> articoli) {
+        var newList = this.mArticoli.getValue();
+        if (newList == null) {
+            newList = new ArrayList<>();
+        }
+
+        for (ArticoloOrdine articolo : articoli) {
+            setBgTint(articolo);
+
+            var alreadySavedItem = Stream.of(newList)
+                    .filter(x -> Objects.equals(x.getCodMart(), articolo.getCodMart()))
+                    .findFirst();
+
+            if (alreadySavedItem.isPresent()) newList.remove(alreadySavedItem.get());
+            newList.add(articolo);
+        }
+
+
+        this.mArticoli.postValue(newList);
+    }
+
 
     public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
         this.checkArticolo(
@@ -225,8 +246,7 @@ public class PVOrdineAcquistoEditViewModel {
                 });
                 if (!articoliToSave.isEmpty()) {
                     mArticoliOrdineRepository.saveArticoliToOrdine(articoliToSave, () -> {
-                        Stream.of(articoliToSave).forEach(this::saveArticolo);
-
+                        this.saveArticoli(articoliToSave);
                         this.sendOnLoadingEnded();
 
                     }, this::sendError);

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/helper/OrdineAcquistoPvHelper.java

@@ -53,9 +53,7 @@ public class OrdineAcquistoPvHelper {
 
 
                 mGrigliaRepository.saveGriglia(griglia, id -> {
-                    saveLisAToGriglia(dto.getGrigliaAcquistiChild(), griglia, grigliaResult -> {
-                        onSaved.run(grigliaResult);
-                    }, onFail);
+                    saveLisAToGriglia(dto.getGrigliaAcquistiChild(), griglia, onSaved, onFail);
                 }, onFail);
             });
         }, onFail);

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java

@@ -57,13 +57,13 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
-import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU;
+import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLUView;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArts;
+import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView;
 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.scan_or_create_lu.DialogScanOrCreateLUView;
-import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNo;
+import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
 
 public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, RettificaGiacenzeViewModel.Listener, BottomSheetMtbColrEditView.Listener {
 
@@ -157,8 +157,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
         mBinding.rettificaGiacenzeMainList.setHasFixedSize(true);
         mBinding.rettificaGiacenzeMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
 
-        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL);
-        itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider));
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireActivity(), SimpleDividerItemDecoration.VERTICAL);
+        itemDecorator.setDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.divider));
         mBinding.rettificaGiacenzeMainList.addItemDecoration(itemDecorator);
     }
 
@@ -215,9 +215,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
         this.onLoadingStarted();
 
-        this.mViewModel.processBarcodeDTO(data, () -> {
-            this.onLoadingEnded();
-        });
+        this.mViewModel.processBarcodeDTO(data, this::onLoadingEnded);
     };
 
 
@@ -289,7 +287,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
     @Override
     public void onArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed) {
-        DialogChooseArtFromListaArts.make(getActivity(), artList, onArtChoosed).show();
+        new DialogChooseArtFromListaArtsView(artList, onArtChoosed)
+                .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -300,7 +299,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
             } else {
                 onComplete.run(mtbColt, created);
             }
-        }).show(getActivity().getSupportFragmentManager(), "tag");
+        }).show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -341,7 +340,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
         if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
-            UtilityExceptions.defaultException(requireActivity(), ex, mCurrentProgress);
+            UtilityExceptions.defaultException(requireActivity(), ex);
         }
     }
 
@@ -471,15 +470,15 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                         null,
                         R.string.button_ignore_print,
                         onComplete)
-                .show(getActivity().getSupportFragmentManager(), "tag");
+                .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) {
-        DialogYesNo.make(getActivity(), "Posiziona UL", "Vuoi cambiare la posizione della UL corrente?", result -> {
+        new DialogYesNoView(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
             switch (result) {
                 case YES:
-                    DialogAskPositionOfLU.makeBase(getActivity(), false, (status, mtbDepoPosizione) -> {
+                    DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
                         if (status == DialogConsts.Results.ABORT) {
                             onComplete.run(false, null);
                         } else {
@@ -489,19 +488,20 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                                 onComplete.run(true, null);
                             }
                         }
-                    }, this::onError).show();
+                    }, this::onError)
+                            .show(requireActivity().getSupportFragmentManager(), "tag");
                     break;
 
                 case NO:
                     onComplete.run(false, null);
                     break;
             }
-        }).show();
+        }).show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onPreDestroy(Runnable onComplete) {
-        if(mViewModel.getCurrentMtbColt() != null)
+        if (mViewModel.getCurrentMtbColt() != null)
             mViewModel.closeLU(false);
         else {
             BarcodeManager.removeCallback(barcodeScannerIstanceID);

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java

@@ -21,7 +21,6 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILUPrintL
 import it.integry.integrywmsnative.core.model.CommonModelConsts;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
-import it.integry.integrywmsnative.core.model.MtbCols;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
@@ -77,7 +76,6 @@ public class RettificaGiacenzeViewModel {
         this.mDefaultCausale = defaultCausale;
         this.mCurrentCodMdep = currentCodMdep;
 
-
         this.sendOnLoadingStarted();
 
         this.mRettificaGiacenzeRESTConsumer.loadListaFornitori(fornitori -> {
@@ -105,11 +103,6 @@ public class RettificaGiacenzeViewModel {
 
 
     public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
-//        if (UtilityBarcode.isEanPeso(barcodeScanDTO)) {
-//            //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
-//            this.executeEtichettaEanPeso(barcodeScanDTO, onComplete);
-//
-//        } else
         if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) {
             //Cerco tramite etichetta ean 128 (che può indicarmi un articolo o una UL)
             this.executeEtichettaEan128(barcodeScanDTO, onComplete);
@@ -126,21 +119,26 @@ public class RettificaGiacenzeViewModel {
         mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
 
             String barcodeProd = null;
+            String codMart = null;
 
             if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
             if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
             if (!UtilityString.isNullOrEmpty(ean128Model.Content))
                 barcodeProd = ean128Model.Content;
 
+            if (!UtilityString.isNullOrEmpty(ean128Model.Internal1))
+                codMart = ean128Model.Internal1;
+
 
             if (!UtilityString.isNullOrEmpty(barcodeProd)) {
-
                 if (barcodeProd.startsWith("0") || barcodeProd.startsWith("9")) {
                     barcodeProd = barcodeProd.substring(1);
                 }
 
                 PickDataDTO pickDataDTO = PickDataDTO.fromEan128(ean128Model);
                 this.loadArticolo(barcodeProd, pickDataDTO, onComplete);
+            } else if (!UtilityString.isNullOrEmpty(codMart)) {
+                this.searchArtInt(codMart, onComplete);
             } else {
                 //EAN 128 non completo o comunque mancano i riferimenti al prodotto
                 onComplete.run();
@@ -149,18 +147,13 @@ public class RettificaGiacenzeViewModel {
     }
 
     private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) {
-        if (barcodeProd.length() == 14) {
-            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
-        }
-
-        String finalBarcodeProd = barcodeProd;
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
             if (onComplete != null) onComplete.run();
 
             if (mtbAartList != null && mtbAartList.size() > 0) {
                 this.dispatchArt(mtbAartList.get(0), pickData);
             } else {
-                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+                this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
 
         }, this::sendError);
@@ -462,18 +455,7 @@ public class RettificaGiacenzeViewModel {
 
 
     private void saveCausaleRettificaGiacenze(Runnable onComplete) {
-        final MtbCols mtbCols = new MtbCols()
-                .setCausale(this.mDefaultCausale);
-        mtbCols.setOperation(CommonModelConsts.OPERATION.INSERT_OR_UPDATE);
-
-        MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
-        cloneMtbColt.setOperation(CommonModelConsts.OPERATION.NO_OP);
-        cloneMtbColt.setMtbColr(null);
-
-        cloneMtbColt.setMtbCols(new ArrayList<>());
-        cloneMtbColt.getMtbCols().add(mtbCols);
-
-        this.mColliMagazzinoRESTConsumer.saveCollo(cloneMtbColt, mtbColt -> onComplete.run(), this::sendError);
+        this.mColliMagazzinoRESTConsumer.confirmGiacenzaUL(mCurrentMtbColt, onComplete, this::sendError);
     }
 
     private void savePosizione(MtbDepoPosizione mtbDepoPosizione, Runnable onComplete) {

app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java

@@ -7,6 +7,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -17,7 +18,9 @@ import com.harrysoft.androidbluetoothserial.BluetoothManager;
 import java.util.ArrayList;
 import java.util.Collection;
 
+import it.integry.barcode_base_android_library.model.BarcodeSetting;
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
 
@@ -26,6 +29,8 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
     private final ArrayList<Runnable> onPreDestroyList = new ArrayList<>();
 
     public static final String KEY_PALLET_BT_DEVICE = "pallet_scale_bt_device";
+    public static final String KEY_TRIGGER_SCAN_MODE = "TRIG_SCAN_MODE";
+    public static final String KEY_TRIGGER_SCAN_DELAY = "TRIG_SCAN_DELAY";
 
     private Collection<BluetoothDevice> btPairedDevices;
 
@@ -39,11 +44,30 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
         setPreferencesFromResource(R.xml.app_preferences, rootKey);
 
         var palletScaleBtDeviceListPref = (ListPreference) findPreference(KEY_PALLET_BT_DEVICE);
+        var triggerScanDelayPref = (EditTextPreference) findPreference(KEY_TRIGGER_SCAN_DELAY);
+        var triggerScanModeListPref = (ListPreference) findPreference(KEY_TRIGGER_SCAN_MODE);
         setListPreferenceData(palletScaleBtDeviceListPref);
         palletScaleBtDeviceListPref.setOnPreferenceChangeListener(this);
+
+        triggerScanDelayPref.setOnPreferenceChangeListener(this);
+        triggerScanDelayPref.setSummary(triggerScanDelayPref.getText());
+
+        loadScanModePreferences();
+        triggerScanModeListPref.setOnPreferenceChangeListener(this);
+        triggerScanModeListPref.setSummary(triggerScanModeListPref.getValue());
     }
 
 
+    protected void loadScanModePreferences() {
+        var triggerScanModeListPref = (ListPreference) findPreference(KEY_TRIGGER_SCAN_MODE);
+        if (triggerScanModeListPref != null) {
+            var scanModes = BarcodeSetting.getTriggerScanModes();
+            triggerScanModeListPref.setEntries(scanModes);
+            triggerScanModeListPref.setEntryValues(scanModes);
+            triggerScanModeListPref.setOnPreferenceChangeListener(this);
+        }
+    }
+
     protected void setListPreferenceData(ListPreference lp) {
         BluetoothManager bluetoothManager = BluetoothManager.getInstance();
         if (bluetoothManager == null) {
@@ -54,7 +78,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
         btPairedDevices = bluetoothManager.getPairedDevicesList();
 
-        if(!Stream.of(btPairedDevices).anyMatch(x -> x.getAddress().equalsIgnoreCase(lp.getValue()))) {
+        if (!Stream.of(btPairedDevices).anyMatch(x -> x.getAddress().equalsIgnoreCase(lp.getValue()))) {
             lp.setValue(null);
         }
 
@@ -106,6 +130,16 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                 final var palletScaleBtDeviceListPref = (ListPreference) preference;
                 updatePalletBtDeviceSummary(palletScaleBtDeviceListPref, (String) newValue);
                 break;
+            case KEY_TRIGGER_SCAN_DELAY:
+                final var scanDelayPref = (EditTextPreference) preference;
+                scanDelayPref.setSummary((String) newValue);
+                updateBarcodeScannerSettings();
+                break;
+            case KEY_TRIGGER_SCAN_MODE:
+                final var scanTriggerMode = (ListPreference) preference;
+                scanTriggerMode.setSummary((String) newValue);
+                updateBarcodeScannerSettings();
+                break;
 
         }
         // Set result so knows to refresh itself
@@ -113,6 +147,14 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
         return true;
     }
 
+    private void updateBarcodeScannerSettings() {
+        try {
+            BarcodeManager.init(requireContext());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 
     private void updatePalletBtDeviceSummary(ListPreference listPref, String btDeviceAddress) {
         String btDeviceName = Stream.of(btPairedDevices)

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

@@ -68,17 +68,18 @@ import it.integry.integrywmsnative.gest.spedizione.ui.SpedizioneListModel;
 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.DialogConsts;
-import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU;
+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.base.DialogSimpleInputHelper;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotView;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
-import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPeso;
+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.scan_art.DialogScanArtView;
-import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNo;
+import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
 
 public class SpedizioneActivity extends BaseActivity implements SpedizioneViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
 
@@ -196,7 +197,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         this.initBarcodeReader();
         this.initRecyclerView();
 
-        closeOrderButtonEnabled.set(SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose());
+        closeOrderButtonEnabled.set(SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose()
+                || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()
+                || (this.isOrdTrasf() && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV()))
+        );
 
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
@@ -220,6 +224,16 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 useQtaOrd);
     }
 
+    private boolean isOrdTrasf() {
+
+        return mTestateOrdini != null && !mTestateOrdini.isEmpty() && Stream.of(mTestateOrdini)
+                .map(OrdineUscitaInevasoDTO::isOrdTrasf)
+                .withoutNulls()
+                .distinctBy(x -> x)
+                .findFirst()
+                .get();
+    }
+
     @Override
     public boolean onSupportNavigateUp() {
         onBackPressed();
@@ -342,6 +356,11 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                     spedizioneListModel.setUntMis(x.getMtbAart().getUntMis());
                             }
 
+                            BigDecimal qtaOmg = x.getSitArtOrdDTO().getQtaOmg();
+                            if (qtaOmg != null && qtaOmg.compareTo(BigDecimal.ZERO) > 0) {
+                                spedizioneListModel.setFreeQuantity(String.format(getString(R.string.ord_ven_qta_omaggio), qtaOmg.stripTrailingZeros().toPlainString(), spedizioneListModel.getUntMis()));
+                            }
+
                             spedizioneListModel.setOriginalModel(x);
                             spedizioneListModels.add(spedizioneListModel);
                         } else {
@@ -703,9 +722,15 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUPesoRequired(String codTcol, BigDecimal netWeightKG, BigDecimal grossWeightKG, RunnableArgsss<String, BigDecimal, BigDecimal> onComplete) {
-        DialogInputPeso.make(this, codTcol, netWeightKG, grossWeightKG, (newCodTcol, newNetWeight, newGrossWeight) -> {
-            onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
-        }).show();
+//        DialogInputPesoView.make(this, codTcol, netWeightKG, grossWeightKG, (newCodTcol, newNetWeight, newGrossWeight) -> {
+//            onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
+//        }).show();
+
+
+        new DialogInputPesoLuView(null, new BigDecimal(50), new BigDecimal(55), (newCodTcol, newNetWeight, newGrossWeight) -> {
+//            onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
+        })
+                .show(getSupportFragmentManager(), "tag");
     }
 
     @Override
@@ -772,7 +797,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     }
 
     @Override
-    public void onItemDispatched(PickingObjectDTO pickingObjectDTO,
+    public void onFullItemDispatched(PickingObjectDTO pickingObjectDTO,
                                      MtbAart mtbAart,
                                      BigDecimal initialNumCnf,
                                      BigDecimal initialQtaCnf,
@@ -791,6 +816,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                                      boolean canOverflowOrderQuantity,
                                      boolean canPartitaMagBeChanged,
                                      RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+
         DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
                 .setMtbAart(mtbAart)
                 .setInitialNumCnf(initialNumCnf)
@@ -809,7 +835,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 .setDataScad(dataScad)
                 .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
                 .setCanLUBeClosed(true)
-                .setCanPartitaMagBeChanged(canPartitaMagBeChanged);
+                .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
+                .setStatoPartitaMag(pickingObjectDTO.getStatoArticoloDTO())
+                .setNotifyProductLotStatus(SettingsManager.iDB().isNotifyLotStatus());
 
         if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
@@ -834,23 +862,23 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) {
-        DialogYesNo.make(this, "Posiziona UL", "Vuoi cambiare la posizione della UL corrente?", result -> {
+        new DialogYesNoView(null, "Vuoi cambiare la posizione della UL corrente?", result -> {
             switch (result) {
                 case YES:
-                    DialogAskPositionOfLU.makeBase(this, false, (status, mtbDepoPosizione) -> {
+                    DialogAskPositionOfLUView.makeBase(false, (status, mtbDepoPosizione) -> {
                         if (status == DialogConsts.Results.ABORT) {
                             onComplete.run(false, null);
                         } else {
                             onComplete.run(true, mtbDepoPosizione);
                         }
-                    }, this::onError).show();
+                    }, this::onError).show(getSupportFragmentManager(), "tag");
                     break;
 
                 case NO:
                     onComplete.run(false, null);
                     break;
             }
-        }).show();
+        }).show(getSupportFragmentManager(), "tag");
     }
 
     public void askShouldPrintPackingList(PrintOrderCloseDTO printOrderCloseDTO, RunnableArgs<PrintOrderCloseDTO> onComplete) {
@@ -899,6 +927,19 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     }
 
+    @Override
+    public void onCreateDocsRequest() {
+        new DialogYesNoView("Chiusura ordine", "Vuoi creare i documenti per gli ordini selezionati?", result -> {
+            this.mViewmodel.onCreateDocsAnswered(result);
+        }).show(this.getSupportFragmentManager(), "tag");
+    }
+
+    @Override
+    public void onChooseArtRequest(List<MtbAart> artsList, RunnableArgs<MtbAart> onComplete) {
+        new DialogChooseArtFromListaArtsView(artsList, onComplete)
+                .show(getSupportFragmentManager(), "tag");
+    }
+
     @Override
     public void onOrderClosed() {
         this.onLoadingEnded();

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

@@ -6,6 +6,7 @@ import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.DocumentiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -20,8 +21,8 @@ public class SpedizioneModule {
     }
 
     @Provides
-    SpedizioneViewModel providesSpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, ColliDataRecoverService colliDataRecoverService, OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer) {
-        return new SpedizioneViewModel(articoloRESTConsumer, barcodeRESTConsumer, colliDataRecoverService, ordiniRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, posizioniRESTConsumer);
+    SpedizioneViewModel providesSpedizioneViewModel(ArticoloRESTConsumer articoloRESTConsumer, ColliDataRecoverService colliDataRecoverService, OrdiniRESTConsumer ordiniRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, BarcodeRESTConsumer barcodeRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, DocumentiRESTConsumer documentiRESTConsumer) {
+        return new SpedizioneViewModel(articoloRESTConsumer, barcodeRESTConsumer, colliDataRecoverService, ordiniRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, posizioniRESTConsumer, documentiRESTConsumer);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickingObjectDTO.java

@@ -9,6 +9,7 @@ import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO;
 
 public class PickingObjectDTO implements Cloneable {
@@ -18,6 +19,7 @@ public class PickingObjectDTO implements Cloneable {
     private List<MtbColt> mtbColts;
 
     private PickDataDTO tempPickData;
+    private StatoArticoloDTO statoArticoloDTO;
     private MtbColt refMtbColt;
     private List<MtbColr> withdrawMtbColrs = new ArrayList<>();
 
@@ -100,4 +102,13 @@ public class PickingObjectDTO implements Cloneable {
         this.withdrawMtbColrs = withdrawMtbColrs;
         return this;
     }
+
+    public StatoArticoloDTO getStatoArticoloDTO() {
+        return statoArticoloDTO;
+    }
+
+    public PickingObjectDTO setStatoArticoloDTO(StatoArticoloDTO statoArticoloDTO) {
+        this.statoArticoloDTO = statoArticoloDTO;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java

@@ -143,6 +143,13 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         holder.mBinding.subdescrizione2.setText(UtilityString.isNullOrEmpty(pickingObjectDTO.getSubDescrizione2()) ? null : Html.fromHtml(pickingObjectDTO.getSubDescrizione2()));
         holder.mBinding.subdescrizione2.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getSubDescrizione2()) ? View.GONE : View.VISIBLE);
 
+        if (!UtilityString.isNullOrEmpty(pickingObjectDTO.getFreeQuantity())) {
+            holder.mBinding.freeQty.setText(Html.fromHtml(pickingObjectDTO.getFreeQuantity()));
+            holder.mBinding.freeQty.setVisibility(View.VISIBLE);
+        } else {
+            holder.mBinding.freeQty.setVisibility(View.GONE);
+        }
+
         holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa()));
         holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot()));
 

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListModel.java

@@ -22,6 +22,7 @@ public class SpedizioneListModel implements Cloneable {
     private BigDecimal qtaEvasa;
     private BigDecimal qtaTot;
     private String untMis;
+    private String freeQuantity;
 
     private boolean active;
 
@@ -164,4 +165,13 @@ public class SpedizioneListModel implements Cloneable {
         this.mSourceMtbColr = sourceMtbColr;
         return this;
     }
+
+    public String getFreeQuantity() {
+        return freeQuantity;
+    }
+
+    public SpedizioneListModel setFreeQuantity(String freeQuantity) {
+        this.freeQuantity = freeQuantity;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/FilterChipView.java

@@ -29,13 +29,13 @@ public class FilterChipView extends Chip {
         this.defaultChipBackgroundColor = getChipBackgroundColor();
         this.defaultChipTextColor = getTextColors();
 
-        setShapeAppearanceModel(
-                getShapeAppearanceModel()
-                        .withCornerSize(4)
-                        .toBuilder()
-                        .build());
-
-        setChipMinHeight(getChipMinHeight() * 1.25f);
+//        setShapeAppearanceModel(
+//                getShapeAppearanceModel()
+//                        .withCornerSize(4)
+//                        .toBuilder()
+//                        .build());
+//
+//        setChipMinHeight(getChipMinHeight() * 1.25f);
 
         setOnCloseIconClickListener(v -> {
             if (onResetClicked != null) onResetClicked.run();

app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java

@@ -64,7 +64,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
 
     public void expand() {
         if(this.mBottomSheetBehavior == null) {
-            UtilityLogger.errorMe(new BottomSheetFragmentViewNotInitializedException());
+            UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException());
             return;
         }
 
@@ -73,7 +73,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
 
     public void collapse() {
         if(this.mBottomSheetBehavior == null) {
-            UtilityLogger.errorMe(new BottomSheetFragmentViewNotInitializedException());
+            UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException());
             return;
         }
 
@@ -91,7 +91,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout {
 
     public State getState() {
         if(this.mBottomSheetBehavior == null) {
-            UtilityLogger.errorMe(new BottomSheetFragmentViewNotInitializedException());
+            UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException());
             return null;
         }
 

app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java

@@ -61,7 +61,7 @@ public class BottomSheetMtbColrEditView extends BottomSheetFragmentBaseView {
     @Override
     public void expand() {
         if(this.mViewModel.getMtbColr() == null) {
-            UtilityLogger.errorMe(new NullMtbColrException());
+            UtilityLogger.error(new NullMtbColrException());
             return;
         }
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java

@@ -1,18 +1,16 @@
 package it.integry.integrywmsnative.view.dialogs;
 
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
+import android.app.Dialog;
 import android.os.Build;
 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 androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.DialogFragment;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.R;
@@ -29,36 +27,53 @@ public class DialogProgressView extends DialogFragment {
     private boolean indeterminateProgress;
 
     public static DialogProgressView newInstance(String title, String subtitle, boolean indeterminate) {
-        return new DialogProgressView()
-                .setIndeterminateProgress(indeterminate)
-                .setTitle(title)
-                .setSubtitle(subtitle);
+        return new DialogProgressView(title, subtitle, indeterminate);
     }
 
     public static DialogProgressView newInstance() {
         return newInstance(null, null, true);
     }
 
-    @Nullable
+    public DialogProgressView(String title, String subtitle, boolean indeterminate) {
+        this.setTitle(title);
+        this.setSubtitle(subtitle);
+        this.setIndeterminateProgress(indeterminate);
+    }
+
+    @NonNull
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_progress, container, false);
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        mBindings = DialogProgressBinding.inflate(LayoutInflater.from(requireContext()));
 
-        setCancelable(false);
-        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireContext().getString(R.string.loading) : title);
+        if (!UtilityString.isNullOrEmpty(subtitle)) mBindings.setSubtitle(subtitle);
 
-        mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireActivity().getString(R.string.loading) : title);
-
-        mBindings.setSubtitle(subtitle);
         mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
+        if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
 
-        if(!isIndeterminateProgress()){
-            mBindings.progressBar.setMax(100);
+        var alertDialog = new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false)
+                .create();
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
     }
 
-        return mBindings.getRoot();
+    public String getTitle() {
+        return title;
     }
 
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getSubtitle() {
+        return subtitle;
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle = subtitle;
+    }
 
     public boolean isIndeterminateProgress() {
         return indeterminateProgress;
@@ -69,17 +84,6 @@ public class DialogProgressView extends DialogFragment {
         return this;
     }
 
-
-    public DialogProgressView setTitle(String title) {
-        this.title = title;
-        return this;
-    }
-
-    public DialogProgressView setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
-        return this;
-    }
-
     public void setProgress(int progress) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             mBindings.progressBar.setProgress(progress, true);

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java

@@ -1,223 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.widget.TextView;
-
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
-
-import com.google.android.material.textfield.TextInputLayout;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
-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.RunnableArgs;
-import it.integry.integrywmsnative.core.expansion.RunnableArgss;
-import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
-import it.integry.integrywmsnative.core.utility.UtilityBarcode;
-import it.integry.integrywmsnative.core.utility.UtilityDialog;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityPosizione;
-import it.integry.integrywmsnative.databinding.DialogAskPositionOfLuBinding;
-import it.integry.integrywmsnative.view.dialogs.DialogConsts;
-
-public class DialogAskPositionOfLU {
-
-
-    private Context mContext;
-    private DialogAskPositionOfLuBinding mBinding;
-    private boolean mCheckForLineaProd;
-
-    private MtbDepoPosizione currentMtbDepoPosizione;
-
-    private Dialog mDialog;
-
-    private RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete;
-    private RunnableArgs<Exception> onFailed;
-
-    private TextInputLayout livelloTextInputLayout;
-
-    private boolean completedFlow = false;
-
-    public static Dialog makeBase(final Context context, boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
-        return new DialogAskPositionOfLU(context, checkForLineaProd, onComplete, onFailed).mDialog;
-    }
-
-    private DialogAskPositionOfLU(Context context, boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
-        mContext = context;
-        mCheckForLineaProd = checkForLineaProd;
-
-        this.onComplete = onComplete;
-        this.onFailed = onFailed;
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_position_of_lu, null, false);
-        mBinding.setMContext(mContext);
-
-        List<Integer> views = new ArrayList<>();
-        views.add(R.layout.dialog_ask_position_of_lu__page1);
-        views.add(R.layout.dialog_ask_position_of_lu__page2);
-
-        DialogAskPositionOfLUAdapter adapter = new DialogAskPositionOfLUAdapter(mContext, views);
-        mBinding.viewpager.setAdapter(adapter);
-        mBinding.viewpager.beginFakeDrag();
-
-
-        mDialog = new Dialog(mContext);
-        mDialog.setContentView(mBinding.getRoot());
-        mDialog.setCanceledOnTouchOutside(false);
-//        mDialog.setCancelable(false);
-        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        UtilityDialog.setTo90PercentWidth(mContext, mDialog);
-
-        mDialog.setOnShowListener(dialog -> {
-            ((AppCompatTextView) adapter.getPage(0).findViewById(R.id.description_text)).setText(mCheckForLineaProd ? R.string.ask_production_line_of_lu_message : R.string.ask_position_of_lu_message);
-
-            adapter.getPage(1).findViewById(R.id.button_confirm).setOnClickListener(v -> {
-                String levelNumber = ((TextView)adapter.getPage(1).findViewById(R.id.level_number)).getText().toString();
-                onLevelConfirm(levelNumber);
-            });
-
-            adapter.getPage(1).findViewById(R.id.button_abort).setOnClickListener(v -> {
-                onLevelAbort();
-            });
-
-            livelloTextInputLayout = adapter.getPage(1).findViewById(R.id.level_number_layout);
-
-            livelloTextInputLayout.getEditText().addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    if(livelloTextInputLayout.getEditText().getText() != null) {
-                        validateLevel(livelloTextInputLayout.getEditText().getText().toString());
-                    } else resetLevelError();
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-
-                }
-            });
-        });
-
-        setupBarcode();
-    }
-
-
-    private void askLivello() {
-        mBinding.viewpager.setCurrentItem(1, true);
-    }
-
-    private boolean isOnLivelloPage() {
-        return mBinding.viewpager.getCurrentItem() == 1;
-    }
-
-    private void setupBarcode() {
-
-        int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
-                .setOnScanSuccessful(onScanSuccessfull)
-                .setOnScanFailed(ex -> UtilityExceptions.defaultException(mContext, ex, false)));
-
-        mDialog.setOnDismissListener(dialog -> {
-            BarcodeManager.removeCallback(barcodeIstanceID);
-            if(!completedFlow) onComplete.run(DialogConsts.Results.ABORT, null);
-        });
-
-        BarcodeManager.enable();
-
-    }
-
-
-    private final RunnableArgs<BarcodeScanDTO> onScanSuccessfull = data -> {
-
-        BarcodeManager.disable();
-
-        if(!isOnLivelloPage()) {
-
-            if (UtilityBarcode.isEtichettaPosizione(data)) {
-
-                MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(data.getStringValue());
-
-                currentMtbDepoPosizione = foundPosizione;
-
-                if (!mCheckForLineaProd && !currentMtbDepoPosizione.isFlagLineaProduzione() && UtilityPosizione.isPosizioneWithLivello(foundPosizione)) {
-                    askLivello();
-                    BarcodeManager.enable();
-                } else {
-                    completedFlow = true;
-                    if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione);
-
-                    mDialog.dismiss();
-                    BarcodeManager.enable();
-                }
-
-            } else {
-                BarcodeManager.enable();
-            }
-        } else {
-            BarcodeManager.enable();
-        }
-    };
-
-
-    private void onLevelConfirm(String levelString) {
-
-        String newPosizione = currentMtbDepoPosizione.getPosizione().substring(0, currentMtbDepoPosizione.getPosizione().length()-1);
-        newPosizione += levelString;
-
-        MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(newPosizione);
-
-        if(foundPosizione != null) {
-            resetLevelError();
-
-            completedFlow = true;
-            if(onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione);
-            mDialog.dismiss();
-
-        } else {
-            setLevelError(mContext.getResources().getString(R.string.not_valid));
-        }
-    }
-
-    private void validateLevel(String levelString) {
-        String newPosizione = currentMtbDepoPosizione.getPosizione().substring(0, currentMtbDepoPosizione.getPosizione().length()-1);
-        newPosizione += levelString;
-
-        if(UtilityPosizione.getFromCache(newPosizione) != null) {
-            resetLevelError();
-        } else setLevelError(mContext.getResources().getString(R.string.not_valid));
-    }
-
-    private void setLevelError(String message){
-        livelloTextInputLayout.setErrorEnabled(true);
-        livelloTextInputLayout.setError(message);
-        livelloTextInputLayout.setErrorIconDrawable(null);
-    }
-
-    private void resetLevelError() {
-        livelloTextInputLayout.setError(null);
-    }
-
-
-    private void onLevelAbort() {
-        completedFlow = true;
-        onComplete.run(DialogConsts.Results.ABORT, null);
-        mDialog.dismiss();
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUView.java

@@ -0,0 +1,234 @@
+package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+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;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableArgss;
+import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.utility.UtilityBarcode;
+import it.integry.integrywmsnative.core.utility.UtilityPosizione;
+import it.integry.integrywmsnative.databinding.DialogAskPositionOfLuBinding;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+
+public class DialogAskPositionOfLUView extends BaseDialogFragment implements DialogInterface.OnShowListener {
+
+    private DialogAskPositionOfLuBinding mBindings;
+    private DialogAskPositionOfLUAdapter viewpagerAdapter;
+    private int mBarcodeScannerIstanceID;
+
+    private boolean mCheckForLineaProd;
+
+    private MtbDepoPosizione currentMtbDepoPosizione;
+
+    private RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete;
+    private RunnableArgs<Exception> onFailed;
+
+    private TextInputLayout livelloTextInputLayout;
+
+    private boolean completedFlow = false;
+
+    public static DialogAskPositionOfLUView makeBase(boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
+        return new DialogAskPositionOfLUView(checkForLineaProd, onComplete, onFailed);
+    }
+
+    private DialogAskPositionOfLUView(boolean checkForLineaProd, RunnableArgss<DialogConsts.Results, MtbDepoPosizione> onComplete, RunnableArgs<Exception> onFailed) {
+        super();
+
+        this.mCheckForLineaProd = checkForLineaProd;
+        this.onComplete = onComplete;
+        this.onFailed = onFailed;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.initBarcode();
+
+        mBindings = DialogAskPositionOfLuBinding.inflate(LayoutInflater.from(requireActivity()), null, false);
+        mBindings.setLifecycleOwner(this);
+
+        List<Integer> views = new ArrayList<>();
+        views.add(R.layout.dialog_ask_position_of_lu__page1);
+        views.add(R.layout.dialog_ask_position_of_lu__page2);
+
+        viewpagerAdapter = new DialogAskPositionOfLUAdapter(requireContext(), views);
+        mBindings.viewpager.setAdapter(viewpagerAdapter);
+        mBindings.viewpager.beginFakeDrag();
+
+        var alertDialog = new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false)
+                .create();
+        alertDialog.setCanceledOnTouchOutside(false);
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if(getDialog() != null) {
+            getDialog().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE);
+            getDialog().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        }
+    }
+
+    @Override
+    public void onShow(DialogInterface dialog) {
+        ((AppCompatTextView) viewpagerAdapter.getPage(0)
+                .findViewById(R.id.description_text))
+                .setText(mCheckForLineaProd ? R.string.ask_production_line_of_lu_message : R.string.ask_position_of_lu_message);
+
+        viewpagerAdapter.getPage(1).findViewById(R.id.button_confirm).setOnClickListener(v -> {
+            String levelNumber = ((TextView) viewpagerAdapter.getPage(1).findViewById(R.id.level_number)).getText().toString();
+            onLevelConfirm(levelNumber);
+        });
+
+        viewpagerAdapter.getPage(1).findViewById(R.id.button_abort).setOnClickListener(v -> {
+            onLevelAbort();
+        });
+
+        livelloTextInputLayout = viewpagerAdapter.getPage(1).findViewById(R.id.level_number_layout);
+        livelloTextInputLayout.getEditText().addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (livelloTextInputLayout.getEditText().getText() != null) {
+                    validateLevel(livelloTextInputLayout.getEditText().getText().toString());
+                } else resetLevelError();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    }
+
+    private void askLivello() {
+        mBindings.viewpager.setCurrentItem(1, true);
+    }
+
+    private boolean isOnLivelloPage() {
+        return mBindings.viewpager.getCurrentItem() == 1;
+    }
+
+    private void initBarcode() {
+        mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
+                .setOnScanSuccessful(onScanSuccessfull)
+                .setOnScanFailed(this::onError));
+
+        BarcodeManager.enable();
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+        if (!completedFlow) onComplete.run(DialogConsts.Results.ABORT, null);
+        super.onDismiss(dialog);
+    }
+
+
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessfull = data -> {
+        BarcodeManager.disable();
+
+        if (!isOnLivelloPage()) {
+
+            if (UtilityBarcode.isEtichettaPosizione(data)) {
+
+                MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(data.getStringValue());
+                currentMtbDepoPosizione = foundPosizione;
+
+                if (!mCheckForLineaProd && !currentMtbDepoPosizione.isFlagLineaProduzione() && UtilityPosizione.isPosizioneWithLivello(foundPosizione)) {
+                    askLivello();
+                    BarcodeManager.enable();
+                } else {
+                    completedFlow = true;
+                    if (onComplete != null)
+                        onComplete.run(DialogConsts.Results.YES, foundPosizione);
+
+                    dismiss();
+                    BarcodeManager.enable();
+                }
+
+            } else {
+                BarcodeManager.enable();
+            }
+        } else {
+            BarcodeManager.enable();
+        }
+    };
+
+
+    private void onLevelConfirm(String levelString) {
+
+        String newPosizione = currentMtbDepoPosizione.getPosizione().substring(0, currentMtbDepoPosizione.getPosizione().length() - 1);
+        newPosizione += levelString;
+
+        MtbDepoPosizione foundPosizione = UtilityPosizione.getFromCache(newPosizione);
+
+        if (foundPosizione != null) {
+            resetLevelError();
+
+            completedFlow = true;
+            if (onComplete != null) onComplete.run(DialogConsts.Results.YES, foundPosizione);
+            dismiss();
+
+        } else {
+            setLevelError(requireContext().getResources().getString(R.string.not_valid));
+        }
+    }
+
+    private void validateLevel(String levelString) {
+        String newPosizione = currentMtbDepoPosizione.getPosizione().substring(0, currentMtbDepoPosizione.getPosizione().length() - 1);
+        newPosizione += levelString;
+
+        if (UtilityPosizione.getFromCache(newPosizione) != null) {
+            resetLevelError();
+        } else setLevelError(requireContext().getResources().getString(R.string.not_valid));
+    }
+
+    private void setLevelError(String message) {
+        livelloTextInputLayout.setErrorEnabled(true);
+        livelloTextInputLayout.setError(message);
+        livelloTextInputLayout.setErrorIconDrawable(null);
+    }
+
+    private void resetLevelError() {
+        livelloTextInputLayout.setError(null);
+    }
+
+
+    private void onLevelAbort() {
+        completedFlow = true;
+        onComplete.run(DialogConsts.Results.ABORT, null);
+        dismiss();
+    }
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java

@@ -1,15 +1,12 @@
 package it.integry.integrywmsnative.view.dialogs.base;
 
-import android.content.Context;
+import android.app.Dialog;
 import android.content.res.ColorStateList;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -19,7 +16,8 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.widget.LinearLayoutCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
-import androidx.databinding.DataBindingUtil;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.HashMap;
 
@@ -66,7 +64,8 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
     private final HashMap<String, String> mHashmapContent;
     private final Runnable mOnPositiveClick;
     private final Runnable mOnNegativeClick;
-    private final @StringRes Integer mRNeutralButtonString;
+    private final @StringRes
+    Integer mRNeutralButtonString;
     private final Runnable mOnNeutralClick;
 
 
@@ -76,13 +75,12 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
 
 
     private DialogBaseBinding mBindings;
-    private Context mContext;
 
-    public static DialogSimpleMessageView newInstance(@NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap<String, String> hashmapContent , Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) {
+    public static DialogSimpleMessageView newInstance(@NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap<String, String> hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) {
         return new DialogSimpleMessageView(type, titleText, messageText, hashmapContent, onPositiveClick, onNegativeClick, rNeutralButtonString, onNeutralClick);
     }
 
-    private DialogSimpleMessageView(@NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap<String, String> hashmapContent , Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) {
+    private DialogSimpleMessageView(@NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap<String, String> hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) {
         super();
 
         this.mType = type;
@@ -99,57 +97,79 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
     public void onStart() {
         super.onStart();
 
-        UtilityDialog.setTo90PercentWidth(this.mContext, this);
+        UtilityDialog.setTo90PercentWidth(this.requireContext(), this);
     }
 
-    @Nullable
+    @NonNull
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        this.mContext = getActivity();
-
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_base, container, false);
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        mBindings = DialogBaseBinding.inflate(LayoutInflater.from(requireContext()), null, false);
 
         mBindings.setView(this);
         mBindings.setLifecycleOwner(this);
 
-        getDialog().setCanceledOnTouchOutside(false);
-        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        this.initContent();
 
+        var alertDialogBuilder = new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false);
+
+        if (isPositiveVisible())
+            alertDialogBuilder.setPositiveButton(getPositiveButtonText(), (dialog, which) -> {
+                if(this.mOnPositiveClick != null) this.mOnPositiveClick.run();
+            });
+
+        if (isNeutralVisible())
+            alertDialogBuilder.setNeutralButton(getNeutralButtonText(), (dialog, which) -> {
+                this.mOnNeutralClick.run();
+            });
+
+        if (isNegativeVisible())
+            alertDialogBuilder.setNegativeButton(getNegativeButtonText(), (dialog, which) -> {
+                this.mOnNegativeClick.run();
+            });
+
+        var alertDialog = alertDialogBuilder.create();
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
+    }
+
+    private void initContent() {
         int colorBackgroundTitle = -1;
         Drawable titleIconRes = null;
 
         switch (mType) {
             case INFO:
-                colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.light_blue_300);
-                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_info_78dp, null);
+                colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.colorPrimary);
+                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_info_78dp, null);
                 break;
 
             case SUCCESS:
-                colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.green_300);
-                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_done_white_24dp, null);
+                colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.green_300);
+                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_done_white_24dp, null);
                 break;
 
             case WARNING:
-                colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.yellow_600);
-                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_warning_white_24dp, null);
+                colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.yellow_600);
+                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_warning_white_24dp, null);
                 break;
 
             case ERROR:
-                colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.red_300);
-                titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_mood_bad_24dp, null);
+                colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.red_300);
+                titleIconRes = ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_mood_bad_24dp, null);
                 break;
         }
 
-        this.positiveButtonText = mContext.getText(R.string.ok).toString();
-        this.negativeButtonText = mContext.getText(R.string.no).toString();
+        this.positiveButtonText = requireContext().getText(R.string.ok).toString();
+        this.negativeButtonText = requireContext().getText(R.string.no).toString();
 
         //Title VIEW
         mBindings.titleText.setText(mTitleText);
-        ColorStateList colorStateList = ColorStateList.valueOf(Color.WHITE);
+        ColorStateList colorStateList = ColorStateList.valueOf(colorBackgroundTitle);
         mBindings.titleIcon.setImageTintList(colorStateList);
         mBindings.titleIcon.setImageDrawable(titleIconRes);
 
-        mBindings.titleContainer.setBackgroundColor(colorBackgroundTitle);
+//        mBindings.titleContainer.setBackgroundColor(colorBackgroundTitle);
 
         //Content View
         mBindings.descriptionText.setText(mMessageText);
@@ -161,20 +181,20 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
                 String currentKey = mHashmapContent.keySet().toArray()[i].toString();
                 String currentValue = mHashmapContent.get(currentKey);
 
-                RelativeLayout singleMapContent = (RelativeLayout) inflater.inflate(R.layout.dialog_custom_content_hashmap_viewmodel, hashMapContainer);
+                RelativeLayout singleMapContent = (RelativeLayout) LayoutInflater.from(requireContext()).inflate(R.layout.dialog_custom_content_hashmap_viewmodel, hashMapContainer);
                 ((TextView) singleMapContent.findViewById(R.id.dialog_content_hashmap_key)).setText(currentKey);
                 ((TextView) singleMapContent.findViewById(R.id.dialog_content_hashmap_value)).setText(currentValue);
 
                 hashMapContainer.addView(singleMapContent);
             }
+        } else {
+            hashMapContainer.setVisibility(View.GONE);
         }
-
-        return mBindings.getRoot();
     }
 
 
     public boolean isPositiveVisible() {
-        return mOnPositiveClick != null;
+        return mOnPositiveClick != null || (!isNeutralVisible() && !isNegativeVisible());
     }
 
     public boolean isNeutralVisible() {
@@ -191,7 +211,7 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
     }
 
     public String getNeutralButtonText() {
-        return mRNeutralButtonString != null && mRNeutralButtonString != -1 ? mContext.getText(mRNeutralButtonString).toString() : null;
+        return mRNeutralButtonString != null && mRNeutralButtonString != -1 ? requireContext().getText(mRNeutralButtonString).toString() : null;
     }
 
     public String getNegativeButtonText() {
@@ -200,17 +220,17 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
 
     public void onPositiveClick() {
         dismiss();
-        if(mOnPositiveClick != null) mOnPositiveClick.run();
+        if (mOnPositiveClick != null) mOnPositiveClick.run();
     }
 
     public void onNeutralClick() {
         dismiss();
-        if(mOnNeutralClick != null) mOnNeutralClick.run();
+        if (mOnNeutralClick != null) mOnNeutralClick.run();
     }
 
     public void onNegativeClick() {
         dismiss();
-        if(mOnNegativeClick != null) mOnNegativeClick.run();
+        if (mOnNegativeClick != null) mOnNegativeClick.run();
     }
 
     public static DialogSimpleMessageView makeInfoDialog(String titleText, Spanned messageText, HashMap<String, String> hashmapContent, Runnable onPositiveClick) {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java

@@ -1,81 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.basket_lu;
-
-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 java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.utility.UtilityDialog;
-import it.integry.integrywmsnative.databinding.DialogBasketLuBinding;
-import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page1.DialogBasketLU_Page1_ViewModel;
-import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page2.DialogBasketLU_Page2_ViewModel;
-
-public class DialogBasketLU {
-
-    private Context mContext;
-    private Dialog mDialog;
-    private DialogBasketLuBinding mBinding;
-
-    private RunnableArgs<MtbColt> mOnComplete;
-
-    public static Dialog make(final Context context, RunnableArgs<MtbColt> onComplete) {
-        return new DialogBasketLU(context, onComplete).mDialog;
-    }
-
-
-    private DialogBasketLU(Context context, RunnableArgs<MtbColt> onComplete) {
-        mContext = context;
-        mOnComplete = onComplete;
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_basket_lu, null, false);
-
-        mDialog = new Dialog(context);
-
-        mDialog.setContentView(mBinding.getRoot());
-
-        mDialog.setCanceledOnTouchOutside(false);
-        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        UtilityDialog.setTo90PercentWidth(context, mDialog);
-
-        this.initViewPager();
-    }
-
-    private void initViewPager() {
-        List<Map.Entry<Integer, Class<?>>> views = new ArrayList<>();
-        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page1, DialogBasketLU_Page1_ViewModel.class));
-        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page2, DialogBasketLU_Page2_ViewModel.class));
-
-        DialogBasketLU_ViewPagerAdapter viewPagerAdapter = new DialogBasketLU_ViewPagerAdapter(mContext, views);
-        mBinding.viewpager.setAdapter(viewPagerAdapter);
-        mBinding.viewpager.beginFakeDrag();
-        mBinding.viewpager.addOnPageChangeListener(viewPagerAdapter);
-        mBinding.viewpager.setEnabled(false);
-
-
-        mDialog.setOnShowListener(v -> {
-
-
-            viewPagerAdapter.getViewModel(R.layout.dialog_basket_lu__page2).setOnConfirmClickListener(data -> {
-                MtbColt mtbColt = (MtbColt) data;
-
-                mOnComplete.run(mtbColt);
-                mDialog.dismiss();
-            });
-
-        });
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLUView.java

@@ -0,0 +1,75 @@
+package it.integry.integrywmsnative.view.dialogs.basket_lu;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.databinding.DialogBasketLuBinding;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page1.DialogBasketLU_Page1_ViewModel;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page2.DialogBasketLU_Page2_ViewModel;
+
+public class DialogBasketLUView extends BaseDialogFragment {
+
+    private final RunnableArgs<MtbColt> mOnComplete;
+    private DialogBasketLuBinding mBindings;
+
+
+
+    public DialogBasketLUView(RunnableArgs<MtbColt> onComplete) {
+        mOnComplete = onComplete;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        mBindings = DialogBasketLuBinding.inflate(LayoutInflater.from(requireContext()), null, false);
+
+        var alertDialog =  new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false)
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(false);
+        this.initViewPager(alertDialog);
+
+        return alertDialog;
+    }
+
+    private void initViewPager(Dialog dialog) {
+        List<Map.Entry<Integer, Class<?>>> views = new ArrayList<>();
+        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page1, DialogBasketLU_Page1_ViewModel.class));
+        views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_basket_lu__page2, DialogBasketLU_Page2_ViewModel.class));
+
+        DialogBasketLU_ViewPagerAdapter viewPagerAdapter = new DialogBasketLU_ViewPagerAdapter(requireContext(), views);
+        mBindings.viewpager.setAdapter(viewPagerAdapter);
+        mBindings.viewpager.beginFakeDrag();
+        mBindings.viewpager.addOnPageChangeListener(viewPagerAdapter);
+        mBindings.viewpager.setEnabled(false);
+
+
+        dialog.setOnShowListener(v -> {
+            viewPagerAdapter.getViewModel(R.layout.dialog_basket_lu__page2).setOnConfirmClickListener(data -> {
+                MtbColt mtbColt = (MtbColt) data;
+
+                mOnComplete.run(mtbColt);
+                dialog.dismiss();
+            });
+
+        });
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java

@@ -1,80 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.LayoutInflater;
-
-import androidx.core.content.ContextCompat;
-import androidx.databinding.DataBindingUtil;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked;
-import it.integry.integrywmsnative.core.model.MtbAart;
-import it.integry.integrywmsnative.core.utility.UtilityDialog;
-import it.integry.integrywmsnative.databinding.DialogChooseArtFromListaArtBinding;
-import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
-
-public class DialogChooseArtFromListaArts {
-
-
-    private Context currentContext;
-    private Dialog mDialog;
-
-    private DialogChooseArtFromListaArtsAdapter currentAdapter;
-
-    private RunnableArgs<MtbAart> mOnItemChoosed;
-
-    public static Dialog make(final Context context, List<MtbAart> listaArts, RunnableArgs<MtbAart> onItemChoosed) {
-        return new DialogChooseArtFromListaArts(context, listaArts, onItemChoosed).mDialog;
-    }
-
-
-    private DialogChooseArtFromListaArts(Context context, List<MtbAart> listaArts, RunnableArgs<MtbAart> onItemChoosed) {
-        currentContext = context;
-        mOnItemChoosed = onItemChoosed;
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        DialogChooseArtFromListaArtBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_choose_art_from_lista_art, null, false);
-
-        mDialog = new Dialog(context);
-
-        mDialog.setContentView(bindings.getRoot());
-
-        mDialog.setCanceledOnTouchOutside(false);
-        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        UtilityDialog.setTo90PercentWidth(context, mDialog);
-
-        initRecyclerView(bindings, listaArts);
-    }
-
-    private void initRecyclerView(DialogChooseArtFromListaArtBinding binding, List<MtbAart> dataset) {
-        binding.dialogChooseArtFromListaArtMainList.setNestedScrollingEnabled(false);
-
-        binding.dialogChooseArtFromListaArtMainList.setHasFixedSize(true);
-
-        binding.dialogChooseArtFromListaArtMainList.setLayoutManager(new LinearLayoutManager(currentContext));
-
-        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(currentContext, SimpleDividerItemDecoration.VERTICAL);
-        itemDecorator.setDrawable(ContextCompat.getDrawable(currentContext, R.drawable.divider));
-        binding.dialogChooseArtFromListaArtMainList.addItemDecoration(itemDecorator);
-
-        currentAdapter = new DialogChooseArtFromListaArtsAdapter(currentContext, dataset, onItemClicked);
-        binding.dialogChooseArtFromListaArtMainList.setAdapter(currentAdapter);
-    }
-
-    private IRecyclerItemClicked<MtbAart> onItemClicked = (item, position) -> {
-        if(mOnItemChoosed != null) {
-            mOnItemChoosed.run(item);
-        }
-
-        mDialog.dismiss();
-    };
-
-}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java

@@ -0,0 +1,73 @@
+package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.databinding.DialogChooseArtFromListaArtBinding;
+import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
+
+public class DialogChooseArtFromListaArtsView extends DialogFragment {
+
+
+    private final List<MtbAart> mListaArts;
+    private final RunnableArgs<MtbAart> mOnItemChoosed;
+
+
+    public DialogChooseArtFromListaArtsView(List<MtbAart> listaArts, RunnableArgs<MtbAart> onItemChoosed) {
+        super();
+        this.mListaArts = listaArts;
+        this.mOnItemChoosed = onItemChoosed;
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        var binding = DialogChooseArtFromListaArtBinding.inflate(LayoutInflater.from(requireContext()));
+
+        initRecyclerView(binding, mListaArts);
+
+        var alertDialog = new MaterialAlertDialogBuilder(requireContext())
+                .setView(binding.getRoot())
+                .setCancelable(false)
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
+    }
+
+    private void initRecyclerView(DialogChooseArtFromListaArtBinding binding, List<MtbAart> dataset) {
+        binding.dialogChooseArtFromListaArtMainList.setNestedScrollingEnabled(false);
+        binding.dialogChooseArtFromListaArtMainList.setHasFixedSize(true);
+        binding.dialogChooseArtFromListaArtMainList.setLayoutManager(new LinearLayoutManager(requireContext()));
+
+        SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireContext(), SimpleDividerItemDecoration.VERTICAL);
+        itemDecorator.setDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider));
+        binding.dialogChooseArtFromListaArtMainList.addItemDecoration(itemDecorator);
+
+        DialogChooseArtFromListaArtsAdapter mCurrentAdapter = new DialogChooseArtFromListaArtsAdapter(requireContext(), dataset,
+                ((item, position) -> {
+                    if (mOnItemChoosed != null) {
+                        mOnItemChoosed.run(item);
+                    }
+
+                    dismiss();
+                }));
+        binding.dialogChooseArtFromListaArtMainList.setAdapter(mCurrentAdapter);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java

@@ -207,7 +207,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
                             .filter(x -> {
                                 String codMart = x.getMtbColr().getMtbAart().getCodMart().toLowerCase();
                                 String descrizioneArt = x.getMtbColr().getMtbAart().getDescrizioneEstesa().toLowerCase();
-                                String diacod = x.getMtbColr().getMtbAart().getDiacod().toLowerCase();
+                                String diacod = x.getMtbColr().getMtbAart().getDiacod();
+                                if (!UtilityString.isNullOrEmpty(diacod)) {
+                                    diacod = diacod.toLowerCase();
+                                }
 
                                 return ((codMart.startsWith(finalNewText) ||
                                         codMart.endsWith(finalNewText) ||
@@ -217,10 +220,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
                                                 descrizioneArt.endsWith(finalNewText) ||
                                                 descrizioneArt.contains(finalNewText) ||
                                                 descrizioneArt.equalsIgnoreCase(finalNewText)) ||
-                                        (diacod.startsWith(finalNewText) ||
+                                        (!UtilityString.isNullOrEmpty(diacod) && (diacod.startsWith(finalNewText) ||
                                                 diacod.endsWith(finalNewText) ||
                                                 diacod.contains(finalNewText) ||
-                                                diacod.equalsIgnoreCase(finalNewText))) &&
+                                                diacod.equalsIgnoreCase(finalNewText)))) &&
                                         !x.isHidden();
                             })
                             .toList();
@@ -305,15 +308,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment {
 
 
     private void loadArticolo(String barcodeProd, Ean128Model ean128Model) {
-        if (barcodeProd.length() == 14) {
-            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
-        }
-
-        String finalBarcodeProd = barcodeProd;
         this.articoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
 
             if (mtbAartList != null && mtbAartList.size() > 0) {
-                this.mBindings.mainSearch.setQuery(finalBarcodeProd, false);
+                this.mBindings.mainSearch.setQuery(barcodeProd, false);
 
                 this.searchArtInList(mtbAartList.get(0), ean128Model);
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/choose_art_from_lista_mtb_colr/DialogChooseArtFromListaMtbColrAdapter.java

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_mtb_colr;
+package it.integry.integrywmsnative.view.dialogs.choose_batch_lot.choose_art_from_lista_mtb_colr;
 
 import android.content.Context;
 import android.view.LayoutInflater;

app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_batch_lot/choose_art_from_lista_mtb_colr/DialogChooseArtFromListaMtbColrView.java

@@ -1,4 +1,4 @@
-package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_mtb_colr;
+package it.integry.integrywmsnative.view.dialogs.choose_batch_lot.choose_art_from_lista_mtb_colr;
 
 import android.app.Dialog;
 import android.content.Context;

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPeso.java

@@ -1,135 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.view.LayoutInflater;
-import android.widget.ArrayAdapter;
-
-import androidx.databinding.DataBindingUtil;
-import androidx.fragment.app.FragmentActivity;
-
-import com.annimon.stream.Optional;
-import com.annimon.stream.Stream;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.di.BindableString;
-import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
-import it.integry.integrywmsnative.core.model.MtbTCol;
-import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityNumber;
-import it.integry.integrywmsnative.core.utility.UtilityProgress;
-import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
-import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
-
-public class DialogInputPeso {
-
-
-    private final FragmentActivity mContext;
-    private final DialogInputPesoLuBinding mBindings;
-    private final DialogInputPesoViewModel mViewModel;
-    private final Dialog currentDialog;
-
-    private List<MtbTCol> codTcolList = null;
-    private ArrayAdapter<String> codTcolArrayAdapter = null;
-
-    public static Dialog make(final FragmentActivity context, String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
-        return new DialogInputPeso(context, codTcol, netWeight, grossWeight, onDialogDismiss).currentDialog;
-    }
-
-
-    private DialogInputPeso(final FragmentActivity context, String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
-        this.mContext = context;
-
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_input_peso_lu, null, false);
-
-        currentDialog = new Dialog(context);
-        currentDialog.setContentView(mBindings.getRoot());
-
-        currentDialog.setCanceledOnTouchOutside(false);
-        currentDialog.setCancelable(false);
-        currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        mViewModel = new DialogInputPesoViewModel();
-        mViewModel.codTcol.set(codTcol);
-        mViewModel.netWeight.set(UtilityNumber.decimalToString(netWeight));
-        mViewModel.grossWeight.set(UtilityNumber.decimalToString(grossWeight));
-
-        mBindings.setViewModel(mViewModel);
-
-        mBindings.buttonConfirm.setOnClickListener(v -> {
-            currentDialog.dismiss();
-
-            String newCodTcol = null;
-
-            if(mViewModel.codTcol.get() != null) {
-                Optional<MtbTCol> newCodTcolOptional = Stream.of(codTcolList)
-                        .filter(x -> (x.getCodTcol() + " - " + x.getDescrizione()).equalsIgnoreCase(mViewModel.codTcol.get()))
-                        .findSingle();
-
-                if(newCodTcolOptional.isPresent()) newCodTcol = newCodTcolOptional.get().getCodTcol();
-            }
-
-
-            BigDecimal netWeightDecimal = new BigDecimal(mViewModel.netWeight.get());
-            BigDecimal grossWeightDecimal = new BigDecimal(mViewModel.grossWeight.get());
-
-            onDialogDismiss.run(newCodTcol, netWeightDecimal, grossWeightDecimal);
-        });
-
-
-        this.init();
-    }
-
-
-
-
-    private void init() {
-
-        final DialogProgressView progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
-
-        MagazzinoRESTConsumer.getTipiColloStatic(codTcols -> {
-            this.codTcolList = codTcols;
-
-            List<String> codTcolDescriptions = Stream.of(codTcols)
-                    .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
-                    .toList();
-
-            if(mViewModel.codTcol.get() != null) {
-                Optional<String> newCodTcol = Stream.of(codTcols)
-                        .filter(x -> x.getCodTcol().equalsIgnoreCase(mViewModel.codTcol.get()))
-                        .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
-                        .findSingle();
-
-                if(newCodTcol.isPresent()) mViewModel.codTcol.set(newCodTcol.get());
-            }
-
-            codTcolArrayAdapter = new ArrayAdapter(mContext, R.layout.array_adapter_single_item);
-            codTcolArrayAdapter.addAll(codTcolDescriptions);
-            mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter);
-
-            progressDialog.dismiss();
-
-        }, ex -> {
-            UtilityExceptions.defaultException(mContext, ex, progressDialog);
-        });
-
-    }
-
-
-    public class DialogInputPesoViewModel {
-        public BindableString codTcol = new BindableString();
-        public BindableString netWeight = new BindableString();
-        public BindableString grossWeight = new BindableString();
-
-    }
-
-
-}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLuView.java

@@ -0,0 +1,116 @@
+package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.widget.ArrayAdapter;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.di.BindableString;
+import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
+import it.integry.integrywmsnative.core.model.MtbTCol;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
+
+public class DialogInputPesoLuView extends DialogFragment {
+
+    private DialogInputPesoLuBinding mBindings;
+    private RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss;
+
+    public BindableString codTcol = new BindableString();
+    public BindableString netWeight = new BindableString();
+    public BindableString grossWeight = new BindableString();
+
+
+    private List<MtbTCol> codTcolList = null;
+    private ArrayAdapter<String> codTcolArrayAdapter = null;
+
+
+    public DialogInputPesoLuView(String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
+        this.onDialogDismiss = onDialogDismiss;
+
+        this.codTcol.set(codTcol);
+        this.netWeight.set(UtilityNumber.decimalToString(netWeight));
+        this.grossWeight.set(UtilityNumber.decimalToString(grossWeight));
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        mBindings = DialogInputPesoLuBinding.inflate(LayoutInflater.from(requireContext()), null, false);
+        mBindings.setView(this);
+
+        this.init();
+
+        var alertDialog =  new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false)
+                .setPositiveButton(R.string.confirm, (dialog, which) -> {
+                    String newCodTcol = null;
+
+                    if(codTcol.get() != null) {
+                        Optional<MtbTCol> newCodTcolOptional = Stream.of(codTcolList)
+                                .filter(x -> (x.getCodTcol() + " - " + x.getDescrizione()).equalsIgnoreCase(codTcol.get()))
+                                .findSingle();
+
+                        if(newCodTcolOptional.isPresent()) newCodTcol = newCodTcolOptional.get().getCodTcol();
+                    }
+
+
+                    BigDecimal netWeightDecimal = new BigDecimal(netWeight.get());
+                    BigDecimal grossWeightDecimal = new BigDecimal(grossWeight.get());
+
+                    onDialogDismiss.run(newCodTcol, netWeightDecimal, grossWeightDecimal);
+                })
+                .create();
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
+    }
+
+    private void init() {
+
+//        final DialogProgressView progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
+
+        MagazzinoRESTConsumer.getTipiColloStatic(codTcols -> {
+            this.codTcolList = codTcols;
+
+            List<String> codTcolDescriptions = Stream.of(codTcols)
+                    .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
+                    .toList();
+
+            if(codTcol.get() != null) {
+                Optional<String> newCodTcol = Stream.of(codTcols)
+                        .filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol.get()))
+                        .map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
+                        .findSingle();
+
+                if(newCodTcol.isPresent()) codTcol.set(newCodTcol.get());
+            }
+
+            codTcolArrayAdapter = new ArrayAdapter(requireContext(), R.layout.array_adapter_single_item);
+            codTcolArrayAdapter.addAll(codTcolDescriptions);
+            mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter);
+
+//            progressDialog.dismiss();
+
+        }, ex -> {
+            UtilityExceptions.defaultException(requireContext(), ex);
+        });
+
+    }
+
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import it.integry.integrywmsnative.core.expansion.RunnableArgsWithReturn;
 import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.dto.StatoArticoloDTO;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 
 public class DialogInputQuantityV2DTO {
@@ -40,6 +41,9 @@ public class DialogInputQuantityV2DTO {
     private boolean isFocusOnStart = true;
     private boolean canLUBeClosed;
     private boolean saveOnImeDone = false;
+    private boolean notifyProductLotStatus = false;
+
+    private StatoArticoloDTO statoPartitaMag;
 
     private String partitaMag;
     private String note;
@@ -317,4 +321,22 @@ public class DialogInputQuantityV2DTO {
         this.saveOnImeDone = saveOnImeDone;
         return this;
     }
+
+    public StatoArticoloDTO getStatoPartitaMag() {
+        return statoPartitaMag;
+    }
+
+    public DialogInputQuantityV2DTO setStatoPartitaMag(StatoArticoloDTO statoPartitaMag) {
+        this.statoPartitaMag = statoPartitaMag;
+        return this;
+    }
+
+    public boolean isNotifyProductLotStatus() {
+        return notifyProductLotStatus;
+    }
+
+    public DialogInputQuantityV2DTO setNotifyProductLotStatus(boolean notifyProductLotStatus) {
+        this.notifyProductLotStatus = notifyProductLotStatus;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java

@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
@@ -10,6 +11,7 @@ import android.text.SpannableString;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 
 import androidx.annotation.NonNull;
@@ -40,6 +42,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbUntMis;
+import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityFocus;
@@ -81,6 +84,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     public ObservableField<Boolean> enabledChangePartitaMag = new ObservableField<>(true);
     public ObservableField<Boolean> enabledNotes = new ObservableField<>(false);
     public ObservableField<Boolean> enabledLUCloseButton = new ObservableField<>(true);
+    public ObservableField<Boolean> showProductLotStatus = new ObservableField<>(false);
 
     private final Handler mHandler = new Handler();
 
@@ -121,6 +125,14 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         this.initBarcode();
     }
 
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        var dialog = super.onCreateDialog(savedInstanceState);
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        return dialog;
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -163,6 +175,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         mBindings.setView(this);
         mBindings.setViewmodel(this.mViewModel);
 
+        if (mDialogInputQuantityV2DTO.isNotifyProductLotStatus() && mDialogInputQuantityV2DTO.getStatoPartitaMag() != null) {
+            this.initProductLotStatusNotification();
+        }
+
         MtbUntMis mtbUntMis = mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis() != null && mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis().size() > 0 ? mDialogInputQuantityV2DTO.getMtbAart().getMtbUntMis().get(0) : null;
         if (!(mtbUntMis != null && mtbUntMis.isFlagDig())) {
             mBindings.inputQtaTotText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
@@ -180,19 +196,41 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
             });
         }
         this.onLoadingEnded();
-        if (mDialogInputQuantityV2DTO.isFocusOnStart()) {
-            mHandler.postDelayed(() -> {
 
+        if (mDialogInputQuantityV2DTO.isFocusOnStart()) {
+            getDialog().setOnShowListener(dialog -> {
                 if (mDialogInputQuantityV2DTO.isNumCnfEditable()) {
-                    mBindings.inputNumCnfText.requestFocus();
+                    UtilityFocus.focusTextBox(requireContext(), mBindings.inputNumCnfText);
                 } else {
                     UtilityFocus.focusTextBox(requireContext(), mBindings.inputQtaTotText);
                 }
-            }, 1000);
+            });
         }
         return mBindings.getRoot();
     }
 
+    private void initProductLotStatusNotification() {
+        StatoPartitaMag statoPartitaMag = StatoPartitaMag.from(this.mDialogInputQuantityV2DTO.getStatoPartitaMag().getStatoArt());
+        if (statoPartitaMag == null)
+            return;
+
+        this.mBindings.inputDataScadLayout.setEndIconMode(TextInputLayout.END_ICON_CUSTOM);
+        switch (statoPartitaMag) {
+            case SCADUTO:
+                this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24);
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.warn_color)));
+                break;
+            case IN_SCADENZA:
+                this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24);
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.error_color)));
+                break;
+            default:
+                this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_check_white_24dp);
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.success_color)));
+
+        }
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();
@@ -425,6 +463,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         this.enabledChangePartitaMag.set(this.mDialogInputQuantityV2DTO.isCanPartitaMagBeChanged());
         this.mViewModel.shouldAskDataScad = this.mDialogInputQuantityV2DTO.isDataScadMandatory();
         this.enabledNotes.set(this.mDialogInputQuantityV2DTO.isNotesAllowed());
+        this.showProductLotStatus.set(SettingsManager.iDB().isNotifyLotStatus());
         this.enabledLUCloseButton.set(this.mDialogInputQuantityV2DTO.isCanLUBeClosed());
         this.currentTaraArticolo.set(this.mViewModel.getMtbAart().getTaraKg());
 

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

@@ -31,7 +31,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.rest.model.Ean128Model;
 import it.integry.integrywmsnative.databinding.DialogScanArtBinding;
 import it.integry.integrywmsnative.view.dialogs.DialogConsts;
-import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_mtb_colr.DialogChooseArtFromListaMtbColrView;
+import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.choose_art_from_lista_mtb_colr.DialogChooseArtFromListaMtbColrView;
 
 public class DialogScanArtView extends BaseDialogFragment implements DialogScanArtViewModel.Listener {
 

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

@@ -5,8 +5,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.core.exception.EmptyLUException;
 import it.integry.integrywmsnative.core.exception.InvalidLUException;
-import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.exception.NoLUFoundException;
 import it.integry.integrywmsnative.core.exception.NoResultFromBarcodeException;
 import it.integry.integrywmsnative.core.exception.TooManyLUFoundInMonoLUPositionException;
@@ -125,7 +125,7 @@ public class DialogScanArtViewModel {
                     onComplete.run(DialogConsts.Results.YES, null, null, mtbColt.getMtbColr());
                 } else this.sendError(new InvalidLUException());
             } else {
-                this.sendError(new NoArtsFoundException());
+                this.sendError(new EmptyLUException());
             }
 
         }, this::sendError);
@@ -149,11 +149,6 @@ public class DialogScanArtViewModel {
 
 
     private void loadArticolo(@NotNull String barcodeProd, Ean128Model ean128Model, RunnableArgssss<DialogConsts.Results, MtbAart, Ean128Model, List<MtbColr>> onComplete) {
-        if (barcodeProd.length() == 14) {
-            barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd);
-        }
-
-        String finalBarcodeProd = barcodeProd;
         this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> {
             if (mtbAartList != null && mtbAartList.size() > 0) {
 
@@ -165,11 +160,11 @@ public class DialogScanArtViewModel {
                 } else if (!mForceOnlyUL) {
                     onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null);
                 } else {
-                    this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+                    this.sendError(new NoResultFromBarcodeException(barcodeProd));
                 }
 
             } else {
-                this.sendError(new NoResultFromBarcodeException(finalBarcodeProd));
+                this.sendError(new NoResultFromBarcodeException(barcodeProd));
             }
         }, this::sendError);
     }

app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java

@@ -2,17 +2,14 @@ package it.integry.integrywmsnative.view.dialogs.scan_or_create_lu;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.databinding.DataBindingUtil;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -30,7 +27,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.databinding.DialogScanOrCreateLuBinding;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
-import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLU;
+import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLUView;
 
 public class DialogScanOrCreateLUView extends BaseDialogFragment implements DialogScanOrCreateLUViewModel.Listener {
 
@@ -40,12 +37,12 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
     private DialogScanOrCreateLuBinding mBindings;
     private int mBarcodeScannerIstanceID;
 
-    private RunnableArgss<MtbColt, Boolean> mOnComplete;
+    private final RunnableArgss<MtbColt, Boolean> mOnComplete;
     private MtbColt openedMtbColt;
 
-    private boolean mShouldCheckResiduo;
-    private boolean mShouldCheckIfExistDoc;
-    private boolean mEnableCreation;
+    private final boolean mShouldCheckResiduo;
+    private final boolean mShouldCheckIfExistDoc;
+    private final boolean mEnableCreation;
 
     private final BindableBoolean basketEnabled = new BindableBoolean();
     private final BindableBoolean creationEnabled = new BindableBoolean();
@@ -73,22 +70,21 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
 
         mEnableCreation = enableCreation;
         mOnComplete = onComplete;
-    }
-
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        this.initBarcode();
-
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_scan_or_create_lu, container, false);
-        mBindings.setLifecycleOwner(this);
-        mBindings.setView(this);
 
         MainApplication.appComponent
                 .dialogScanOrCreateLUComponent()
                 .create()
                 .inject(this);
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.initBarcode();
+
+        mBindings = DialogScanOrCreateLuBinding.inflate(LayoutInflater.from(requireContext()), null, false);
+        mBindings.setLifecycleOwner(this);
+        mBindings.setView(this);
 
         this.mViewModel
                 .setListener(this);
@@ -98,26 +94,21 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
 
         mBindings.createNewLuButton.setOnClickListener(v -> {
             this.mViewModel.createNewLU();
+//            dismiss();
         });
 
         mBindings.viewBasket.setOnClickListener(v -> {
-            DialogBasketLU.make(getActivity(), mtbColt -> {
+            new DialogBasketLUView(mtbColt -> {
                 onLUOpened(mtbColt, false);
-            }).show();
+            }).show(requireActivity().getSupportFragmentManager(), "tag");
         });
 
-        return mBindings.getRoot();
-    }
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        var dialog = super.onCreateDialog(savedInstanceState);
-
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        return dialog;
+        var alertDialog =  new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false)
+                .create();
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
     }
 
     @Override

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

@@ -1,52 +0,0 @@
-package it.integry.integrywmsnative.view.dialogs.yes_no;
-
-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.DialogYesNoBinding;
-import it.integry.integrywmsnative.view.dialogs.DialogConsts;
-
-public class DialogYesNo {
-
-    private Dialog currentDialog;
-
-    public static Dialog make(final Context context, final String title, final String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
-        return new DialogYesNo(context, title, description, onDialogDismiss).currentDialog;
-    }
-
-    private DialogYesNo(Context context, String title, String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-        DialogYesNoBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_yes_no, null, false);
-
-        currentDialog = new Dialog(context);
-
-        currentDialog.setContentView(bindings.getRoot());
-
-        currentDialog.setCancelable(false);
-        currentDialog.setCanceledOnTouchOutside(false);
-        currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        bindings.titleText.setText(title);
-        bindings.descriptionText.setText(description);
-
-        bindings.buttonYes.setOnClickListener(v -> {
-            onDialogDismiss.run(DialogConsts.Results.YES);
-            currentDialog.dismiss();
-        });
-
-        bindings.buttonNo.setOnClickListener(v -> {
-            onDialogDismiss.run(DialogConsts.Results.NO);
-            currentDialog.dismiss();
-        });
-
-
-    }
-
-
-}

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

@@ -0,0 +1,67 @@
+package it.integry.integrywmsnative.view.dialogs.yes_no;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+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;
+import it.integry.integrywmsnative.view.dialogs.DialogConsts;
+
+public class DialogYesNoView extends DialogFragment {
+
+    private final String title;
+    private final String description;
+    private final RunnableArgs<DialogConsts.Results> onDialogDismiss;
+
+    public DialogYesNoView(final String title, final String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
+        super();
+
+        this.title = title;
+        this.description = description;
+        this.onDialogDismiss = onDialogDismiss;
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        var binding = DialogYesNoBinding.inflate(LayoutInflater.from(requireContext()));
+        binding.executePendingBindings();
+
+        if(UtilityString.isNullOrEmpty(title)) {
+            binding.titleText.setVisibility(View.GONE);
+            binding.descriptionText.setTextAppearance(requireContext(), R.style.TextAppearance_Material3_BodyLarge);
+        } else {
+            binding.titleText.setText(title);
+            binding.titleText.setVisibility(View.VISIBLE);
+            binding.descriptionText.setTextAppearance(requireContext(), R.style.TextAppearance_Material3_BodyMedium);
+        }
+
+        binding.descriptionText.setText(description);
+
+
+        var alertDialog = new MaterialAlertDialogBuilder(requireContext())
+                .setView(binding.getRoot())
+                .setCancelable(false)
+                .setPositiveButton("Ok", (dialog, which) -> {
+                    if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.YES);
+                })
+                .setNegativeButton("Annulla", (dialog, which) -> {
+                    if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.NO);
+                })
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
+    }
+}

app/src/main/res/drawable/badge_round_corner.xml

@@ -8,5 +8,5 @@
         android:right="6dp"
         android:top="1dp" />
 
-    <corners android:radius="5dp" />
+    <corners android:radius="12dp" />
 </shape>

app/src/main/res/drawable/ic_baseline_warning_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+</vector>

app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml

@@ -295,6 +295,7 @@
                             android:backgroundTint="@color/light_blue_100"
                             android:orientation="vertical"
                             android:paddingHorizontal="8dp"
+                            android:paddingVertical="4dp"
                             android:visibility="@{viewmodel.totalNumCnfInWarehouse != null || viewmodel.totalQtaInWarehouse != null ? View.VISIBLE : View.GONE}">
 
 
@@ -394,6 +395,7 @@
                             android:backgroundTint="@color/light_blue_100"
                             android:orientation="vertical"
                             android:paddingHorizontal="8dp"
+                            android:paddingVertical="4dp"
                             android:visibility="@{viewmodel.totalNumCnfCommitted != null || viewmodel.totalQtaCommitted != null ? View.VISIBLE : View.GONE}">
 
 

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

@@ -26,7 +26,7 @@
         <androidx.cardview.widget.CardView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:cardCornerRadius="8dp"
+            app:cardCornerRadius="16dp"
             app:cardElevation="4dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -4,9 +4,6 @@
     <data>
         <import type="android.text.Html" />
         <import type="it.integry.integrywmsnative.R" />
-        <variable
-            name="mContext"
-            type="android.content.Context" />
     </data>
 
 
@@ -14,45 +11,33 @@
         android:orientation="vertical" android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        app:cardCornerRadius="12dp"
+        app:cardCornerRadius="16dp"
         app:cardElevation="0dp">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/light_blue_300"
-                android:gravity="center_horizontal">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_error_white_24dp"
-                    android:layout_margin="24dp"/>
-
-            </RelativeLayout>
-
-
-
-            <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-                android:paddingTop="24dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="24dp">
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
 
-                <TextView
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_error_white_24dp"
+                app:tint="?colorPrimary" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
-                    android:text="@string/placement"
-                    android:gravity="center_horizontal"/>
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="@string/placement" />
 
 
             <it.integry.integrywmsnative.ui.DeactivatableViewPager
@@ -62,9 +47,8 @@
 
             </it.integry.integrywmsnative.ui.DeactivatableViewPager>
 
-            </LinearLayout>
 
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.cardview.widget.CardView>
 
 </layout>

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

@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:layout_margin="16dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
+    android:layout_margin="16dp"
     android:weightSum="10">
 
 
+
             <ProgressBar
                 android:id="@+id/progressBar"
                 style="?android:attr/progressBarStyle"
@@ -31,6 +27,5 @@
                 android:gravity="center_horizontal"
                 style="@style/TextViewMaterial"
                 tools:text="Scansiona il codice a barre di uno Scaffale"/>
-        </LinearLayout>
 
-</LinearLayout>
+</androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -40,7 +40,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/Button.PrimaryOutline"
-            app:icon="@drawable/ic_clear_24dp"
             app:strokeColor="@color/colorPrimary"
             android:layout_marginEnd="8dp"
             android:text="@string/abort"/>
@@ -51,7 +50,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/Button.PrimaryFull"
-            app:icon="@drawable/ic_save_24dp"
             android:text="@string/confirm"/>
     </LinearLayout>
 

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

@@ -17,58 +17,40 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:orientation="vertical"
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
 
-            <RelativeLayout
-                android:id="@+id/title_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/green_300"
-                android:gravity="center_horizontal">
 
             <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/title_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="24dp"
-                    android:src="@drawable/ic_error_white_24dp" />
-
-            </RelativeLayout>
+                android:id="@id/title_icon"
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_error_white_24dp"
+                app:tint="?colorPrimary" />
 
 
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:id="@+id/base_buttons_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingStart="16dp"
-                android:paddingTop="24dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="16dp">
-
-                <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/title_text"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 tools:text="Title here" />
 
-                <TextView
+            <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/description_text"
-                    style="@style/TextViewMaterial"
+                style="@style/MaterialAlertDialog.Material3.Body.Text.CenterStacked"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp"
-                    android:gravity="left"
                 tools:text="Description here" />
 
 
@@ -76,203 +58,202 @@
                 android:id="@+id/dialog_content_hashmap"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
+                android:layout_marginTop="24dp"
                 android:orientation="vertical"
-                    android:paddingLeft="12dp"
-                    android:paddingRight="12dp">
+                android:paddingHorizontal="12dp" />
 
 
-                </androidx.appcompat.widget.LinearLayoutCompat>
+            <!--                <androidx.constraintlayout.widget.ConstraintLayout-->
+            <!--                    android:layout_width="match_parent"-->
+            <!--                    android:layout_height="wrap_content"-->
+            <!--                    android:layout_marginTop="8dp"-->
+            <!--                    android:visibility="@{view.negativeVisible &amp;&amp; !view.neutralVisible ? View.VISIBLE : View.GONE}">-->
+
+            <!--                    <androidx.constraintlayout.widget.Guideline-->
+            <!--                        android:id="@+id/center_guideline"-->
+            <!--                        android:layout_width="wrap_content"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:orientation="vertical"-->
+            <!--                        app:layout_constraintGuide_percent="0.5" />-->
 
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="@{view.negativeVisible &amp;&amp; !view.neutralVisible ? View.VISIBLE : View.GONE}">
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/center_guideline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.5" />
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Widget.Material3.Button.OutlinedButton"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        android:onClick="@{() -> view.onNegativeClick()}"-->
+            <!--                        android:text="@{view.negativeButtonText}"-->
+            <!--                        tools:text="Neutral"-->
+            <!--                        app:layout_constraintEnd_toStartOf="@id/center_guideline"-->
+            <!--                        app:layout_constraintStart_toStartOf="parent"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent" />-->
 
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.PrimaryOutline"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:onClick="@{() -> view.onNegativeClick()}"
-                        android:text="@{view.negativeButtonText}"
-                        app:layout_constraintEnd_toStartOf="@id/center_guideline"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:strokeColor="@color/colorPrimary" />
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Widget.Material3.Button.UnelevatedButton"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        android:onClick="@{() -> view.onPositiveClick()}"-->
+            <!--                        android:text="@{view.positiveButtonText}"-->
+            <!--                        tools:text="Positive"-->
+            <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+            <!--                        app:layout_constraintStart_toStartOf="@id/center_guideline"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent" />-->
 
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.PrimaryFull"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:onClick="@{() -> view.onPositiveClick()}"
-                        android:text="@{view.positiveButtonText}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/center_guideline"
-                        app:layout_constraintTop_toTopOf="parent" />
+            <!--                </androidx.constraintlayout.widget.ConstraintLayout>-->
+
+            <!--                <androidx.constraintlayout.widget.ConstraintLayout-->
+            <!--                    android:layout_width="match_parent"-->
+            <!--                    android:layout_height="wrap_content"-->
+            <!--                    android:layout_marginTop="8dp"-->
+            <!--                    android:visibility="@{!view.negativeVisible &amp;&amp; !view.neutralVisible ? View.VISIBLE : View.GONE}">-->
 
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
+            <!--                    <androidx.constraintlayout.widget.Guideline-->
+            <!--                        android:id="@+id/ok_left_buttons_guideline"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:orientation="vertical"-->
+            <!--                        app:layout_constraintGuide_percent="0.25" />-->
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="@{!view.negativeVisible &amp;&amp; !view.neutralVisible ? View.VISIBLE : View.GONE}">
+            <!--                    <androidx.constraintlayout.widget.Guideline-->
+            <!--                        android:id="@+id/ok_right_buttons_guideline"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:orientation="vertical"-->
+            <!--                        app:layout_constraintGuide_percent="0.75" />-->
+
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Widget.Material3.Button.UnelevatedButton"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        tools:text="Positive"-->
+            <!--                        android:onClick="@{() -> view.onPositiveClick()}"-->
+            <!--                        android:text="@{view.positiveButtonText}"-->
+            <!--                        app:layout_constraintEnd_toEndOf="@id/ok_right_buttons_guideline"-->
+            <!--                        app:layout_constraintStart_toStartOf="@id/ok_left_buttons_guideline"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent" />-->
 
 
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/ok_left_buttons_guideline"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.25" />
+            <!--                </androidx.constraintlayout.widget.ConstraintLayout>-->
 
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/ok_right_buttons_guideline"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.75" />
+            <!--                <androidx.constraintlayout.widget.ConstraintLayout-->
+            <!--                    android:layout_width="match_parent"-->
+            <!--                    android:layout_height="wrap_content"-->
+            <!--                    android:layout_marginTop="8dp"-->
+            <!--                    android:visibility="@{view.negativeVisible &amp;&amp; view.neutralVisible ? View.VISIBLE : View.GONE}">-->
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.PrimaryFull"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
+            <!--                    <androidx.constraintlayout.widget.Guideline-->
+            <!--                        android:id="@+id/left_buttons_guideline"-->
+            <!--                        android:layout_width="wrap_content"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:orientation="vertical"-->
+            <!--                        app:layout_constraintGuide_percent="0.33" />-->
 
-                        android:onClick="@{() -> view.onPositiveClick()}"
-                        android:text="@{view.positiveButtonText}"
-                        app:layout_constraintEnd_toEndOf="@id/ok_right_buttons_guideline"
-                        app:layout_constraintStart_toStartOf="@id/ok_left_buttons_guideline"
-                        app:layout_constraintTop_toTopOf="parent" />
+            <!--                    <androidx.constraintlayout.widget.Guideline-->
+            <!--                        android:id="@+id/right_buttons_guideline"-->
+            <!--                        android:layout_width="wrap_content"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:orientation="vertical"-->
+            <!--                        app:layout_constraintGuide_percent="0.66" />-->
 
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="@{view.negativeVisible &amp;&amp; view.neutralVisible ? View.VISIBLE : View.GONE}">
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/left_buttons_guideline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.33" />
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/right_buttons_guideline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.66" />
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Button.DangerFull"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        tools:text="Negative"-->
+            <!--                        android:onClick="@{() -> view.onNegativeClick()}"-->
+            <!--                        android:text="@{view.negativeButtonText}"-->
+            <!--                        app:layout_constraintEnd_toStartOf="@id/left_buttons_guideline"-->
+            <!--                        app:layout_constraintStart_toStartOf="parent"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent" />-->
 
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.DangerFull"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:onClick="@{() -> view.onNegativeClick()}"
-                        android:text="@{view.negativeButtonText}"
-                        app:layout_constraintEnd_toStartOf="@id/left_buttons_guideline"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Widget.Material3.Button.OutlinedButton"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        tools:text="Neutral"-->
+            <!--                        android:onClick="@{() -> view.onNeutralClick()}"-->
+            <!--                        android:text="@{view.neutralButtonText}"-->
+            <!--                        app:layout_constraintEnd_toStartOf="@id/right_buttons_guideline"-->
+            <!--                        app:layout_constraintStart_toStartOf="@id/left_buttons_guideline"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent"-->
+            <!--                        app:strokeColor="@color/colorPrimary" />-->
 
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.PrimaryOutline"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:onClick="@{() -> view.onNeutralClick()}"
-                        android:text="@{view.neutralButtonText}"
-                        app:layout_constraintEnd_toStartOf="@id/right_buttons_guideline"
-                        app:layout_constraintStart_toStartOf="@id/left_buttons_guideline"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:strokeColor="@color/colorPrimary" />
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Widget.Material3.Button.UnelevatedButton"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        tools:text="Positive"-->
+            <!--                        android:onClick="@{() -> view.onPositiveClick()}"-->
+            <!--                        android:text="@{view.positiveButtonText}"-->
+            <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+            <!--                        app:layout_constraintStart_toStartOf="@id/right_buttons_guideline"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent" />-->
 
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.PrimaryFull"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:onClick="@{() -> view.onPositiveClick()}"
-                        android:text="@{view.positiveButtonText}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/right_buttons_guideline"
-                        app:layout_constraintTop_toTopOf="parent" />
+            <!--                </androidx.constraintlayout.widget.ConstraintLayout>-->
+
+            <!--                <androidx.constraintlayout.widget.ConstraintLayout-->
+            <!--                    android:layout_width="match_parent"-->
+            <!--                    android:layout_height="wrap_content"-->
+            <!--                    android:layout_marginTop="8dp"-->
+            <!--                    android:visibility="@{!view.negativeVisible &amp;&amp; view.neutralVisible ? View.VISIBLE : View.GONE}">-->
+
+            <!--                    <androidx.constraintlayout.widget.Guideline-->
+            <!--                        android:id="@+id/center_guideline2"-->
+            <!--                        android:layout_width="wrap_content"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:orientation="vertical"-->
+            <!--                        app:layout_constraintGuide_percent="0.5" />-->
 
 
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:visibility="@{!view.negativeVisible &amp;&amp; view.neutralVisible ? View.VISIBLE : View.GONE}">
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/center_guideline2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintGuide_percent="0.5" />
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Widget.Material3.Button.OutlinedButton"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        tools:text="Neutral"-->
+            <!--                        android:onClick="@{() -> view.onNeutralClick()}"-->
+            <!--                        android:text="@{view.neutralButtonText}"-->
+            <!--                        app:layout_constraintEnd_toStartOf="@id/center_guideline2"-->
+            <!--                        app:layout_constraintStart_toStartOf="parent"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent"-->
+            <!--                        app:strokeColor="@color/colorPrimary" />-->
 
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.PrimaryOutline"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:onClick="@{() -> view.onNeutralClick()}"
-                        android:text="@{view.neutralButtonText}"
-                        app:layout_constraintEnd_toStartOf="@id/center_guideline2"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:strokeColor="@color/colorPrimary" />
+            <!--                    <com.google.android.material.button.MaterialButton-->
+            <!--                        style="@style/Widget.Material3.Button.UnelevatedButton"-->
+            <!--                        android:layout_width="0dp"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_marginLeft="8dp"-->
+            <!--                        android:layout_marginRight="8dp"-->
+            <!--                        tools:text="Positive"-->
+            <!--                        android:onClick="@{() -> view.onPositiveClick()}"-->
+            <!--                        android:text="@{view.positiveButtonText}"-->
+            <!--                        app:layout_constraintEnd_toEndOf="parent"-->
+            <!--                        app:layout_constraintStart_toStartOf="@id/center_guideline2"-->
+            <!--                        app:layout_constraintTop_toTopOf="parent" />-->
 
 
-                    <com.google.android.material.button.MaterialButton
-                        style="@style/Button.PrimaryFull"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        android:onClick="@{() -> view.onPositiveClick()}"
-                        android:text="@{view.positiveButtonText}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/center_guideline2"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
+            <!--                </androidx.constraintlayout.widget.ConstraintLayout>-->
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 

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

@@ -1,45 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/base_root"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="0dp">
 
 
-        <LinearLayout
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-            android:paddingTop="24dp"
         android:paddingStart="8dp"
+        android:paddingTop="24dp"
         android:paddingEnd="8dp"
         android:paddingBottom="16dp">
 
-            <TextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/title_text"
+            style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                style="@style/TextViewMaterial.Dialog.HeadlineText"
-                android:text="@string/basket"
-                android:gravity="center_horizontal"/>
+            android:gravity="center_horizontal"
+            android:text="@string/basket" />
 
         <it.integry.integrywmsnative.ui.DeactivatableViewPager
             android:id="@+id/viewpager"
-                android:animateLayoutChanges="true"
             android:layout_width="match_parent"
-                android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_marginTop="16dp"
+            android:animateLayoutChanges="true">
 
         </it.integry.integrywmsnative.ui.DeactivatableViewPager>
 
 
     </LinearLayout>
 
-    </androidx.cardview.widget.CardView>
 
 </layout>

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

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <data>
+
         <import type="it.integry.integrywmsnative.core.model.MtbColt" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+
         <import type="android.view.View" />
 
         <variable
@@ -12,49 +17,41 @@
             type="MtbColt" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
         android:paddingTop="12dp"
         android:paddingEnd="12dp"
-        android:paddingBottom="12dp"
-        android:clickable="true"
-        android:background="?attr/selectableItemBackground">
+        android:paddingBottom="12dp">
 
-        <LinearLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="@{mtbColt.numCollo.toString()}"
-                    tools:text="22222"
+                android:layout_marginHorizontal="12dp"
                 android:background="@drawable/badge_round_corner"
                 android:backgroundTint="@color/colorPrimary"
-                    android:textColor="@android:color/white"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
+                android:layout_gravity="center"
                 android:paddingLeft="6dp"
+                android:paddingTop="2dp"
                 android:paddingRight="6dp"
-                    android:textStyle="bold"/>
-
-            </RelativeLayout>
+                android:paddingBottom="2dp"
+                android:text="@{mtbColt.numCollo.toString()}"
+                android:textColor="@android:color/white"
+                android:textStyle="bold"
+                tools:text="22222" />
 
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -63,25 +60,25 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <TextView
-                        android:layout_toStartOf="@id/posizione_collo"
-                        android:layout_alignParentStart="true"
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_toStartOf="@id/posizione_collo"
+                        android:text="@{mtbColt.getDataColloHumanLong()}"
                         android:textColor="@android:color/black"
                         android:textSize="16sp"
-                        android:text="@{mtbColt.getDataColloHumanLong()}"
                         tools:text="28 ottobre 2018" />
 
-                    <TextView
+                    <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/posizione_collo"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:text="@{mtbColt.posizione}"
-                        android:textSize="16sp"
                         android:textColor="@android:color/black"
+                        android:textSize="16sp"
                         android:textStyle="bold"
                         android:visibility="@{UtilityString.isNullOrEmpty(mtbColt.posizione) ? View.INVISIBLE : View.VISIBLE}"
                         tools:text="A01F01C01L01" />
@@ -90,16 +87,17 @@
                 </RelativeLayout>
 
 
-                <TextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="14sp"
                     android:text="@{`Preparato da: ` + mtbColt.preparatoDa}"
+                    android:textSize="14sp"
                     android:visibility="@{UtilityString.isNullOrEmpty(mtbColt.preparatoDa) ? View.INVISIBLE : View.VISIBLE}"
                     tools:text="Preparato da: Utente" />
-            </LinearLayout>
 
-        </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

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

@@ -45,7 +45,7 @@
                 android:orientation="vertical"
                 app:layout_constraintGuide_percent="0.85" />
 
-            <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
@@ -69,7 +69,7 @@
                     android:text="@string/no_lu_found_message"
                     android:layout_marginTop="16dp"
                     style="@style/AppTheme.NewMaterial.Text.Medium"/>
-            </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -106,15 +106,13 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/button_abort"
-                        style="@style/Button.PrimaryOutline"
+                        style="@style/Widget.Material3.Button.TextButton.Dialog"
                         android:layout_width="0dp"
                         android:layout_height="52dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginHorizontal="8dp"
                         android:text="@string/back"
                         app:icon="@drawable/ic_black_back"
                         app:iconGravity="textStart"
-                        app:iconSize="24dp"
                         app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -123,15 +121,13 @@
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/button_confirm"
-                        style="@style/Button.PrimaryFull"
+                        style="@style/Widget.Material3.Button.TonalButton.Icon"
                         android:layout_width="0dp"
                         android:layout_height="52dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginHorizontal="8dp"
                         android:text="@string/use"
                         app:icon="@drawable/ic_black_tick"
                         app:iconGravity="textStart"
-                        app:iconSize="24dp"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
                         app:layout_constraintTop_toTopOf="parent" />