xamarin
diff --git a/‎samples/XCT.Sample.Android/MainActivity.cs
Lines changed: 1 addition & 2 deletions b/‎samples/XCT.Sample.Android/MainActivity.cs
Lines changed: 1 addition & 2 deletions
diff --git a/‎samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
Lines changed: 1 addition & 0 deletions b/‎samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
Lines changed: 1 addition & 0 deletions
diff --git a/‎samples/XCT.Sample.GTK/Xamarin.CommunityToolkit.Sample.GTK.csproj
Lines changed: 1 addition & 1 deletion b/‎samples/XCT.Sample.GTK/Xamarin.CommunityToolkit.Sample.GTK.csproj
Lines changed: 1 addition & 1 deletion
diff --git a/‎samples/XCT.Sample.UWP/App.xaml.cs
Lines changed: 0 additions & 10 deletions b/‎samples/XCT.Sample.UWP/App.xaml.cs
Lines changed: 0 additions & 10 deletions
diff --git a/‎samples/XCT.Sample.UWP/Xamarin.CommunityToolkit.Sample.UWP.csproj
Lines changed: 1 addition & 1 deletion b/‎samples/XCT.Sample.UWP/Xamarin.CommunityToolkit.Sample.UWP.csproj
Lines changed: 1 addition & 1 deletion
diff --git a/‎samples/XCT.Sample.WPF/DrawingViewRenderer.wpf.cs
Lines changed: 108 additions & 0 deletions b/‎samples/XCT.Sample.WPF/DrawingViewRenderer.wpf.cs
Lines changed: 108 additions & 0 deletions
diff --git a/‎samples/XCT.Sample.WPF/MainWindow.xaml.cs
Lines changed: 2 additions & 15 deletions b/‎samples/XCT.Sample.WPF/MainWindow.xaml.cs
Lines changed: 2 additions & 15 deletions
diff --git a/‎samples/XCT.Sample.WPF/Xamarin.CommunityToolkit.Sample.WPF.csproj
Lines changed: 3 additions & 0 deletions b/‎samples/XCT.Sample.WPF/Xamarin.CommunityToolkit.Sample.WPF.csproj
Lines changed: 3 additions & 0 deletions
diff --git a/‎samples/XCT.Sample.iOS/AppDelegate.cs
Lines changed: 2 additions & 3 deletions b/‎samples/XCT.Sample.iOS/AppDelegate.cs
Lines changed: 2 additions & 3 deletions
diff --git a/‎samples/XCT.Sample.iOS/Info.plist
Lines changed: 2 additions & 0 deletions b/‎samples/XCT.Sample.iOS/Info.plist
Lines changed: 2 additions & 0 deletions
@@ -14,8 +14,7 @@ protected override void OnCreate(Bundle savedInstanceState)
 			ToolbarResource = Resource.Layout.Toolbar;
 
 			base.OnCreate(savedInstanceState);
-
-			global::Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
+      
 			Essentials.Platform.Init(this, savedInstanceState);
 			global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
 			LoadApplication(new App());
 
@@ -20,6 +20,7 @@
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
 
@@ -102,4 +102,4 @@
     <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
@@ -1,18 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
 namespace Xamarin.CommunityToolkit.Sample.UWP
 
