From c1ff1a4c4fcfbdf49598d678ab8dbfb89f7182ad Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 27 Dec 2016 23:42:11 +0100 Subject: [PATCH] file cosmetics --- .../osmand/plus/views/MultiTouchSupport.java | 128 +++++++++--------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java index 6e27a8e1fa..527e10f301 100644 --- a/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java +++ b/OsmAnd/src/net/osmand/plus/views/MultiTouchSupport.java @@ -16,26 +16,26 @@ public class MultiTouchSupport { private static final Log log = PlatformUtil.getLog(MultiTouchSupport.class); - public static final int ACTION_MASK = 255; - public static final int ACTION_POINTER_ID_SHIFT = 8; - public static final int ACTION_POINTER_DOWN = 5; - public static final int ACTION_POINTER_UP = 6; + public static final int ACTION_MASK = 255; + public static final int ACTION_POINTER_ID_SHIFT = 8; + public static final int ACTION_POINTER_DOWN = 5; + public static final int ACTION_POINTER_UP = 6; private float angleStarted; private float angleRelative; public interface MultiTouchZoomListener { - - public void onZoomStarted(PointF centerPoint); - - public void onZoomingOrRotating(double relativeToStart, float angle); - - public void onZoomOrRotationEnded(double relativeToStart, float angleRelative); - - public void onGestureInit(float x1, float y1, float x2, float y2); - - } - - private boolean multiTouchAPISupported = false; + + public void onZoomStarted(PointF centerPoint); + + public void onZoomingOrRotating(double relativeToStart, float angle); + + public void onZoomOrRotationEnded(double relativeToStart, float angleRelative); + + public void onGestureInit(float x1, float y1, float x2, float y2); + + } + + private boolean multiTouchAPISupported = false; private final MultiTouchZoomListener listener; protected final Context ctx; @@ -43,47 +43,46 @@ public class MultiTouchSupport { protected Method getX; protected Method getY; protected Method getPointerId; - - - - public MultiTouchSupport(Context ctx, MultiTouchZoomListener listener){ + + + public MultiTouchSupport(Context ctx, MultiTouchZoomListener listener){ this.ctx = ctx; this.listener = listener; initMethods(); - } - - public boolean isMultiTouchSupported(){ - return multiTouchAPISupported; - } - - public boolean isInZoomMode(){ - return inZoomMode; - } - - private void initMethods(){ - try { - getPointerCount = MotionEvent.class.getMethod("getPointerCount"); //$NON-NLS-1$ - getPointerId = MotionEvent.class.getMethod("getPointerId", Integer.TYPE); //$NON-NLS-1$ - getX = MotionEvent.class.getMethod("getX", Integer.TYPE); //$NON-NLS-1$ - getY = MotionEvent.class.getMethod("getY", Integer.TYPE); //$NON-NLS-1$ - multiTouchAPISupported = true; - } catch (Exception e) { - multiTouchAPISupported = false; - log.info("Multi touch not supported", e); //$NON-NLS-1$ + } + + public boolean isMultiTouchSupported(){ + return multiTouchAPISupported; + } + + public boolean isInZoomMode(){ + return inZoomMode; + } + + private void initMethods(){ + try { + getPointerCount = MotionEvent.class.getMethod("getPointerCount"); //$NON-NLS-1$ + getPointerId = MotionEvent.class.getMethod("getPointerId", Integer.TYPE); //$NON-NLS-1$ + getX = MotionEvent.class.getMethod("getX", Integer.TYPE); //$NON-NLS-1$ + getY = MotionEvent.class.getMethod("getY", Integer.TYPE); //$NON-NLS-1$ + multiTouchAPISupported = true; + } catch (Exception e) { + multiTouchAPISupported = false; + log.info("Multi touch not supported", e); //$NON-NLS-1$ } - } - - private boolean inZoomMode = false; - private double zoomStartedDistance = 100; - private double zoomRelative = 1; - private PointF centerPoint = new PointF(); - - public boolean onTouchEvent(MotionEvent event){ - if(!isMultiTouchSupported()){ - return false; - } - int actionCode = event.getAction() & ACTION_MASK; - try { + } + + private boolean inZoomMode = false; + private double zoomStartedDistance = 100; + private double zoomRelative = 1; + private PointF centerPoint = new PointF(); + + public boolean onTouchEvent(MotionEvent event){ + if(!isMultiTouchSupported()){ + return false; + } + int actionCode = event.getAction() & ACTION_MASK; + try { Integer pointCount = (Integer) getPointerCount.invoke(event); if(pointCount < 2){ if(inZoomMode){ @@ -97,12 +96,12 @@ public class MultiTouchSupport { Float y1 = (Float) getY.invoke(event, 0); Float y2 = (Float) getY.invoke(event, 1); float distance = (float) Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); - float angle = 0; - boolean angleDefined = false; - if(x1 != x2 || y1 != y2) { - angleDefined = true; - angle = (float) (Math.atan2(y2 - y1, x2 -x1) * 180 / Math.PI); - } + float angle = 0; + boolean angleDefined = false; + if(x1 != x2 || y1 != y2) { + angleDefined = true; + angle = (float) (Math.atan2(y2 - y1, x2 -x1) * 180 / Math.PI); + } if (actionCode == ACTION_POINTER_DOWN) { centerPoint = new PointF((x1 + x2) / 2, (y1 + y2) / 2); listener.onGestureInit(x1, y1, x2, y2); @@ -128,14 +127,13 @@ public class MultiTouchSupport { } else if (pointCount >= 2) { return true; } - } catch (Exception e) { - log.debug("Multi touch exception" , e); //$NON-NLS-1$ + } catch (Exception e) { + log.debug("Multi touch exception" , e); //$NON-NLS-1$ } - return false; - } + return true; + } - - public PointF getCenterPoint() { + public PointF getCenterPoint() { return centerPoint; } }