Merge branch 'develop' into feature/Refactoring_Spedizione

# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java

@@ -1,14 +1,13 @@
 package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.viewmodel;
 
 import android.app.Dialog;
+import android.text.SpannableString;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.databinding.ObservableArrayList;
 import androidx.databinding.ObservableField;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import android.text.SpannableString;
-
 import com.annimon.stream.Stream;
 import com.tfb.fbtoast.FBToast;
 
@@ -17,16 +16,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.CommonConst;
-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.GestSetupRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
-import it.integry.integrywmsnative.core.rest.model.Ean128Model;
-import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.CommonModelConsts;
@@ -35,6 +27,14 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.report.ReportManager;
+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.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ISimpleOperationCallback;
+import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.model.Ean128Model;
+import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityBarcode;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -49,13 +49,12 @@ import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.IOnOrdi
 import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.MainListOrdineAccettazioneAdapter;
 import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoOrderBy;
 import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest.OrdineAccettazioneInevasoRESTConsumerService;
-import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
 import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback;
 import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
 import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity;
 import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO;
-import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog;
 
 public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloClosedCallback, IOnOrdineAccettazioneRowDispatchCallback {
 
@@ -482,7 +481,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
 
                 List<String> numDataOrds =
                         Stream.of(mOrders)
-                                .map(value -> ("" + value.getNumero()) + value.getData())
+                                .map(value -> value.getNumero() + value.getData())
                                 .distinct()
                                 .toList();
 
@@ -526,7 +525,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
                 });
             }, ex -> UtilityExceptions.defaultException(mActivity, ex, finalProgress));
 
-        }).show();
+        }, finalProgress::dismiss).show();
 
 
     }

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

@@ -382,6 +382,8 @@ public class PickingResiActivity extends BaseActivity implements IOnColloClosedC
                     } else postNoteSave.run();
 
 
+                }, () -> {
+
                 }).show();
             } else {
                 deleteCollo(progress, onComplete);

app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java

@@ -57,6 +57,11 @@ public class DeactivatableViewPager extends ViewPager implements Animation.Anima
                 height = getMinimumHeight();
             }
 
+            int displayHeight = (int)(getResources().getDisplayMetrics().heightPixels*0.77);
+
+            if(height > displayHeight) height = displayHeight;
+
+
             int newHeight = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
             if (/*getLayoutParams().height != 0 && */heightMeasureSpec != height && height > 0 && height < 100000) {
 //                animate()

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

@@ -66,6 +66,8 @@ public class DialogBasketLU {
 
 
         mDialog.setOnShowListener(v -> {
+
+
             viewPagerAdapter.getViewModel(R.layout.dialog_basket_lu__page2).setOnConfirmClickListener(data -> {
                 MtbColt mtbColt = (MtbColt) data;
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java

@@ -45,7 +45,7 @@ public class DialogBasketLU_Page1_ViewModel extends DialogBasketLU_BaseViewModel
 
     @Override
     public void onShow() {
-
+        this.mBinding.getRoot().requestLayout();
 
         mBinding.constraintLayout.setMaxHeight((int) (mContext.getResources().getDisplayMetrics().heightPixels * 0.75));
 

app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java

@@ -60,7 +60,7 @@ public class DialogBasketLU_Page2_ViewModel extends DialogBasketLU_BaseViewModel
 
     @Override
     public void onShow() {
-
+        this.mBinding.getRoot().getParent().requestLayout();
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/view/dialogs/note_aggiuntive_lu/NoteAggiuntiveLUDialog.java

@@ -16,11 +16,11 @@ public class NoteAggiuntiveLUDialog {
 
     private Dialog mDialog;
 
-    public static Dialog make(Context context, final RunnableArgs<String> onComplete) {
+    public static Dialog make(Context context, final RunnableArgs<String> onComplete, final Runnable onAbort) {
-        return new NoteAggiuntiveLUDialog(context, onComplete).mDialog;
+        return new NoteAggiuntiveLUDialog(context, onComplete, onAbort).mDialog;
     }
 
-    private NoteAggiuntiveLUDialog(Context context, final RunnableArgs<String> onComplete){
+    private NoteAggiuntiveLUDialog(Context context, final RunnableArgs<String> onComplete, final Runnable onAbort){
 
         LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
         DialogNoteAggiuntiveNuovaUlBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_note_aggiuntive_nuova_ul, null, false);
@@ -39,7 +39,7 @@ public class NoteAggiuntiveLUDialog {
 
         bindings.buttonAbort.setOnClickListener(v -> {
             mDialog.dismiss();
-            if(onComplete != null) onComplete.run(null);
+            if(onAbort != null) onAbort.run();
         });
 
 

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
-    xmlns:tools="http://schemas.android.com/tools">
     <androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/base_root"
@@ -13,7 +12,6 @@
         app:cardElevation="0dp">
 
 
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -23,8 +21,6 @@
             android:paddingEnd="8dp"
             android:paddingBottom="16dp">
 
-
-
             <TextView
                 android:id="@+id/title_text"
                 android:layout_width="match_parent"
@@ -37,16 +33,13 @@
                 android:id="@+id/viewpager"
                 android:animateLayoutChanges="true"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent">
 
             </it.integry.integrywmsnative.ui.DeactivatableViewPager>
 
 
         </LinearLayout>
 
-
-
-
     </androidx.cardview.widget.CardView>
 
 </layout>

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

@@ -3,14 +3,15 @@
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/myScrollView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:fillViewport="true">
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
@@ -26,6 +27,7 @@
                         android:id="@+id/dialog_basket_lu__mtb_colr_list"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:nestedScrollingEnabled="false"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />