chore: Few fixes

unoplatform · Feb 2, 2023 · 66537ba · 66537ba
1 parent 159cc0e
commit 66537ba
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 359 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlConstants.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlConstants.cs
@@ -95,7 +95,6 @@ public static class Types
 			// Misc
 			public const string Setter = BaseXamlNamespace + ".Setter";
 			public const string CornerRadius = BaseXamlNamespace + ".CornerRadius";
-			public const string SolidColorBrushHelper = BaseXamlNamespace + ".SolidColorBrushHelper";
 			public const string GridLength = BaseXamlNamespace + ".GridLength";
 			public const string GridUnitType = BaseXamlNamespace + ".GridUnitType";
 			public const string Color = RootWUINamespace + ".Color";

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
@@ -527,7 +527,7 @@ private string InnerGenerateFile()
 									BuildComponentFields(componentBuilder);
 
 									BuildCompiledBindings(componentBuilder);
-									
+
 									_generationRunFileInfo.SetAppliedTypes(_xamlAppliedTypes);
 									_generationRunFileInfo.ComponentCode = componentBuilder.ToString();
 								}
@@ -5319,19 +5319,18 @@ private string BuildFontWeight(string memberValue)
 
 		private string BuildBrush(string memberValue)
 		{
-			var colorHelper = (INamedTypeSymbol)_metadataHelper.GetTypeByFullName(XamlConstants.Types.SolidColorBrushHelper);
+			var colors = (INamedTypeSymbol)_metadataHelper.GetTypeByFullName(XamlConstants.Types.Colors);
 
 			// This ensures that a memberValue "DarkGoldenRod" gets converted to colorName "DarkGoldenrod" (notice the lowercase 'r')
-			var colorName = colorHelper.GetProperties().FirstOrDefault(m => m.Name.Equals(memberValue, StringComparison.OrdinalIgnoreCase))?.Name;
+			var colorName = colors.GetProperties().FirstOrDefault(m => m.Name.Equals(memberValue, StringComparison.OrdinalIgnoreCase))?.Name;
 			if (colorName != null)
 			{
-				return "SolidColorBrushHelper." + colorName;
+				return $"new global::{XamlConstants.Types.SolidColorBrush}(global::{XamlConstants.Types.Colors}.{colorName})";
 			}
 			else
 			{
 				memberValue = ColorCodeParser.ParseColorCode(memberValue);
-
-				return "SolidColorBrushHelper.FromARGB({0})".InvariantCultureFormat(memberValue);
+				return $"new global::{XamlConstants.Types.SolidColorBrush}(global::{XamlConstants.Types.Color}.FromArgb({{0}}))".InvariantCultureFormat(memberValue);
 			}
 		}
 

diff --git a/src/Uno.UI/UI/Xaml/Media/Brush.cs b/src/Uno.UI/UI/Xaml/Media/Brush.cs
@@ -17,7 +17,7 @@ public Brush()
 			InitializeBinder();
 		}
 
-		public static implicit operator Brush(Color uiColor) => SolidColorBrushHelper.FromARGB(uiColor.A, uiColor.R, uiColor.G, uiColor.B);
+		public static implicit operator Brush(Color uiColor) => new SolidColorBrush(uiColor);
 
 		public static implicit operator Brush(string colorCode) => SolidColorBrushHelper.Parse(colorCode);
 

diff --git a/src/Uno.UI/UI/Xaml/Media/BrushConverter.cs b/src/Uno.UI/UI/Xaml/Media/BrushConverter.cs
@@ -28,7 +28,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 			switch (value)
 			{
 				case string color:
-					return SolidColorBrushHelper.FromARGB(color);
+					return SolidColorBrushHelper.Parse(color);
 
 				case Color color:
 					return new SolidColorBrush(color);