A few enhancements to the base types (#115)

mono · Jun 19, 2022 · e73ab52 · e73ab52
1 parent 707125d
commit e73ab52
Show file tree

Hide file tree

Showing 15 changed files with 151 additions and 98 deletions.
diff --git a/samples/Forms/SkiaSharpDemo/App.xaml b/samples/Forms/SkiaSharpDemo/App.xaml
@@ -7,6 +7,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <views:BottomTabBarResources />
+                <views:OptionButtonsResources />
             </ResourceDictionary.MergedDictionaries>
 
             <converters:RoundToIntConverter x:Key="RoundToInt" />
@@ -22,41 +23,8 @@
                 <Setter Property="Padding" Value="0" />
             </Style>
 
-            <!-- OptionButton styles -->
-            <ResourceDictionary>
-                <Style x:Key="OptionButtonStyle" TargetType="Button">
-                    <Setter Property="CornerRadius" Value="3" />
-                    <Setter Property="VisualStateManager.VisualStateGroups">
-                        <VisualStateGroupList>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="Pressed">
-                                    <VisualState.Setters>
-                                        <Setter Property="Scale" Value="0.8" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="SelectedStates">
-                                <VisualState x:Name="Unselected" />
-                                <VisualState x:Name="Selected">
-                                    <VisualState.Setters>
-                                        <Setter Property="BorderColor" Value="Black" />
-                                        <Setter Property="BorderWidth" Value="3" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateGroupList>
-                    </Setter>
-                </Style>
-                <Style x:Key="TextOptionButtonStyle" TargetType="Button" BasedOn="{StaticResource OptionButtonStyle}">
-                    <Setter Property="BackgroundColor" Value="Accent" />
-                    <Setter Property="TextColor" Value="White" />
-                    <Setter Property="Padding" Value="24,12" />
-                </Style>
-            </ResourceDictionary>
-        </ResourceDictionary>
-
-        <!-- Application resource dictionary -->
+            <!-- Application resource dictionary -->
 
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/samples/Forms/SkiaSharpDemo/Demos/Confetti/ConfettiPage.xaml b/samples/Forms/SkiaSharpDemo/Demos/Confetti/ConfettiPage.xaml
@@ -17,6 +17,11 @@
             </controls:SKConfettiView.GestureRecognizers>
         </controls:SKConfettiView>
 
+        <BoxView Color="Green" Opacity="0.5" CornerRadius="12"
+                 WidthRequest="25" HeightRequest="24" Margin="24"
+                 HorizontalOptions="End" VerticalOptions="Start"
+                 IsVisible="{Binding IsComplete, Source={Reference confettiView}}" />
+
         <views:BottomTabBar SelectedIndex="{Binding SelectedTab}" PagePadding="12,6">
             <views:BottomTabCollection>
 

diff --git a/samples/Forms/SkiaSharpDemo/Views/OptionButtons/OptionButtonsResources.xaml b/samples/Forms/SkiaSharpDemo/Views/OptionButtons/OptionButtonsResources.xaml
@@ -0,0 +1,40 @@
+<ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+                    xmlns:views="clr-namespace:SkiaSharpDemo.Views"
+                    mc:Ignorable="d"
+                    x:Class="SkiaSharpDemo.Views.OptionButtonsResources">
+
+    <Style x:Key="OptionButtonStyle" TargetType="Button">
+        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="VisualStateManager.VisualStateGroups">
+            <VisualStateGroupList>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="Pressed">
+                        <VisualState.Setters>
+                            <Setter Property="Scale" Value="0.8" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="SelectedStates">
+                    <VisualState x:Name="Unselected" />
+                    <VisualState x:Name="Selected">
+                        <VisualState.Setters>
+                            <Setter Property="BorderColor" Value="Black" />
+                            <Setter Property="BorderWidth" Value="3" />
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateGroupList>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TextOptionButtonStyle" TargetType="Button" BasedOn="{StaticResource OptionButtonStyle}">
+        <Setter Property="BackgroundColor" Value="Accent" />
+        <Setter Property="TextColor" Value="White" />
+        <Setter Property="Padding" Value="24,12" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/samples/Forms/SkiaSharpDemo/Views/OptionButtons/OptionButtonsResources.xaml.cs b/samples/Forms/SkiaSharpDemo/Views/OptionButtons/OptionButtonsResources.xaml.cs
@@ -0,0 +1,12 @@
+using Xamarin.Forms;
+
+namespace SkiaSharpDemo.Views
+{
+	public partial class OptionButtonsResources : ResourceDictionary
+	{
+		public OptionButtonsResources()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/samples/Maui/SkiaSharpDemo/Demos/Confetti/ConfettiPage.xaml b/samples/Maui/SkiaSharpDemo/Demos/Confetti/ConfettiPage.xaml
@@ -17,6 +17,11 @@
             </controls:SKConfettiView.GestureRecognizers>
         </controls:SKConfettiView>
 
+        <BoxView Color="Green" Opacity="0.5" CornerRadius="12"
+                 WidthRequest="25" HeightRequest="24" Margin="24"
+                 HorizontalOptions="End" VerticalOptions="Start"
+                 IsVisible="{Binding IsComplete, Source={Reference confettiView}}" />
+
         <views:BottomTabBar SelectedIndex="{Binding SelectedTab}" PagePadding="12,6">
             <views:BottomTabCollection>
 

diff --git a/source/SkiaSharp.Extended.UI.Forms/Controls/ExtendedTypeConverter.shared.cs b/source/SkiaSharp.Extended.UI.Forms/Controls/ExtendedTypeConverter.shared.cs
diff --git a/source/SkiaSharp.Extended.UI.Forms/Controls/StringTypeConverter.shared.cs b/source/SkiaSharp.Extended.UI.Forms/Controls/StringTypeConverter.shared.cs
@@ -0,0 +1,18 @@
+namespace SkiaSharp.Extended.UI.Controls.Converters;
+
+public abstract class StringTypeConverter : TypeConverter
+{
+	internal StringTypeConverter()
+	{
+	}
+
+	public override object? ConvertFromInvariantString(string? value) =>
+		ConvertFromStringCore(value);
+
+	public override string? ConvertToInvariantString(object? value) =>
+		ConvertToStringCore(value);
+
+	protected abstract object? ConvertFromStringCore(string? value);
+
+	protected virtual string? ConvertToStringCore(object? value) => throw new NotImplementedException();
+}
diff --git a/source/SkiaSharp.Extended.UI.Maui/Controls/ExtendedTypeConverter.cs b/source/SkiaSharp.Extended.UI.Maui/Controls/ExtendedTypeConverter.cs
diff --git a/source/SkiaSharp.Extended.UI.Maui/Controls/StringTypeConverter.shared.cs b/source/SkiaSharp.Extended.UI.Maui/Controls/StringTypeConverter.shared.cs
@@ -0,0 +1,26 @@
+using System.Globalization;
+
+namespace SkiaSharp.Extended.UI.Controls.Converters;
+
+public abstract class StringTypeConverter : TypeConverter
+{
+	internal StringTypeConverter()
+	{
+	}
+
+	public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType) =>
+		sourceType == typeof(string);
+
+	public override bool CanConvertTo(ITypeDescriptorContext? context, Type? destinationType) =>
+		destinationType == typeof(string);
+
+	public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value) =>
+		ConvertFromStringCore(value?.ToString());
+
+	public override object? ConvertTo(ITypeDescriptorContext? context, CultureInfo? culture, object? value, Type destinationType) =>
+		ConvertToStringCore(value);
+
+	protected abstract object? ConvertFromStringCore(string? value);
+
+	protected virtual string? ConvertToStringCore(object? value) => throw new NotImplementedException();
+}
diff --git a/.../SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiColorCollectionTypeConverter.shared.cs b/.../SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiColorCollectionTypeConverter.shared.cs
@@ -3,9 +3,9 @@
 #if XAMARIN_FORMS
 [TypeConversion(typeof(SKConfettiColorCollection))]
 #endif
-public class SKConfettiColorCollectionTypeConverter : ExtendedTypeConverter
+public class SKConfettiColorCollectionTypeConverter : StringTypeConverter
 {
-	protected override object? Convert(string? value)
+	protected override object? ConvertFromStringCore(string? value)
 	{
 		if (value == null)
 			return null;

diff --git a/...ce/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiEmitterBoundsTypeConverter.shared.cs b/...ce/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiEmitterBoundsTypeConverter.shared.cs
@@ -3,9 +3,9 @@
 #if XAMARIN_FORMS
 [TypeConversion(typeof(SKConfettiEmitterBounds))]
 #endif
-public class SKConfettiEmitterBoundsTypeConverter : ExtendedTypeConverter
+public class SKConfettiEmitterBoundsTypeConverter : StringTypeConverter
 {
-	protected override object? Convert(string? value)
+	protected override object? ConvertFromStringCore(string? value)
 	{
 		if (value == null)
 			return null;

diff --git a/source/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiPhysicsTypeConverter.shared.cs b/source/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiPhysicsTypeConverter.shared.cs
@@ -3,9 +3,9 @@
 #if XAMARIN_FORMS
 [TypeConversion(typeof(SKConfettiPhysics))]
 #endif
-public class SKConfettiPhysicsTypeConverter : ExtendedTypeConverter
+public class SKConfettiPhysicsTypeConverter : StringTypeConverter
 {
-	protected override object? Convert(string? value)
+	protected override object? ConvertFromStringCore(string? value)
 	{
 		if (value == null)
 			return null;

diff --git a/source/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiView.shared.cs b/source/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiView.shared.cs
@@ -67,7 +67,7 @@ protected override void OnPaintSurface(SKCanvas canvas, SKSize size)
 	{
 		var particles = 0;
 
-		if (Systems is not null)
+		if (Systems?.Count > 0)
 		{
 			foreach (var system in Systems)
 			{
@@ -93,7 +93,7 @@ private void OnSizeChanged(object? sender, EventArgs e)
 		}
 	}
 
-	private void OnSystemsChanged(object? sender, NotifyCollectionChangedEventArgs e)
+	private void OnSystemsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
 	{
 		if (e.NewItems is not null)
 		{
@@ -126,10 +126,10 @@ private static void OnSystemsPropertyChanged(BindableObject bindable, object? ol
 			return;
 
 		if (oldValue is SKConfettiSystemCollection oldCollection)
-			oldCollection.CollectionChanged -= cv.OnSystemsChanged;
+			oldCollection.CollectionChanged -= cv.OnSystemsCollectionChanged;
 
 		if (newValue is SKConfettiSystemCollection newCollection)
-			newCollection.CollectionChanged += cv.OnSystemsChanged;
+			newCollection.CollectionChanged += cv.OnSystemsCollectionChanged;
 
 		cv.UpdateIsComplete();
 	}

diff --git a/source/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiViewResources.shared.xaml.cs b/source/SkiaSharp.Extended.UI/Controls/Confetti/SKConfettiViewResources.shared.xaml.cs
@@ -9,28 +9,6 @@ public SKConfettiViewResources()
 		InitializeComponent();
 	}
 
-	internal static void EnsureRegistered()
-	{
-		if (registered)
-			return;
-
-		var merged = Application.Current?.Resources?.MergedDictionaries;
-		if (merged != null)
-		{
-			foreach (var dic in merged)
-			{
-				if (dic.GetType() == typeof(SKConfettiViewResources))
-				{
-					registered = true;
-					break;
-				}
-			}
-
-			if (!registered)
-			{
-				merged.Add(new SKConfettiViewResources());
-				registered = true;
-			}
-		}
-	}
+	internal static void EnsureRegistered() =>
+		ResourceLoader.EnsureRegistered<SKConfettiViewResources>(ref registered);
 }
diff --git a/source/SkiaSharp.Extended.UI/Utils/ResourceLoader.shared.cs b/source/SkiaSharp.Extended.UI/Utils/ResourceLoader.shared.cs
@@ -0,0 +1,30 @@
+namespace SkiaSharp.Extended.UI;
+
+internal static class ResourceLoader
+{
+	internal static void EnsureRegistered<T>(ref bool registered)
+		where T : ResourceDictionary, new()
+	{
+		if (registered)
+			return;
+
+		var merged = Application.Current?.Resources?.MergedDictionaries;
+		if (merged != null)
+		{
+			foreach (var dic in merged)
+			{
+				if (dic.GetType() == typeof(T))
+				{
+					registered = true;
+					break;
+				}
+			}
+
+			if (!registered)
+			{
+				merged.Add(new T());
+				registered = true;
+			}
+		}
+	}
+}