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

Scale gesture enchantment.

Browse source
This commit is contained in:
GaidamakUA 2016-01-22 17:01:51 +02:00
parent 807e547e1b
commit b226ad2fd1
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,8 +16,9 @@ import org.apache.commons.logging.Log;
public class DoubleTapScaleDetector {
private static final Log LOG = PlatformUtil.getLog(DoubleTapScaleDetector.class);
private static final int DOUBLE_TAP_TIMEOUT = ViewConfiguration.getDoubleTapTimeout();
private static final int TAP_TIMEOUT = ViewConfiguration.getTapTimeout();
private static final int DOUBLE_TAP_MIN_TIME = 40;
private static final int SCALE_PER_SCREEN = 8;
public static final int SCALE_PER_SCREEN = 8;
private final DoubleTapZoomListener listener;
protected final Context ctx;
@ -28,6 +29,7 @@ public class DoubleTapScaleDetector {
private float scale;
private MotionEvent firstDown;
private MotionEvent firstUp;
private MotionEvent secondDown;
private int mDoubleTapSlopSquare;
public DoubleTapScaleDetector(Activity ctx, DoubleTapZoomListener listener) {
@ -35,7 +37,7 @@ public class DoubleTapScaleDetector {
this.listener = listener;
Point size = new Point();
ctx.getWindowManager().getDefaultDisplay().getSize(size);
displayHeightPx = size.x;
displayHeightPx = size.y;
final ViewConfiguration configuration = ViewConfiguration.get(ctx);
int doubleTapSlop = configuration.getScaledTouchSlop();
mDoubleTapSlopSquare = doubleTapSlop * doubleTapSlop;
@ -47,6 +49,7 @@ public class DoubleTapScaleDetector {
}
long currentTime = System.currentTimeMillis();
if (event.getAction() == MotionEvent.ACTION_UP) {
secondDown = null;
if (isDoubleTapping) {
isDoubleTapping = false;
listener.onZoomEnded(scale, 0);
@ -57,7 +60,7 @@ public class DoubleTapScaleDetector {
} else {
if (event.getAction() == MotionEvent.ACTION_DOWN && !isDoubleTapping) {
if (isConsideredDoubleTap(firstDown, firstUp, event)) {
isDoubleTapping = true;
secondDown = MotionEvent.obtain(event);
float x = event.getX();
float y = event.getY();
listener.onGestureInit(x, y, x, y);
@ -67,6 +70,9 @@ public class DoubleTapScaleDetector {
firstDown = MotionEvent.obtain(event);
}
} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
if (isConfirmedScale(secondDown, event)) {
isDoubleTapping = true;
}
if (isDoubleTapping) {
float delta = convertPxToDp((int) (firstDown.getY() - event.getY()));
float scaleDelta = delta / (displayHeightPx / SCALE_PER_SCREEN);
@ -105,6 +111,14 @@ public class DoubleTapScaleDetector {
return toReturn;
}
private static final boolean isConfirmedScale(MotionEvent secondDown,
MotionEvent moveEvent) {
if (secondDown == null || moveEvent == null) {
return false;
}
return moveEvent.getEventTime() - secondDown.getEventTime() > TAP_TIMEOUT - 50;
}
public float getCenterX() {
return firstUp.getX();
}

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

@ -230,7 +230,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
Point size = new Point();
ctx.getWindowManager().getDefaultDisplay().getSize(size);
displayHeightPx = size.x;
displayHeightPx = size.y;
}
public void setView(View view) {
@ -596,8 +596,14 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
}
protected void drawScale(Canvas canvas, float x, float y) {
canvas.drawLine(x - 10, y, x + 10, y, paintCenter);
canvas.drawLine(x, y + 200, x, y -200, paintCenter);
float height = displayHeightPx / 2;
float width = height / 40;
canvas.drawLine(x, y + height, x, y - height, paintCenter);
for (int i = 0; i < DoubleTapScaleDetector.SCALE_PER_SCREEN; i++) {
float deltaY = displayHeightPx / DoubleTapScaleDetector.SCALE_PER_SCREEN;
float markY = y - height + deltaY * i;
canvas.drawLine(x - width, markY, x + width, markY, paintCenter);
}
}
private void refreshBufferImage(final DrawSettings drawSettings) {
@ -952,7 +958,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override
public void onLongPress(MotionEvent e) {
if (multiTouchSupport.isInZoomMode() || afterTwoFingerTap) {
if (multiTouchSupport.isInZoomMode()
|| doubleTapScaleDetector.isInZoomMode()
|| afterTwoFingerTap) {
afterTwoFingerTap = false;
return;
}