Finish v1.29.5(309)

Aggiornato DialogProgressView.
Aggiornato DialogYesNoView.
Aggiornato DialogInputPesoLuView.

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 300
-    def appVersionName = '1.28.6'
+    def appVersionCode = 309
+    def appVersionName = '1.29.5'
 
     signingConfigs {
         release {
@@ -31,12 +31,12 @@ android {
         }
     }
 
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 32
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -83,6 +83,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'it.integry.integrywmsnative'
 
 
 }
@@ -103,28 +104,32 @@ dependencies {
     implementation 'com.google.firebase:firebase-core'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:18.0.0'
+    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.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    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.4.1'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+//    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.40'
+    def dagger2_version = '2.40.1'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
@@ -143,7 +148,7 @@ dependencies {
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.4.1"
+    def room_version = "2.4.3"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"

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/MainApplicationComponent.java

@@ -86,6 +86,8 @@ import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdC
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
+import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCComponent;
+import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCModule;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUComponent;
@@ -137,7 +139,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DialogEditArticoloModule.class,
         DialogPrintOrderSSCCListModule.class,
         ProdLineeProduzioneModule.class,
-        ProdDettaglioLineaModule.class
+        ProdDettaglioLineaModule.class,
+        DialogPrintUlSSCCModule.class
 })
 public interface MainApplicationComponent {
 
@@ -231,6 +234,8 @@ public interface MainApplicationComponent {
 
     ProdDettaglioLineaComponent.Factory prodDettaglioLineaComponent();
 
+    DialogPrintUlSSCCComponent.Factory dialogPrintUlSSCCComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);

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,20 @@
 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.gest.settings.MainSettingsFragment;
 import it.integry.keyobardemulatorscannerlibrary.KeyboardEmulatorBarcodeReader;
 import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
 import it.integry.zebrascannerlibrary.ZebraBarcodeReader;
@@ -21,12 +27,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 +66,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 +94,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;
     }
 
