Remove SkiaSharp project (#141)

BlazorBindings.Maui.sln

@@ -26,8 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBindings.Core", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBindings.Maui", "src\BlazorBindings.Maui\BlazorBindings.Maui.csproj", "{23A1BA67-E120-409A-A99C-70C4D2336CD4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBindings.Maui.SkiaSharp", "src\BlazorBindings.Maui.SkiaSharp\BlazorBindings.Maui.SkiaSharp.csproj", "{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBindings.UnitTests", "src\BlazorBindings.UnitTests\BlazorBindings.UnitTests.csproj", "{DA44514B-591B-447A-9EAF-E1A89EE59903}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBindingsXaminals", "samples\BlazorBindingsXaminals\BlazorBindingsXaminals.csproj", "{F116930A-543B-4478-A1C6-0A2822BD6A29}"
@@ -44,7 +42,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBindings.Maui.Compone
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThirdPartyControlsSample", "samples\ThirdPartyControlsSample\ThirdPartyControlsSample.csproj", "{5AC34CCA-967A-4A21-91BF-F0BD04129DCE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidationsSample", "samples\ValidationsSample\ValidationsSample.csproj", "{F27CF7EE-3A84-4915-ADA4-567629AB127E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ValidationsSample", "samples\ValidationsSample\ValidationsSample.csproj", "{F27CF7EE-3A84-4915-ADA4-567629AB127E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -98,18 +96,6 @@ Global
 		{23A1BA67-E120-409A-A99C-70C4D2336CD4}.Release|iPhone.Build.0 = Release|Any CPU
 		{23A1BA67-E120-409A-A99C-70C4D2336CD4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{23A1BA67-E120-409A-A99C-70C4D2336CD4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Release|iPhone.Build.0 = Release|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{DA44514B-591B-447A-9EAF-E1A89EE59903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA44514B-591B-447A-9EAF-E1A89EE59903}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA44514B-591B-447A-9EAF-E1A89EE59903}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -262,7 +248,6 @@ Global
 		{145DC613-E47F-45D3-9538-5DCEADB3E5DF} = {50192AAF-25B6-447A-99AA-BA8161DBB594}
 		{4095ACDC-733A-4C95-9DB1-D2FD47149863} = {175AB6E2-5FB5-4C15-94C2-DCA2EE6B0703}
 		{23A1BA67-E120-409A-A99C-70C4D2336CD4} = {175AB6E2-5FB5-4C15-94C2-DCA2EE6B0703}
-		{08B354C1-2036-42EA-BC7E-EEB02F3EB3B9} = {175AB6E2-5FB5-4C15-94C2-DCA2EE6B0703}
 		{DA44514B-591B-447A-9EAF-E1A89EE59903} = {175AB6E2-5FB5-4C15-94C2-DCA2EE6B0703}
 		{F116930A-543B-4478-A1C6-0A2822BD6A29} = {50192AAF-25B6-447A-99AA-BA8161DBB594}
 		{399DA09C-D565-4445-8F4D-6B7AFCA6071E} = {50192AAF-25B6-447A-99AA-BA8161DBB594}

samples/ControlGallery/AppShell.razor

@@ -78,7 +78,6 @@
 
     @*Other*@
     <ShadowsPage />
-    <SkiaCanvasPage />
     <GestureEvents />
     <GestureRecognizersPage />
     <ErrorBoundariesPage />

samples/ControlGallery/ControlGallery.csproj

@@ -50,7 +50,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\..\src\BlazorBindings.Maui.SkiaSharp\BlazorBindings.Maui.SkiaSharp.csproj" />
 	  <ProjectReference Include="..\..\src\BlazorBindings.Maui\BlazorBindings.Maui.csproj" />
 	</ItemGroup>
 

samples/ControlGallery/MauiProgram.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using BlazorBindings.Maui;
-using SkiaSharp.Views.Maui.Controls.Hosting;
 using UraniumUI;
 
 namespace ControlGallery;
@@ -14,7 +13,6 @@ public static MauiApp CreateMauiApp()
         var builder = MauiApp.CreateBuilder();
         builder
             .UseMauiApp<App>()
-            .UseSkiaSharp()
             .UseMauiBlazorBindings()
             .ConfigureFonts(fonts =>
             {

samples/ThirdPartyControlsSample/AppShell.razor

@@ -6,4 +6,5 @@
     <CommunityToolkitBehaviors />
     <XCalendarPage />
     <MaterialComponentsPage />
+    <SkiaCanvasPage />
 </Shell>

samples/ControlGallery/Views/SkiaCanvasPage.razor → samples/ThirdPartyControlsSample/Pages/SkiaCanvasPage.razor

@@ -1,12 +1,13 @@
-@page "/skia/canvas"
+@using BlazorBindings.Maui.Elements.SkiaSharp
+
 <ContentPage Title="SkiaSharp Canvas">
     <StackLayout Padding="20">
-        <Slider Margin="20" ValueChanged="RotationSliderChanged" />
+        <Slider Margin="20" @bind-Value="_sliderValue" @bind-Value:after="InvalidateSurfaces" />
 
-        <BlazorBindings.Maui.SkiaSharp.SKCanvasView @ref="CanvasView"
+        <SKCanvasView @ref="CanvasView"
                       OnPaintSurface="PaintSurface"
                       VerticalOptions="LayoutOptions.FillAndExpand" />
-        <BlazorBindings.Maui.SkiaSharp.SKCanvasView @ref="CanvasView2"
+        <SKCanvasView @ref="CanvasView2"
                       OnPaintSurface="PaintSurface2"
                       VerticalOptions="LayoutOptions.FillAndExpand" />
     </StackLayout>

samples/ControlGallery/Views/SkiaCanvasPage.razor.cs → samples/ThirdPartyControlsSample/Pages/SkiaCanvasPage.razor.cs

@@ -1,23 +1,25 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-using BlazorBindings.Maui.SkiaSharp;
+using BlazorBindings.Maui.Elements.SkiaSharp;
 using SkiaSharp;
 using SkiaSharp.Views.Maui;
 
-namespace ControlGallery.Views;
+namespace ThirdPartyControlsSample.Pages;
 
 public partial class SkiaCanvasPage
 {
     public SKCanvasView CanvasView { get; set; }
     public SKCanvasView CanvasView2 { get; set; }
 
-    private float rotation;
-    public void RotationSliderChanged(double value)
+
+    double _sliderValue;
+    float Rotation => (float)(_sliderValue * 360);
+
+    private void InvalidateSurfaces()
     {
-        rotation = (float)(value * 360);
-        CanvasView?.InvalidateSurface();
-        CanvasView2?.InvalidateSurface();
+        CanvasView.NativeControl.InvalidateSurface();
+        CanvasView2.NativeControl.InvalidateSurface();
     }
 
     private void PaintSurface2(SKPaintSurfaceEventArgs e)
@@ -54,7 +56,7 @@ private void PaintSurface2(SKPaintSurfaceEventArgs e)
         canvas.Translate(canvasSize.MidX, canvasSize.MidY);
         var shortSideRatio = Math.Min(canvasSize.Width / pathSize.Width, canvasSize.Height / pathSize.Width);
         canvas.Scale(0.9f * shortSideRatio);
-        canvas.RotateDegrees(rotation);
+        canvas.RotateDegrees(Rotation);
         canvas.Translate(-pathSize.MidX, -pathSize.MidY);
 
         canvas.DrawPath(path, paint);
@@ -80,7 +82,7 @@ private void PaintSurface(SKPaintSurfaceEventArgs e)
         canvas.Translate(canvasSize.MidX, canvasSize.MidY);
         var shortSideRatio = Math.Min(canvasSize.Width / pathSize.Width, canvasSize.Height / pathSize.Width);
         canvas.Scale(0.7f * shortSideRatio);
-        canvas.RotateDegrees(rotation);
+        canvas.RotateDegrees(Rotation);
         canvas.Translate(-pathSize.MidX, -pathSize.MidY);
 
         canvas.Scale(-1);