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

AndreiMisiukevich · AndreiMisiukevich · commit eb3f002e08fe · 2020-10-27T15:01:45.000+03:00
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; }
+    }
+}
diff --git a/TouchEffect/TouchEff.cs b/TouchEffect/TouchEff.cs
diff --git a/TouchEffect/TouchVisualManager.cs b/TouchEffect/TouchVisualManager.cs
diff --git a/TouchEffectSample/TouchFadeViewPage.xaml b/TouchEffectSample/TouchFadeViewPage.xaml
diff --git a/TouchEffectSample/TouchFadeViewPage.xaml.cs b/TouchEffectSample/TouchFadeViewPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ private void OnTouch(object sender, AView.TouchEventArgs e)`
`133`	`133`	`IsCanceled = false;`
`134`	`134`	`_startX = e.Event.GetX();`
`135`	`135`	`_startY = e.Event.GetY();`
	`136`	`+ _effect?.HandleUserInteraction(UserInteractionState.Running);`
`136`	`137`	`_effect?.HandleTouch(TouchStatus.Started);`
`137`	`138`	`StartRipple(e.Event.GetX(), e.Event.GetY());`
`138`	`139`	`if (_effect.DisallowTouchThreshold > 0)`
`@@ -215,6 +216,7 @@ private void HandleEnd(TouchStatus status)`
`215`	`216`	`Group.Parent?.RequestDisallowInterceptTouchEvent(false);`
`216`	`217`	`}`
`217`	`218`	`_effect?.HandleTouch(status);`
	`219`	`+ _effect?.HandleUserInteraction(UserInteractionState.Idle);`
`218`	`220`	`EndRipple();`
`219`	`221`	`}`
`220`	`222`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ public override void MouseDown(NSEvent mouseEvent)`
`134`	`134`	`{`
`135`	`135`	`if (_effect?.IsDisabled ?? true) return;`
`136`	`136`
	`137`	`+ _effect?.HandleUserInteraction(UserInteractionState.Running);`
`137`	`138`	`_effect?.HandleTouch(TouchStatus.Started);`
`138`	`139`	`base.MouseDown(mouseEvent);`
`139`	`140`	`}`
`@@ -151,6 +152,8 @@ public override void MouseUp(NSEvent mouseEvent)`
`151`	`152`
`152`	`153`	`_effect?.HandleTouch(status);`
`153`	`154`	`}`
	`155`	`+ _effect?.HandleUserInteraction(UserInteractionState.Idle);`
	`156`	`+`
