1.2.9.7

README.md

@@ -90,8 +90,9 @@ ___Please star ⭐ if you like it, helps very much!___
 
 ## What's New
 
-### Nuget 1.2.9.6
+### Nuget 1.2.9.7
 for SkiaSharp 2.88.9-preview.2.2 
+* Added gestures delegate `OnGestures` to SkiaLayout.
 * HotFix for SkiaCarousel always setting index at 0 upon initialization.
 * HotFix for random crash accessing disposed LoadedImageSource.
 * [HotFix](https://github.com/taublast/DrawnUi.Maui/issues/136) for loading images from StreamImageSource
@@ -123,6 +124,7 @@ V3 preview: subclassed `SkiaShaderEffect`, implementing `ISkiaGestureProcessor`,
 
  ## Development Notes
 
+* To compile the v3 version that supports NEW SHADERS you must set `<UseSkiaSharp3>true</UseSkiaSharp3>` inside `Directory.Build.props` file.
 * All files to be consumed (images etc) must be placed inside the MAUI app Resources/Raw folder, subfolders allowed. If you need to load from the native app folder use prefix "file://".
 * Accessibility support is compatible and is on the roadmap.
 
@@ -716,19 +718,20 @@ It will render a mask over its children when hovered, think of it as an inverted
 
 ## Published Apps powered by DrawnUI For .Net MAUI
 
-### Bug ID: Insect Identifier AI
-
-_Totally drawn with just one root view `Canvas` and `SkiaShell` for navigation. First ever drawn MAUI app!_
-
-GooglePlay: https://play.google.com/store/apps/details?id=com.niroapps.insects
-
 ### Racebox
 
 _MAUI pages with canvases, custom navigation. All scrolls, cells collections, maps, buttons, labels and custom controls are drawn._
 
 iOS: https://apps.apple.com/us/app/racebox-vehicle-dynamics/id6444165250  
 GooglePlay: https://play.google.com/store/apps/details?id=com.raceboxcompanion.app
 
+### Bug ID: Insect Identifier AI
+
+_Totally drawn with just one root view `Canvas` and `SkiaShell` for navigation. First ever drawn MAUI app!_
+
+__Ooops looks like the app API went dead, client maybe abandoned the project due to AI detecting stuff better than dedicated neural networks!__
+
+GooglePlay: https://play.google.com/store/apps/details?id=com.niroapps.insects
+
 
 
-

dev/github_uploadnugets.bat

@@ -13,8 +13,8 @@ REM Define the source directory for the packages
 set "source_dir=E:\Nugets"
 
 REM Define the list of file masks for the packages
-set "mask[1]=DrawnUi.Maui*.1.2.9.6*.nupkg"
-set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.6*.*nupkg"
+set "mask[1]=DrawnUi.Maui*.1.2.9.7*.nupkg"
+set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.7*.*nupkg"
 set "mask_count=2"
 
 REM Loop through each file mask

dev/nuget_uploadnugets.bat

@@ -13,8 +13,8 @@ REM Define the source directory for the packages
 set "source_dir=E:\Nugets"
 
 REM Define the list of file masks for the packages
-set "mask[1]=DrawnUi.Maui*.1.2.9.6*.nupkg"
-set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.6*.*nupkg"
+set "mask[1]=DrawnUi.Maui*.1.2.9.7*.nupkg"
+set "mask[2]=AppoMobi.Maui.DrawnUi.1.2.9.7*.*nupkg"
 set "mask_count=2"
 
 REM Loop through each file mask
@@ -24,7 +24,7 @@ for /L %%i in (1,1,%mask_count%) do (
     REM Loop through each package file matching the mask in the source directory
     for %%f in ("!source_dir!\!file_mask!") do (
         echo Uploading "%%f" to NUGET.ORG with API key.
-        nuget push "%%f" -Source https://api.nuget.org/v3/index.json -ApiKey %APIKEY%
+        nuget push "%%f" -Source https://api.nuget.org/v3/index.json -ApiKey %APIKEY% -SkipDuplicate
         if errorlevel 1 (
             echo An error occurred while uploading "%%f".
         ) else (

src/Addons/DrawnUi.Maui.Camera/DrawnUi.Maui.Camera.csproj

@@ -44,7 +44,7 @@
 
     <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.6" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.7" />
   </ItemGroup>
 
 </Project>

src/Addons/DrawnUi.Maui.Game/DrawnUi.Maui.Game.csproj

@@ -42,7 +42,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.6" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.7" />
   </ItemGroup>
 
 

src/Addons/DrawnUi.Maui.MapsUi/src/DrawnUi.Maui.MapsUi.csproj

@@ -54,7 +54,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.6" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.7" />
   </ItemGroup>
 
 </Project>

src/Addons/DrawnUi.Maui.Rive/DrawnUi.Maui.Rive.csproj

@@ -47,7 +47,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.6" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.7" />
   </ItemGroup>
 
 

src/Addons/DrawnUi.MauiGraphics/DrawnUi.MauiGraphics.csproj

@@ -41,7 +41,7 @@
 
   <!--production-->
   <ItemGroup Condition="'$(UseNuget)' == 'true'">
-    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.6" />
+    <PackageReference Include="AppoMobi.Maui.DrawnUi" Version="1.2.9.7" />
   </ItemGroup>
 
   <ItemGroup>

src/Directory.Build.props

@@ -5,13 +5,13 @@
 
   <PropertyGroup Condition="'$(UseSkiaSharp3)' != 'true'">
     <PackageReleaseNotes>Using SkiaSharp 2.xx. Checkout the DrawnUi Sandbox project for usage example.</PackageReleaseNotes>
-    <Version>1.2.9.6</Version>
+    <Version>1.2.9.7</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseSkiaSharp3)' == 'true'">
     <DefineConstants>$(DefineConstants);SKIA3</DefineConstants>
     <PackageReleaseNotes>Using SkiaSharp 3-preview. New handlers, SKSL, WinUI hardware acceleration etc..</PackageReleaseNotes>
-    <Version>1.3.55.1-pre</Version>
+    <Version>1.3.56.1-pre</Version>
   </PropertyGroup>
 
 </Project>

src/Engine/Draw/Base/SkiaControl.Shared.cs

@@ -585,7 +585,7 @@
         /// <param name="cancel"></param>
         /// <param name="onStopped"></param>
         /// <returns></returns>
         public Task AnimateRangeAsync(Action<double> callback, double start, double end, double length = 250, Easing easing = null,
             CancellationToken cancel = default,
             bool applyEndValueOnStop = false)
         {
@@ -1398,7 +1398,7 @@
         /// <summary>
         /// Use clipping area from another control
         /// </summary>
         public new SkiaControl ClipFrom
         {
             get { return (SkiaControl)GetValue(ClipFromProperty); }
             set { SetValue(ClipFromProperty, value); }
@@ -5858,19 +5858,14 @@
         {
             if (shadow != null && paint != null)
             {
-
-                if (LastShadow == null || LastShadow.Shadow != shadow ||
-                    LastShadow.Scale != scale)
+                var kill = LastShadow;
+                LastShadow = new()
                 {
-                    var kill = LastShadow;
-                    LastShadow = new()
-                    {
-                        Filter = CreateShadow(shadow, scale),
-                        Scale = scale,
-                        Shadow = shadow
-                    };
-                    DisposeObject(kill);
-                }
+                    Filter = CreateShadow(shadow, scale),
+                    Scale = scale,
+                    Shadow = shadow
+                };
+                DisposeObject(kill);
 
                 var old = paint.ImageFilter;
                 paint.ImageFilter = LastShadow.Filter;

src/Engine/Draw/Layout/SkiaLayout.Grid.Structure.cs

@@ -5,92 +5,6 @@
 
 namespace DrawnUi.Maui.Draw;
 
-public static class FluentExtensions
-{
-    public static T With<T>(this T view, Action<T> action) where T : SkiaControl
-    {
-        action?.Invoke(view);
-        return view;
-    }
-
-    public static T WithParent<T>(this T view, IDrawnBase parent) where T : SkiaControl
-    {
-        parent.AddSubView(view);
-        return view;
-    }
-
-    public static T CenterX<T>(this T view) where T : SkiaControl
-    {
-        view.HorizontalOptions = LayoutOptions.Center;
-        return view;
-    }
-
-    public static T CenterY<T>(this T view) where T : SkiaControl
-    {
-        view.VerticalOptions = LayoutOptions.Center;
-        return view;
-    }
-
-}
-
-public static class GridExtensions
-{
-    public static T WithRow<T>(this T view, int row) where T : SkiaControl
-    {
-        Grid.SetRow(view, row);
-        return view;
-    }
-
-    public static T WithColumn<T>(this T view, int column) where T : SkiaControl
-    {
-        Grid.SetColumn(view, column);
-        return view;
-    }
-
-    public static T WithRowSpan<T>(this T view, int rowSpan) where T : SkiaControl
-    {
-        Grid.SetRowSpan(view, rowSpan);
-        return view;
-    }
-
-    public static T WithColumnSpan<T>(this T view, int columnSpan) where T : SkiaControl
-    {
-        Grid.SetColumnSpan(view, columnSpan);
-        return view;
-    }
-
-    public static SkiaLayout WithColumnDefinitions(this SkiaLayout grid, string columnDefinitions)
-    {
-        var converter = new ColumnDefinitionCollectionTypeConverter();
-
-        if (converter.CanConvertFrom(typeof(string)))
-        {
-            var columns = (ColumnDefinitionCollection)converter.ConvertFromInvariantString(columnDefinitions);
-            grid.ColumnDefinitions = columns;
-        }
-        else
-        {
-            throw new InvalidOperationException("ColumnDefinitionCollectionTypeConverter cannot convert from string.");
-        }
-        return grid;
-    }
-    public static SkiaLayout WithRowDefinitions(this SkiaLayout grid, string definitions)
-    {
-        var converter = new ColumnDefinitionCollectionTypeConverter();
-
-        if (converter.CanConvertFrom(typeof(string)))
-        {
-            var defs = (RowDefinitionCollection)converter.ConvertFromInvariantString(definitions);
-            grid.RowDefinitions = defs;
-        }
-        else
-        {
-            throw new InvalidOperationException("RowDefinitionCollectionTypeConverter cannot convert from string.");
-        }
-        return grid;
-    }
-}
-
 public partial class SkiaLayout
 {
     public class SkiaGridStructure

src/Engine/Draw/Layout/SkiaLayout.cs

@@ -8,6 +8,30 @@ namespace DrawnUi.Maui.Draw
 
     public partial class SkiaLayout : SkiaControl, ISkiaGestureListener, ISkiaGridLayout
     {
+        /// <summary>
+        /// For easier code-behind use
+        /// </summary>
+        /// <param name="args"></param>
+        /// <param name="apply"></param>
+        /// <returns></returns>
+        public override ISkiaGestureListener OnSkiaGestureEvent(SkiaGesturesParameters args, GestureEventProcessingInfo apply)
+        {
+            if (!CanDraw)
+                return null;
+
+            if (OnGestures != null)
+            {
+                return OnGestures(args, apply);
+            }
+
+            return base.OnSkiaGestureEvent(args, apply);
+        }
+
+        /// <summary>
+        /// Delegate for use instead of calling base.OnSkiaGestureEvent
+        /// </summary>
+        public Func<SkiaGesturesParameters, GestureEventProcessingInfo, ISkiaGestureListener> OnGestures;
+
         public override bool IsGestureForChild(SkiaControlWithRect child, SKPoint point)
         {
             if (this.IsStack)
@@ -978,6 +1002,8 @@ public override void OnDisposing()
             StackStructure?.Clear();
             StackStructureMeasured?.Clear();
 
+            OnGestures = null;
+
             base.OnDisposing();
         }
 

src/Engine/Internals/Extensions/FluentExtensions.cs

@@ -0,0 +1,89 @@
+namespace DrawnUi.Maui.Draw
+{
+    public static class FluentExtensions
+    {
+        public static T With<T>(this T view, Action<T> action) where T : SkiaControl
+        {
+            action?.Invoke(view);
+            return view;
+        }
+
+        public static T WithParent<T>(this T view, IDrawnBase parent) where T : SkiaControl
+        {
+            parent.AddSubView(view);
+            return view;
+        }
+
+        public static T CenterX<T>(this T view) where T : SkiaControl
+        {
+            view.HorizontalOptions = LayoutOptions.Center;
+            return view;
+        }
+
+        public static T CenterY<T>(this T view) where T : SkiaControl
+        {
+            view.VerticalOptions = LayoutOptions.Center;
+            return view;
+        }
+
+
+        #region GRID
+
+        public static T WithRow<T>(this T view, int row) where T : SkiaControl
+        {
+            Grid.SetRow(view, row);
+            return view;
+        }
+
+        public static T WithColumn<T>(this T view, int column) where T : SkiaControl
+        {
+            Grid.SetColumn(view, column);
+            return view;
+        }
+
+        public static T WithRowSpan<T>(this T view, int rowSpan) where T : SkiaControl
+        {
+            Grid.SetRowSpan(view, rowSpan);
+            return view;
+        }
+
+        public static T WithColumnSpan<T>(this T view, int columnSpan) where T : SkiaControl
+        {
+            Grid.SetColumnSpan(view, columnSpan);
+            return view;
+        }
+
+        public static SkiaLayout WithColumnDefinitions(this SkiaLayout grid, string columnDefinitions)
+        {
+            var converter = new ColumnDefinitionCollectionTypeConverter();
+
+            if (converter.CanConvertFrom(typeof(string)))
+            {
+                var columns = (ColumnDefinitionCollection)converter.ConvertFromInvariantString(columnDefinitions);
+                grid.ColumnDefinitions = columns;
+            }
+            else
+            {
+                throw new InvalidOperationException("ColumnDefinitionCollectionTypeConverter cannot convert from string.");
+            }
+            return grid;
+        }
+        public static SkiaLayout WithRowDefinitions(this SkiaLayout grid, string definitions)
+        {
+            var converter = new ColumnDefinitionCollectionTypeConverter();
+
+            if (converter.CanConvertFrom(typeof(string)))
+            {
+                var defs = (RowDefinitionCollection)converter.ConvertFromInvariantString(definitions);
+                grid.RowDefinitions = defs;
+            }
+            else
+            {
+                throw new InvalidOperationException("RowDefinitionCollectionTypeConverter cannot convert from string.");
+            }
+            return grid;
+        }
+
+        #endregion
+    }
+}