fix: Updated sample, fix touch manipulation & iOS rendering, fix key error + code cleanup and more

Maui.FreakyEffects/Maui.FreakyEffects/Maui.FreakyEffects.csproj

@@ -10,7 +10,7 @@
 		<RootNamespace>Maui.FreakyEffects</RootNamespace>
 		<AssemblyVersion>0.1.0</AssemblyVersion>
 		<AssemblyFileVersion>0.1.0</AssemblyFileVersion>
-		<Version>0.1.0-pre</Version>
+		<Version>0.1.0</Version>
 		<NeutralLanguage>en</NeutralLanguage>
 		<!--Version of C# to use -->
 		<PackageId>FreakyEffects</PackageId>
@@ -38,6 +38,9 @@
 		<LangVersion>latest</LangVersion>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-ios|AnyCPU'">
+	  <CreatePackage>false</CreatePackage>
+	</PropertyGroup>
 	<ItemGroup>
 		<None Remove="Platforms\Android\" />
 		<None Remove="Platforms\iOS\" />
@@ -52,6 +55,6 @@
 		<Folder Include="Shared\Skeleton\" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.3" />
+		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
 	</ItemGroup>
 </Project>

Maui.FreakyEffects/Maui.FreakyEffects/Platforms/Android/ContextExtensions.cs

@@ -32,5 +32,4 @@ public static float ToPixels(this Context self, double dp)
 
         return (float)Math.Round(dp * _displayDensity);
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Platforms/Android/TouchEffect.cs

@@ -21,12 +21,10 @@ protected override void OnAttached()
         {
             return;
         }
-
         _touchHandler = new TouchHandler();
         _touchHandler.TouchAction += TouchHandlerOnTouch;
         _touchHandler.Capture = _touchEffect.Capture;
         _touchHandler.RegisterEvents(_view);
-
     }
 
     private void TouchHandlerOnTouch(object sender, TouchActionEventArgs args)
@@ -43,5 +41,4 @@ protected override void OnDetached()
         _touchHandler.TouchAction -= TouchHandlerOnTouch;
         _touchHandler.UnregisterEvents(_view);
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Platforms/Android/TouchHandler.cs

