Merge pull request #775 from unoplatform/dev/sb/merge-legacy

chore: merge legacy branch
unoplatform · Aug 30, 2023 · e7888a7 · e7888a7
2 parents 8386296 + 9945bd0
commit e7888a7
Show file tree

Hide file tree

Showing 13 changed files with 757 additions and 785 deletions.
diff --git a/....Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml b/....Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
diff --git a/...t.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml b/...t.Samples/Uno.Toolkit.Samples.Shared/Content/TestPages/ShadowContainerTestPage.WinUI.xaml
@@ -22,11 +22,11 @@
 					Padding="10"
 					Height="220"
 					Width="220">
-				<utu:ShadowContainer x:Name="shadowContainer">
+				<utu:ShadowContainer x:Name="shadowContainer"
+									 Background="Green">
 					<Border Width="200"
 							Height="200"
-							x:Name="border"
-							Background="Green" />
+							x:Name="border" />
 				</utu:ShadowContainer>
 			</Border>
 		</StackPanel>

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters/HexToColorConverter.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters/HexToColorConverter.cs
@@ -16,7 +16,7 @@ public class HexToColorConverter : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
-			return value.ToString();
+			return value?.ToString();
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -5,7 +5,7 @@
 	<ItemGroup>
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
 		<PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
-		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
 		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
 		<PackageVersion Include="SkiaSharp" Version="2.88.5" />
 		<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.5" />

diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs
@@ -148,16 +148,6 @@ public double Spread
 
 	public event PropertyChangedEventHandler? PropertyChanged;
 
-	internal static bool IsShadowProperty(string propertyName)
-	{
-		return propertyName == nameof(OffsetX) || propertyName == nameof(OffsetY) ||
-			   propertyName == nameof(IsInner) ||
-			   propertyName == nameof(Color) ||
-			   propertyName == nameof(Opacity) ||
-			   propertyName == nameof(BlurRadius) ||
-			   propertyName == nameof(Spread);
-	}
-
 	internal static bool IsShadowSizeProperty(string propertyName)
 	{
 		return propertyName == nameof(OffsetX) || propertyName == nameof(OffsetY) ||
@@ -174,9 +164,6 @@ private static void OnPropertyChanged(object dependencyObject, string propertyNa
 	public override string ToString() =>
 		$"{{ IsInner: {{{IsInner}}}, Offset: {{{OffsetX}, {OffsetY}}} Color: {{A={Color.A}, R={Color.R}, G={Color.G}, B={Color.B}}}, Opacity: {Opacity}, BlurRadius: {BlurRadius}, Spread: {Spread} }}";
 
-	public string ToKey() =>
-		string.Join(",", IsInner, OffsetX, OffsetY, Color.ToString(), Opacity, BlurRadius, Spread);
-
 	public Shadow Clone()
 	{
 		return new Shadow

diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
@@ -7,10 +7,4 @@ namespace Uno.Toolkit.UI;
 
 public class ShadowCollection : ObservableCollection<Shadow>
 {
-	public bool HasInnerShadow() => this.Any(s => s.IsInner);
-
-	public string ToKey(double width, double height, Windows.UI.Color? contentBackground) =>
-		FormattableString.Invariant($"w{width},h{height}") +
-		(contentBackground.HasValue ? $",cb{contentBackground.Value}:" : ":") +
-		string.Join("/", this.Select(x => x.ToKey()));
 }