Finish v1.36.04(397)
This commit is contained in:
commit
cc54c6decb
@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
||||||
def appVersionCode = 396
|
def appVersionCode = 397
|
||||||
def appVersionName = '1.36.03'
|
def appVersionName = '1.36.04'
|
||||||
|
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|||||||
@ -1,8 +1,6 @@
|
|||||||
package it.integry.integrywmsnative.ui;
|
package it.integry.integrywmsnative.ui;
|
||||||
|
|
||||||
import android.animation.LayoutTransition;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import androidx.viewpager.widget.ViewPager;
|
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
import android.view.MotionEvent;
|
import android.view.MotionEvent;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@ -10,6 +8,8 @@ import android.view.animation.Animation;
|
|||||||
import android.view.animation.Interpolator;
|
import android.view.animation.Interpolator;
|
||||||
import android.view.animation.Transformation;
|
import android.view.animation.Transformation;
|
||||||
|
|
||||||
|
import androidx.viewpager.widget.ViewPager;
|
||||||
|
|
||||||
public class DeactivatableViewPager extends ViewPager implements Animation.AnimationListener {
|
public class DeactivatableViewPager extends ViewPager implements Animation.AnimationListener {
|
||||||
|
|
||||||
private View mCurrentView;
|
private View mCurrentView;
|
||||||
@ -57,7 +57,7 @@ public class DeactivatableViewPager extends ViewPager implements Animation.Anima
|
|||||||
height = getMinimumHeight();
|
height = getMinimumHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
int displayHeight = (int)(getResources().getDisplayMetrics().heightPixels*0.77);
|
int displayHeight = (int)(getResources().getDisplayMetrics().heightPixels*0.5);
|
||||||
|
|
||||||
if(height > displayHeight) height = displayHeight;
|
if(height > displayHeight) height = displayHeight;
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<it.integry.integrywmsnative.ui.DeactivatableViewPager
|
<it.integry.integrywmsnative.ui.DeactivatableViewPager
|
||||||
android:id="@+id/viewpager"
|
android:id="@+id/viewpager"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="16dp"
|
android:layout_marginTop="16dp"
|
||||||
android:animateLayoutChanges="true">
|
android:animateLayoutChanges="true">
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user