@@ -81,145 +81,144 @@
         return screenPointerCoords;
     }
 
     private void OnTouch(object sender, View.TouchEventArgs args)
     {
         // Two object common to all the events
         View senderView = sender as View;
         MotionEvent motionEvent = args.Event;
 
         // Get the pointer index
         int pointerIndex = motionEvent.ActionIndex;
 
         // Get the id that identifies a finger over the course of its progress
         int id = motionEvent.GetPointerId(pointerIndex);
 
         senderView.GetLocationOnScreen(_locationOnScreen);
         TouchTrackingPoint screenPointerCoords =
             GetScreenPointerCoordinates(_locationOnScreen, motionEvent, pointerIndex);
 
-
         // Use ActionMasked here rather than Action to reduce the number of possibilities
         switch (args.Event.ActionMasked)
         {
             case MotionEventActions.Down:
             case MotionEventActions.PointerDown:
                 FireEvent(this, id, TouchActionType.Pressed, screenPointerCoords, true);
 
                 if (!_idToTouchHandlerDictionary.ContainsKey(id))
                 {
                     _idToTouchHandlerDictionary.Add(id, this);
                 }
 
                 _capture = Capture;
 
                 if (UseTouchSlop)
                 {
                     _lastX = args.Event.GetX();
                     _lastY = args.Event.GetY();
                 }
                 break;
 
             case MotionEventActions.Move:
                 if (motionEvent.PointerCount == 1 && UseTouchSlop)
                 {
                     id = motionEvent.GetPointerId(0);
                     senderView.GetLocationOnScreen(_locationOnScreen);
 
                     if (!_moveInProgress)
                     {
                         var x = args.Event.GetX();
                         var y = args.Event.GetY();
 
                         var xDiff = Math.Abs(_lastX - x);
                         var yDiff = Math.Abs(_lastY - y);
 
                         if (xDiff > _slop || yDiff > _slop)
                         {
                             _moveInProgress = true;
                         }
                     }
 
                     if (_moveInProgress)
                     {
                         screenPointerCoords = GetScreenPointerCoordinates(_locationOnScreen, motionEvent, pointerIndex);
                         FireEvent(this, id, TouchActionType.Moved, screenPointerCoords, true);
                     }
 
                     break;
                 }
 
                 _moveInProgress = false;
                 _lastX = 0;
                 _lastY = 0;
 
                 // Multiple Move events are bundled, so handle them in a loop
                 for (pointerIndex = 0; pointerIndex < motionEvent.PointerCount; pointerIndex++)
                 {
                     id = motionEvent.GetPointerId(pointerIndex);
 
                     if (_capture)
                     {
                         senderView.GetLocationOnScreen(_locationOnScreen);
 
                         screenPointerCoords = GetScreenPointerCoordinates(_locationOnScreen, motionEvent, pointerIndex);
                         FireEvent(this, id, TouchActionType.Moved, screenPointerCoords, true);
                     }
                     else
                     {
                         CheckForBoundaryHop(id, screenPointerCoords);
 
                         if (_idToTouchHandlerDictionary[id] != null)
                         {
                             FireEvent(_idToTouchHandlerDictionary[id], id, TouchActionType.Moved, screenPointerCoords, true);
                         }
                     }
                 }
                 break;
 
             case MotionEventActions.Up:
             case MotionEventActions.Pointer1Up:
                 if (_capture)
                 {
                     FireEvent(this, id, TouchActionType.Released, screenPointerCoords, false);
                 }
                 else
                 {
                     CheckForBoundaryHop(id, screenPointerCoords);
 
                     if (_idToTouchHandlerDictionary[id] != null)
                     {
                         FireEvent(_idToTouchHandlerDictionary[id], id, TouchActionType.Released, screenPointerCoords, false);
                     }
                 }
                 _idToTouchHandlerDictionary.Remove(id);
 
                 _moveInProgress = false;
                 _lastX = 0;
                 _lastY = 0;
                 break;
 
             case MotionEventActions.Cancel:
                 if (_capture)
                 {
                     FireEvent(this, id, TouchActionType.Cancelled, screenPointerCoords, false);
                 }
                 else
                 {
                     if (_idToTouchHandlerDictionary[id] != null)
                     {
                         FireEvent(_idToTouchHandlerDictionary[id], id, TouchActionType.Cancelled, screenPointerCoords, false);
                     }
                 }
                 _idToTouchHandlerDictionary.Remove(id);
 
                 _moveInProgress = false;
                 _lastX = 0;
                 _lastY = 0;
                 break;
         }
     }
 
     private void CheckForBoundaryHop(int id, TouchTrackingPoint pointerLocation)
     {
         TouchHandler touchEffectHit = null;
 
@@ -268,5 +267,4 @@
         OnTouchAction(touchEffect._view,
             new TouchActionEventArgs(id, actionType, point, isInContact));
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Platforms/iOS/TouchEffect.cs

@@ -26,7 +26,6 @@ protected override void OnAttached()
         _touchHandler.TouchAction += TouchHandlerOnTouch;
         _touchHandler.Capture = _touchEffect.Capture;
         _touchHandler.RegisterEvents(_view);
-
     }
 
     private void TouchHandlerOnTouch(object sender, TouchActionEventArgs args)
@@ -43,4 +42,4 @@ protected override void OnDetached()
         _touchHandler.TouchAction -= TouchHandlerOnTouch;
         _touchHandler.UnregisterEvents(_view);
     }
-}
+}

Maui.FreakyEffects/Maui.FreakyEffects/Platforms/iOS/TouchRecognizer.cs

@@ -29,7 +29,6 @@ public void Detach()
         viewDictionary.Remove(_view);
     }
 
