From efb27760e4bf218e29b860cf207d4aba27738a22 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 8 Jun 2020 18:40:02 +0200
Subject: [PATCH] Risolta anomalia altezza dialog basket LU

---
 .../integrywmsnative/ui/DeactivatableViewPager.java   |  5 +++++
 .../view/dialogs/basket_lu/DialogBasketLU.java        |  2 ++
 .../pages/page1/DialogBasketLU_Page1_ViewModel.java   |  2 +-
 .../pages/page2/DialogBasketLU_Page2_ViewModel.java   |  2 +-
 app/src/main/res/layout/dialog_basket_lu.xml          | 11 ++---------
 app/src/main/res/layout/dialog_basket_lu__page2.xml   |  6 ++++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java b/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java
index 200d73aa..d4d25345 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java
+++ b/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()
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java
index dbf5b69c..c5f7b4a0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java
@@ -75,6 +75,8 @@ public class DialogBasketLU {
 
 
         mDialog.setOnShowListener(v -> {
+
+
             viewPagerAdapter.getViewModel(R.layout.dialog_basket_lu__page2).setOnConfirmClickListener(data -> {
                 MtbColt mtbColt = (MtbColt) data;
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java
index 50196c74..e110c041 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page1/DialogBasketLU_Page1_ViewModel.java
+++ b/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));
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
index aa0e863f..ccc4653e 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ViewModel.java
+++ b/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
diff --git a/app/src/main/res/layout/dialog_basket_lu.xml b/app/src/main/res/layout/dialog_basket_lu.xml
index 637234c8..17884abc 100644
--- a/app/src/main/res/layout/dialog_basket_lu.xml
+++ b/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"
-    xmlns:tools="http://schemas.android.com/tools">
+<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"
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_basket_lu__page2.xml b/app/src/main/res/layout/dialog_basket_lu__page2.xml
index 54d6bbbb..1fd84f5c 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page2.xml
+++ b/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" />