`154`	`157`	`base.MouseUp(mouseEvent);`
`155`	`158`	`}`
`156`	`159`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ private void OnPointerCanceled(object sender, PointerRoutedEventArgs e)`
`131`	`131`
`132`	`132`	`_pressed = false;`
`133`	`133`	`_effect?.HandleTouch(TouchStatus.Canceled);`
	`134`	`+ _effect?.HandleUserInteraction(UserInteractionState.Idle);`
`134`	`135`	`_effect?.HandleHover(HoverStatus.Exited);`
`135`	`136`	`AnimateTilt(_pointerUpStoryboard);`
`136`	`137`	`}`
`@@ -145,6 +146,7 @@ private void OnPointerCaptureLost(object sender, PointerRoutedEventArgs e)`
`145`	`146`	`{`
`146`	`147`	`_effect?.HandleTouch(TouchStatus.Canceled);`
`147`	`148`	`}`
	`149`	`+ _effect?.HandleUserInteraction(UserInteractionState.Idle);`
`148`	`150`	`if (_effect.HoverStatus != HoverStatus.Exited)`
`149`	`151`	`{`
`150`	`152`	`_effect?.HandleHover(HoverStatus.Exited);`
`@@ -168,6 +170,7 @@ private void OnPointerReleased(object sender, PointerRoutedEventArgs e)`
`168`	`170`	`AnimateTilt(_pointerUpStoryboard);`
`169`	`171`	`}`
`170`	`172`
	`173`	`+ _effect?.HandleUserInteraction(UserInteractionState.Idle);`
`171`	`174`	`_pressed = false;`
`172`	`175`	`_intentionalCaptureLoss = true;`
`173`	`176`	`}`
`@@ -178,6 +181,7 @@ private void OnPointerPressed(object sender, PointerRoutedEventArgs e)`
`178`	`181`
`179`	`182`	`_pressed = true;`
`180`	`183`	`Container.CapturePointer(e.Pointer);`
	`184`	`+ _effect?.HandleUserInteraction(UserInteractionState.Running);`
`181`	`185`	`_effect?.HandleTouch(TouchStatus.Started);`
`182`	`186`	`AnimateTilt(_pointerDownStoryboard);`
`183`	`187`	`_intentionalCaptureLoss = false;`
Original file line number	Diff line number	Diff line change
`@@ -73,15 +73,15 @@ public override void TouchesBegan(NSSet touches, UIEvent evt)`
`73`	`73`
`74`	`74`	`IsCanceled = false;`
`75`	`75`	`_startPoint = GetTouchPoint(touches);`
`76`		`- HandleTouch(TouchStatus.Started);`
	`76`	`+ HandleTouch(TouchStatus.Started, UserInteractionState.Running);`
`77`	`77`	`base.TouchesBegan(touches, evt);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public override void TouchesEnded(NSSet touches, UIEvent evt)`
`81`	`81`	`{`
`82`	`82`	`if (_effect?.IsDisabled ?? true) return;`
`83`	`83`
`84`		`- HandleTouch(_effect?.Status == TouchStatus.Started ? TouchStatus.Completed : TouchStatus.Canceled);`
	`84`	`+ HandleTouch(_effect?.Status == TouchStatus.Started ? TouchStatus.Completed : TouchStatus.Canceled, UserInteractionState.Idle);`
`85`	`85`	`IsCanceled = true;`
`86`	`86`	`base.TouchesEnded(touches, evt);`
`87`	`87`	`}`
`@@ -90,7 +90,7 @@ public override void TouchesCancelled(NSSet touches, UIEvent evt)`
`90`	`90`	`{`
`91`	`91`	`if (_effect?.IsDisabled ?? true) return;`
`92`	`92`
`93`		`- HandleTouch(TouchStatus.Canceled);`
	`93`	`+ HandleTouch(TouchStatus.Canceled, UserInteractionState.Idle);`
`94`	`94`	`IsCanceled = true;`
`95`	`95`	`base.TouchesCancelled(touches, evt);`
`96`	`96`	`}`
`@@ -108,7 +108,7 @@ public override void TouchesMoved(NSSet touches, UIEvent evt)`
`108`	`108`	`var maxDiff = Max(diffX, diffY);`
`109`	`109`	`if (maxDiff > disallowTouchThreshold)`
`110`	`110`	`{`
`111`		`- HandleTouch(TouchStatus.Canceled);`
	`111`	`+ HandleTouch(TouchStatus.Canceled, UserInteractionState.Idle);`
`112`	`112`	`IsCanceled = true;`
`113`	`113`	`base.TouchesMoved(touches, evt);`
`114`	`114`	`return;`
`@@ -140,7 +140,7 @@ protected override void Dispose(bool disposing)`
`140`	`140`	`private CGPoint? GetTouchPoint(NSSet touches)`
`141`	`141`	`=> Renderer != null ? (touches?.AnyObject as UITouch)?.LocationInView(Renderer) : null;`
`142`	`142`
`143`		`- public void HandleTouch(TouchStatus status)`
	`143`	`+ public void HandleTouch(TouchStatus status, UserInteractionState? userInteractionState = null)`
`144`	`144`	`{`
`145`	`145`	`if (IsCanceled \|\| _effect == null)`
`146`	`146`	`{`
`@@ -149,7 +149,12 @@ public void HandleTouch(TouchStatus status)`
`149`	`149`
`150`	`150`	`if (_effect?.IsDisabled ?? true) return;`
`151`	`151`
`152`		`- _effect?.HandleTouch(status);`
	`152`	`+ _effect.HandleTouch(status);`
	`153`	`+ if (userInteractionState.HasValue)`
	`154`	`+ {`
	`155`	`+ _effect.HandleUserInteraction(userInteractionState.Value);`
	`156`	`+ }`
	`157`	`+`
`153`	`158`	`if (_effect == null \|\| !_effect.NativeAnimation \|\| !_effect.CanExecute)`
`154`	`159`	`{`
`155`	`160`	`return;`
`@@ -196,7 +201,7 @@ public override bool ShouldRecognizeSimultaneously(UIGestureRecognizer gestureRe`
`196`	`201`	`if (gestureRecognizer is TouchUITapGestureRecognizer touchGesture && otherGestureRecognizer is UIPanGestureRecognizer &&`
`197`	`202`	`otherGestureRecognizer.State == UIGestureRecognizerState.Began)`
`198`	`203`	`{`
`199`		`- touchGesture.HandleTouch(TouchStatus.Canceled);`
	`204`	`+ touchGesture.HandleTouch(TouchStatus.Canceled, UserInteractionState.Idle);`
`200`	`205`	`touchGesture.IsCanceled = true;`
`201`	`206`	`}`
`202`	`207`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
++
 +namespace TouchEffect.Enums
 +{
 +    public enum UserInteractionState
 +    {
 +        Idle,
 +        Running
 +    }
 +}
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@ public TouchStateChangedEventArgs(TouchState state)`
`10`	`10`
`11`	`11`	`public TouchState State { get; }`
`12`	`12`	`}`
	`13`	`+`
`13`	`14`	`}`