-
     // touches = touches of interest; evt = all touches of type UITouch
     public override void TouchesBegan(NSSet touches, UIEvent evt)
     {
@@ -75,7 +74,6 @@ public override void TouchesMoved(NSSet touches, UIEvent evt)
     public override void TouchesEnded(NSSet touches, UIEvent evt)
     {
         base.TouchesEnded(touches, evt);
-
         foreach (UITouch touch in touches.Cast<UITouch>())
         {
             long id = touch.Handle.Handle.ToInt64();
@@ -120,8 +118,6 @@ public override void TouchesCancelled(NSSet touches, UIEvent evt)
     void CheckForBoundaryHop(UITouch touch)
     {
         long id = touch.Handle.Handle.ToInt64();
-
-        // TODO: Might require converting to a List for multiple hits
         TouchRecognizer recognizerHit = null;
 
         foreach (UIView view in viewDictionary.Keys)

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Extensions.cs

@@ -9,7 +9,6 @@
 using PlatformTouchEffects = Maui.FreakyEffects.Platforms.iOS.TouchEffect;
 #endif
 
-
 namespace Maui.FreakyEffects;
 
 public static class Extensions
@@ -18,4 +17,4 @@ public static void InitFreakyEffects(this IEffectsBuilder effects)
     {
         effects.Add<TouchEffect, PlatformTouchEffects>();
     }
-}
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/AnimationTypes.cs

@@ -7,5 +7,4 @@ public enum AnimationTypes
     Fade,
     VerticalShake,
     HorizontalShake
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/BaseAnimation.cs

@@ -8,7 +8,6 @@ public abstract class BaseAnimation : IAnimation
     public double Parameter { get; set; }
 
     protected abstract Task<bool> Animate(BindableObject bindable);
-
     protected abstract Task StopAnimation(BindableObject bindable);
 
     public void Start(BindableObject bindable)
@@ -35,5 +34,4 @@ private async Task<bool> Run(BindableObject bindable)
             return await Run(bindable);
         }
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/BaseAnimationTypeConverter.cs

@@ -16,7 +16,6 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destina
     /// <inheritdoc/>
 	public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
     {
-
         return null;
         //var valueAsString = value?.ToString() ?? string.Empty;
 
@@ -58,5 +57,4 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destina
     //    var type = (AnimationTypes)Enum.Parse(typeof(AnimationTypes), value);
     //    return new DefaultAnimationExtension() { Source = type }.ProvideValue(null);
     //}
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/BeatAnimation.cs

@@ -21,5 +21,4 @@ protected override async Task StopAnimation(BindableObject bindable)
         var self = (View)bindable;
         await self.ScaleTo(1, 100);
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/FadeAnimation.cs

@@ -21,5 +21,4 @@ protected override async Task StopAnimation(BindableObject bindable)
         var self = (View)bindable;
         await self.FadeTo(1, 100);
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/HorizontalShakeAnimation.cs

@@ -21,5 +21,4 @@ protected override async Task StopAnimation(BindableObject bindable)
         if (bindable is View self)
             await self.TranslateTo(0, 0, 100);
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/IAnimation.cs

@@ -4,5 +4,4 @@ public interface IAnimation
 {
     void Start(BindableObject bindable);
     void Stop(BindableObject bindable);
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/Skeleton/VerticalShakeAnimation.cs

@@ -5,7 +5,7 @@ public class VerticalShakeAnimation : BaseAnimation
     public VerticalShakeAnimation(int interval, double? parameter)
     {
         this.Interval = (uint)interval;
-        this.Parameter = parameter.HasValue ? parameter.Value : 15;
+        this.Parameter = parameter ?? 15;
     }
 
     protected override async Task<bool> Animate(BindableObject bindable)
@@ -21,5 +21,4 @@ protected override async Task StopAnimation(BindableObject bindable)
         if (bindable is View self)
             await self.TranslateTo(0, 0, 100);
     }
-}
-
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/SkiaScene/SkiaScene.TouchManipulation/SceneGestureResponder.cs

@@ -8,16 +8,16 @@ public class SceneGestureResponder : ISceneGestureResponder
     private readonly ISKScene _skScene;
     private readonly ITouchGestureRecognizer _touchGestureRecognizer;
 
+    public TouchManipulationMode TouchManipulationMode { get; set; }
+    public bool EnableTwoFingersPanInIsotropicScaleMode { get; set; }
+    public float DoubleTapScaleFactor { get; set; } = 2f;
+
     public SceneGestureResponder(ISKScene skScene, ITouchGestureRecognizer touchGestureRecognizer)
     {
         _skScene = skScene;
         _touchGestureRecognizer = touchGestureRecognizer;
     }
 
-    public TouchManipulationMode TouchManipulationMode { get; set; }
-    public bool EnableTwoFingersPanInIsotropicScaleMode { get; set; }
-    public float DoubleTapScaleFactor { get; set; } = 2f;
-
     public void StartResponding()
     {
         _touchGestureRecognizer.OnPan += TouchGestureRecognizerOnPan;
@@ -31,7 +31,6 @@ public void StopResponding()
         _touchGestureRecognizer.OnDoubleTap -= TouchGestureRecognizerOnDoubleTap;
     }
 
-
     protected virtual void TouchGestureRecognizerOnPinch(object sender, PinchEventArgs args)
     {
         if (args.TouchActionType != TouchActionType.Moved)
@@ -105,4 +104,4 @@ private float GetAngleBetweenVectors(SKPoint oldVector, SKPoint newVector)
         float angle = newAngle - oldAngle;
         return angle;
     }
-}
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/SkiaScene/SkiaScene.TouchManipulation/TouchGestureRecognizer.cs

@@ -25,12 +25,23 @@ public void ProcessTouchEvent(long id, TouchActionType type, SKPoint location)
         switch (type)
         {
             case TouchActionType.Pressed:
-                _touchDictionary.Add(id, new TouchManipulationInfo
+                // TODO: System.ArgumentException Message = An item with the same key has already been added.Key: 1 happens after a few pinches
+                var newTouchManipulation = new TouchManipulationInfo
                 {
                     PreviousPoint = location,
                     NewPoint = location,
                     MoveCounter = 0
-                });
+                };
+
+                if (_touchDictionary.ContainsKey(id))
+                {
+                    _touchDictionary[id] = newTouchManipulation;
+                }
+                else
+                {
+                    _touchDictionary.Add(id, newTouchManipulation);
+                }
+
                 break;
 
             case TouchActionType.Moved:
@@ -125,4 +136,4 @@ private void DetectPinchAndPanGestures(TouchActionType touchActionType)
             OnPinch?.Invoke(this, new PinchEventArgs(previousPoint, newPoint, pivotPoint, touchActionType));
         }
     }
