https://github.com/AndreiMisiukevich/TouchEffect/issues/58

AndreiMisiukevich · Oct 27, 2020 · eb3f002 · eb3f002
1 parent 4780d56
commit eb3f002
Show file tree

Hide file tree

Showing 12 changed files with 217 additions and 52 deletions.
diff --git a/TouchEffect.Droid/PlatformTouchEff.cs b/TouchEffect.Droid/PlatformTouchEff.cs
@@ -133,6 +133,7 @@ private void OnTouch(object sender, AView.TouchEventArgs e)
                     IsCanceled = false;
                     _startX = e.Event.GetX();
                     _startY = e.Event.GetY();
+                    _effect?.HandleUserInteraction(UserInteractionState.Running);
                     _effect?.HandleTouch(TouchStatus.Started);
                     StartRipple(e.Event.GetX(), e.Event.GetY());
                     if (_effect.DisallowTouchThreshold > 0)
@@ -215,6 +216,7 @@ private void HandleEnd(TouchStatus status)
                 Group.Parent?.RequestDisallowInterceptTouchEvent(false);
             }
             _effect?.HandleTouch(status);
+            _effect?.HandleUserInteraction(UserInteractionState.Idle);
             EndRipple();
         }
 

diff --git a/TouchEffect.Mac/PlatformTouchEff.cs b/TouchEffect.Mac/PlatformTouchEff.cs
@@ -134,6 +134,7 @@ public override void MouseDown(NSEvent mouseEvent)
         {
             if (_effect?.IsDisabled ?? true) return;
 
+            _effect?.HandleUserInteraction(UserInteractionState.Running);
             _effect?.HandleTouch(TouchStatus.Started);
             base.MouseDown(mouseEvent);
         }
@@ -151,6 +152,8 @@ public override void MouseUp(NSEvent mouseEvent)
 
                 _effect?.HandleTouch(status);
             }
+            _effect?.HandleUserInteraction(UserInteractionState.Idle);
+
             base.MouseUp(mouseEvent);
         }
 

diff --git a/TouchEffect.UWP/PlatformTouchEff.cs b/TouchEffect.UWP/PlatformTouchEff.cs
@@ -131,6 +131,7 @@ private void OnPointerCanceled(object sender, PointerRoutedEventArgs e)
 
             _pressed = false;
             _effect?.HandleTouch(TouchStatus.Canceled);
+            _effect?.HandleUserInteraction(UserInteractionState.Idle);
             _effect?.HandleHover(HoverStatus.Exited);
             AnimateTilt(_pointerUpStoryboard);
         }
@@ -145,6 +146,7 @@ private void OnPointerCaptureLost(object sender, PointerRoutedEventArgs e)
             {
                 _effect?.HandleTouch(TouchStatus.Canceled);
             }
+            _effect?.HandleUserInteraction(UserInteractionState.Idle);
             if (_effect.HoverStatus != HoverStatus.Exited)
             {
                 _effect?.HandleHover(HoverStatus.Exited);
@@ -168,6 +170,7 @@ private void OnPointerReleased(object sender, PointerRoutedEventArgs e)
                 AnimateTilt(_pointerUpStoryboard);
             }
 
+            _effect?.HandleUserInteraction(UserInteractionState.Idle);
             _pressed = false;
             _intentionalCaptureLoss = true;
         }
@@ -178,6 +181,7 @@ private void OnPointerPressed(object sender, PointerRoutedEventArgs e)
 
             _pressed = true;
             Container.CapturePointer(e.Pointer);
+            _effect?.HandleUserInteraction(UserInteractionState.Running);
             _effect?.HandleTouch(TouchStatus.Started);
             AnimateTilt(_pointerDownStoryboard);
             _intentionalCaptureLoss = false;

diff --git a/TouchEffect.iOS/PlatformTouchEff.cs b/TouchEffect.iOS/PlatformTouchEff.cs
@@ -73,15 +73,15 @@ public override void TouchesBegan(NSSet touches, UIEvent evt)
 
             IsCanceled = false;
             _startPoint = GetTouchPoint(touches);
-            HandleTouch(TouchStatus.Started);
+            HandleTouch(TouchStatus.Started, UserInteractionState.Running);
             base.TouchesBegan(touches, evt);
         }
 
         public override void TouchesEnded(NSSet touches, UIEvent evt)
         {
             if (_effect?.IsDisabled ?? true) return;
 
-            HandleTouch(_effect?.Status == TouchStatus.Started ? TouchStatus.Completed : TouchStatus.Canceled);
+            HandleTouch(_effect?.Status == TouchStatus.Started ? TouchStatus.Completed : TouchStatus.Canceled, UserInteractionState.Idle);
             IsCanceled = true;
             base.TouchesEnded(touches, evt);
         }
