Merge pull request #1512 from ichan-mb/fix_scrollview

Scrolling detect Improvement

Author: mortend

Source/Fuse.Controls.Native/Android/Java/FuseScrollView.java

@@ -206,7 +206,10 @@ private void setupContainer() {
 		_container = new android.widget.FrameLayout(com.fuse.Activity.getRootActivity());
 		_container.setFocusable(true);
 		_container.setFocusableInTouchMode(true);
-		_container.setLayoutParams(new android.widget.LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
+		if (_currentScrollView instanceof VerticalScrollView)
+			_container.setLayoutParams(new android.widget.LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT));
+		else
+			_container.setLayoutParams(new android.widget.LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.WRAP_CONTENT, android.view.ViewGroup.LayoutParams.MATCH_PARENT));
 		_currentScrollView.addView(_container);
 	}
 

Source/Fuse.Controls.Native/Android/Java/HorizontalScrollView.java

@@ -73,7 +73,15 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
 		if (this.mChildView == null && getChildCount() > 0 || mChildView != getChildAt(0)) {
 			this.mChildView = getChildAt(0);
 		}
-		return super.onInterceptTouchEvent(ev);
+		return super.onInterceptTouchEvent(ev) && isHorizontalScroll(ev);
+	}
+
+	private boolean isHorizontalScroll(MotionEvent ev) {
+		try {
+			return Math.abs(ev.getX() - ev.getHistoricalX(0)) > Math.abs(ev.getY() - ev.getHistoricalY(0));
+		} catch (IllegalArgumentException e) {
+			return true;
+		}
 	}
 
 	@Override
@@ -125,7 +133,7 @@ public void onAnimationUpdate(@NonNull ValueAnimator animation) {
 				break;
 		}
 
-		return super.onTouchEvent(ev);
+		return isHorizontalScroll(ev) && super.onTouchEvent(ev);
 	}
 
 	private float calculateDamping() {

Source/Fuse.Controls.Native/Android/Java/VerticalScrollView.java

@@ -74,7 +74,15 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
 		if (this.mChildView == null && getChildCount() > 0 || mChildView != getChildAt(0)) {
 			this.mChildView = getChildAt(0);
 		}
-		return super.onInterceptTouchEvent(ev);
+		return super.onInterceptTouchEvent(ev) && isVerticalScroll(ev);
+	}
+
+	private boolean isVerticalScroll(MotionEvent ev) {
+		try {
+			return Math.abs(ev.getX() - ev.getHistoricalX(0)) < Math.abs(ev.getY() - ev.getHistoricalY(0));
+		} catch (IllegalArgumentException e) {
+			return true;
+		}
 	}
 
 	@Override
@@ -126,7 +134,7 @@ public void onAnimationUpdate(@NonNull ValueAnimator animation) {
 				break;
 		}
 
-		return super.onTouchEvent(ev);
+		return isVerticalScroll(ev) && super.onTouchEvent(ev);
 	}
 
 	private float calculateDamping() {