-}
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/SkiaScene/SkiaScene/SKScene.cs

@@ -37,7 +37,10 @@ public void MoveByVector(SKPoint vector)
             return;
         }
         var resultPoint = invertedMatrix.MapVector(vector.X, vector.Y);
-        Matrix.PreConcat(SKMatrix.CreateTranslation(resultPoint.X, resultPoint.Y));
+
+        // TODO: Matrix.IsIdentity was true, even after multiple gestures, which means that the Matrix doesn't hold on to it's new values. Matrix = ... is the right syntax.
+        Matrix = Matrix.PreConcat(SKMatrix.CreateTranslation(resultPoint.X, resultPoint.Y));
+
         if (CenterBoundary.IsEmpty)
         {
             return;
@@ -46,34 +49,34 @@ public void MoveByVector(SKPoint vector)
         if (!CenterBoundary.Contains(center))
         {
             //rollback
-            Matrix.PreConcat(SKMatrix.CreateTranslation(-resultPoint.X, -resultPoint.Y));
+            Matrix = Matrix.PreConcat(SKMatrix.CreateTranslation(-resultPoint.X, -resultPoint.Y));
         }
     }
 
     public void MoveToPoint(SKPoint point)
     {
         var center = GetCenter();
         SKPoint diff = center - point;
-        Matrix.PreConcat(SKMatrix.CreateTranslation(diff.X, diff.Y));
+        Matrix = Matrix.PreConcat(SKMatrix.CreateTranslation(diff.X, diff.Y));
     }
 
     public void Rotate(SKPoint point, float radians)
     {
         var currentAngle = GetAngleInRadians();
         var angleDiff = radians - currentAngle;
-        Matrix.PreConcat(SKMatrix.CreateRotation(angleDiff, point.X, point.Y));
+        Matrix = Matrix.PreConcat(SKMatrix.CreateRotation(angleDiff, point.X, point.Y));
     }
 
     public void RotateByRadiansDelta(SKPoint point, float radiansDelta)
     {
-        Matrix.PreConcat(SKMatrix.CreateRotation(radiansDelta, point.X, point.Y));
+        Matrix = Matrix.PreConcat(SKMatrix.CreateRotation(radiansDelta, point.X, point.Y));
     }
 
     public void Zoom(SKPoint point, float scale)
     {
         var currentScale = GetScale();
         var scaleFactor = scale / currentScale;
-        Matrix.PreConcat(SKMatrix.CreateScale(scaleFactor, scaleFactor, point.X, point.Y));
+        Matrix = Matrix.PreConcat(SKMatrix.CreateScale(scaleFactor, scaleFactor, point.X, point.Y));
     }
 
     public void ZoomByScaleFactor(SKPoint point, float scaleFactor)
