Develop to main for 1.3-pre2

samples/XCT.Sample.Android/MainActivity.cs

@@ -14,7 +14,7 @@ protected override void OnCreate(Bundle savedInstanceState)
 			ToolbarResource = Resource.Layout.Toolbar;
 
 			base.OnCreate(savedInstanceState);
-      
+
 			Essentials.Platform.Init(this, savedInstanceState);
 			global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
 			LoadApplication(new App());

samples/XCT.Sample.WPF/DrawingViewRenderer.wpf.cs

@@ -1,4 +1,5 @@
-using System.Collections.Specialized;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows.Controls;
@@ -10,6 +11,7 @@
 using Xamarin.Forms.Platform.WPF;
 
 [assembly: ExportRenderer(typeof(DrawingView), typeof(DrawingViewRenderer))]
+
 namespace Xamarin.CommunityToolkit.Sample.WPF
 {
 	public class DrawingViewRenderer : ViewRenderer<DrawingView, InkCanvas>
@@ -19,11 +21,11 @@ public class DrawingViewRenderer : ViewRenderer<DrawingView, InkCanvas>
 		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
 			base.OnElementPropertyChanged(sender, e);
-			if (e.PropertyName == DrawingView.PointsProperty.PropertyName)
+			if (e.PropertyName == DrawingView.LinesProperty.PropertyName)
 			{
 				canvas!.Strokes.StrokesChanged -= OnStrokesChanged;
 				canvas.Strokes.Clear();
-				LoadPoints();
+				LoadLines();
 				canvas.Strokes.StrokesChanged += OnStrokesChanged;
 			}
 		}
@@ -35,15 +37,15 @@ protected override void OnElementChanged(ElementChangedEventArgs<DrawingView> e)
 			{
 				canvas = new InkCanvas
 				{
-					DefaultDrawingAttributes =
+					Background = Element.BackgroundColor.ToBrush(),
+					DefaultDrawingAttributes = new()
 					{
-						Color = Element.LineColor.ToMediaColor(),
-						Width = Element.LineWidth,
-						Height = Element.LineWidth
-					},
-					Background = Element.BackgroundColor.ToBrush()
+						Color = Element.DefaultLineColor.ToMediaColor(),
+						Width = Element.DefaultLineWidth,
+						Height = Element.DefaultLineWidth
+					}
 				};
-				Element.Points.CollectionChanged += OnCollectionChanged;
+				Element.Lines.CollectionChanged += OnCollectionChanged;
 				SetNativeControl(canvas);
 
 				canvas.Strokes.StrokesChanged += OnStrokesChanged;
@@ -53,55 +55,96 @@ protected override void OnElementChanged(ElementChangedEventArgs<DrawingView> e)
 			if (e.OldElement != null)
 			{
 				canvas!.Strokes.StrokesChanged -= OnStrokesChanged;
-				Element!.Points.CollectionChanged -= OnCollectionChanged;
+				Element!.Lines.CollectionChanged -= OnCollectionChanged;
 				if (Control != null)
 					Control.PreviewMouseDown -= OnPreviewMouseDown;
 			}
 		}
 
-		void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs args) => LoadPoints();
+		void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs args)
+		{
+			canvas!.Strokes.StrokesChanged -= OnStrokesChanged;
+			canvas.Strokes.Clear();
+			LoadLines();
+			canvas.Strokes.StrokesChanged += OnStrokesChanged;
+		}
+
+		void OnPreviewMouseDown(object sender, MouseButtonEventArgs e) => Clear();
 
-		void OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
+		void Clear(bool force = false)
 		{
-			canvas!.Strokes.Clear();
-			Element.Points.Clear();
+			if (!Element.MultiLineMode || force)
+			{
+				canvas!.Strokes.Clear();
+				Element.Lines.Clear();
+			}
 		}
 
 		void OnStrokesChanged(object sender, StrokeCollectionChangedEventArgs e)
 		{
-			Element.Points.CollectionChanged -= OnCollectionChanged;
+			Element.Lines.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.MultiLineMode)
+				{
+					Element.Lines.Clear();
+				}
 
