Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Risolta anomalia altezza dialog basket LU

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-06-08 18:40:02 +02:00
parent d388d1d0a4
commit efb27760e4
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/it/integry/integrywmsnative/ui/DeactivatableViewPager.java
View File

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

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

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

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

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

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

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

11
app/src/main/res/layout/dialog_basket_lu.xml
View File

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

6
app/src/main/res/layout/dialog_basket_lu__page2.xml
View File

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