Finish v1.23.8(263)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 261
+    def appVersionCode = 263
-    def appVersionName = '1.23.6'
+    def appVersionName = '1.23.8'
 
     signingConfigs {
         release {

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

@@ -65,6 +65,8 @@ import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviForn
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreModule;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceComponent;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceModule;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsComponent;
 import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArtsModule;
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
@@ -119,7 +121,8 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         DocInterniModule.class,
         DialogSelectDocInfoModule.class,
         DocInterniEditFormModule.class,
-        DialogSelectDocRowsModule.class
+        DialogSelectDocRowsModule.class,
+        DialogAskClienteModule.class
 })
 public interface MainApplicationComponent {
 
@@ -161,6 +164,8 @@ public interface MainApplicationComponent {
 
     OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
 
+    DialogAskClienteComponent.Factory dialogAskClienteComponent();
+
     DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
 
     DialogInputLUProdComponent.Factory dialogInputLUProdComponent();

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

@@ -31,6 +31,7 @@ import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
 import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
 @Module
 public class MainApplicationModule {
@@ -85,6 +86,12 @@ public class MainApplicationModule {
         return DialogProgressView.newInstance();
     }
 
+    @Provides
+    @Singleton
+    DialogInputQuantityV2View providesDialogInputQuantityV2View() {
+        return new DialogInputQuantityV2View();
+    }
+
     @Provides
     @Singleton
     OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {

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

@@ -41,6 +41,7 @@ public class DBSettingsModel {
     private String produzioneDefaultCodAnag;
     private String reportNameSpedizionChiudiOrdine;
     private int onNumCnfInputChanged = 1;
+    private boolean flagAccettazioneUseQtaOrd = false;
 
     public boolean isFlagSpedizioneEnableFakeGiacenza() {
         return flagSpedizioneEnableFakeGiacenza;
@@ -302,4 +303,13 @@ public class DBSettingsModel {
         this.docInterniCheckFornitore = docInterniCheckFornitore;
         return this;
     }
+
+    public boolean isFlagAccettazioneUseQtaOrd() {
+        return flagAccettazioneUseQtaOrd;
+    }
+
+    public DBSettingsModel setFlagAccettazioneUseQtaOrd(boolean flagAccettazioneUseQtaOrd) {
+        this.flagAccettazioneUseQtaOrd = flagAccettazioneUseQtaOrd;
+        return this;
+    }
 }

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

@@ -278,6 +278,10 @@ public class SettingsManager {
                 .setGestName("PVM")
                 .setSection("DOC_INTERNI")
                 .setKeySection("CHECK_FORNITORE"));
+        stbGestSetupList.add(new StbGestSetup()
+                .setGestName("PICKING")
+                .setSection("ACCETTAZIONE")
+                .setKeySection("FLAG_USE_QTA_ORD"));
 
 
         GestSetupRESTConsumer.getValues(stbGestSetupList, list -> {
@@ -304,6 +308,7 @@ public class SettingsManager {
             dbSettingsModelIstance.setFlagSpedizioneUseQtaOrd(getValueFromList(list, "SPEDIZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
             dbSettingsModelIstance.setFlagOrdinaNuoviArticoliInGriglia(getValueFromList(list, "ORDINI_A", "ORDINA_NUOVI_ARTICOLI", Boolean.class));
             dbSettingsModelIstance.setDocInterniCheckFornitore(getValueFromList(list, "DOC_INTERNI", "CHECK_FORNITORE", String.class));
+            dbSettingsModelIstance.setFlagAccettazioneUseQtaOrd(getValueFromList(list, "ACCETTAZIONE", "FLAG_USE_QTA_ORD", Boolean.class));
 
             String notePerdita = getValueFromList(list, "DOC_INTERNI", "NOTE_PERDITA", String.class);
             if (notePerdita != null) {

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

@@ -85,6 +85,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     @Inject
     AccettazionePickingViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private final AccettazionePickingFiltroOrdineViewModel mAppliedFilterViewModel = new AccettazionePickingFiltroOrdineViewModel();
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
@@ -141,9 +144,14 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
         this.initFilters();
 
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
+        boolean useQtaOrd = SettingsManager.iDB().isFlagAccettazioneUseQtaOrd();
 
         mViewModel.setListeners(this);
-        mViewModel.init(mOrders, mSitArts, codMdep);
+        mViewModel.init(
+                mOrders,
+                mSitArts,
+                codMdep,
+                useQtaOrd);
     }
 
     private void initFilters() {
@@ -833,8 +841,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                 .setCanLUBeClosed(true)
                 .setCanOverflowOrderQuantity(canOverflowQuantity);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -842,9 +851,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                             .setPartitaMag(resultDTO.getPartitaMag())
                             .setDataScad(resultDTO.getDataScad());
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
-                    this.mViewModel.resetMatchedRows();
                 })
+                .setOnAbort(() -> this.mViewModel.resetMatchedRows())
                 .show(getSupportFragmentManager(), "tag");
     }
 

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

@@ -73,6 +73,7 @@ public class AccettazionePickingViewModel {
 
     private List<OrdineAccettazioneInevasoDTO> mOrders;
     private List<SitArtOrdDTO> mSitArts;
+    private boolean mUseQtaOrd;
     private final MutableLiveData<List<PickingObjectDTO>> mPickingList = new MutableLiveData<>();
 
     private MtbColt mCurrentMtbColt = null;
@@ -97,9 +98,10 @@ public class AccettazionePickingViewModel {
     }
 
 
-    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep) {
+    public void init(List<OrdineAccettazioneInevasoDTO> orders, List<SitArtOrdDTO> sitArts, String codMdep, boolean useQtaOrd) {
         this.mOrders = orders;
         this.mDefaultCodMdep = codMdep;
+        this.mUseQtaOrd = useQtaOrd;
 
         this.mSitArts = Stream.of(sitArts)
                 .filter(x -> UtilityBigDecimal.greaterThan(x.getNumCnfDaEvadere(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO))
@@ -536,7 +538,9 @@ public class AccettazionePickingViewModel {
             initialQtaTot = totalQtaOrd;
         }
 
-        if (UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) && UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
+        if (!this.mUseQtaOrd &&
+                UtilityBigDecimal.greaterThan(pickingObjectDTO.getMtbAart().getColliPedana(), BigDecimal.ZERO) &&
+                UtilityBigDecimal.greaterThan(initialNumCnf, pickingObjectDTO.getMtbAart().getColliPedana())) {
             initialNumCnf = pickingObjectDTO.getMtbAart().getColliPedana();
             initialQtaTot = initialNumCnf.multiply(initialQtaCnf);
         }

app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormActivity.java

@@ -55,9 +55,13 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
 
     @Inject
     MtbColrRepository documentRowsRepository;
+
     @Inject
     DocInterniEditFormViewModel viewModel;
 
+    @Inject
+    DialogInputQuantityV2View dialogInputQuantityV2View;
+
 
     private int mBarcodeScannerIstanceID;
     private ActivityContabDocInterniEditBinding binding;
@@ -245,11 +249,12 @@ public class DocInterniEditFormActivity extends BaseActivity implements DocInter
                     }
                     return partitaMag;
                 });
-        DialogInputQuantityV2View
+        dialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     this.onLoadingStarted();
                     this.viewModel.saveRow(row, resultDTO);
-                }, this::onLoadingEnded)
+                })
+                .setOnAbort(this::onLoadingEnded)
                 .show(getSupportFragmentManager(), "tag");
     }
 

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

@@ -69,6 +69,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
     @Inject
     PickingLiberoViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     public BindableBoolean thereIsAnOpenedUL = new BindableBoolean(false);
     public BindableBoolean thereIsntAnOpenedUL = new BindableBoolean(true);
     public BindableBoolean thereIsAnyRowInUL = new BindableBoolean(false);
@@ -334,8 +337,8 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(canLUBeClosed);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -345,15 +348,14 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
 
                     this.openProgress();
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
-                    this.closeProgress();
                 })
-                .show(getActivity().getSupportFragmentManager(), "tag");
+                .setOnAbort(this::closeProgress)
+                .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onRowSaved() {
-        getActivity().runOnUiThread(() -> {
+        requireActivity().runOnUiThread(() -> {
             FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
         });
     }

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

@@ -64,6 +64,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
     @Inject
     PickingResiViewModel mViewmodel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
     private ObservableArrayList<PickingResiListModel> mPickingResiMutableData = new ObservableArrayList<>();
@@ -319,8 +322,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
                 .setCanLUBeClosed(false)
                 .setCanPartitaMagBeChanged(false);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -330,7 +334,8 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
 
                     this.openProgress();
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
+                })
+                .setOnAbort(() -> {
                     this.mViewmodel.resetMatchedRows();
                 })
                 .show(getSupportFragmentManager(), "tag");

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

@@ -53,6 +53,9 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     @Inject
     ProdRecuperoMaterialeViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private FragmentProdRecuperoMaterialeBinding mBinding;
 
     private int barcodeScannerIstanceID = -1;
@@ -200,8 +203,9 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                 .setCanOverflowOrderQuantity(canOverflowOrderQuantity)
                 .setCanLUBeClosed(canLUBeClosed);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -210,7 +214,8 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                             .setDataScad(resultDTO.getDataScad());
 
                     this.mViewModel.onItemDispatched(item, pickedQuantityDTO, sourceMtbColt);
-                }, this::onLoadingEnded)
+                })
+                .setOnAbort(this::onLoadingEnded)
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java