@@ -164,4 +164,4 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-</Project>
+</Project>
@@ -0,0 +1,108 @@
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows.Controls;
+using System.Windows.Ink;
+using System.Windows.Input;
+using Xamarin.CommunityToolkit.Sample.WPF;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.WPF;
+
+[assembly: ExportRenderer(typeof(DrawingView), typeof(DrawingViewRenderer))]
+namespace Xamarin.CommunityToolkit.Sample.WPF
+{
+	public class DrawingViewRenderer : ViewRenderer<DrawingView, InkCanvas>
+	{
+		InkCanvas? canvas;
+
+		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			base.OnElementPropertyChanged(sender, e);
+			if (e.PropertyName == DrawingView.PointsProperty.PropertyName)
+			{
+				canvas!.Strokes.StrokesChanged -= OnStrokesChanged;
+				canvas.Strokes.Clear();
+				LoadPoints();
+				canvas.Strokes.StrokesChanged += OnStrokesChanged;
+			}
+		}
+
+		protected override void OnElementChanged(ElementChangedEventArgs<DrawingView> e)
+		{
+			base.OnElementChanged(e);
+			if (Control == null && Element != null)
+			{
+				canvas = new InkCanvas
+				{
+					DefaultDrawingAttributes =
+					{
+						Color = Element.LineColor.ToMediaColor(),
+						Width = Element.LineWidth,
+						Height = Element.LineWidth
+					},
+					Background = Element.BackgroundColor.ToBrush()
+				};
+				Element.Points.CollectionChanged += OnCollectionChanged;
+				SetNativeControl(canvas);
+
+				canvas.Strokes.StrokesChanged += OnStrokesChanged;
+				Control!.PreviewMouseDown += OnPreviewMouseDown;
+			}
+
+			if (e.OldElement != null)
+			{
+				canvas!.Strokes.StrokesChanged -= OnStrokesChanged;
+				Element!.Points.CollectionChanged -= OnCollectionChanged;
+				if (Control != null)
+					Control.PreviewMouseDown -= OnPreviewMouseDown;
+			}
+		}
+
+		void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs args) => LoadPoints();
+
+		void OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
+		{
+			canvas!.Strokes.Clear();
+			Element.Points.Clear();
+		}
+
+		void OnStrokesChanged(object sender, StrokeCollectionChangedEventArgs e)
+		{
+			Element.Points.CollectionChanged -= OnCollectionChanged;
+			if (e.Added.Count > 0)
+			{
+				var points = e.Added.First().StylusPoints.Select(point => new Point(point.X, point.Y));
+				Element.Points.Clear();
+				foreach (var point in points)
+					Element.Points.Add(point);
+
+				if (Element.Points.Count > 0)
+				{
+					if (Element.DrawingCompletedCommand?.CanExecute(null) ?? false)
+						Element.DrawingCompletedCommand.Execute(Element.Points);
+				}
+
+				if (Element.ClearOnFinish)
+				{
+					canvas!.Strokes.StrokesChanged -= OnStrokesChanged;
+					canvas.Strokes.Clear();
+					canvas.Strokes.StrokesChanged += OnStrokesChanged;
+					Element.Points.Clear();
+				}
+			}
+
+			Element.Points.CollectionChanged += OnCollectionChanged;
+		}
+
+		void LoadPoints()
+		{
+			var stylusPoints = Element?.Points.Select(point => new StylusPoint(point.X, point.Y)).ToList();
+			if (stylusPoints is { Count: > 0 })
+			{
+				var stroke = new Stroke(new StylusPointCollection(stylusPoints), canvas!.DefaultDrawingAttributes);
+				canvas.Strokes.Add(stroke);
+			}
+		}
+	}
+}
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms.PancakeView.Platforms.WPF;
 using Xamarin.Forms.Platform.WPF;
 
@@ -25,7 +12,7 @@ public partial class MainWindow : FormsApplicationPage
 		public MainWindow()
 		{
 			InitializeComponent();
-			Xamarin.Forms.Forms.Init();
+			Forms.Forms.Init();
 			PancakeViewRenderer.Init();
 			LoadApplication(new Xamarin.CommunityToolkit.Sample.App());
 		}
 
@@ -65,6 +65,9 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="DrawingViewRenderer.wpf.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
 
@@ -6,8 +6,8 @@ namespace Xamarin.CommunityToolkit.Sample.iOS
 	// The UIApplicationDelegate for the application. This class is responsible for launching the
 	// User Interface of the application, as well as listening (and optionally responding) to
 	// application events from iOS.
-	[Register("AppDelegate")]
-	public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
+	[Register(nameof(AppDelegate))]
+	public class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
 	{
 		// This method is invoked when the application has loaded and is ready to run. In this
 		// method you should instantiate the window, load the UI into it and then make the window
@@ -16,7 +16,6 @@ public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsAppli
 		// You have 17 seconds to return from this method, or iOS will terminate your application.
 		public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 		{
-			global::Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
 			global::Xamarin.Forms.Forms.Init();
 			LoadApplication(new App());
 
 
@@ -46,5 +46,7 @@
 	<array>
 		<string>audio</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>