gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #4110 from yunikkk/fix-touch-gestures

Browse source 
Fixed PP animation bug.
This commit is contained in:
Alexander Marchuk 2016-08-21 19:51:22 +03:00 • committed by GitHub
commit 132acbed89
4 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/mapswithme/maps/widget/placepage/BasePlacePageAnimationController.java
View file

@ -36,7 +36,7 @@ public abstract class BasePlacePageAnimationController
protected ViewGroup mButtons;
// Gestures
protected GestureDetectorCompat mGestureDetector;
protected boolean mIsGestureHandled;
protected boolean mIsDragging;
protected float mDownCoord;
protected float mTouchSlop;

42
android/src/com/mapswithme/maps/widget/placepage/PlacePageBottomAnimationController.java → android/src/com/mapswithme/maps/widget/placepage/BottomPlacePageAnimationController.java
View file

@ -21,15 +21,16 @@ import com.mapswithme.maps.widget.placepage.PlacePageView.State;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.concurrency.UiThread;
class PlacePageBottomAnimationController extends BasePlacePageAnimationController
class BottomPlacePageAnimationController extends BasePlacePageAnimationController
{
private static final String TAG = PlacePageBottomAnimationController.class.getSimpleName();
private static final String TAG = BottomPlacePageAnimationController.class.getSimpleName();
private final ViewGroup mLayoutToolbar;
private final AnimationHelper mAnimationHelper = new AnimationHelper();
private ValueAnimator mCurrentAnimator;
private boolean mShouldHandleGesture;
private boolean mIsGestureStartedInsideView;
private boolean mIsGestureFinished;
private class AnimationHelper
{
@ -47,7 +48,7 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
};
}
public PlacePageBottomAnimationController(@NonNull PlacePageView placePage)
public BottomPlacePageAnimationController(@NonNull PlacePageView placePage)
{
super(placePage);
mLayoutToolbar = (LinearLayout) mPlacePage.findViewById(R.id.toolbar_layout);
@ -77,21 +78,23 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
case MotionEvent.ACTION_DOWN:
if (!isInsideView(event.getY()))
{
mShouldHandleGesture = false;
mIsGestureStartedInsideView = false;
break;
}
mShouldHandleGesture = true;
mIsGestureHandled = false;
mIsGestureStartedInsideView = true;
mIsDragging = false;
mIsGestureFinished = false;
mDownCoord = event.getY();
break;
case MotionEvent.ACTION_MOVE:
if (!mIsGestureStartedInsideView)
break;
final float delta = mDownCoord - event.getY();
if (mShouldHandleGesture
&& Math.abs(delta) > mTouchSlop
&& !isDetailsScroll(mDownCoord, delta)
&& isInsideView(mDownCoord))
if (Math.abs(delta) > mTouchSlop && !isDetailsScroll(mDownCoord, delta))
return true;
break;
}
@ -129,11 +132,20 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
@Override
protected boolean onTouchEvent(@NonNull MotionEvent event)
{
if (!isInsideView(event.getY()))
if (mIsGestureFinished)
return false;
if (event.getAction() == MotionEvent.ACTION_UP)
final boolean finishedDrag = (mIsDragging &&
(event.getAction() == MotionEvent.ACTION_UP ||
event.getAction() == MotionEvent.ACTION_CANCEL));
if (!mIsGestureStartedInsideView ||
!isInsideView(event.getY()) ||
finishedDrag)
{
mIsGestureFinished = true;
finishDrag();
return false;
}
super.onTouchEvent(event);
return true;
@ -153,11 +165,11 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
if (isVertical)
{
mIsGestureHandled = true;
mIsDragging = true;
translateBy(-distanceY);
}
return mIsGestureHandled;
return true;
}
@Override

24
android/src/com/mapswithme/maps/widget/placepage/PlacePageLeftAnimationController.java → android/src/com/mapswithme/maps/widget/placepage/LeftPlacePageAnimationController.java
View file

@ -11,9 +11,9 @@ import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.widget.placepage.PlacePageView.State;
import com.mapswithme.util.UiUtils;
class PlacePageLeftAnimationController extends BasePlacePageAnimationController
class LeftPlacePageAnimationController extends BasePlacePageAnimationController
{
public PlacePageLeftAnimationController(@NonNull PlacePageView placePage)
public LeftPlacePageAnimationController(@NonNull PlacePageView placePage)
{
super(placePage);
}
@ -30,7 +30,7 @@ class PlacePageLeftAnimationController extends BasePlacePageAnimationController
switch (event.getAction())
{
case MotionEvent.ACTION_DOWN:
mIsGestureHandled = false;
mIsDragging = false;
mDownCoord = event.getX();
break;
case MotionEvent.ACTION_MOVE:
@ -69,20 +69,18 @@ class PlacePageLeftAnimationController extends BasePlacePageAnimationController
final boolean isHorizontal = Math.abs(distanceX) > X_TO_Y_SCROLL_RATIO * Math.abs(distanceY);
final boolean isInRange = Math.abs(distanceX) > X_MIN && Math.abs(distanceX) < X_MAX;
if (isHorizontal && isInRange)
if (!isHorizontal || !isInRange)
return false;;
if (!mIsDragging)
{
if (!mIsGestureHandled)
{
if (distanceX > 0)
mPlacePage.hide();
if (distanceX > 0)
mPlacePage.hide();
mIsGestureHandled = true;
}
return true;
mIsDragging = true;
}
return false;
return true;
}
});
}

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -474,8 +474,8 @@ public class PlacePageView extends RelativeLayout
mIsFloating = attrArray.getBoolean(R.styleable.PlacePageView_floating, false);
attrArray.recycle();
mAnimationController = animationType == 0 ? new PlacePageBottomAnimationController(this)
: new PlacePageLeftAnimationController(this);
mAnimationController = animationType == 0 ? new BottomPlacePageAnimationController(this)
: new LeftPlacePageAnimationController(this);
}
public void restore()