@@ -70,11 +70,11 @@ public class EditArticoloDialog extends BaseDialogFragment {
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         super.onDismiss(dialog);
-        ArticoloOrdine articolo = mArticolo.getValue();
+        /*ArticoloOrdine articolo = mArticolo.getValue();
         if (articolo != null && articolo.getQtaOrd() <= 0f) {
             articolo = null;
         }
-        onDialogDismiss.run(articolo);
+        onDialogDismiss.run(articolo);*/
     }
 
     @Nullable
@@ -155,17 +155,23 @@ public class EditArticoloDialog extends BaseDialogFragment {
             }
 
             articolo.setQtaOrd(qtaOrd.get().floatValue());
-            mArticolo.postValue(articolo);
+            mArticolo.setValue(articolo);
-
+            mHelper.saveArticoloToOrdine(mArticolo.getValue(), () -> {
+                this.onLoadingEnded();
+                requireActivity().runOnUiThread(() -> {
+                    onDialogDismiss.run(articolo);
+                });
+                this.dismiss();
+            }, e -> {
+                mContext.runOnUiThread(() -> UtilityExceptions.defaultException(mContext, e));
+                this.onLoadingEnded();
+            });
         } catch (Exception e) {
             mContext.runOnUiThread(() -> UtilityExceptions.defaultException(mContext, e));
             this.onLoadingEnded();
             return;
         }