-				if (Element.Points.Count > 0)
+				var lines = Element.MultiLineMode ? e.Added : new StrokeCollection() {e.Added.First()};
+
+				foreach (var line in lines)
+				{
+					var points = line.StylusPoints.Select(point => new Point(point.X, point.Y)).ToList();
+					Element.Lines.Add(new Line()
+					{
+						Points = new ObservableCollection<Point>(points),
+						LineColor = Color.FromRgba(line.DrawingAttributes.Color.R, line.DrawingAttributes.Color.G,
+							line.DrawingAttributes.Color.B, line.DrawingAttributes.Color.A),
+						LineWidth = (float) line.DrawingAttributes.Width
+					});
+				}
+
+				if (Element.Lines.Count > 0)
 				{
-					if (Element.DrawingCompletedCommand?.CanExecute(null) ?? false)
-						Element.DrawingCompletedCommand.Execute(Element.Points);
+					var lastLine = Element.Lines.Last();
+					if (Element.DrawingLineCompletedCommand?.CanExecute(lastLine) ?? false)
+						Element.DrawingLineCompletedCommand.Execute(lastLine);
 				}
 
 				if (Element.ClearOnFinish)
 				{
-					canvas!.Strokes.StrokesChanged -= OnStrokesChanged;
-					canvas.Strokes.Clear();
-					canvas.Strokes.StrokesChanged += OnStrokesChanged;
-					Element.Points.Clear();
+					Element.Lines.CollectionChanged -= OnCollectionChanged;
+					Clear(true);
+					canvas!.Strokes.StrokesChanged += OnStrokesChanged;
 				}
 			}
 
-			Element.Points.CollectionChanged += OnCollectionChanged;
+			Element.Lines.CollectionChanged += OnCollectionChanged;
 		}
 
-		void LoadPoints()
+		void LoadLines()
 		{
-			var stylusPoints = Element?.Points.Select(point => new StylusPoint(point.X, point.Y)).ToList();
-			if (stylusPoints is { Count: > 0 })
+			var lines = Element.MultiLineMode
+				? Element.Lines
+				: Element.Lines.Any()
+					? new ObservableCollection<Line> {Element.Lines.LastOrDefault()}
+					: new ObservableCollection<Line>();
+			foreach (var line in lines)
 			{
-				var stroke = new Stroke(new StylusPointCollection(stylusPoints), canvas!.DefaultDrawingAttributes);
-				canvas.Strokes.Add(stroke);
+				var stylusPoints = line.Points.Select(point => new StylusPoint(point.X, point.Y)).ToList();
+				if (stylusPoints is {Count: > 0})
+				{
+					var stroke = new Stroke(new StylusPointCollection(stylusPoints))
+					{
+						DrawingAttributes = new()
+						{
+							Color = line.LineColor.ToMediaColor(),
+							Width = line.LineWidth,
+							Height = line.LineWidth
+						}
+					};
+					canvas!.Strokes.Add(stroke);
+				}
 			}
 		}
 	}

samples/XCT.Sample/Pages/TestCases/LinkerCameraViewPage.xaml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BasePage
+    x:Class="Xamarin.CommunityToolkit.Sample.Pages.TestCases.LinkerCameraViewPage"
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
+    xmlns:xct="http://xamarin.com/schemas/2020/toolkit">
+    <ContentPage.Content>
+        <StackLayout>
+            <Label HorizontalTextAlignment="Center" Text="This is to test if the Linker is keeping the MediaCaptured and MediaCaptureFailed events if they are used!" />
+            <Grid>
+                <xct:CameraView
+                    x:Name="cameraView"
+                    CaptureMode="Photo"
+                    HorizontalOptions="FillAndExpand"
+                    OnAvailable="CameraView_OnAvailable"
+                    VerticalOptions="FillAndExpand">
+                    <xct:CameraView.Behaviors>
+                        <xct:EventToCommandBehavior Command="{Binding CaptureCommand}" EventName="MediaCaptured" />
+                    </xct:CameraView.Behaviors>
+                </xct:CameraView>
+                <Button
+                    x:Name="shutterButton"
+                    Margin="40"
+                    BackgroundColor="WhiteSmoke"
+                    BorderColor="Black"
+                    BorderWidth="1"
+                    Clicked="ShutterButtonClicked"
+                    CornerRadius="40"
+                    HeightRequest="80"
+                    HorizontalOptions="CenterAndExpand"
+                    IsEnabled="False"
+                    VerticalOptions="End"
+                    WidthRequest="80" />
+                <Image
+                    x:Name="previewPicture"
+                    Margin="40"
+                    Aspect="AspectFill"
+                    BackgroundColor="Black"
+                    HeightRequest="80"
+                    HorizontalOptions="EndAndExpand"
+                    VerticalOptions="EndAndExpand"
+                    WidthRequest="80" />
+            </Grid>
+        </StackLayout>
+    </ContentPage.Content>
+</pages:BasePage>