@@ -90,7 +90,7 @@ public override void TouchesCancelled(NSSet touches, UIEvent evt)
         {
             if (_effect?.IsDisabled ?? true) return;
 
-            HandleTouch(TouchStatus.Canceled);
+            HandleTouch(TouchStatus.Canceled, UserInteractionState.Idle);
             IsCanceled = true;
             base.TouchesCancelled(touches, evt);
         }
@@ -108,7 +108,7 @@ public override void TouchesMoved(NSSet touches, UIEvent evt)
                 var maxDiff = Max(diffX, diffY);
                 if (maxDiff > disallowTouchThreshold)
                 {
-                    HandleTouch(TouchStatus.Canceled);
+                    HandleTouch(TouchStatus.Canceled, UserInteractionState.Idle);
                     IsCanceled = true;
                     base.TouchesMoved(touches, evt);
                     return;
@@ -140,7 +140,7 @@ protected override void Dispose(bool disposing)
         private CGPoint? GetTouchPoint(NSSet touches)
             => Renderer != null ? (touches?.AnyObject as UITouch)?.LocationInView(Renderer) : null;
 
-        public void HandleTouch(TouchStatus status)
+        public void HandleTouch(TouchStatus status, UserInteractionState? userInteractionState = null)
         {
             if (IsCanceled || _effect == null)
             {
@@ -149,7 +149,12 @@ public void HandleTouch(TouchStatus status)
 
             if (_effect?.IsDisabled ?? true) return;
 
-            _effect?.HandleTouch(status);
+            _effect.HandleTouch(status);
+            if (userInteractionState.HasValue)
+            {
+                _effect.HandleUserInteraction(userInteractionState.Value);
+            }
+
             if (_effect == null || !_effect.NativeAnimation || !_effect.CanExecute)
             {
                 return;
@@ -196,7 +201,7 @@ public override bool ShouldRecognizeSimultaneously(UIGestureRecognizer gestureRe
             if (gestureRecognizer is TouchUITapGestureRecognizer touchGesture && otherGestureRecognizer is UIPanGestureRecognizer &&
                 otherGestureRecognizer.State == UIGestureRecognizerState.Began)
             {
-                touchGesture.HandleTouch(TouchStatus.Canceled);
+                touchGesture.HandleTouch(TouchStatus.Canceled, UserInteractionState.Idle);
                 touchGesture.IsCanceled = true;
             }
 

diff --git a/TouchEffect/Delegates/TEffectUserInteractionStateChangedHandler.cs b/TouchEffect/Delegates/TEffectUserInteractionStateChangedHandler.cs
@@ -0,0 +1,7 @@
+using TouchEffect.EventArgs;
+using Xamarin.Forms;
+
+namespace TouchEffect.Delegates
+{
+    public delegate void TEffectUserInteractionStateChangedHandler(VisualElement sender, UserInteractionStateChangedEventArgs args);
+}
diff --git a/TouchEffect/Enums/UserInteractionState.cs b/TouchEffect/Enums/UserInteractionState.cs
@@ -0,0 +1,9 @@
+
+namespace TouchEffect.Enums
+{
+    public enum UserInteractionState
+    {
+        Idle,
+        Running
+    }
+}
diff --git a/TouchEffect/EventArgs/TouchStateChangedEventArgs.cs b/TouchEffect/EventArgs/TouchStateChangedEventArgs.cs
@@ -10,4 +10,5 @@ public TouchStateChangedEventArgs(TouchState state)
 
         public TouchState State { get; }
     }
+
 }
diff --git a/TouchEffect/EventArgs/UserInteractionStateChangedEventArgs.cs b/TouchEffect/EventArgs/UserInteractionStateChangedEventArgs.cs
@@ -0,0 +1,13 @@
+using TouchEffect.Enums;
+namespace TouchEffect.EventArgs
+{
+    public class UserInteractionStateChangedEventArgs : System.EventArgs
+    {
+        public UserInteractionStateChangedEventArgs(UserInteractionState userInteractionstate)
+        {
+            UserInteractionState = userInteractionstate;
+        }
+
+        public UserInteractionState UserInteractionState { get; }
+    }
+}