-        mHelper.saveArticoloToOrdine(mArticolo.getValue(), () -> {
+        ;
-            this.onLoadingEnded();
-            this.dismiss();
-        }, e -> mContext.runOnUiThread(() -> UtilityExceptions.defaultException(mContext, e)));
     }
 
     public ArticoloOrdine getArticolo() {
@@ -174,6 +180,9 @@ public class EditArticoloDialog extends BaseDialogFragment {
 
     public void cancel() {
         mArticolo.postValue(null);
+        requireActivity().runOnUiThread(() -> {
+            onDialogDismiss.run(null);
+        });
         this.dismiss();
     }
 }

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

@@ -73,6 +73,9 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     @Inject
     RettificaGiacenzeViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     public BindableBoolean thereIsAnOpenedUL = new BindableBoolean(false);
     public BindableBoolean thereIsntAnOpenedUL = new BindableBoolean(false);
 
@@ -378,8 +381,9 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged)
                 .setCanLUBeClosed(canLUBeClosed);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -389,15 +393,16 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
                     this.openProgress();
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
+                })
+                .setOnAbort(() -> {
                     this.closeProgress();
                 })
-                .show(getActivity().getSupportFragmentManager(), "tag");
+                .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
     @Override
     public void onRowSaved() {
-        FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
+        FBToast.successToast(requireActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
     }
 
 
@@ -450,7 +455,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
                 null,
                 () -> onComplete.run(true),
                 () -> onComplete.run(false))
-                .show(getActivity().getSupportFragmentManager(), "tag");;
+                .show(getActivity().getSupportFragmentManager(), "tag");
+        ;
     }
 
     @Override

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

@@ -83,6 +83,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     @Inject
     SpedizioneViewModel mViewmodel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
     private final ObservableArrayList<SpedizioneListModel> mSpedizioneMutableData = new ObservableArrayList<>();
@@ -821,8 +824,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
                 .setCanLUBeClosed(true)
                 .setCanPartitaMagBeChanged(canPartitaMagBeChanged);
 
-        DialogInputQuantityV2View
+        mDialogInputQuantityV2View
-                .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                .setOnComplete((resultDTO, shouldCloseLU) -> {
                     PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                             .setNumCnf(resultDTO.getNumCnf())
                             .setQtaCnf(resultDTO.getQtaCnf())
@@ -832,7 +836,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
                     this.openProgress();
                     onComplete.run(pickedQuantityDTO, shouldCloseLU);
-                }, () -> {
+                })
+                .setOnAbort(() -> {
                     this.mViewmodel.resetMatchedRows();
                 })
                 .show(getSupportFragmentManager(), "tag");

app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java

@@ -48,6 +48,9 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
     @Inject
     VersamentoMerceViewModel mViewModel;
 
+    @Inject
+    DialogInputQuantityV2View mDialogInputQuantityV2View;
+
     private FragmentMainVersamentoMerceBinding mBindings = null;
 
     private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
@@ -202,9 +205,10 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
                 .setCanPartitaMagBeChanged(canBatchLotBeChanged)
                 .setCanLUBeClosed(false);
 
