karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

ChartView let's parent handle TouchEvents if not zoomed.

Browse Source
This commit is contained in:
Dennis Guse
2020-12-05 22:34:23 +01:00
committed by Román Martínez
parent ae8833d21b
commit eb79f2277a
1 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/chart/ChartView.java
+2 -32
View File
@@ -118,14 +118,6 @@ public class ChartView extends View {
private boolean reportSpeed = true; private boolean reportSpeed = true;
private boolean showPointer = false; private boolean showPointer = false;
// To handle disallow intercept touch event in parent.
private static final int SCROLL_X_NONE = 0;
private static final int SCROLL_X_LEFT = 1;
private static final int SCROLL_X_RIGHT = 2;
private boolean isOnLeftEdge = true;
private boolean isOnRightEdge = true;
private int scrollXDirection = SCROLL_X_NONE;
private final GestureDetectorCompat detectorScrollFlingTab = new GestureDetectorCompat(getContext(), new GestureDetector.SimpleOnGestureListener() { private final GestureDetectorCompat detectorScrollFlingTab = new GestureDetectorCompat(getContext(), new GestureDetector.SimpleOnGestureListener() {
@Override @Override
@@ -138,14 +130,6 @@ public class ChartView extends View {
@Override @Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
if (distanceX < 0) {
scrollXDirection = SCROLL_X_LEFT;
} else if (distanceX > 0) {
scrollXDirection = SCROLL_X_RIGHT;
} else {
scrollXDirection = SCROLL_X_NONE;
}
if (Math.abs(distanceX) > 0) { if (Math.abs(distanceX) > 0) {
int availableToScroll = effectiveWidth * (zoomLevel - 1) - getScrollX(); int availableToScroll = effectiveWidth * (zoomLevel - 1) - getScrollX();
if (availableToScroll > 0) { if (availableToScroll > 0) {
@@ -451,9 +435,6 @@ public class ChartView extends View {
chartPoints.clear(); chartPoints.clear();
xExtremityMonitor.reset(); xExtremityMonitor.reset();
zoomLevel = 1; zoomLevel = 1;
isOnLeftEdge = true;
isOnRightEdge = true;
scrollXDirection = SCROLL_X_NONE;
updateDimensions(); updateDimensions();
} }
} }
@@ -541,17 +522,11 @@ public class ChartView extends View {
int scrollX = getScrollX() + deltaX; int scrollX = getScrollX() + deltaX;
if (scrollX <= 0) { if (scrollX <= 0) {
scrollX = 0; scrollX = 0;
isOnLeftEdge = true;
} else {
isOnLeftEdge = false;
} }
int maxWidth = effectiveWidth * (zoomLevel - 1); int maxWidth = effectiveWidth * (zoomLevel - 1);
if (scrollX >= maxWidth) { if (scrollX >= maxWidth) {
scrollX = maxWidth; scrollX = maxWidth;
isOnRightEdge = true;
} else {
isOnRightEdge = false;
} }
scrollTo(scrollX, 0); scrollTo(scrollX, 0);
@@ -579,13 +554,8 @@ public class ChartView extends View {
boolean isZoom = detectorZoom.onTouchEvent(event); boolean isZoom = detectorZoom.onTouchEvent(event);
boolean isScrollTab = detectorScrollFlingTab.onTouchEvent(event); boolean isScrollTab = detectorScrollFlingTab.onTouchEvent(event);
if (event.getPointerCount() == 1 && ((isOnLeftEdge && scrollXDirection == SCROLL_X_LEFT) || (isOnRightEdge && scrollXDirection == SCROLL_X_RIGHT))) { // ChartView handles zoom gestures (more than one pointer) and all gestures when zoomed itself
// Focus on view's parent. requestDisallowInterceptTouchEventInParent(event.getPointerCount() != 1 || zoomLevel != MIN_ZOOM_LEVEL);
requestDisallowInterceptTouchEventInParent(false);
} else {
// Focus on ChartView.
requestDisallowInterceptTouchEventInParent(true);
}
return isZoom || isScrollTab; return isZoom || isScrollTab;
} }