samples/XCT.Sample/Pages/TestCases/LinkerCameraViewPage.xaml.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.CommunityToolkit.Sample.ViewModels;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.TestCases
+{
+	public partial class LinkerCameraViewPage
+	{
+		int counter = 0;
+
+		public LinkerCameraViewPage()
+		{
+			InitializeComponent();
+			BindingContext = new CameraViewTestViewModel();
+		}
+
+		public void CameraView_OnAvailable(object sender, bool e)
+		{
+			shutterButton.IsEnabled = e;
+		}
+
+		public void CameraView_MediaCaptured(object sender, MediaCapturedEventArgs e)
+		{
+			shutterButton.Text = $"{++counter}";
+			previewPicture.Source = e.Image;
+			previewPicture.Rotation = e.Rotation;
+		}
+
+		void ShutterButtonClicked(object sender, EventArgs e)
+		{
+			cameraView.Shutter();
+		}
+	}
+
+	sealed class CameraViewTestViewModel : BaseViewModel
+	{
+		public Command<object> CaptureCommand { get; }
+
+		public CameraViewTestViewModel()
+		{
+			CaptureCommand = new Command<object>(CaptureCommandExecute);
+		}
+
+		void CaptureCommandExecute(object args)
+		{
+			Console.WriteLine(args);
+		}
+	}
+}

samples/XCT.Sample/Pages/Views/DrawingViewPage.xaml

@@ -6,38 +6,38 @@
                 xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
                 xmlns:viewsVodel="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views;assembly=Xamarin.CommunityToolkit.Sample">
 
-    <pages:BasePage.BindingContext>
-        <viewsVodel:DrawingViewViewModel/>
-    </pages:BasePage.BindingContext>
-
     <ScrollView>
         <StackLayout>
-            <Switch x:Name="ClearOnFinish"  />
+            <StackLayout Orientation="Horizontal" Margin="5">
+                <Label Text="Clear on Finish" Margin="0,0,5,0" />
+                <Switch x:Name="ClearOnFinish" />
+            </StackLayout>
+            <StackLayout Orientation="Horizontal" Margin="5">
+                <Label Text="Multi-Line Mode" Margin="0,0,5,0" />
+                <Switch x:Name="MultiLineMode" />
+            </StackLayout>
             <Button
                 BackgroundColor="White"
-                Clicked="LoadPointsButtonClicked"
-                Text="Load points"
+                Clicked="AddNewLine"
+                Text="Add new line"
                 TextColor="Black" />
             <Button
                 BackgroundColor="White"
-                Command="{Binding SetPointsCommand}"
-                Text="Load points ViewModel"
+                Clicked="LoadPointsButtonClicked"
+                Text="Load points"
                 TextColor="Black" />
-            <Label
-                x:Name="HiddenLabel"
+            <StackLayout x:Name="HiddenPanel"
                 HorizontalOptions="CenterAndExpand"
-                IsVisible="False"
-                Text="Draw &amp; GO" />
+                IsVisible="False">
+                <Label Text="Draw &amp; GO" />
+                <Button Text="Clear all lines"
+                        Clicked="ClearLines_Clicked"/>
+            </StackLayout>
             <Button
                 BackgroundColor="White"
                 Clicked="DisplayHiddenLabelButtonClicked"
                 Text="Display hidden label"
                 TextColor="Black" />
-            <Button
-                BackgroundColor="White"
-                Command="{Binding GetPointsCommand}"
-                Text="Get points ViewModel"
-                TextColor="Black" />
             <Button
                 BackgroundColor="White"
                 Clicked="GetCurrentDrawingViewImageClicked"
@@ -52,22 +52,17 @@
                 x:Name="GestureImage"
                 HeightRequest="100"
                 WidthRequest="100" />
-
-            <Label Text="Default DrawingView"/>
-            <views:DrawingView BackgroundColor="LightGray" HeightRequest="200" />
 
-            <Label Text="Advanced DrawingView"/>
-            <views:DrawingView
-                x:Name="DrawingViewControl"
-                Points="{Binding MacroPoints, Mode=TwoWay}"
-                EnableSmoothedPath="false"
-                Granularity="5"
-                BackgroundColor="DarkGray"
-                ClearOnFinish="{Binding Source={x:Reference ClearOnFinish}, Path=IsToggled}"
-                HorizontalOptions="FillAndExpand"
-                LineColor="Red"
-                LineWidth="10"
-                HeightRequest="200" />
+            <Label Text="DrawingView (Code behind)"/>
+            <views:DrawingView x:Name="DrawingViewControl" 
+                               BackgroundColor="LightGray" 
+                               HeightRequest="200"
+                               DefaultLineColor="Red"
+                               DefaultLineWidth="3"
+                               Lines="{Binding Lines, Mode=TwoWay}"
+                               ClearOnFinish="{Binding Source={x:Reference ClearOnFinish}, Path=IsToggled}"
+                               MultiLineMode="{Binding Source={x:Reference MultiLineMode}, Path=IsToggled}"/>
+
             <Editor x:Name="Logs" HeightRequest="50" />
         </StackLayout>
     </ScrollView>