-        this.getActivity().runOnUiThread(() -> {
+        this.requireActivity().runOnUiThread(() -> {
-            DialogInputQuantityV2View
+            mDialogInputQuantityV2View
-                    .newInstance(dialogInputQuantityV2DTO, (resultDTO, shouldCloseLU) -> {
+                    .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)
+                    .setOnComplete((resultDTO, shouldCloseLU) -> {
 
                         PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO()
                                 .setNumCnf(resultDTO.getNumCnf())
@@ -215,8 +219,9 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
 
                         onComplete.run(pickedQuantityDTO);
 
-                    }, this::onLoadingEnded)
+                    })
-                    .show(getActivity().getSupportFragmentManager(), "tag");
+                    .setOnAbort(this::onLoadingEnded)
+                    .show(requireActivity().getSupportFragmentManager(), "tag");
         });
     }
 

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

@@ -44,7 +44,7 @@ public class DialogProgressView extends DialogFragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_progress, container, false);
 
-        getDialog().setCanceledOnTouchOutside(false);
+        setCancelable(false);
         getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
         mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireActivity().getString(R.string.loading) : title);

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteComponent.java

@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.ask_cliente;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogAskClienteComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogAskClienteComponent create();
+    }
+
+    void inject(DialogAskClienteView dialogAskClienteView);
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteModule.java

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative.view.dialogs.ask_cliente;
+
+import dagger.Module;
+
+@Module(subcomponents = DialogAskClienteComponent.class)
+public class DialogAskClienteModule {
+}

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskClienteView.java

@@ -14,20 +14,32 @@ import androidx.annotation.Nullable;
 import androidx.databinding.DataBindingUtil;
 import androidx.fragment.app.FragmentActivity;
 
+import com.annimon.stream.Stream;
+import com.google.gson.reflect.TypeToken;
+
 import org.jetbrains.annotations.NotNull;
 
+import java.lang.reflect.Type;
 import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.model.VtbDest;