@@ -92,15 +95,13 @@ public void ZoomByScaleFactor(SKPoint point, float scaleFactor)
                 return;
             }
         }
-        Matrix.PreConcat(SKMatrix.CreateScale(scaleFactor, scaleFactor, point.X, point.Y));
-    }
 
+        Matrix = Matrix.PreConcat(SKMatrix.CreateScale(scaleFactor, scaleFactor, point.X, point.Y));
+    }
 
     public SKPoint GetCanvasPointFromViewPoint(SKPoint viewPoint)
     {
-
-        SKMatrix invertedMatrix;
-        if (!Matrix.TryInvert(out invertedMatrix))
+        if (!Matrix.TryInvert(out SKMatrix invertedMatrix))
         {
             return SKPoint.Empty;
         }
@@ -130,7 +131,7 @@ public float GetScale()
         //https://stackoverflow.com/questions/4361242/extract-rotation-scale-values-from-2d-transformation-matrix
         var scaleX = Matrix.ScaleX;
         var skewY = Matrix.SkewY;
-        var result = Math.Sqrt(scaleX * scaleX + skewY * skewY);
+        var result = Math.Sqrt((scaleX * scaleX) + (skewY * skewY));
         return (float)result;
     }
 }

Maui.FreakyEffects/Maui.FreakyEffects/Shared/TouchTracking/TouchActionEventArgs.cs

@@ -0,0 +1,17 @@
+namespace Maui.FreakyEffects.TouchTracking;
+
+public class TouchActionEventArgs : EventArgs
+{
+    public TouchActionEventArgs(long id, TouchActionType type, TouchTrackingPoint location, bool isInContact)
+    {
+        Id = id;
+        Type = type;
+        Location = location;
+        IsInContact = isInContact;
+    }
+
+    public long Id { private set; get; }
+    public TouchActionType Type { private set; get; }
+    public TouchTrackingPoint Location { private set; get; }
+    public bool IsInContact { private set; get; }
+}

Maui.FreakyEffects/Maui.FreakyEffects/Shared/TouchTracking/TouchActionType.cs

@@ -0,0 +1,11 @@
+namespace Maui.FreakyEffects.TouchTracking;
+
+public enum TouchActionType
+{
+    Entered = 0,
+    Pressed = 1,
+    Moved = 2,
+    Released = 3,
+    Cancelled = 4,
+    Exited = 5
+}