https://github.com/AndreiMisiukevich/CardView/issues/382

AndreiMisiukevich · Apr 26, 2021 · ac346c3 · ac346c3
1 parent 0f89557
commit ac346c3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 42 deletions.
diff --git a/PanCardView.Droid/CardsViewRenderer.cs b/PanCardView.Droid/CardsViewRenderer.cs
@@ -73,11 +73,7 @@ public override bool OnTouchEvent(MotionEvent e)
                 var yDelta = GetTotalY(e);
                 CheckTouchHandled(xDelta, yDelta);
 
-                if ((Abs(yDelta) <= Abs(xDelta) && Element.IsHorizontalOrientation) ||
-                    (Abs(yDelta) >= Abs(xDelta) && !Element.IsHorizontalOrientation))
-                {
-                    UpdatePan(GestureStatus.Running, xDelta, yDelta);
-                }
+                UpdatePan(GestureStatus.Running, xDelta, yDelta);
             }
 
             HandleDownUpEvents(e);

diff --git a/PanCardView.iOS/CardsViewRenderer.cs b/PanCardView.iOS/CardsViewRenderer.cs
@@ -48,7 +48,6 @@ public override void AddGestureRecognizer(UIGestureRecognizer gestureRecognizer)
 
             if (gestureRecognizer is UIPanGestureRecognizer panGestureRecognizer)
             {
-                gestureRecognizer.ShouldBeRequiredToFailBy = ShouldBeRequiredToFailBy;
                 gestureRecognizer.ShouldRecognizeSimultaneously = ShouldRecognizeSimultaneously;
                 gestureRecognizer.ShouldBegin = ShouldBegin;
             }
@@ -126,41 +125,26 @@ private bool ShouldBegin(UIGestureRecognizer recognizer)
         {
             if (recognizer is UIPanGestureRecognizer pangesture)
             {
-                var velocity = pangesture.VelocityInView(this);
-                var absVelocityX = Abs(velocity.X);
-                var absVelocityY = Abs(velocity.Y);
-                var isHorizontal = Element.IsHorizontalOrientation;
-                return (absVelocityY < absVelocityX && isHorizontal) ||
-                       (absVelocityY > absVelocityX && !isHorizontal);
-            }
-
-            return true;
-        }
-
-        private bool ShouldBeRequiredToFailBy(UIGestureRecognizer gestureRecognizer, UIGestureRecognizer otherGestureRecognizer)
-            => IsPanGestureHandled() && otherGestureRecognizer.View != this;
-
-        private bool ShouldRecognizeSimultaneously(UIGestureRecognizer gestureRecognizer, UIGestureRecognizer otherGestureRecognizer)
-        {
-            if (!(gestureRecognizer is UIPanGestureRecognizer panGesture))
-            {
-                return true;
-            }
-
-            var parent = Element?.Parent;
-            while (parent != null)
-            {
-                if (parent is FlyoutPage && (Element?.IsHorizontalOrientation ?? false))
-                {
-                    var velocity = panGesture.VelocityInView(this);
-                    return Abs(velocity.Y) > Abs(velocity.X);
+                var superview = pangesture.View.Superview;
+                while (superview != null)
+                {
+                    if (superview is UIScrollView)
+                    {
+                        var velocity = pangesture.VelocityInView(this);
+                        var absVelocityX = Abs(velocity.X);
+                        var absVelocityY = Abs(velocity.Y);
+                        var isHorizontal = Element.IsHorizontalOrientation;
+                        return (absVelocityY < absVelocityX && isHorizontal) ||
+                               (absVelocityY > absVelocityX && !isHorizontal);
+                    }
+                    superview = superview.Superview;
                 }
-                parent = parent.Parent;
             }
-            return !IsPanGestureHandled();
-        }
 
-        private bool IsPanGestureHandled()
-            => Abs(Element?.CurrentDiff ?? 0) >= Element?.MoveThresholdDistance;
+            return true;
+        }
+
+        private bool ShouldRecognizeSimultaneously(UIGestureRecognizer gestureRecognizer, UIGestureRecognizer otherGestureRecognizer)
+            => Element == null || !(otherGestureRecognizer is UIPanGestureRecognizer);
     }
 }
diff --git a/PanCardViewSample/PanCardViewSample/Views/CarouselSampleListView.cs b/PanCardViewSample/PanCardViewSample/Views/CarouselSampleListView.cs
@@ -1,8 +1,6 @@
-using System;
-using Xamarin.Forms;
+using Xamarin.Forms;
 using PanCardViewSample.ViewModels;
 using PanCardView;
-using System.Collections.Generic;
 using PanCardView.Extensions;
 using CardCarouselView = PanCardView.CarouselView;