+import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.utility.UtilityDialog;
+import it.integry.integrywmsnative.core.utility.UtilityHashMap;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogAskClienteBinding;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteClienteDTO;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page1ViewModel;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page2ViewModel;
@@ -45,6 +57,12 @@ public class DialogAskClienteView extends BaseDialogFragment {
 
     private boolean mIsClienteSelected = false;
 
+    @Inject
+    SystemRESTConsumer systemRESTConsumer;
+
+    @Inject
+    DialogProgressView dialogProgressView;
+
     public static DialogAskClienteView newInstance(@NotNull RunnableArgss<VtbDest, String> onComplete, @NotNull Runnable onAbort) {
         return new DialogAskClienteView(onComplete, onAbort);
     }
@@ -69,6 +87,11 @@ public class DialogAskClienteView extends BaseDialogFragment {
         getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
         getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
 
+        MainApplication.appComponent
+                .dialogAskClienteComponent()
+                .create()
+                .inject(this);
+
 
         List<Map.Entry<Integer, Class<? extends IDialogAskClienteViewModel>>> views = new ArrayList<>();
         views.add(new AbstractMap.SimpleEntry<>(R.layout.dialog_ask_cliente__page1, DialogAskCliente_Page1ViewModel.class));
@@ -96,8 +119,7 @@ public class DialogAskClienteView extends BaseDialogFragment {
         DialogAskCliente_Page1ViewModel viewModel1 = (DialogAskCliente_Page1ViewModel) mAdapter.getViewModel(R.layout.dialog_ask_cliente__page1);
         DialogAskCliente_Page2ViewModel viewModel2 = (DialogAskCliente_Page2ViewModel) mAdapter.getViewModel(R.layout.dialog_ask_cliente__page2);
 
-        viewModel1
+        viewModel1.setOnConfirmClickListener(() -> {
-                .setOnConfirmClickListener(() -> {
             String codAnag = viewModel1.getCurrentCliente();
 
             if (UtilityString.isNullOrEmpty(codAnag)) {
@@ -110,7 +132,6 @@ public class DialogAskClienteView extends BaseDialogFragment {
 
             mBindings.viewpager.setCurrentItem(mBindings.viewpager.getCurrentItem() + 1, true);
         });
-
         viewModel2.setOnConfirmClickListener(() -> {
             DialogAskClienteDestinatarioDTO cliente = viewModel2.getCurrentDestinatario();
 
@@ -122,9 +143,84 @@ public class DialogAskClienteView extends BaseDialogFragment {
 
         viewModel1.setOnAbortClickListener(this::dismiss);
         viewModel2.setOnAbortClickListener(this::dismiss);
+
+
+        this.dialogProgressView.show(this.getParentFragmentManager(), "tag");
+
+        this.initClienti(viewModel1, () -> {
+            this.initDestinatari(viewModel2, () -> {
+                this.dialogProgressView.dismiss();
+            }, () -> {
+                this.dialogProgressView.dismiss();
+            });
+        }, () -> {
+            this.dialogProgressView.dismiss();
+        });
     }
 
 
+    private void initClienti(DialogAskCliente_Page1ViewModel viewModel, Runnable onComplete, Runnable onAbort) {
+        Type typeOfObjectsList = new TypeToken<ArrayList<HashMap<String, Object>>>() {
+        }.getType();
+
+        String sqlClienti = "SELECT gtb_anag.cod_anag, rag_soc, jtb_comt.cod_jcom " +
+                "FROM gtb_anag " +
+                "LEFT OUTER JOIN jtb_comt ON gtb_anag.cod_anag = jtb_comt.cod_anag " +
+                "INNER JOIN vtb_clie ON gtb_anag.cod_anag = vtb_clie.cod_anag " +
+                "WHERE vtb_clie.flag_stato = 'A' " +
+                "ORDER BY rag_soc";
+
+        this.systemRESTConsumer.<ArrayList<HashMap<String, Object>>>processSql(sqlClienti, typeOfObjectsList, value -> {
+            var availableClienti = new ArrayList<DialogAskClienteClienteDTO>();
+
+            Stream.of(value)
+                    .groupBy(x -> x.get("codAnag").toString() + " " + x.get("ragSoc").toString())
+                    .forEach(x -> {
+                        DialogAskClienteClienteDTO dialogAskClienteClienteDTO = new DialogAskClienteClienteDTO();
+                        dialogAskClienteClienteDTO.setCodAnag(UtilityHashMap.getValueIfExists(x.getValue().get(0), "codAnag"));
+                        dialogAskClienteClienteDTO.setRagSoc(UtilityHashMap.getValueIfExists(x.getValue().get(0), "ragSoc"));
+
+                        for (HashMap<String, Object> group : x.getValue()) {
+                            if (group.containsKey("codJcom")) {
+                                dialogAskClienteClienteDTO.getCodJcoms().add(UtilityHashMap.getValueIfExists(group, "codJcom"));
+                            }
+                        }
+
+                        availableClienti.add(dialogAskClienteClienteDTO);
+                    });
+
+            viewModel.setAvailableClienti(availableClienti);
+            onComplete.run();
+        }, ex -> {
+            onAbort.run();
+        });
+    }
+
+    private void initDestinatari(DialogAskCliente_Page2ViewModel viewModel, Runnable onComplete, Runnable onAbort) {
+        String sql = "SELECT vtb_dest.cod_anag,\n" +
+                "       cod_vdes,\n" +
+                "       destinatario,\n" +
+                "       indirizzo,\n" +
+                "       cap,\n" +
+                "       citta,\n" +
+                "       prov,\n" +
+                "       nazione\n" +
+                "FROM vtb_dest\n" +
+                "INNER JOIN vtb_clie ON vtb_clie.cod_anag = vtb_dest.cod_anag\n" +
+                "WHERE vtb_clie.flag_stato = 'A'";
+
+        Type typeOfObjectsList = new TypeToken<ArrayList<DialogAskClienteDestinatarioDTO>>() {
+        }.getType();
+        this.systemRESTConsumer.<ArrayList<DialogAskClienteDestinatarioDTO>>processSql(sql, typeOfObjectsList, value -> {
+            viewModel.setAvailableDestinatari(value);
+
+            onComplete.run();
+        }, ex -> {
+            onAbort.run();
+        });
+
+    }
+
     @Override
     public void onDismiss(@NonNull DialogInterface dialog) {
         mAdapter.onDismiss();

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java

@@ -10,12 +10,9 @@ import androidx.databinding.ViewDataBinding;
 
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
-import com.google.gson.reflect.TypeToken;
 import com.tfb.fbtoast.FBToast;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
@@ -24,11 +21,8 @@ import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityHashMap;
 import it.integry.integrywmsnative.databinding.DialogAskClientePage1Binding;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteClienteDTO;
 
@@ -46,7 +40,6 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
     private Runnable onAbortClickListener;
 
     public DialogAskCliente_Page1ViewModel() {
-
     }
 
     @Override
@@ -59,53 +52,18 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod
         this.mBinding = (DialogAskClientePage1Binding) binding;
     }
 
+    public void setAvailableClienti(ArrayList<DialogAskClienteClienteDTO> availableClienti) {
+        this.availableClienti = availableClienti;
+        initializeAdapter(availableClienti);
+    }
+
     @Override
     public void onShow() {
 
-        String sql = "SELECT gtb_anag.cod_anag, rag_soc, jtb_comt.cod_jcom " +
-                "FROM gtb_anag " +
-                "LEFT OUTER JOIN jtb_comt ON gtb_anag.cod_anag = jtb_comt.cod_anag " +
-                "INNER JOIN vtb_clie ON gtb_anag.cod_anag = vtb_clie.cod_anag " +
-                "WHERE vtb_clie.flag_stato = 'A' " +
-                "ORDER BY rag_soc";
-
-        Type typeOfObjectsList = new TypeToken<ArrayList<HashMap<String, Object>>>() { }.getType();
-
-        SystemRESTConsumer.processSqlStatic(sql, typeOfObjectsList, new ISimpleOperationCallback<ArrayList<HashMap<String, Object>>>() {
-            @Override
-            public void onSuccess(ArrayList<HashMap<String, Object>> value) {
-
-                availableClienti = new ArrayList<>();
-
-                Stream.of(value)
-                        .groupBy(x -> x.get("codAnag").toString() + " " + x.get("ragSoc").toString())
-                        .forEach(x -> {
-                            DialogAskClienteClienteDTO dialogAskClienteClienteDTO = new DialogAskClienteClienteDTO();
-                            dialogAskClienteClienteDTO.setCodAnag(UtilityHashMap.getValueIfExists(x.getValue().get(0), "codAnag"));
-                            dialogAskClienteClienteDTO.setRagSoc(UtilityHashMap.getValueIfExists(x.getValue().get(0), "ragSoc"));
-
-                            for (HashMap<String, Object> group : x.getValue()) {
-                                if (group.containsKey("codJcom")) {
-                                    dialogAskClienteClienteDTO.getCodJcoms().add(UtilityHashMap.getValueIfExists(group, "codJcom"));
-                                }
-                            }
-
-                            availableClienti.add(dialogAskClienteClienteDTO);
-                        });
-
-                initializeAdapter(availableClienti);
-
         mBarcodeScannerInstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
                 .setOnScanSuccessfull(onScanSuccessful)
                 .setOnScanFailed(ex -> UtilityExceptions.defaultException(mContext, ex, false)));
         BarcodeManager.enable();
-            }
-
-            @Override
-            public void onFailed(Exception ex) {
-
-            }
-        });
 
         this.mBinding.buttonYes.setOnClickListener(v -> {
             if (validateCliente()) {

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2ViewModel.java

@@ -5,29 +5,24 @@ import android.widget.AutoCompleteTextView;
 
 import androidx.databinding.ViewDataBinding;
 
-import com.google.gson.reflect.TypeToken;
+import com.annimon.stream.Stream;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
 import it.integry.integrywmsnative.databinding.DialogAskClientePage2Binding;
 import it.integry.integrywmsnative.view.dialogs.ask_cliente.dto.DialogAskClienteDestinatarioDTO;
 
 public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewModel {
 
-
     private DialogAskClientePage2Binding mBinding;
     private Context mContext;
 
     private Runnable mOnConfirm;
     private Runnable mOnAbort;
 
-    private List<DialogAskClienteDestinatarioDTO> availableDestinatari;
+    private ArrayList<DialogAskClienteDestinatarioDTO> availableDestinatari;
 
     private String mCodAnag;
 
@@ -40,6 +35,10 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
         this.mBinding = (DialogAskClientePage2Binding) binding;
     }
 
+    public void setAvailableDestinatari(ArrayList<DialogAskClienteDestinatarioDTO> availableDestinatari) {
+        this.availableDestinatari = availableDestinatari;
+    }
+
     @Override
     public void setContext(Context context) {
         this.mContext = context;
@@ -47,29 +46,18 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
 
     @Override
     public void onShow() {
-        String sql = "SELECT cod_anag, cod_vdes, destinatario, indirizzo, cap, citta, prov, nazione " +
+        var filteredDestinatari = availableDestinatari != null ? Stream.of(availableDestinatari)
-                "FROM vtb_dest " +
+                .filter(x -> x.getCodAnag().equalsIgnoreCase(mCodAnag))
-                "WHERE cod_anag = " + UtilityDB.valueToString(mCodAnag);
+                .toList()
+                : null;
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<DialogAskClienteDestinatarioDTO>>() {
-        }.getType();
-        SystemRESTConsumer.processSqlStatic(sql, typeOfObjectsList, new ISimpleOperationCallback<ArrayList<DialogAskClienteDestinatarioDTO>>() {
-            @Override
-            public void onSuccess(ArrayList<DialogAskClienteDestinatarioDTO> value) {
-                availableDestinatari = value;
-                initializeAdapter(value);
 
-                if(value == null || value.size() == 0) {
+        if (filteredDestinatari == null || filteredDestinatari.size() == 0) {
             mOnConfirm.run();
             return;
         }
-            }
 
-            @Override
+        initializeAdapter(filteredDestinatari);
-            public void onFailed(Exception ex) {
-
-            }
-        });
 
 
         this.mBinding.buttonYes.setOnClickListener(v -> {
@@ -106,7 +94,7 @@ public class DialogAskCliente_Page2ViewModel implements IDialogAskClienteViewMod
     }
 
 
-    private void initializeAdapter(ArrayList<DialogAskClienteDestinatarioDTO> items) {
+    private void initializeAdapter(List<DialogAskClienteDestinatarioDTO> items) {
         DialogAskCliente_Page2_ArrayAdapter adapter = new DialogAskCliente_Page2_ArrayAdapter(mContext, items);
 
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page2_ArrayAdapter.java

@@ -27,7 +27,7 @@ public class DialogAskCliente_Page2_ArrayAdapter extends ArrayAdapter<DialogAskC
 
     private ListFilter listFilter = new ListFilter();
 
-    public DialogAskCliente_Page2_ArrayAdapter(@NonNull Context context, @NonNull ArrayList<DialogAskClienteDestinatarioDTO> list) {
+    public DialogAskCliente_Page2_ArrayAdapter(@NonNull Context context, @NonNull List<DialogAskClienteDestinatarioDTO> list) {
         super(context, 0 , list);
         mContext = context;
         mDataset = list;

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

@@ -23,13 +23,12 @@ import com.google.android.material.textfield.TextInputLayout;
 import com.pedromassango.doubleclick.DoubleClick;
 import com.pedromassango.doubleclick.DoubleClickListener;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.Date;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.MainApplication;
@@ -47,14 +46,15 @@ import it.integry.integrywmsnative.core.utility.UtilityObservable;
 import it.integry.integrywmsnative.databinding.DialogInputQuantityV2Binding;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
 
+@Singleton
 public class DialogInputQuantityV2View extends BaseDialogFragment implements DialogInputQuantityV2ViewModel.Listener {
 
     @Inject
     DialogInputQuantityV2ViewModel mViewModel;
 
-    private final DialogInputQuantityV2DTO mDialogInputQuantityV2DTO;
+    private DialogInputQuantityV2DTO mDialogInputQuantityV2DTO;
-    private final RunnableArgss<DialogInputQuantityV2ResultDTO, Boolean> mOnComplete;
+    private RunnableArgss<DialogInputQuantityV2ResultDTO, Boolean> mOnComplete;
-    private final Runnable mOnAbort;
+    private Runnable mOnAbort;
 
     public ObservableField<Integer> currentTextNumCnfToTake = new ObservableField<>(0);
     public ObservableField<Integer> currentTextNumPezziToTake = new ObservableField<>(0);
@@ -86,17 +86,22 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     private boolean mEnableDataCallback = true;
 
     private int mBarcodeScannerIstanceID;
+    private boolean mFirstStart = true;
 
-    public static DialogInputQuantityV2View newInstance(@NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO, @NotNull RunnableArgss<DialogInputQuantityV2ResultDTO, Boolean> onComplete, @NotNull Runnable onAbort) {
+
-        return new DialogInputQuantityV2View(dialogInputQuantityV2DTO, onComplete, onAbort);
+    public DialogInputQuantityV2View setDialogInputQuantityV2DTO(DialogInputQuantityV2DTO mDialogInputQuantityV2DTO) {
+        this.mDialogInputQuantityV2DTO = mDialogInputQuantityV2DTO;
+        return this;
     }
 
-    private DialogInputQuantityV2View(@NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO, @NotNull RunnableArgss<DialogInputQuantityV2ResultDTO, Boolean> onComplete, @NotNull Runnable onAbort) {
+    public DialogInputQuantityV2View setOnComplete(RunnableArgss<DialogInputQuantityV2ResultDTO, Boolean> mOnComplete) {
-        super();
+        this.mOnComplete = mOnComplete;
+        return this;
+    }
 
-        this.mDialogInputQuantityV2DTO = dialogInputQuantityV2DTO;
+    public DialogInputQuantityV2View setOnAbort(Runnable mOnAbort) {
-        this.mOnComplete = onComplete;
+        this.mOnAbort = mOnAbort;
-        this.mOnAbort = onAbort;
+        return this;
     }
 
     @Override
@@ -203,7 +208,11 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     @Override
     public void onStart() {
         super.onStart();
+
+//        if(!mFirstStart) {
             this.init();
+//            mFirstStart = false;
+//        }
 
         int onNumCnfInputChanged = SettingsManager.iDB().getOnNumCnfInputChanged();
 

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

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout xmlns:tools="http://schemas.android.com/tools"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    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" />
+
         <variable
             name="viewModel"
             type="it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
@@ -18,64 +20,61 @@
         android:layout_height="match_parent">
 
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/linearLayout2"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/full_white"
-            android:orientation="vertical"
+            android:descendantFocusability="blocksDescendants">
-            android:descendantFocusability="blocksDescendants"
-            >
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/full_white"
-                android:orientation="vertical"
-                android:paddingTop="8dp"
-                tools:context=".gest.contenuto_bancale.ContenutoBancaleActivity">
 
             <it.integry.integrywmsnative.ui.ElevatedToolbar
                 android:id="@+id/elevated_toolbar"
                 android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">
 
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?actionBarSize">
+
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/toolbar_title"
+                        style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                            tools:text="modifica ordine"
+                        android:layout_gravity="start"
-                            style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+                        tools:text="modifica ordine" />
-                            android:layout_gravity="start" />
 
                     <androidx.appcompat.widget.AppCompatImageButton
                         android:id="@+id/add_extra_items_toolbar"
                         android:layout_width="wrap_content"
                         android:layout_height="50dp"
                         android:layout_gravity="end"
-                            android:background="@drawable/ripple_effect"
                         android:adjustViewBounds="true"
-                            android:src="@drawable/ic_search_black_24dp"
+                        android:background="@drawable/ripple_effect"
                         android:onClick="@{()->viewModel.manualSearch()}"
+                        android:src="@drawable/ic_search_black_24dp"
                         android:tint="@color/colorPrimaryGray" />
                 </androidx.appcompat.widget.Toolbar>
 
             </it.integry.integrywmsnative.ui.ElevatedToolbar>
 
-                <LinearLayout
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/header_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
                 android:background="@drawable/gray_detail_background_round8"
                 android:orientation="vertical"
+                app:layout_constraintTop_toBottomOf="@id/elevated_toolbar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 android:padding="16dp">
 
-                    <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
@@ -93,13 +92,14 @@
                         style="@style/AppTheme.NewMaterial.Text.Small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
                         android:textColor="@android:color/black"
                         android:textSize="16sp"
                         android:textStyle="bold"
                         tools:text="22 ottobre 2018" />
-                    </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-                    <LinearLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
@@ -116,13 +116,14 @@
                         style="@style/AppTheme.NewMaterial.Text.Small"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:paddingEnd="2dp"
                         android:textColor="@android:color/black"
                         android:textStyle="italic"
-                            tools:text="4SECCO" />
+                        tools:text="4SAPORIV" />
-                    </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-
+                <androidx.appcompat.widget.LinearLayoutCompat
-                    <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
@@ -143,28 +144,38 @@
                         android:textColor="@android:color/black"
                         android:textStyle="bold"
                         tools:text="10" />
-                    </LinearLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/articoli_ordine_list"
                 android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="92dp"
                 android:paddingStart="2dp"
-                    android:paddingEnd="2dp" />
+                android:paddingEnd="2dp"
-                <LinearLayout
+                android:clipToPadding="false"
+                android:paddingBottom="72dp"
+                android:scrollbars="vertical"
+                app:layout_constraintTop_toBottomOf="@id/header_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:id="@+id/scan_art_spinner"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="24dp"
+                android:orientation="horizontal"
                 android:visibility="visible"
-                    android:orientation="horizontal">
+                app:layout_constraintTop_toBottomOf="@id/header_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">
 
 
                 <ProgressBar
@@ -174,27 +185,22 @@
                     android:layout_height="wrap_content" />
 
                 <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                        android:textSize="16sp"
+                    android:layout_gravity="center_vertical"
                     android:layout_marginStart="8dp"
                     android:layout_marginEnd="12dp"
-                        android:layout_gravity="center_vertical"
                     android:gravity="center_horizontal"
-                        style="@style/AppTheme.NewMaterial.Text"
+                    android:text="@string/scan_item"
-                        android:text="@string/scan_item"/>
+                    android:textSize="16sp" />
-                </LinearLayout>
+            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
 
             <com.github.clans.fab.FloatingActionMenu
                 android:id="@+id/close_activity_fab"
-            android:layout_width="match_parent"
+                android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+                android:layout_height="wrap_content"
-            app:layout_anchor="@+id/linearLayout2"
+                android:layout_alignParentBottom="true"
                 app:layout_anchorGravity="center"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -254,5 +260,12 @@
 
 
             </com.github.clans.fab.FloatingActionMenu>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+
 </layout>

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

@@ -46,6 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/recipient"
+            android:layout_marginTop="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/description_text">

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'