@@ -133,6 +145,9 @@ public class BarcodeManager {
         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/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/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

@@ -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/MtbAart.java

@@ -88,6 +88,11 @@ public class MtbAart extends EntityBase {
     private String marchio;
     private Integer sezione;
     private UntMisRifPesoEnum untMisRifPeso;
+    
+    private BigDecimal qtaEsistente;
+    private BigDecimal qtaImpegnata;
+    private BigDecimal numCnfEsistente;
+    private BigDecimal numCnfImpegnata;
 
     private List<MtbUntMis> mtbUntMis;
 
@@ -819,4 +824,40 @@ public class MtbAart extends EntityBase {
         this.untMisRifPeso = untMisRifPeso;
         return this;
     }
+
+    public BigDecimal getQtaEsistente() {
+        return qtaEsistente;
+    }
+
+    public MtbAart setQtaEsistente(BigDecimal qtaEsistente) {
+        this.qtaEsistente = qtaEsistente;
+        return this;
+    }
+
+    public BigDecimal getQtaImpegnata() {
+        return qtaImpegnata;
+    }
+
+    public MtbAart setQtaImpegnata(BigDecimal qtaImpegnata) {
+        this.qtaImpegnata = qtaImpegnata;
+        return this;
+    }
+
+    public BigDecimal getNumCnfEsistente() {
+        return numCnfEsistente;
+    }
+
+    public MtbAart setNumCnfEsistente(BigDecimal numCnfEsistente) {
+        this.numCnfEsistente = numCnfEsistente;
+        return this;
+    }
+
+    public BigDecimal getNumCnfImpegnata() {
+        return numCnfImpegnata;
+    }
+
+    public MtbAart setNumCnfImpegnata(BigDecimal numCnfImpegnata) {
+        this.numCnfImpegnata = numCnfImpegnata;
+        return this;
+    }
 }

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/RESTBuilder.java

@@ -28,11 +28,11 @@ public class RESTBuilder {
     }
 
     public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors) {
-        return getService(service, host, port, addInterceptors, true, 30);
+        return getService(service, host, port, addInterceptors, true, 60);
     }
 
     public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, boolean addEmsApi) {
-        return getService(service, host, port, addInterceptors, addEmsApi, 30);
+        return getService(service, host, port, addInterceptors, addEmsApi, 60);
     }
 
     public static <T> T getService(final Class<T> service, String host, int port, boolean addInterceptors, boolean addEmsApi, int timeout) {

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/ColliMagazzinoRESTConsumer.java

@@ -326,7 +326,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
 
     public void getBySSCC(String ssccString, boolean onlyResiduo, boolean throwExcIfNull, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
         ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class);
-        colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new Callback<ServiceRESTResponse<MtbColt>>() {
+        colliMagazzinoRESTConsumerService.getColloByBarcode(ssccString, onlyResiduo, throwExcIfNull).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<MtbColt>> call, Response<ServiceRESTResponse<MtbColt>> response) {
                 analyzeAnswer(response, "GetBySSCC", mtbColt -> {
@@ -700,4 +700,29 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer {
         });
     }
 
+    public void loadShipmentUlFromProductionUL(MtbColt mtbColt, RunnableArgs<MtbColt> onComplete, RunnableArgs<Exception> onFailed) {
+
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("mtb_colr.gestione_rif", mtbColt.getGestione());
+        params.put("mtb_colr.ser_collo_rif", mtbColt.getSerCollo());
+        params.put("mtb_colr.num_collo_rif", mtbColt.getNumCollo());
+        params.put("mtb_colr.data_collo_rif", mtbColt.getDataColloD());
+
+        String whereCond = UtilityQuery.concatFieldsInWhereCond(params);
+
+
+        String query = "select distinct mtb_colt.*\n" +
+                "from mtb_colt\n" +
+                "         left join mtb_colr on mtb_colt.gestione = mtb_colr.gestione and mtb_colt.data_collo = mtb_colr.data_collo and\n" +
+                "                               mtb_colt.ser_collo = mtb_colr.ser_collo and mtb_colt.num_collo = mtb_colr.num_collo\n" +
+                "where mtb_colt.gestione = 'V'" +
+                "  AND " + whereCond;
+
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<MtbColt>>() {
+        }.getType();
+        this.mSystemRESTConsumer.<ArrayList<MtbColt>>processSql(query, typeOfObjectsList, data -> {
+            onComplete.run(data.get(0));
+        }, onFailed);
+    }
 }

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/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/UtilityDate.java

@@ -99,7 +99,21 @@ public class UtilityDate {
 
 
     public static Date getDateInstance() {
-        return getCalendarInstance().getTime();
+        return getDateInstance(false);
+    }
+
+
+    public static Date getDateInstance(boolean removeTime) {
+        var calendar = getCalendarInstance();
+
+        if(removeTime) {
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+        }
+
+        return calendar.getTime();
     }
 
     public static Calendar getCalendarInstance() {

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);
     }

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

@@ -35,6 +35,7 @@ public class UtilityNumber {
         decimalFormat.setMaximumFractionDigits(decimal);
         decimalFormat.setDecimalFormatSymbols(otherSymbols);
         decimalFormat.setGroupingUsed(false);
+        decimalFormat.setMinimumFractionDigits(2);
 
         return decimalFormat.format(floatValue);
     }

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_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/main/MainActivity.java

@@ -49,6 +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.DialogProgressView;
 
 public class MainActivity extends BaseActivity
         implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity {
@@ -70,12 +71,16 @@ public class MainActivity extends BaseActivity
     @Inject
     UpdatesManager updatesManager;
 
+    @Inject
+    DialogProgressView mDialogProgressView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         MainApplication.appComponent
                 .mainActivityComponent()
+
                 .create()
                 .inject(this);
 

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_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_dettaglio_linea/ProdDettaglioLineaActivity.java

@@ -231,6 +231,7 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett
     public void requestResources() {
         this.onLoadingEnded();
         BarcodeManager.disable();
+
         this.runOnUiThread(() -> {
 
             DialogSimpleInputHelper.makeInputDialog(this, "Inserisci il numero di risorse da allocare", this.hrNum.get(), "n. risorse", qta -> {
@@ -276,7 +277,7 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett
             getSupportFragmentManager()
                     .beginTransaction()
                     .add(R.id.frame_layout_container,
-                            ProdRecuperoMaterialeFragment.newInstance(mViewModel.lineaProd.getValue().getCodJfas(), DATA_KEY_FRAGMENT_LISTENER))
+                            ProdRecuperoMaterialeFragment.newInstance(null, DATA_KEY_FRAGMENT_LISTENER))
                     .addToBackStack("ProdRecuperoMaterialeFragment")
                     .commit();
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ProdLineeProduzioneFragment.java

@@ -10,7 +10,6 @@ import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.databinding.ObservableArrayList;
-import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.List;
 
@@ -43,11 +42,6 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled
     private FragmentLineeProdBinding mBinding;
     private ElevatedToolbar mToolbar;
     private int barcodeScannerIstanceID = -1;
-    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
-        this.onLoadingStarted();
-
-        this.mViewModel.processBarcodeDTO(data);
-    };
 
     public static ProdLineeProduzioneFragment newInstance() {
         return new ProdLineeProduzioneFragment();
@@ -83,6 +77,11 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled
                 .setOnScanFailed(this::onError));
     }
 
+    private final RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
+        this.onLoadingStarted();
+        this.mViewModel.processBarcodeDTO(data);
+    };
+
     @Override
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;
@@ -98,11 +97,14 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled
 
     private void initRecyclerView() {
         this.mViewModel.getProdLinesList().observe(getViewLifecycleOwner(), this::refreshLineeProd);
-        LinesListAdapter prodLinesListAdapter = new LinesListAdapter(this.requireActivity(), this.mLinesObservableList);
-        prodLinesListAdapter.setEmptyView(this.mBinding.linesListEmptyView);
+
+        LinesListAdapter prodLinesListAdapter = new LinesListAdapter(this.mLinesObservableList);
         this.mBinding.linesMainList.setAdapter(prodLinesListAdapter);
-        this.mBinding.linesMainList.setLayoutManager(new LinearLayoutManager(this.requireActivity()));
-        prodLinesListAdapter.setOnItemClicked(this.mViewModel::onLineSelected);
+
+        prodLinesListAdapter
+                .setOnItemClicked(this::selectLine)
+                .setEmptyView(this.mBinding.linesListEmptyView);
+
         if (mToolbar != null)
             mToolbar.setRecyclerView(this.mBinding.linesMainList);
     }
@@ -136,6 +138,7 @@ public class ProdLineeProduzioneFragment extends BaseFragment implements ITitled
     public void selectLine(ProdLineStatusDTO dto) {
         this.onLoadingEnded();
         BarcodeManager.disable();
+
         if (!dto.isStarted()) {
             this.requestResources(dto);
         } else {

app/src/main/java/it/integry/integrywmsnative/gest/prod_linee_produzione/ui/LinesListAdapter.java

@@ -1,6 +1,5 @@
 package it.integry.integrywmsnative.gest.prod_linee_produzione.ui;
 
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
@@ -16,13 +15,11 @@ import it.integry.integrywmsnative.databinding.FragmentLineeProdMainListModelBin
 import it.integry.integrywmsnative.gest.prod_linee_produzione.dto.ProdLineStatusDTO;
 
 public class LinesListAdapter extends ExtendedRecyclerView<ProdLineStatusDTO, LinesListAdapter.SingleItemViewHolder> {
-    private Context mContext;
 
     private RunnableArgs<ProdLineStatusDTO> mOnItemClicked;
 
-    public LinesListAdapter(Context context, ObservableArrayList<ProdLineStatusDTO> myDataset) {
+    public LinesListAdapter(ObservableArrayList<ProdLineStatusDTO> myDataset) {
         super(myDataset);
-        this.mContext = context;
     }
 
     @NonNull
@@ -38,6 +35,7 @@ public class LinesListAdapter extends ExtendedRecyclerView<ProdLineStatusDTO, Li
 
         holder.binding.setListModel(line);
         holder.binding.executePendingBindings();
+
         holder.binding.getRoot().setOnClickListener(v -> {
             if (this.mOnItemClicked != null)
                 this.mOnItemClicked.run(line);
@@ -45,8 +43,9 @@ public class LinesListAdapter extends ExtendedRecyclerView<ProdLineStatusDTO, Li
     }
 
 
-    public void setOnItemClicked(RunnableArgs<ProdLineStatusDTO> onItemClicked) {
+    public LinesListAdapter setOnItemClicked(RunnableArgs<ProdLineStatusDTO> onItemClicked) {
         this.mOnItemClicked = onItemClicked;
+        return this;
     }
 
     static class SingleItemViewHolder extends RecyclerView.ViewHolder {

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java

@@ -9,10 +9,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.appcompat.widget.AppCompatTextView;
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
 
@@ -88,7 +86,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_recupero_materiale, container, false);
+        mBinding = FragmentProdRecuperoMaterialeBinding.inflate(inflater, container, false);
 
         MainApplication.appComponent
                 .prodRecuperoMaterialeComponent()
@@ -168,8 +166,6 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     private void initRecyclerView() {
         this.mViewModel.getOrderList().observe(getViewLifecycleOwner(), this::refreshList);
 
-        mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(getActivity()));
-
         HistoryULsListAdapter adapter = new HistoryULsListAdapter(getActivity(), mHistoryULMutableData)
                 .setOnItemClicked(data -> this.mViewModel.dispatchItem(data.getOriginalModel(), null));
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java

@@ -247,6 +247,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer {
                                 .setCodCol(restDTO.getCodCol())
                                 .setCodTagl(restDTO.getCodTagl())
                                 .setCodJfas(restDTO.getCodJfas())
+                                .setDescrizioneArt(restDTO.getDescrizioneArt())
                                 .setDescrizioneFase(restDTO.getDescrizioneFase())
                                 .setQtaCol(qtaColTot)
                                 .setNumCnf(numCnfColTot)

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ui/HistoryULsListAdapter.java

@@ -15,6 +15,7 @@ import java.util.List;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.view.ExtendedSectionedRecyclerView;
+import it.integry.integrywmsnative.core.utility.UtilityNumber;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListHeaderBinding;
 import it.integry.integrywmsnative.databinding.ProdRecuperoMaterialeListItemBinding;
@@ -99,7 +100,7 @@ public class HistoryULsListAdapter extends ExtendedSectionedRecyclerView<History
         holder.binding.numCollo.setText(String.valueOf(ul.getNumCollo()));
         holder.binding.partitaMag.setText("(" + ul.getPartitaMag() + ")");
 
-        holder.binding.qtaVersata.setText(String.valueOf(ul.getQtaVersata()));
+        holder.binding.qtaVersata.setText(UtilityNumber.decimalToString(ul.getQtaVersata(), 2));
         holder.binding.untMisQtaVersata.setText(String.valueOf(ul.getUntMisVersata()));
 
         holder.binding.getRoot().setOnClickListener(v -> {

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java

@@ -63,6 +63,8 @@ public class ProdRientroMerceFragment extends BaseFragment implements
         return new ProdRientroMerceFragment();
     }
 
+
+
     @Override
     public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java

@@ -51,6 +51,7 @@ import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdDTO;
 import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdView;
+import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCView;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -248,7 +249,17 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements
     }
 
     @Override
-    public void onDataSaved() {
+    public void onDataSaved(MtbColt mtbColt) {
+        String codJcom = currentOrder.getValue().getCodJcom();
+
+        DialogPrintUlSSCCView.newInstance(codJcom, mtbColt, result -> {
+                    if (result.isFlagPrintShipmentLabel() || result.isFlagPrintProductionLabel()) {
+                        this.mViewModel.printSavedMtbColt(result);
+                    } else {
+                        this.mViewModel.refreshMtbColts();
+                    }
+                })
+                .show(requireActivity().getSupportFragmentManager(), "DialogPrintUlSSCC");
 
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailModule.java

@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail;
 import dagger.Module;
 import dagger.Provides;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.ProdRientroMerceOrderDetailRESTConsumer;
 
@@ -17,8 +18,9 @@ public class ProdRientroMerceOrderDetailModule {
     @Provides
     ProdRientroMerceOrderDetailViewModel provideProdRientroMerceOrderDetailViewModel(
             ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer,
-            ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) {
-        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer);
+            ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+            PrinterRESTConsumer printerRESTConsumer) {
+        return new ProdRientroMerceOrderDetailViewModel(prodRientroMerceOrderDetailRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailViewModel.java

@@ -6,32 +6,42 @@ import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Inject;
 
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.report.ReportType;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.ProdRientroMerceOrderDetailRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.rest.dto.ImportColliDaProduzioneRequestDTO;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO;
+import it.integry.integrywmsnative.view.dialogs.printSsccUl.dto.PrintUlDTO;
 
 public class ProdRientroMerceOrderDetailViewModel {
 
-    public MutableLiveData<List<MtbColt>> mtbColtsOfOrder = new MutableLiveData<>();
+    public final MutableLiveData<List<MtbColt>> mtbColtsOfOrder = new MutableLiveData<>();
     private OrdineLavorazioneDTO currentOrder;
 
     private final ProdRientroMerceOrderDetailRESTConsumer mProdRientroMerceOrderDetailRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
+    private final PrinterRESTConsumer mPrinterRESTConsumer;
 
     private Listener mListener;
 
     @Inject
     public ProdRientroMerceOrderDetailViewModel(ProdRientroMerceOrderDetailRESTConsumer prodRientroMerceOrderDetailRESTConsumer,
-                                                ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer) {
+                                                ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
+                                                PrinterRESTConsumer printerRESTConsumer) {
         this.mProdRientroMerceOrderDetailRESTConsumer = prodRientroMerceOrderDetailRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
+        this.mPrinterRESTConsumer = printerRESTConsumer;
     }
 
     public void setOrder(OrdineLavorazioneDTO order) {
@@ -40,7 +50,7 @@ public class ProdRientroMerceOrderDetailViewModel {
         refreshMtbColts();
     }
 
-    private void refreshMtbColts() {
+    public void refreshMtbColts() {
         this.sendOnLoadingStarted();
         this.mtbColtsOfOrder.postValue(null);
 
@@ -81,12 +91,9 @@ public class ProdRientroMerceOrderDetailViewModel {
                             .setPesoNetto(pickedQuantityDTO.getPesoNetto());
 
             this.mProdRientroMerceOrderDetailRESTConsumer.importColloDaProduzione(importColliDaProduzioneRequestDTO, mtbColtSaved -> {
-
                 synchronized (this.mtbColtsOfOrder) {
-                    refreshMtbColts();
+                    this.mListener.onDataSaved(mtbColtSaved);
                 }
-
-                this.sendOnLoadingEnded();
             }, this::sendError);
 
 
@@ -136,9 +143,39 @@ public class ProdRientroMerceOrderDetailViewModel {
         if (this.mListener != null) mListener.onError(ex);
     }
 
+    public void printSavedMtbColt(PrintUlDTO result) {
+        if (result.isFlagPrintProductionLabel()) {
+            this.startPrint(result.getMtbColt(), ReportType.ETICHETTA_SSCC_LAVORAZIONE, currentOrder.getCodAnag());
+        } else {
+            this.loadShipmentUlFromProductionUL(result.getMtbColt(), mtbColt -> {
+                this.startPrint(mtbColt, ReportType.ETICHETTA_SSCC_SPEDIZIONE, mtbColt.getCodAnag());
+            }, this::sendError);
+        }
+
+    }
+
+    private void loadShipmentUlFromProductionUL(MtbColt productionUL, RunnableArgs<MtbColt> onLoad, RunnableArgs<Exception> onError) {
+        this.mColliMagazzinoRESTConsumer.loadShipmentUlFromProductionUL(productionUL, onLoad, onError);
+    }
+
+    private void startPrint(MtbColt mtbColt, ReportType reportType, String codAnag) {
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("gestione", mtbColt.getGestione());
+        params.put("ser_collo", mtbColt.getSerCollo());
+        params.put("num_collo", mtbColt.getNumCollo());
+        params.put("data_collo", UtilityDate.formatDate(mtbColt.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.YMD_DASH));
+        this.mPrinterRESTConsumer.printReportType(
+                reportType,
+                SettingsManager.i().getUserSession().getDepo().getCodMdep(),
+                codAnag,
+                params,
+                this::refreshMtbColts,
+                this::sendError);
+    }
+
     public interface Listener extends ILoadingListener {
 
-        void onDataSaved();
+        void onDataSaved(MtbColt mtbColt);
 
         void onError(Exception ex);
 

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

@@ -63,7 +63,7 @@ import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.Dialo
 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 {
 
@@ -288,8 +288,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     }
 
     @Override
-    public void onArtListLoaded(ArrayList<MtbAart> artList) {
-        DialogChooseArtFromListaArts.make(getActivity(), artList, mtbAart -> mViewModel.dispatchArt(mtbAart, null)).show();
+    public void onArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed) {
+        DialogChooseArtFromListaArts.make(getActivity(), artList, onArtChoosed).show();
     }
 
     @Override
@@ -336,14 +336,13 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     @Override
     public void onError(Exception ex) {
         this.onLoadingEnded();
+        BarcodeManager.enable();
 
         if (ex instanceof InvalidPesoKGException) {
             UtilityToast.showToast(ex.getMessage());
         } else {
-            UtilityExceptions.defaultException(requireActivity(), ex, mCurrentProgress);
+            UtilityExceptions.defaultException(requireActivity(), ex);
         }
-
-        BarcodeManager.enable();
     }
 
     @Override
@@ -353,6 +352,10 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
             BigDecimal initialNumCnf,
             BigDecimal initialQtaCnf,
             BigDecimal initialQtaTot,
+            BigDecimal totalQtaInWarehouse,
+            BigDecimal totalNumCnfInWarehouse,
+            BigDecimal totalQtaCommitted,
+            BigDecimal totalNumCnfCommitted,
             BigDecimal totalQtaToBeTaken,
             BigDecimal totalNumCnfToBeTaken,
             BigDecimal qtaCnfToBeTaken,
@@ -368,6 +371,10 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                 .setInitialNumCnf(initialNumCnf)
                 .setInitialQtaCnf(initialQtaCnf)
                 .setInitialQtaTot(initialQtaTot)
+                .setTotalQtaInWarehouse(totalQtaInWarehouse)
+                .setTotalNumCnfInWarehouse(totalNumCnfInWarehouse)
+                .setTotalQtaCommitted(totalQtaCommitted)
+                .setTotalNumCnfCommitted(totalNumCnfCommitted)
                 .setTotalQtaToBeTaken(totalQtaToBeTaken)
                 .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken)
                 .setQtaCnfToBeTaken(qtaCnfToBeTaken)
@@ -464,12 +471,12 @@ 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) -> {
@@ -489,12 +496,16 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                     onComplete.run(false, null);
                     break;
             }
-        }).show();
+        }).show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onPreDestroy(Runnable onComplete) {
-        BarcodeManager.removeCallback(barcodeScannerIstanceID);
-        mViewModel.closeLU(false);
+        if(mViewModel.getCurrentMtbColt() != null)
+            mViewModel.closeLU(false);
+        else {
+            BarcodeManager.removeCallback(barcodeScannerIstanceID);
+            onComplete.run();
+        }
     }
 }

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

@@ -196,10 +196,24 @@ public class RettificaGiacenzeViewModel {
             return;
         }
 
+        RunnableArgs<MtbAart> dispatchArtRunnable = mtbAart -> {
+
+            var matchRows = Stream.of(this.mCurrentMtbColt.getMtbColr())
+                    .filter(x -> x.getCodMart().equalsIgnoreCase(mtbAart.getCodMart()))
+                    .toList();
+
+            if (matchRows.size() != 1) {
+                dispatchArt(mtbAart, null);
+            } else {
+                dispatchRowEdit(matchRows.get(0));
+            }
+
+        };
+
         if (artsList.size() == 1) {
-            dispatchArt(artsList.get(0), null);
+            dispatchArtRunnable.run(artsList.get(0));
         } else {
-            this.sendOnArtListLoaded(new ArrayList<>(artsList));
+            this.sendOnArtListLoaded(new ArrayList<>(artsList), dispatchArtRunnable);
         }
     }
 
@@ -291,6 +305,10 @@ public class RettificaGiacenzeViewModel {
                 initialNumCnf,
                 initialQtaCnf,
                 initialQtaTot,
+                mtbAart.getQtaEsistente(),
+                mtbAart.getNumCnfEsistente(),
+                mtbAart.getQtaImpegnata(),
+                mtbAart.getNumCnfImpegnata(),
                 qtaColDaPrelevare,
                 numCnfDaPrelevare,
                 qtaCnfDaPrelevare,
@@ -507,33 +525,41 @@ public class RettificaGiacenzeViewModel {
 
     public void dispatchRowEdit(MtbColr mtbColrToUpdate) {
 
-        final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
-                .setMtbAart(mtbColrToUpdate.getMtbAart());
+        this.mRettificaGiacenzeRESTConsumer.searchArtInt(mtbColrToUpdate.getMtbAart().getCodMart(), newMtbAartList -> {
 
-        this.sendOnItemDispatched(
-                pickingObjectDTO,
-                pickingObjectDTO.getMtbAart(),
-                mtbColrToUpdate.getNumCnf(),
-                mtbColrToUpdate.getQtaCnf(),
-                mtbColrToUpdate.getQtaCol(),
-                null,
-                null,
-                null,
-                mtbColrToUpdate.getPartitaMag(),
-                mtbColrToUpdate.getDataScadPartitaD(),
-                false,
-                false,
-                true,
-                (pickedQuantityDTO, shouldCloseLU) -> {
+            var newMtbAart = newMtbAartList.get(0);
+
+            final PickingObjectDTO pickingObjectDTO = new PickingObjectDTO()
+                    .setMtbAart(newMtbAart);
+
+            this.sendOnItemDispatched(
+                    pickingObjectDTO,
+                    pickingObjectDTO.getMtbAart(),
+                    mtbColrToUpdate.getNumCnf(),
+                    mtbColrToUpdate.getQtaCnf(),
+                    mtbColrToUpdate.getQtaCol(),
+                    newMtbAart.getQtaEsistente(), newMtbAart.getNumCnfEsistente(),
+                    newMtbAart.getQtaImpegnata(), newMtbAart.getNumCnfImpegnata(),
+                    null,
+                    null,
+                    null,
+                    mtbColrToUpdate.getPartitaMag(),
+                    mtbColrToUpdate.getDataScadPartitaD(),
+                    false,
+                    false,
+                    true,
+                    (pickedQuantityDTO, shouldCloseLU) -> {
+
+                        this.saveEditedRow(mtbColrToUpdate,
+                                pickedQuantityDTO.getNumCnf(),
+                                pickedQuantityDTO.getQtaCnf(),
+                                pickedQuantityDTO.getQtaTot(),
+                                pickedQuantityDTO.getPartitaMag(),
+                                pickedQuantityDTO.getDataScad(),
+                                shouldCloseLU);
+                    });
+        }, this::sendError);
 
-                    this.saveEditedRow(mtbColrToUpdate,
-                            pickedQuantityDTO.getNumCnf(),
-                            pickedQuantityDTO.getQtaCnf(),
-                            pickedQuantityDTO.getQtaTot(),
-                            pickedQuantityDTO.getPartitaMag(),
-                            pickedQuantityDTO.getDataScad(),
-                            shouldCloseLU);
-                });
     }
 
     private void saveEditedRow(MtbColr mtbColrToUpdate, BigDecimal numCnf, BigDecimal qtaCnf, BigDecimal qtaTot, String partitaMag, Date dataScad, boolean shouldCloseLU) {
@@ -670,8 +696,8 @@ public class RettificaGiacenzeViewModel {
     }
 
 
-    private void sendOnArtListLoaded(ArrayList<MtbAart> artList) {
-        if (this.mListener != null) mListener.onArtListLoaded(artList);
+    private void sendOnArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed) {
+        if (this.mListener != null) mListener.onArtListLoaded(artList, onArtChoosed);
     }
 
     private void sendOnLUOpenRequest(RunnableArgss<MtbColt, Boolean> onComplete) {
@@ -699,6 +725,10 @@ public class RettificaGiacenzeViewModel {
                                       BigDecimal initialNumCnf,
                                       BigDecimal initialQtaCnf,
                                       BigDecimal initialQtaTot,
+                                      BigDecimal totalQtaInWarehouse,
+                                      BigDecimal totalNumCnfInWarehouse,
+                                      BigDecimal totalQtaCommitted,
+                                      BigDecimal totalNumCnfCommitted,
                                       BigDecimal totalQtaToBeTaken,
                                       BigDecimal totalNumCnfToBeTaken,
                                       BigDecimal qtaCnfToBeTaken,
@@ -713,6 +743,10 @@ public class RettificaGiacenzeViewModel {
                 initialNumCnf,
                 initialQtaCnf,
                 initialQtaTot,
+                totalQtaInWarehouse,
+                totalNumCnfInWarehouse,
+                totalQtaCommitted,
+                totalNumCnfCommitted,
                 totalQtaToBeTaken,
                 totalNumCnfToBeTaken,
                 qtaCnfToBeTaken,
@@ -751,7 +785,7 @@ public class RettificaGiacenzeViewModel {
 
         void onFornitoriLoaded(ArrayList<FornitoreDTO> fornitoriList);
 
-        void onArtListLoaded(ArrayList<MtbAart> artList);
+        void onArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed);
 
         void onLUOpenRequest(RunnableArgss<MtbColt, Boolean> onComplete);
 
@@ -768,6 +802,10 @@ public class RettificaGiacenzeViewModel {
                               BigDecimal initialNumCnf,
                               BigDecimal initialQtaCnf,
                               BigDecimal initialQtaTot,
+                              BigDecimal totalQtaInWarehouse,
+                              BigDecimal totalNumCnfInWarehouse,
+                              BigDecimal totalQtaCommitted,
+                              BigDecimal totalNumCnfCommitted,
                               BigDecimal totalQtaToBeTaken,
                               BigDecimal totalNumCnfToBeTaken,
                               BigDecimal qtaCnfToBeTaken,

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/rest/RettificaGiacenzeRESTConsumer.java

@@ -12,6 +12,7 @@ import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbAartWithFornitore;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.FornitoreDTO;
 
@@ -41,7 +42,7 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
                 " WHERE mtb_lisa.cod_alis = " + UtilityDB.valueToString(codAlis) +
                 " AND mtb_lisa.cod_mart = mtb_aart.cod_mart " +
                 " AND mtb_lisa.cod_mart = mtb_part.cod_mart " +
-                " AND mtb_part.cod_mdep = '01' " +
+                " AND mtb_part.cod_mdep = '" + SettingsManager.i().getUserSession().getDepo().getCodMdep() + "' " +
                 " AND (mtb_aart.descrizione_estesa LIKE '%" + codArtForOrDescr + "%' OR cod_art_for LIKE '%" + codArtForOrDescr + "%') " +
                 " ORDER BY ABS(mtb_part.qta_esistente) DESC, mtb_aart.descrizione_estesa";
 
@@ -55,13 +56,19 @@ public class RettificaGiacenzeRESTConsumer extends _BaseRESTConsumer {
 
 
     public void searchArtInt(String codMartOrBarcodeOrDescr, RunnableArgs<ArrayList<MtbAart>> onComplete, RunnableArgs<Exception> onFailed) {
-        String sql = "SELECT DISTINCT mtb_aart.* " +
-                "FROM mtb_aart " +
-                "LEFT OUTER JOIN mvw_barcode on mtb_aart.cod_mart = mvw_barcode.cod_mart " +
-                "WHERE CASE" +
+        String sql = "SELECT DISTINCT mtb_aart.*," +
+                "                       qta_esistente, " +
+                "                       qta_imp_cli + qta_imp_lav AS qta_impegnata, " +
+                "                       num_esistente             AS num_cnf_esistente, " +
+                "                       num_imp_cli + num_imp_lav AS num_cnf_impegnata " +
+                " FROM mtb_aart " +
+                "   LEFT OUTER JOIN mvw_barcode on mtb_aart.cod_mart = mvw_barcode.cod_mart " +
+                "   LEFT OUTER JOIN mtb_part mp on mtb_aart.cod_mart = mp.cod_mart " +
+                "                                   AND mp.cod_mdep = '" + SettingsManager.i().getUserSession().getDepo().getCodMdep() + "'" +
+                " WHERE CASE" +
                 "       WHEN LEN(mvw_barcode.cod_barre) > 13 THEN mvw_barcode.cod_barre " +
                 "       ELSE Replicate('0', 13 - len(mvw_barcode.cod_barre))+ mvw_barcode.cod_barre " +
-                "END  LIKE '%' +  CASE " +
+                " END  LIKE '%' +  CASE " +
                 "                   WHEN LEN('" + codMartOrBarcodeOrDescr + "') > 13 THEN '" + codMartOrBarcodeOrDescr + "' " +
                 "                   ELSE Replicate('0', 13 - len('" + codMartOrBarcodeOrDescr + "')) + '" + codMartOrBarcodeOrDescr + "'" +
                 "                 END " +

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

@@ -72,13 +72,14 @@ import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPosi
 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.DialogChooseArtFromListaArts;
 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,25 +797,26 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     }
 
     @Override
-    public void onItemDispatched(PickingObjectDTO pickingObjectDTO,
-                                 MtbAart mtbAart,
-                                 BigDecimal initialNumCnf,
-                                 BigDecimal initialQtaCnf,
-                                 BigDecimal initialQtaTot,
-                                 BigDecimal totalQtaOrd,
-                                 BigDecimal totalNumCnfOrd,
-                                 BigDecimal qtaCnfOrd,
-                                 BigDecimal totalQtaToBeTaken,
-                                 BigDecimal totalNumCnfToBeTaken,
-                                 BigDecimal qtaCnfToBeTaken,
-                                 BigDecimal totalQtaAvailable,
-                                 BigDecimal totalNumCnfAvailable,
-                                 BigDecimal qtaCnfAvailable,
-                                 String partitaMag,
-                                 Date dataScad,
-                                 boolean canOverflowOrderQuantity,
-                                 boolean canPartitaMagBeChanged,
-                                 RunnableArgss<PickedQuantityDTO, Boolean> onComplete) {
+    public void onFullItemDispatched(PickingObjectDTO pickingObjectDTO,
+                                     MtbAart mtbAart,
+                                     BigDecimal initialNumCnf,
+                                     BigDecimal initialQtaCnf,
+                                     BigDecimal initialQtaTot,
+                                     BigDecimal totalQtaOrd,
+                                     BigDecimal totalNumCnfOrd,
+                                     BigDecimal qtaCnfOrd,
+                                     BigDecimal totalQtaToBeTaken,
+                                     BigDecimal totalNumCnfToBeTaken,
+                                     BigDecimal qtaCnfToBeTaken,
+                                     BigDecimal totalQtaAvailable,
+                                     BigDecimal totalNumCnfAvailable,
+                                     BigDecimal qtaCnfAvailable,
+                                     String partitaMag,
+                                     Date dataScad,
+                                     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,7 +862,7 @@ 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) -> {
@@ -850,7 +878,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                     onComplete.run(false, null);
                     break;
             }
-        }).show();
+        }).show(getSupportFragmentManager(), "tag");
     }
 
     public void askShouldPrintPackingList(PrintOrderCloseDTO printOrderCloseDTO, RunnableArgs<PrintOrderCloseDTO> onComplete) {
@@ -899,6 +927,18 @@ 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) {
+        DialogChooseArtFromListaArts.make(this, artsList, onComplete).show();
+    }
+
     @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/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,51 @@ 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
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_progress, container, false);
-
-        setCancelable(false);
-        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-
-        mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireActivity().getString(R.string.loading) : title);
-
-        mBindings.setSubtitle(subtitle);
-        mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
-
-        if(!isIndeterminateProgress()){
-            mBindings.progressBar.setMax(100);
-        }
-
-        return mBindings.getRoot();
+    public DialogProgressView(String title, String subtitle, boolean indeterminate) {
+        this.setTitle(title);
+        this.setSubtitle(subtitle);
+        this.setIndeterminateProgress(indeterminate);
     }
 
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        mBindings = DialogProgressBinding.inflate(LayoutInflater.from(requireContext()));
+
+        mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireContext().getString(R.string.loading) : title);
+        if (!UtilityString.isNullOrEmpty(subtitle)) mBindings.setSubtitle(subtitle);
+
+        mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
+        if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
+
+        return new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false)
+                .create();
+    }
+
+    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 +82,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/base/DialogSimpleInputHelper.java

@@ -1,68 +1,115 @@
 package it.integry.integrywmsnative.view.dialogs.base;
 
-import android.app.Dialog;
 import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
 import android.text.InputType;
 import android.view.LayoutInflater;
 
-import androidx.databinding.DataBindingUtil;
+import androidx.annotation.NonNull;
+import androidx.databinding.ObservableField;
+
+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.UtilityDialog;
 import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding;
+import it.integry.integrywmsnative.databinding.DialogInputGeneralContentBinding;
 
 /**
  * Created by GiuseppeS on 22/03/2018.
  */
 
-public class DialogSimpleInputHelper {
+public class DialogSimpleInputHelper extends MaterialAlertDialogBuilder {
 
 
-    private static Dialog makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
-        Dialog dialog = new Dialog(mContext);
-        DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog);
+    public final ObservableField<String> inputValue = new ObservableField<>();
 
+    public DialogSimpleInputHelper(@NonNull Context context, String titleText, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
+        super(context);
 
-        DialogInputGeneralBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_input_general, null, false);
-        viewModel
-                .setOnPositive(() -> {
+        var dialogBindings = DialogInputGeneralContentBinding.inflate(LayoutInflater.from(context));
+        dialogBindings.setView(this);
 
-                    onPositiveClick.run(mBinding.generalInput.getText().toString());
-                })
-                .setOnNegative(onNegativeClick);
+        dialogBindings.executePendingBindings();
 
-        mBinding.setViewmodel(viewModel);
-
-        //Title VIEW
-
-        mBinding.titleText.setText(titleText);
+        this.setTitle(titleText);
+//        this.setMessage("Inserisci la nuova quantità residua dell'ordine");
+        this.setView(dialogBindings.getRoot());
+        this.setCancelable(true);
 
         if (!UtilityString.isNullOrEmpty(hintText)) {
-            mBinding.generalInput.setHint(hintText);
+            dialogBindings.generalInputText.setHint(hintText);
         }
 
         if (!UtilityString.isNullOrEmpty(defaultTextValue)) {
-            mBinding.generalInput.setText(defaultTextValue);
+            dialogBindings.generalInputText.setText(defaultTextValue);
         }
         if (inputType != null) {
-            mBinding.generalInput.setInputType(InputType.TYPE_CLASS_NUMBER);
+            dialogBindings.generalInputText.setInputType(InputType.TYPE_CLASS_NUMBER);
         }
-        //Content View
-        dialog.setCancelable(true);
-        dialog.setCanceledOnTouchOutside(false);
-        dialog.setContentView(mBinding.getRoot());
-        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        UtilityDialog.setTo90PercentWidth(mContext, dialog);
 
-        return dialog;
+        this.setPositiveButton("Ok", (dialog, which) -> {
+            if(onPositiveClick != null) onPositiveClick.run(this.inputValue.get());
+        });
+
+        this.setNegativeButton("Annulla", (dialog, which) -> {
+            if(onNegativeClick != null) onNegativeClick.run();
+        });
+
+
     }
 
 
-    public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick) {
+    private static DialogSimpleInputHelper makeBase(Context mContext, String titleText, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
+        DialogSimpleInputHelper dialogSimpleInputHelper = new DialogSimpleInputHelper(
+                mContext,
+                titleText,
+                defaultTextValue,
+                hintText,
+                onPositiveClick,
+                onNegativeClick,
+                inputType
+        );
+
+        return dialogSimpleInputHelper;
+
+        //        Dialog dialog = new Dialog(mContext);
+//        DialogSimpleInputViewModel viewModel = new DialogSimpleInputViewModel(dialog);
+//
+//
+//        DialogInputGeneralBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_input_general, null, false);
+//        viewModel
+//                .setOnPositive(() -> {
+//
+//                    onPositiveClick.run(mBinding.generalInput.getText().toString());
+//                })
+//                .setOnNegative(onNegativeClick);
+//
+//        mBinding.setViewmodel(viewModel);
+//
+//        //Title VIEW
+//        mBinding.titleText.setText(titleText);
+//
+//        if (!UtilityString.isNullOrEmpty(hintText)) {
+//            mBinding.generalInput.setHint(hintText);
+//        }
+//
+//        if (!UtilityString.isNullOrEmpty(defaultTextValue)) {
+//            mBinding.generalInput.setText(defaultTextValue);
+//        }
+//        if (inputType != null) {
+//            mBinding.generalInput.setInputType(InputType.TYPE_CLASS_NUMBER);
+//        }
+//        //Content View
+//        dialog.setCancelable(true);
+//        dialog.setCanceledOnTouchOutside(false);
+//        dialog.setContentView(mBinding.getRoot());
+//        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+//        UtilityDialog.setTo90PercentWidth(mContext, dialog);
+//
+//        return dialog;
+    }
+
+
+    public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick) {
 
         return makeBase(mContext,
                 title,
@@ -75,7 +122,7 @@ public class DialogSimpleInputHelper {
     }
 
 
-    public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick) {
+    public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick) {
 
         return makeBase(mContext,
                 title,
@@ -87,7 +134,7 @@ public class DialogSimpleInputHelper {
 
     }
 
-    public static Dialog makeInputDialog(Context mContext, String title, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
+    public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
 
         return makeBase(mContext,
                 title,
@@ -100,7 +147,7 @@ public class DialogSimpleInputHelper {
     }
 
 
-    public static Dialog makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
+    public static DialogSimpleInputHelper makeInputDialog(Context mContext, String title, String defaultTextValue, String hintText, RunnableArgs<String> onPositiveClick, Runnable onNegativeClick, Integer inputType) {
 
         return makeBase(mContext,
                 title,

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) -> {
+                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,15 +181,15 @@ 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();
     }
 
 
@@ -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_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();

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 {
@@ -19,6 +20,11 @@ public class DialogInputQuantityV2DTO {
     private BigDecimal totalNumCnfOrd;
     private BigDecimal qtaCnfOrd;
 
+    private BigDecimal totalQtaInWarehouse;
+    private BigDecimal totalNumCnfInWarehouse;
+    private BigDecimal totalQtaCommitted;
+    private BigDecimal totalNumCnfCommitted;
+
     private BigDecimal totalQtaToBeTaken;
     private BigDecimal totalNumCnfToBeTaken;
     private BigDecimal qtaCnfToBeTaken;
@@ -35,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;
@@ -106,6 +115,42 @@ public class DialogInputQuantityV2DTO {
         return this;
     }
 
+    public BigDecimal getTotalQtaInWarehouse() {
+        return totalQtaInWarehouse;
+    }
+
+    public DialogInputQuantityV2DTO setTotalQtaInWarehouse(BigDecimal totalQtaInWarehouse) {
+        this.totalQtaInWarehouse = totalQtaInWarehouse;
+        return this;
+    }
+
+    public BigDecimal getTotalNumCnfInWarehouse() {
+        return totalNumCnfInWarehouse;
+    }
+
+    public DialogInputQuantityV2DTO setTotalNumCnfInWarehouse(BigDecimal totalNumCnfInWarehouse) {
+        this.totalNumCnfInWarehouse = totalNumCnfInWarehouse;
+        return this;
+    }
+
+    public BigDecimal getTotalQtaCommitted() {
+        return totalQtaCommitted;
+    }
+
+    public DialogInputQuantityV2DTO setTotalQtaCommitted(BigDecimal totalQtaCommitted) {
+        this.totalQtaCommitted = totalQtaCommitted;
+        return this;
+    }
+
+    public BigDecimal getTotalNumCnfCommitted() {
+        return totalNumCnfCommitted;
+    }
+
+    public DialogInputQuantityV2DTO setTotalNumCnfCommitted(BigDecimal totalNumCnfCommitted) {
+        this.totalNumCnfCommitted = totalNumCnfCommitted;
+        return this;
+    }
+
     public BigDecimal getTotalQtaToBeTaken() {
         return UtilityBigDecimal.round(totalQtaToBeTaken);
     }
@@ -276,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,7 +1,6 @@
 package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.os.Handler;
@@ -16,7 +15,6 @@ import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableField;
 import androidx.fragment.app.DialogFragment;
 
@@ -42,6 +40,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;
@@ -83,7 +82,9 @@ 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);
-    private Handler mHandler = new Handler();
+    public ObservableField<Boolean> showProductLotStatus = new ObservableField<>(false);
+
+    private final Handler mHandler = new Handler();
 
     private Context context;
 
@@ -110,6 +111,11 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         return this;
     }
 
+    public DialogInputQuantityV2View() {
+        super();
+//        openInFullScreen();
+    }
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -122,7 +128,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         this.context = getActivity();
 
-        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_v2, container, false);
+        mBindings = DialogInputQuantityV2Binding.inflate(inflater, container, false);
         mBindings.setLifecycleOwner(this);
         mBindings.toolbar.setTitle("Inserimento articolo");
 
@@ -136,6 +142,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 .setInitialNumCnf(mDialogInputQuantityV2DTO.getInitialNumCnf())
                 .setInitialQtaCnf(mDialogInputQuantityV2DTO.getInitialQtaCnf())
                 .setInitialQtaTot(mDialogInputQuantityV2DTO.getInitialQtaTot())
+                .setTotalQtaInWarehouse(mDialogInputQuantityV2DTO.getTotalQtaInWarehouse())
+                .setTotalNumCnfInWarehouse(mDialogInputQuantityV2DTO.getTotalNumCnfInWarehouse())
+                .setTotalQtaCommitted(mDialogInputQuantityV2DTO.getTotalQtaCommitted())
+                .setTotalNumCnfCommitted(mDialogInputQuantityV2DTO.getTotalNumCnfCommitted())
                 .setTotalNumCnfOrd(mDialogInputQuantityV2DTO.getTotalNumCnfOrd())
                 .setTotalQtaOrd(mDialogInputQuantityV2DTO.getTotalQtaOrd())
                 .setQtaCnfOrd(mDialogInputQuantityV2DTO.getQtaCnfOrd())
@@ -155,6 +165,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);
@@ -172,19 +186,49 @@ 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();
+
+        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+        if (mAbort) this.mOnAbort.run();
+    }
+
     private void initBarcode() {
         mBarcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessful(onScanSuccessful)
@@ -213,12 +257,12 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         }
     }
 
-    @Override
-    public void onDismiss(@NonNull DialogInterface dialog) {
-        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
-        if (mAbort) this.mOnAbort.run();
-        super.onDismiss(dialog);
-    }
+//    @Override
+//    public void onDismiss(@NonNull DialogInterface dialog) {
+//        BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
+//        if (mAbort) this.mOnAbort.run();
+//        super.onDismiss(dialog);
+//    }
 
     @Override
     public void onStart() {
@@ -409,6 +453,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/input_quantity_v2/DialogInputQuantityV2ViewModel.java

@@ -45,6 +45,11 @@ public class DialogInputQuantityV2ViewModel {
     public BigDecimal totalNumCnfToBeTaken;
     public BigDecimal qtaCnfToBeTaken;
 
+    public BigDecimal totalQtaInWarehouse;
+    public BigDecimal totalNumCnfInWarehouse;
+    public BigDecimal totalQtaCommitted;
+    public BigDecimal totalNumCnfCommitted;
+
     public BigDecimal totalQtaAvailable;
     public BigDecimal totalNumCnfAvailable;
     public BigDecimal qtaCnfAvailable;
@@ -244,6 +249,26 @@ public class DialogInputQuantityV2ViewModel {
         return this;
     }
 
+    public DialogInputQuantityV2ViewModel setTotalQtaInWarehouse(BigDecimal totalQtaInWarehouse) {
+        this.totalQtaInWarehouse = totalQtaInWarehouse;
+        return this;
+    }
+
+    public DialogInputQuantityV2ViewModel setTotalNumCnfInWarehouse(BigDecimal totalNumCnfInWarehouse) {
+        this.totalNumCnfInWarehouse = totalNumCnfInWarehouse;
+        return this;
+    }
+
+    public DialogInputQuantityV2ViewModel setTotalQtaCommitted(BigDecimal totalQtaCommitted) {
+        this.totalQtaCommitted = totalQtaCommitted;
+        return this;
+    }
+
+    public DialogInputQuantityV2ViewModel setTotalNumCnfCommitted(BigDecimal totalNumCnfCommitted) {
+        this.totalNumCnfCommitted = totalNumCnfCommitted;
+        return this;
+    }
+
     public DialogInputQuantityV2ViewModel setTotalQtaOrd(BigDecimal totalQtaOrd) {
         this.totalQtaOrd = totalQtaOrd;
         return this;

app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/DialogPrintUlSSCCComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.printSsccUl;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogPrintUlSSCCComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogPrintUlSSCCComponent create();
+    }
+
+    void inject(DialogPrintUlSSCCView dialogPrintUlSSCCView);
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/DialogPrintUlSSCCModule.java

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.view.dialogs.printSsccUl;
+
+import dagger.Module;
+
+@Module(subcomponents = DialogPrintUlSSCCComponent.class)
+public class DialogPrintUlSSCCModule {
+
+
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/DialogPrintUlSSCCView.java

@@ -0,0 +1,116 @@
+package it.integry.integrywmsnative.view.dialogs.printSsccUl;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RadioGroup;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import it.integry.integrywmsnative.MainApplication;
+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.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+import it.integry.integrywmsnative.databinding.DialogPrintUlSsccBinding;
+import it.integry.integrywmsnative.view.dialogs.printSsccUl.dto.PrintUlDTO;
+
+public class DialogPrintUlSSCCView extends BaseDialogFragment {
+
+
+    private Context mContext;
+    private DialogPrintUlSsccBinding mBindings;
+    private final PrintUlDTO printUlDTO;
+    private final RunnableArgs<PrintUlDTO> onDialogClose;
+
+
+    public static DialogPrintUlSSCCView newInstance(
+            String codJcom, MtbColt mtbColt,
+            RunnableArgs<PrintUlDTO> onDismiss
+    ) {
+        return new DialogPrintUlSSCCView(codJcom, mtbColt, onDismiss);
+    }
+
+    public DialogPrintUlSSCCView(@NotNull String codJcom, @NotNull MtbColt mtbColt, @NotNull RunnableArgs<PrintUlDTO> onDismiss) {
+        this.onDialogClose = onDismiss;
+
+        this.printUlDTO = new PrintUlDTO()
+                .setMtbColt(mtbColt)
+                .setFlagPrintShipmentLabel(!UtilityString.isNullOrEmpty(codJcom))
+                .setFlagPrintProductionLabel(UtilityString.isNullOrEmpty(codJcom));
+    }
+
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.mContext = getActivity();
+
+        mBindings = DialogPrintUlSsccBinding.inflate(inflater, container, false);
+
+        MainApplication.appComponent
+                .dialogPrintUlSSCCComponent()
+                .create();
+
+        mBindings.setView(this);
+        setCancelable(true);
+        getDialog().setCanceledOnTouchOutside(true);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        return mBindings.getRoot();
+    }
+
+    public void onCheckChange(RadioGroup radioGroup, int id) {
+        this.printUlDTO.setFlagPrintProductionLabel(id == mBindings.printProductionLabel.getId());
+        this.printUlDTO.setFlagPrintShipmentLabel(id == mBindings.printShippingLabel.getId());
+
+    }
+
+    public void onPositiveClick() {
+        this.dismiss();
+    }
+
+    public void onNegativeClick() {
+        this.printUlDTO.setFlagPrintProductionLabel(false);
+        this.printUlDTO.setFlagPrintShipmentLabel(false);
+        this.dismiss();
+    }
+
+    @Override
+    public void onDismiss(@NonNull DialogInterface dialog) {
+        this.onDialogClose.run(this.printUlDTO);
+        super.onDismiss(dialog);
+    }
+
+    @Override
+    public void onCancel(@NonNull DialogInterface dialog) {
+        this.onNegativeClick();
+        super.onCancel(dialog);
+    }
+
+    @Override
+    public void onStart() {
+        if (this.printUlDTO.isFlagPrintShipmentLabel()) {
+            mBindings.printShippingLabel.setChecked(true);
+        } else {
+            mBindings.printProductionLabel.setChecked(true);
+        }
+        super.onStart();
+    }
+
+
+    @Override
+    public void onError(Exception ex) {
+        UtilityExceptions.defaultException(this.mContext, ex);
+        dismiss();
+    }
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/printSsccUl/dto/PrintUlDTO.java

@@ -0,0 +1,37 @@
+package it.integry.integrywmsnative.view.dialogs.printSsccUl.dto;
+
+import it.integry.integrywmsnative.core.model.MtbColt;
+
+public class PrintUlDTO {
+
+    private boolean flagPrintShipmentLabel = false;
+    private boolean flagPrintProductionLabel = false;
+    private MtbColt mtbColt;
+
+    public boolean isFlagPrintShipmentLabel() {
+        return flagPrintShipmentLabel;
+    }
+
+    public PrintUlDTO setFlagPrintShipmentLabel(boolean flagPrintShipmentLabel) {
+        this.flagPrintShipmentLabel = flagPrintShipmentLabel;
+        return this;
+    }
+
+    public boolean isFlagPrintProductionLabel() {
+        return flagPrintProductionLabel;
+    }
+
+    public PrintUlDTO setFlagPrintProductionLabel(boolean flagPrintProductionLabel) {
+        this.flagPrintProductionLabel = flagPrintProductionLabel;
+        return this;
+    }
+
+    public MtbColt getMtbColt() {
+        return mtbColt;
+    }
+
+    public PrintUlDTO setMtbColt(MtbColt mtbColt) {
+        this.mtbColt = mtbColt;
+        return this;
+    }
+}

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);

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

@@ -1,17 +1,15 @@
 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;
 
@@ -29,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 {
 
@@ -39,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();
@@ -72,45 +70,47 @@ 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);
 
-        getDialog().setCanceledOnTouchOutside(false);
-        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
         this.mViewModel.init(mShouldCheckResiduo, mShouldCheckIfExistDoc, mEnableCreation);
 
         mBindings.createNewLuButton.setOnClickListener(v -> {
+            dismiss();
             this.mViewModel.createNewLU();
         });
 
         mBindings.viewBasket.setOnClickListener(v -> {
-            DialogBasketLU.make(getActivity(), mtbColt -> {
+            new DialogBasketLUView(mtbColt -> {
                 onLUOpened(mtbColt, false);
-            }).show();
+            }).show(requireActivity().getSupportFragmentManager(), "tag");
         });
 
-        return mBindings.getRoot();
+        var alertDialog =  new MaterialAlertDialogBuilder(requireContext())
+                .setView(mBindings.getRoot())
+                .setCancelable(false)
+                .create();
+        alertDialog.setCanceledOnTouchOutside(false);
+        return alertDialog;
     }
 
-
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         BarcodeManager.removeCallback(mBarcodeScannerIstanceID);

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/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

@@ -276,6 +276,215 @@
 
                     </RelativeLayout>
 
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:weightSum="1">
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginEnd="2dp"
+                            android:layout_weight="0.5"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/light_blue_100"
+                            android:orientation="vertical"
+                            android:paddingHorizontal="8dp"
+                            android:visibility="@{viewmodel.totalNumCnfInWarehouse != null || viewmodel.totalQtaInWarehouse != null ? View.VISIBLE : View.GONE}">
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/in_warehouse"
+                                android:textColor="@color/gray_600" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfInWarehouse, 1)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="@string/unt_mis_col"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="("
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="0dp"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaInWarehouse, 2)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="2dp"
+                                    android:text="@{viewmodel.mtbAart.untMis}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="0dp"
+                                    android:text=")"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginStart="2dp"
+                            android:layout_weight="0.5"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/light_blue_100"
+                            android:orientation="vertical"
+                            android:paddingHorizontal="8dp"
+                            android:visibility="@{viewmodel.totalNumCnfCommitted != null || viewmodel.totalQtaCommitted != null ? View.VISIBLE : View.GONE}">
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/total_committed"
+                                android:textColor="@color/gray_600" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfCommitted, 1)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="@string/unt_mis_col"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="("
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="0dp"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaCommitted, 2)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="2dp"
+                                    android:text="@{viewmodel.mtbAart.untMis}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="0dp"
+                                    android:text=")"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

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

@@ -81,12 +81,12 @@
                         android:id="@+id/add_extra_items_toolbar"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:padding="5dp"
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:adjustViewBounds="true"
                         android:background="?attr/selectableItemBackground"
                         android:onClick="@{()->viewModel.settings()}"
+                        android:padding="6dp"
                         android:src="@drawable/ic_settings_24dp"
                         android:tint="@color/colorPrimaryGray" />
 

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

@@ -17,262 +17,243 @@
         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"
+
+            <androidx.appcompat.widget.AppCompatImageView
+                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.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/green_300"
-                android:gravity="center_horizontal">
+                android:gravity="center_horizontal"
+                tools:text="Title here" />
 
-                <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>
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/MaterialAlertDialog.Material3.Body.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                tools:text="Description here" />
 
 
             <androidx.appcompat.widget.LinearLayoutCompat
-                android:id="@+id/base_buttons_layout"
+                android:id="@+id/dialog_content_hashmap"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
                 android:orientation="vertical"
-                android:paddingStart="16dp"
-                android:paddingTop="24dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="16dp">
-
-                <TextView
-                    android:id="@+id/title_text"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    tools:text="Title here" />
-
-                <TextView
-                    android:id="@+id/description_text"
-                    style="@style/TextViewMaterial"
-                    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" />
+                android:paddingHorizontal="12dp" />
 
 
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:id="@+id/dialog_content_hashmap"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:orientation="vertical"
-                    android:paddingLeft="12dp"
-                    android:paddingRight="12dp">
+            <!--                <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.appcompat.widget.LinearLayoutCompat>
+            <!--                    <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" />-->
 
 
-                <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.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.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" />
+            <!--                </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}">-->
 
 
-                    <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.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.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.ConstraintLayout>
+            <!--                </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-->
+            <!--                    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" />-->
 
 
-                    <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.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/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="@id/ok_right_buttons_guideline"
-                        app:layout_constraintStart_toStartOf="@id/ok_left_buttons_guideline"
-                        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"-->
+            <!--                        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" />-->
 
 
-                </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/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.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.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.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" />
+            <!--                </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/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" />
+            <!--                    <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" />-->
 
 
-                </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.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.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/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"
+
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="0dp">
+        android:orientation="vertical"
+        android:paddingStart="8dp"
+        android:paddingTop="24dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="16dp">
 
-
-        <LinearLayout
+        <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"
-            android:orientation="vertical"
-            android:paddingTop="24dp"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:paddingBottom="16dp">
+            android:gravity="center_horizontal"
+            android:text="@string/basket" />
 
-            <TextView
-                android:id="@+id/title_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextViewMaterial.Dialog.HeadlineText"
-                android:text="@string/basket"
-                android:gravity="center_horizontal"/>
+        <it.integry.integrywmsnative.ui.DeactivatableViewPager
+            android:id="@+id/viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="16dp"
+            android:animateLayoutChanges="true">
 
-            <it.integry.integrywmsnative.ui.DeactivatableViewPager
-                android:id="@+id/viewpager"
-                android:animateLayoutChanges="true"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-            </it.integry.integrywmsnative.ui.DeactivatableViewPager>
+        </it.integry.integrywmsnative.ui.DeactivatableViewPager>
 
 
-        </LinearLayout>
+    </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
+
+            <androidx.appcompat.widget.AppCompatTextView
                 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:background="@drawable/badge_round_corner"
-                    android:backgroundTint="@color/colorPrimary"
-                    android:textColor="@android:color/white"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
-                    android:paddingLeft="6dp"
-                    android:paddingRight="6dp"
-                    android:textStyle="bold"/>
-
-            </RelativeLayout>
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="12dp"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
+                android:layout_gravity="center"
+                android:paddingLeft="6dp"
+                android:paddingTop="2dp"
+                android:paddingRight="6dp"
+                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" />

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="16dp">
+
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/general_input_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:focusableInTouchMode="false"
+            android:imeOptions="actionDone"
+            android:layout_marginTop="8dp">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/general_input_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:selectAllOnFocus="true"
+                app:binding="@{view.inputValue}" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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

@@ -1,188 +1,157 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
+
     <data>
+
         <import type="android.text.Html" />
+
         <import type="it.integry.integrywmsnative.R" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
         <variable
             name="mContext"
             type="android.content.Context" />
 
         <variable
-            name="viewModel"
-            type="it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPeso.DialogInputPesoViewModel" />
+            name="view"
+            type="it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLuView" />
     </data>
 
-    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical" android:layout_width="match_parent"
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
-        <LinearLayout
+        <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
+
+            <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"
-                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>
+                android:gravity="center_horizontal"
+                android:text="@string/action_insert_weight" />
 
 
-
-            <LinearLayout
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/MaterialAlertDialog.Material3.Body.Text.CenterStacked"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingTop="24dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="24dp">
+                android:layout_marginTop="16dp"
+                android:text="@string/dialog_input_peso_lu_description" />
 
-                <TextView
-                    android:id="@+id/title_text"
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:orientation="vertical">
+
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/input_cod_tcol"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
-                    android:text="@string/action_insert_weight"
-                    android:gravity="center_horizontal"/>
+                    android:hint="@string/lu_type">
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial"
-                    android:text="@string/dialog_input_peso_lu_description"
-                    android:gravity="center"
-                    android:layout_marginTop="16dp" />
-
-
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp">
-
-
-
-
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/input_cod_tcol"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
+                    <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                        android:id="@+id/filled_exposed_dropdown_cod_tcol"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/lu_type">
+                        android:ellipsize="end"
+                        android:imeOptions="actionNext"
+                        android:inputType="textNoSuggestions"
+                        android:nextFocusForward="@id/filled_exposed_dropdown_vettore"
+                        android:singleLine="true"
+                        app:binding="@{view.codTcol}" />
 
-                        <androidx.appcompat.widget.AppCompatAutoCompleteTextView
-                            android:id="@+id/filled_exposed_dropdown_cod_tcol"
+                </com.google.android.material.textfield.TextInputLayout>
+
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/guide_center_1"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:orientation="vertical"
+                        app:layout_constraintGuide_percent="0.49" />
+
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/guide_center_2"
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:orientation="vertical"
+                        app:layout_constraintGuide_percent="0.51" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        app:layout_constraintEnd_toEndOf="@id/guide_center_1"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            style="@style/TextInputEditText.OutlinePrimary"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:inputType="textNoSuggestions"
-                            android:singleLine="true"
-                            android:ellipsize="end"
-                            android:imeOptions="actionNext"
-                            android:nextFocusForward="@id/filled_exposed_dropdown_vettore"
-                            app:binding="@{viewModel.codTcol}"/>
+                            android:hint="@string/gross_weight"
+                            android:inputType="numberDecimal"
+                            app:binding="@{view.grossWeight}" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/TextInputLayout.OutlinePrimary"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="16dp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="@id/guide_center_2"
+                        app:layout_constraintTop_toTopOf="parent">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <androidx.constraintlayout.widget.Guideline
-                            android:id="@+id/guide_center_1"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:orientation="vertical"
-                            app:layout_constraintGuide_percent="0.49"/>
-
-                        <androidx.constraintlayout.widget.Guideline
-                            android:id="@+id/guide_center_2"
-                            android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:orientation="vertical"
-                            app:layout_constraintGuide_percent="0.51"/>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="0dp"
+                        <com.google.android.material.textfield.TextInputEditText
+                            style="@style/TextInputEditText.OutlinePrimary"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintEnd_toEndOf="@id/guide_center_1"
-                            android:layout_marginBottom="16dp"
-                            style="@style/TextInputLayout.OutlinePrimary">
+                            android:hint="@string/net_weight"
+                            android:inputType="numberDecimal"
+                            app:binding="@{view.netWeight}" />
 
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/gross_weight"
-                                android:inputType="numberDecimal"
-                                app:binding="@{viewModel.grossWeight}"
-                                style="@style/TextInputEditText.OutlinePrimary"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-                        </com.google.android.material.textfield.TextInputLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintStart_toStartOf="@id/guide_center_2"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            android:layout_marginBottom="16dp"
-                            style="@style/TextInputLayout.OutlinePrimary">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/net_weight"
-                                android:inputType="numberDecimal"
-                                app:binding="@{viewModel.netWeight}"
-                                style="@style/TextInputEditText.OutlinePrimary"/>
-
-                        </com.google.android.material.textfield.TextInputLayout>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="8dp"
-                        android:gravity="bottom|center_horizontal">
-
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/button_confirm"
-                            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>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
 
     </androidx.cardview.widget.CardView>

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

@@ -29,7 +29,8 @@
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -287,6 +288,214 @@
                     </RelativeLayout>
 
 
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:weightSum="1">
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginEnd="2dp"
+                            android:layout_weight="0.5"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/light_blue_100"
+                            android:orientation="vertical"
+                            android:paddingHorizontal="8dp"
+                            android:visibility="@{viewmodel.totalNumCnfInWarehouse != null || viewmodel.totalQtaInWarehouse != null ? View.VISIBLE : View.GONE}">
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/in_warehouse"
+                                android:textColor="@color/gray_600" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfInWarehouse, 1)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="@string/unt_mis_col"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="("
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="0dp"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaInWarehouse, 2)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="2dp"
+                                    android:text="@{viewmodel.mtbAart.untMis}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="0dp"
+                                    android:text=")"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:layout_marginStart="2dp"
+                            android:layout_weight="0.5"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/light_blue_100"
+                            android:orientation="vertical"
+                            android:paddingHorizontal="8dp"
+                            android:visibility="@{viewmodel.totalNumCnfCommitted != null || viewmodel.totalQtaCommitted != null ? View.VISIBLE : View.GONE}">
+
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="@string/total_committed"
+                                android:textColor="@color/gray_600" />
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfCommitted, 1)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="@string/unt_mis_col"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal">
+
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="4dp"
+                                    android:text="("
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginStart="0dp"
+                                    android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaCommitted, 2)}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="2dp"
+                                    android:text="@{viewmodel.mtbAart.untMis}"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_alignParentEnd="true"
+                                    android:layout_marginStart="0dp"
+                                    android:text=")"
+                                    android:textColor="@color/gray_600"
+                                    android:textStyle="bold" />
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

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

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <variable
+            name="view"
+            type="it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCView" />
+    </data>
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical"
+        app:cardBackgroundColor="@android:color/transparent"
+        app:cardCornerRadius="24dp"
+        app:cardElevation="0dp">
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/base"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:orientation="vertical"
+            app:cardBackgroundColor="@color/light_blue_300"
+            app:cardCornerRadius="24dp"
+            app:cardElevation="0dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                android:background="@drawable/dialog_card_child_bg"
+                android:padding="24dp">
+
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/title_text"
+                    style="@style/TextViewMaterial.Dialog.HeadlineText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:text="@string/action_close_order" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/description_text"
+                    style="@style/TextViewMaterial"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:gravity="left"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/title_text"
+                    android:text="@string/message_print_SSCC_list_on_close_order" />
+
+                <RadioGroup
+                    android:id="@+id/radioGroup"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:onCheckedChanged="@{view::onCheckChange}"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintTop_toBottomOf="@id/description_text">
+
+                    <RadioButton
+                        android:id="@+id/print_shipping_label"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/action_print_shipping_SSCC" />
+
+                    <RadioButton
+                        android:id="@+id/print_production_label"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/action_print_production_SSCC" />
+                </RadioGroup>
+
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buttonPositive"
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{() -> view.onPositiveClick()}"
+                    android:text="@string/confirm"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/radioGroup" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buttonNegative"
+                    style="@style/Button.DangerOutline"
+                    android:layout_marginTop="12dp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:onClick="@{() -> view.onNegativeClick()}"
+                    android:text="@string/abort"
+                    android:layout_marginEnd="12dp"
+                    android:layout_marginStart="12dp"
+                    app:layout_constraintTop_toBottomOf="@id/radioGroup"
+                    app:layout_constraintEnd_toStartOf="@id/buttonPositive"
+
+                    />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </androidx.cardview.widget.CardView>
+    </androidx.cardview.widget.CardView>
+
+</layout>

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

@@ -3,91 +3,60 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-<data>
-    <import type="android.view.View" />
-    <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
 
-    <variable
-        name="title"
-        type="String" />
+    <data>
 
-    <variable
-        name="subtitle"
-        type="String" />
-</data>
-    <androidx.cardview.widget.CardView
-        android:orientation="vertical" android:layout_width="match_parent"
+        <import type="android.view.View" />
+
+        <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
+        <variable
+            name="title"
+            type="String" />
+
+        <variable
+            name="subtitle"
+            type="String" />
+    </data>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="0dp">
+        android:orientation="vertical"
+        android:paddingLeft="24dp"
+        android:paddingTop="24dp"
+        android:paddingRight="24dp">
 
 
-        <LinearLayout
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="24dp"
-            android:paddingLeft="24dp"
-            android:paddingRight="24dp">
+            android:gravity="center_horizontal"
+            android:text="@{title}"
+            tools:text="Loading" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/MaterialAlertDialog.Material3.Body.Text.CenterStacked"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@{subtitle}"
+            android:visibility="@{UtilityString.isNullOrEmpty(subtitle) ? View.GONE : View.VISIBLE}"
+            tools:text="@string/loading" />
 
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/TextViewMaterial.Dialog.HeadlineText"
-                android:text="@{title}"
-                android:gravity="center_horizontal"/>
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="24dp"
+            android:indeterminate="true" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/AppTheme.NewMaterial.Text.Small"
-                android:text="@{subtitle}"
-                tools:text="@string/loading"
-                android:visibility="@{UtilityString.isNullOrEmpty(subtitle) ? View.GONE : View.VISIBLE}"
-                android:gravity="center_horizontal"/>
+    </LinearLayout>
 
 
-            <ProgressBar
-                android:id="@+id/progressBar"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="24dp"
-                android:indeterminate="true"/>
-
-
-
-<!--                <RelativeLayout-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_marginTop="32dp"-->
-<!--                    android:layout_marginBottom="40dp"-->
-<!--                    android:layout_marginStart="40dp"-->
-<!--                    android:layout_marginEnd="40dp"-->
-<!--                    android:paddingStart="4dp"-->
-<!--                    android:paddingEnd="4dp"-->
-<!--                    android:backgroundTint="@color/white_bg_alpha"-->
-<!--                    android:background="@drawable/circular_background">-->
-
-<!--                    <ProgressBar-->
-<!--                        android:id="@+id/progressBar"-->
-<!--                        style="?android:attr/progressBarStyleHorizontal"-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="20dp"-->
-<!--                        android:indeterminate="true"-->
-<!--                        android:layout_marginTop="-5dp"-->
-<!--                        android:layout_marginBottom="-5dp"/>-->
-<!--                </RelativeLayout>-->
-
-
-        </LinearLayout>
-
-
-
-
-    </androidx.cardview.widget.CardView>
-
 </layout>

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

@@ -1,200 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="view"
             type="it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView" />
     </data>
 
-    <androidx.cardview.widget.CardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/base_root"
-        android:orientation="vertical"
+
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        app:cardCornerRadius="12dp"
-        app:cardElevation="0dp">
+        android:orientation="vertical"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="16dp">
 
-        <LinearLayout
+
+        <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"
-            android:orientation="vertical">
+            android:gravity="center_horizontal"
+            android:text="@string/title_open_lu" />
 
-            <RelativeLayout
-                android:id="@+id/title_container"
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
+
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/light_blue_300"
+                android:layout_marginTop="16dp"
+                android:orientation="horizontal"
                 android:gravity="center_horizontal">
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/title_icon"
+
+                <ProgressBar
+                    android:id="@+id/progressBar"
+                    style="?android:attr/progressBarStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/MaterialAlertDialog.Material3.Body.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_error_white_24dp"
-                    android:layout_margin="24dp"/>
-
-            </RelativeLayout>
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="12dp"
+                    android:gravity="center_horizontal"
+                    android:text="Scansiona il codice a barre di una UL" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-            <LinearLayout
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/dialog_scan_or_create_lu__creation_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center_horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:visibility="@{view.creationEnabled}">
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/MaterialAlertDialog.Material3.Body.Text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginVertical="12dp"
+                android:gravity="center_horizontal"
+                android:text="OPPURE"
+                android:textStyle="bold" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/create_new_lu_button"
+                style="@style/Widget.Material3.Button.UnelevatedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/button_create_new_ul" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/dialog_scan_or_create_lu__basket_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingTop="24dp"
-                android:paddingBottom="16dp"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp">
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:gravity="center_horizontal"
+                app:visibility="@{view.basketEnabled}">
 
 
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/MaterialAlertDialog.Material3.Body.Text"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginVertical="12dp"
+                    android:gravity="center_horizontal"
+                    android:text="OPPURE"
+                    android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/title_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        style="@style/TextViewMaterial.Dialog.HeadlineText"
-                        android:text="@string/title_open_lu"
-                        android:gravity="center_horizontal"/>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_marginTop="16dp">
-
-
-                        <ProgressBar
-                            android:id="@+id/progressBar"
-                            style="?android:attr/progressBarStyle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"/>
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textSize="16sp"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginEnd="12dp"
-                            android:layout_gravity="center_vertical"
-                            android:gravity="center_horizontal"
-                            style="@style/TextViewMaterial"
-                            android:text="Scansiona il codice a barre di una UL"/>
-                    </LinearLayout>
-
-
-
-                </LinearLayout>
-
-
-
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/dialog_scan_or_create_lu__creation_layout"
-                    android:layout_width="match_parent"
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/view_basket"
+                    style="@style/Widget.Material3.Button.OutlinedButton.Icon"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:visibility="@{view.creationEnabled}">
+                    android:text="@string/button_view_basket_ul"
+                    app:icon="@drawable/ic_black_shopping_cart"
+                    app:iconSize="24dp" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_horizontal"
-                            android:layout_marginTop="12dp"
-                            android:layout_marginBottom="12dp"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
-                            android:layout_gravity="center_horizontal"
-                            style="@style/TextViewMaterial"
-                            android:text="OPPURE" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/create_new_lu_button"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/Button.PrimaryFull"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp"
-                            android:text="@string/button_create_new_ul"/>
-                    </LinearLayout>
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/dialog_scan_or_create_lu__basket_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:visibility="@{view.basketEnabled}">
-
-
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
-
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_horizontal"
-                            android:layout_marginTop="12dp"
-                            android:layout_marginBottom="12dp"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
-                            android:layout_gravity="center_horizontal"
-                            style="@style/TextViewMaterial"
-                            android:text="OPPURE" />
-
-                        <com.google.android.material.button.MaterialButton
-                            android:id="@+id/view_basket"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/Button.PrimaryOutline"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp"
-                            android:text="@string/button_view_basket_ul"
-                            app:iconSize="24dp"
-                            app:icon="@drawable/ic_black_shopping_cart"/>
-                    </LinearLayout>
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-
-    </androidx.cardview.widget.CardView>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
 </layout>

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

@@ -8,101 +8,42 @@
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
-        <LinearLayout
+
+        <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
+            <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"
-                android:background="@color/green_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>
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="Title here" />
 
 
-
-            <LinearLayout
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingTop="24dp"
-                android:paddingLeft="24dp"
-                android:paddingRight="24dp">
-
-                <TextView
-                    android:id="@+id/title_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial.Dialog.HeadlineText"
-                    android:text="Title here"
-                    android:gravity="center_horizontal"/>
-
-                <TextView
-                    android:id="@+id/description_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/TextViewMaterial"
-                    android:text="Description here"
-                    android:gravity="left"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="16dp" />
+                android:gravity="center_horizontal"
+                android:text="Description here" />
 
 
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp">
-
-                    <androidx.constraintlayout.widget.Guideline
-                        android:id="@+id/center_buttons_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
-                        android:id="@+id/button_no"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        style="@style/Button.PrimaryOutline"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        app:strokeColor="@color/colorPrimary"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
-                        android:text="@string/no"/>
-
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/button_yes"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        style="@style/Button.PrimaryFull"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginRight="8dp"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        android:text="@string/yes"/>
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </LinearLayout>
-
-
-        </LinearLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
 
     </androidx.cardview.widget.CardView>

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

@@ -1,86 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
 
     </data>
 
-    <LinearLayout
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
         android:background="@color/full_white">
 
-        <RelativeLayout
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lines_main_list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:scrollbars="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            tools:itemCount="5"
+            tools:listitem="@layout/fragment_linee_prod_main_list_model" />
 
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lines_main_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scrollbars="vertical"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/lines_list_empty_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.3">
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_top"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.1" />
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/lines_list_empty_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:alpha="0.3">
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.15" />
 
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/guideline_empty_top"
-                    android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline_empty_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.85" />
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="72dp"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    app:layout_constraintGuide_percent="0.1" />
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/ic_playlist_add_check_24dp" />
 
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/guideline_empty_left"
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_constraintGuide_percent="0.15" />
-
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/guideline_empty_right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_constraintGuide_percent="0.85" />
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
-                    android:orientation="vertical"
-                    app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
-                    app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
-                    app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
+                    android:text="@string/nessuna_linea_disponibile"
+                    android:textColor="@android:color/black"
+                    android:textSize="18sp" />
+            </LinearLayout>
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:layout_width="72dp"
-                        android:layout_height="wrap_content"
-                        android:adjustViewBounds="true"
-                        android:src="@drawable/ic_playlist_add_check_24dp" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:text="@string/nessuna_linea_disponibile"
-                        android:textColor="@android:color/black"
-                        android:textSize="18sp" />
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </RelativeLayout>
+    </RelativeLayout>
 
 
-    </LinearLayout>
 </layout>

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

@@ -25,204 +25,200 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true">
 
-        <RelativeLayout
+
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:background="?attr/selectableItemBackground"
-            app:layout_constraintStart_toStartOf="parent"
+            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="0dp">
-
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:padding="10dp"
+                android:weightSum="2">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/mtb_grp_container"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="10dp"
-                    android:weightSum="2">
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/mtb_grp_container"
+                    <RelativeLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                        android:layout_height="wrap_content">
 
-                        <RelativeLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
 
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text.Large"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{listModel.getLabel()}"
+                            android:textColor="@{ContextCompat.getColor(context,listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
+                            android:textSize="16sp"
+                            android:textStyle="bold"
+                            tools:text="L2 - Linea 2"
+                            tools:textColor="@color/green_600" />
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_centerVertical="true"
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@{ContextCompat.getColor(context, listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
+                            android:orientation="horizontal"
+                            android:weightSum="2"
+                            tools:backgroundTint="@color/green_600">
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/image"
+                                android:layout_width="18dp"
+                                android:layout_height="19dp"
+                                android:layout_gravity="center_horizontal"
+                                android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
+                                app:tint="@color/white"
+                                tools:src="@drawable/ic_baseline_play_arrow_24" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Large"
+                                android:id="@+id/peso_lordo_collo"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@{listModel.getLabel()}"
-                                android:textColor="@{ContextCompat.getColor(context,listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
-                                android:textSize="16sp"
+                                android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
+                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:textColor="@android:color/white"
                                 android:textStyle="bold"
-                                tools:text="L2 - Linea 2"
-                                tools:textColor="@color/green_600" />
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_alignParentEnd="true"
-                                android:layout_centerVertical="true"
-                                android:background="@drawable/badge_round_corner"
-                                android:backgroundTint="@{ContextCompat.getColor(context, listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
-                                android:orientation="horizontal"
-                                android:weightSum="2"
-                                tools:backgroundTint="@color/green_600">
-
-                                <androidx.appcompat.widget.AppCompatImageView
-                                    android:id="@+id/image"
-                                    android:layout_width="18dp"
-                                    android:layout_height="19dp"
-                                    android:layout_gravity="center_horizontal"
-                                    android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
-                                    app:tint="@color/white"
-                                    tools:src="@drawable/ic_baseline_play_arrow_24" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:id="@+id/peso_lordo_collo"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                                    android:textColor="@android:color/white"
-                                    android:textStyle="bold"
-                                    tools:text="In lavorazione" />
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        </RelativeLayout>
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/resources_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:visibility="@{listModel.isStarted() ? View.VISIBLE : View.GONE}">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp"
-                            android:text="@string/risorse_impostate"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/resources"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{listModel.getRisorseLabel()}"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp"
-                            android:textStyle="bold"
-                            tools:text="5/25" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/lista_ords_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:visibility="@{listModel.isStarted() &amp;&amp; !UtilityString.isNullOrEmpty(listModel.listaOrd) ? View.VISIBLE : View.GONE}">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp"
-                            android:text="@string/orders_in_progress"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/lista_ords"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{listModel.listaOrd}"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp"
-                            android:textStyle="bold"
-                            tools:text="125|255" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/production_start_cotnainer"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:visibility="@{listModel.isStarted() ? View.VISIBLE : View.GONE}">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp"
-                            android:text="@string/inizio_produzione"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/production_start"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{UtilityDate.formatDate(listModel.datetimeStart, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp"
-                            android:textStyle="bold"
-                            tools:text="05/07/2022 14:00:00" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    <androidx.appcompat.widget.LinearLayoutCompat
-                        android:id="@+id/production_stop_cotnainer"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:visibility="@{listModel.isStarted() ? View.GONE : View.VISIBLE}">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="8dp"
-                            android:text="@string/ultima_produzione"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/production_stop"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{UtilityDate.formatDate(listModel.datetimeEnd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
-                            android:textColor="@android:color/black"
-                            android:textSize="14sp"
-                            android:textStyle="bold"
-                            tools:text="05/07/2022 23:59:59" />
-
-                    </androidx.appcompat.widget.LinearLayoutCompat>
+                                tools:text="In lavorazione" />
+                        </androidx.appcompat.widget.LinearLayoutCompat>
 
+                    </RelativeLayout>
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/resources_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="@{listModel.isStarted() ? View.VISIBLE : View.GONE}">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:text="@string/risorse_impostate"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/resources"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{listModel.getRisorseLabel()}"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:text="5/25" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/lista_ords_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="@{listModel.isStarted() &amp;&amp; !UtilityString.isNullOrEmpty(listModel.listaOrd) ? View.VISIBLE : View.GONE}">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:text="@string/orders_in_progress"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/lista_ords"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{listModel.listaOrd}"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:text="125|255" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/production_start_cotnainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="@{listModel.isStarted() ? View.VISIBLE : View.GONE}">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:text="@string/inizio_produzione"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/production_start"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{UtilityDate.formatDate(listModel.datetimeStart, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:text="05/07/2022 14:00:00" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/production_stop_cotnainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="@{listModel.isStarted() ? View.GONE : View.VISIBLE}">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:text="@string/ultima_produzione"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/production_stop"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{UtilityDate.formatDate(listModel.datetimeEnd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
+                        android:textColor="@android:color/black"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        tools:text="05/07/2022 23:59:59" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
             </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-        </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -3,12 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.google.android.material.card.MaterialCardView
-        style="@style/Widget.MaterialComponents.CardView"
+        style="@style/Widget.Material3.CardView.Elevated"
         android:layout_margin="8dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardBackgroundColor="@android:color/white"
-        app:cardCornerRadius="4dp">
+        app:cardCornerRadius="4dp"
+        app:cardElevation="4dp">
 
 
 
@@ -20,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <ImageView
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/menu_icon"
                 android:layout_width="64sp"
                 android:layout_height="wrap_content"

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

@@ -24,9 +24,10 @@
         android:background="@android:color/white"
         tools:context=".gest.vendita.MainVenditaFragment">
 
-        <RelativeLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <HorizontalScrollView
                 android:id="@+id/filter_chips"
@@ -50,8 +51,7 @@
                 android:id="@+id/vendita_main_list"
                 android:scrollbars="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@id/filter_chips"/>
+                android:layout_height="match_parent"/>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/ordini_vendita_empty_view"
@@ -106,18 +106,17 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </RelativeLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/vendita_main_fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:tint="@android:color/white"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
+            android:layout_margin="16dp"
+            android:contentDescription="Dispatch orders"
             app:srcCompat="@drawable/ic_check_black_24dp"
+            android:onClick="@{() -> view.dispatchOrders()}"
             app:visibility="@{view.fabVisible}"
-            android:onClick="@{() -> view.dispatchOrders()}" />
+            style="?attr/floatingActionButtonPrimaryStyle" />
     </FrameLayout>
 </layout>

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

@@ -17,6 +17,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="2dp"
         android:paddingEnd="4dp"
+        android:paddingVertical="2dp"
         android:orientation="horizontal">
 
 
@@ -24,33 +25,29 @@
         <View
             android:id="@+id/empty_view"
             android:layout_width="8dp"
-            android:layout_height="match_parent"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp" />
+            android:layout_height="match_parent" />
 
-        <RelativeLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/ordine_lavorazione_main_list_group_item_container_root"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
             android:paddingStart="2dp"
             android:paddingEnd="8dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:background="@color/full_white">
 
 
-            <androidx.appcompat.widget.AppCompatCheckBox
+            <CheckBox
                 android:id="@+id/checkbox"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
                 app:checked="@{selected}" />
 
             <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_toEndOf="@id/checkbox">
+                android:layout_alignParentEnd="true">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/right_descrizione"
@@ -96,7 +93,7 @@
                     android:layout_toStartOf="@id/right_sub_descrizione"/>
 
             </RelativeLayout>
-        </RelativeLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 

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

@@ -1,45 +1,32 @@
 <layout>
-    <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.appcompat.widget.LinearLayoutCompat
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/mainOrange"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:paddingStart="12dp"
         xmlns:tools="http://schemas.android.com/tools">
 
 
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/mainOrange"
-                android:paddingStart="12dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="8dp"
-                android:paddingBottom="8dp">
 
                 <CheckBox
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:checked="true"
-                    android:enabled="false" />
+                    android:enabled="false"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/group_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@android:color/white"
-                    android:textStyle="bold"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    style="@style/TextAppearance.Material3.TitleMedium"
                     tools:text="NOME GRUPPO"/>
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
     </androidx.appcompat.widget.LinearLayoutCompat>
 
 </layout>

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

@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:fab="http://schemas.android.com/apk/res-auto">
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
     <data>
-
-        <import type="android.view.View"/>
-
+        <import type="android.view.View" />
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
 
         <variable
             name="view"
             type="it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment" />
-
     </data>
 
-    <androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_width="match_parent"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent">
 
 
-
-
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/picking_libero_main_list"
             android:layout_width="match_parent"
@@ -28,10 +25,9 @@
             android:layout_marginTop="16dp"
             android:layout_marginBottom="92dp"
             android:paddingStart="2dp"
-            android:paddingEnd="2dp">
-
-        </androidx.recyclerview.widget.RecyclerView>
-
+            android:paddingEnd="2dp"
+            tools:itemCount="3"
+            tools:listitem="@layout/lista_picking_libero_list_model" />
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -44,7 +40,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.35"/>
+                app:layout_constraintGuide_percent="0.35" />
 
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/free_picking__suggestion_1__guideline_left"
@@ -63,76 +59,84 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:alpha="0.4"
-                app:visibility="@{view.thereIsntAnOpenedUL}"
-                app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
+                android:orientation="vertical"
                 app:layout_constraintLeft_toRightOf="@id/free_picking__suggestion_1__guideline_left"
-                app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right">
+                app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right"
+                app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
+                app:visibility="@{view.thereIsntAnOpenedUL}">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
-                    android:textSize="18sp"
-                    android:gravity="center_horizontal"
                     android:layout_gravity="center_horizontal"
-                    android:text="@string/free_picking_suggestion_1"/>
+                    android:gravity="center_horizontal"
+                    android:text="@string/free_picking_suggestion_1"
+                    android:textColor="@android:color/black"
+                    android:textSize="18sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:alpha="0.4"
-                app:visibility="@{view.thereIsAnOpenULWithoutRows}"
-                app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
+                android:orientation="vertical"
                 app:layout_constraintLeft_toRightOf="@id/free_picking__suggestion_1__guideline_left"
-                app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right">
+                app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right"
+                app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
+                app:visibility="@{view.thereIsAnOpenULWithoutRows}">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@android:color/black"
-                    android:textSize="18sp"
-                    android:gravity="center_horizontal"
                     android:layout_gravity="center_horizontal"
-                    android:text="@string/free_picking_suggestion_2"/>
+                    android:gravity="center_horizontal"
+                    android:text="@string/free_picking_suggestion_2"
+                    android:textColor="@android:color/black"
+                    android:textSize="18sp" />
             </LinearLayout>
 
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-
-
-
-        <com.github.clans.fab.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:src="@drawable/fab_add"
+            android:layout_margin="16dp"
+            android:contentDescription=""
+            app:srcCompat="@drawable/fab_add"
             android:onClick="@{() -> view.createNewLU()}"
             app:visibility="@{view.thereIsntAnOpenedUL}"
-            fab:fab_colorNormal="@color/colorPrimary"
-            fab:fab_colorPressed="@color/white_pressed"
-            fab:fab_colorRipple="#66FFFFFF"/>
+            style="?attr/floatingActionButtonPrimaryStyle" />
 
-
-
-        <com.github.clans.fab.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:src="@drawable/ic_check_white_24dp"
+            android:layout_margin="16dp"
+            android:contentDescription=""
+            app:srcCompat="@drawable/ic_check_white_24dp"
             android:onClick="@{() -> view.closeLU()}"
             app:visibility="@{view.thereIsAnOpenedUL}"
-            fab:fab_colorNormal="@color/mainGreen"
-            fab:fab_colorPressed="@color/white_pressed"
-            fab:fab_colorRipple="#66FFFFFF"/>
+            style="?attr/floatingActionButtonSecondaryStyle" />
+
+
+
+
+
+<!--        <com.github.clans.fab.FloatingActionButton-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_gravity="bottom|end"-->
+<!--            android:layout_marginEnd="8dp"-->
+<!--            android:layout_marginBottom="8dp"-->
+<!--            android:onClick="@{() -> view.closeLU()}"-->
+<!--            android:src="@drawable/ic_check_white_24dp"-->
+<!--            app:visibility="@{view.thereIsAnOpenedUL}"-->
+<!--            fab:fab_colorNormal="@color/mainGreen"-->
+<!--            fab:fab_colorPressed="@color/white_pressed"-->
+<!--            fab:fab_colorRipple="#66FFFFFF" />-->
 
 
         <View
@@ -140,9 +144,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="#99000000"
-            android:visibility="gone"
             android:clickable="true"
-            android:focusable="true" />
+            android:focusable="true"
+            android:visibility="gone" />
 
         <it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView
             android:id="@+id/bottom_sheet__mtb_colr_edit"

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

@@ -22,7 +22,9 @@
             android:background="@android:color/white"
             android:id="@+id/prod_recupero_materiale_main_list"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            tools:listitem="@layout/prod_recupero_materiale_list_item"/>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/empty_view"
@@ -54,25 +56,25 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
                 android:gravity="center_horizontal"
-                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
+                android:orientation="vertical"
                 app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
+                app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
                 app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="72dp"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_playlist_add_check_24dp"
-                    android:adjustViewBounds="true"/>
+                    android:adjustViewBounds="true"
+                    android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
+                    android:text="@string/no_item_in_recupera_materiale"
                     android:textColor="@android:color/black"
-                    android:textSize="18sp"
-                    android:text="@string/no_item_in_recupera_materiale"/>
+                    android:textSize="18sp" />
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -91,20 +91,20 @@
                 android:orientation="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHeight_max="300dp"
+                app:layout_constraintHeight_max="280dp"
                 app:layout_constraintHeight_min="200dp"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:listitem="@layout/layout_filter_gruppo_merc__list_item" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/save_btn"
-            style="@style/Button.PrimaryFull"
+            style="@style/Widget.Material3.Button.UnelevatedButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginHorizontal="16dp"
             android:layout_marginBottom="8dp"
             android:text="@string/confirm"
             app:singleClick="@{() -> view.onConfirm()}" />