Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix double tap zoom issues

Browse source
This commit is contained in:
Alexey Kulish 2016-07-11 12:20:48 +03:00
parent ff7792acd6
commit d254b27f59
2 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
OsmAnd/src/net/osmand/plus/views/DoubleTapScaleDetector.java
View file

@ -1,17 +1,15 @@
package net.osmand.plus.views;
import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Point;
import android.graphics.PointF;
import android.os.Build;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
import net.osmand.PlatformUtil;
import net.osmand.data.RotatedTileBox;
import org.apache.commons.logging.Log;
@ -22,10 +20,11 @@ public class DoubleTapScaleDetector {
public static final int SCALE_PER_SCREEN = 4;
private final DoubleTapZoomListener listener;
protected final Context ctx;
protected final OsmandMapTileView view;
private int displayHeightPx;
private PointF centerScreen;
private PointF zoomCenter;
private boolean mIsInZoomMode = false;
private float scale;
@ -37,20 +36,16 @@ public class DoubleTapScaleDetector {
private boolean mIsDoubleTapping;
private boolean mScrolling;
public DoubleTapScaleDetector(Activity ctx, DoubleTapZoomListener listener) {
this.ctx = ctx;
public DoubleTapScaleDetector(OsmandMapTileView view, DoubleTapZoomListener listener) {
this.view = view;
this.listener = listener;
Display defaultDisplay = ctx.getWindowManager().getDefaultDisplay();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
Point size = new Point();
defaultDisplay.getSize(size);
displayHeightPx = size.y;
centerScreen = new PointF(size.x / 2, size.y / 2);
} else {
displayHeightPx = defaultDisplay.getHeight();
centerScreen = new PointF(defaultDisplay.getWidth() / 2, defaultDisplay.getHeight() / 2);
}
final ViewConfiguration configuration = ViewConfiguration.get(ctx);
RotatedTileBox tileBox = view.getCurrentRotatedTileBox();
centerScreen = new PointF(tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
displayHeightPx = tileBox.getPixHeight();
zoomCenter = new PointF(centerScreen.x, centerScreen.y);
final ViewConfiguration configuration = ViewConfiguration.get(view.getContext());
int touchSlop = configuration.getScaledTouchSlop();
mTouchSlopSquare = touchSlop * touchSlop;
int doubleTapSlop = (int) (configuration.getScaledDoubleTapSlop() * 0.5);
@ -62,6 +57,7 @@ public class DoubleTapScaleDetector {
resetEvents();
mIsDoubleTapping = false;
mScrolling = false;
mIsInZoomMode = false;
return false;
}
if (event.getAction() == MotionEvent.ACTION_UP) {
@ -96,7 +92,8 @@ public class DoubleTapScaleDetector {
float x = event.getX();
float y = event.getY();
listener.onGestureInit(x, y, x, y);
listener.onZoomStarted(centerScreen);
zoomCenter = isXLargeDevice(view.getContext()) ? new PointF(x, y) : centerScreen;
listener.onZoomStarted(zoomCenter);
return true;
} else {
firstDown = MotionEvent.obtain(event);
@ -163,12 +160,17 @@ public class DoubleTapScaleDetector {
return calculateSqaredDistance(secondDown, moveEvent) > mDoubleTapSlopSquare;
}
private boolean isXLargeDevice(Context ctx) {
int lt = (ctx.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK);
return lt == Configuration.SCREENLAYOUT_SIZE_XLARGE;
}
public float getCenterX() {
return firstUp.getX();
return zoomCenter.x;
}
public float getCenterY() {
return firstUp.getY();
return zoomCenter.y;
}
public interface DoubleTapZoomListener {

26
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -200,18 +200,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
handler = new Handler();
baseHandler = new Handler(application.getResourceManager().getRenderingBufferImageThread().getLooper());
animatedDraggingThread = new AnimateDraggingMapThread(this);
gestureDetector = new GestureDetector(ctx, new MapTileViewOnGestureListener());
multiTouchSupport = new MultiTouchSupport(ctx, new MapTileViewMultiTouchZoomListener());
doubleTapScaleDetector = new DoubleTapScaleDetector(activity, new MapTileViewMultiTouchZoomListener());
twoFingersTapDetector = new TwoFingerTapDetector() {
@Override
public void onTwoFingerTap() {
afterTwoFingersTap = true;
if (isZoomingAllowed(getZoom(), -1)) {
getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), true);
}
}
};
WindowManager mgr = (WindowManager) ctx.getSystemService(Context.WINDOW_SERVICE);
dm = new DisplayMetrics();
@ -222,6 +210,19 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
setPixelDimensions(w, h).build();
currentViewport.setDensity(dm.density);
currentViewport.setMapDensity(getSettingsMapDensity());
gestureDetector = new GestureDetector(ctx, new MapTileViewOnGestureListener());
multiTouchSupport = new MultiTouchSupport(ctx, new MapTileViewMultiTouchZoomListener());
doubleTapScaleDetector = new DoubleTapScaleDetector(this, new MapTileViewMultiTouchZoomListener());
twoFingersTapDetector = new TwoFingerTapDetector() {
@Override
public void onTwoFingerTap() {
afterTwoFingersTap = true;
if (isZoomingAllowed(getZoom(), -1)) {
getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), true);
}
}
};
}
public void setView(View view) {
@ -1052,6 +1053,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
public void onLongPress(MotionEvent e) {
if (multiTouchSupport.isInZoomMode()
|| doubleTapScaleDetector.isInZoomMode()
|| doubleTapScaleDetector.isDoubleTapping()
|| afterTwoFingersTap) {
afterTwoFingersTap = false;
return;