From c5d9e5f6d66aa61a93e7e1699fd7eab9497188e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 2 Mar 2023 18:58:09 +0100
Subject: [PATCH] Allow string property binding as Color source (#9814) Fixes
 #9662 Fixes #8390

---
 .../Pages/Controls/ButtonPage.xaml            |  6 +++
 .../Pages/Controls/ButtonPage.xaml.cs         |  2 +
 src/Controls/src/Core/BindableProperty.cs     |  1 +
 .../tests/Xaml.UnitTests/ColorConverter.xaml  | 12 ++++++
 .../Xaml.UnitTests/ColorConverter.xaml.cs     | 39 +++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 100644 src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml
 create mode 100644 src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml.cs

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
index 7187ddd0ae0b..bb41724e7b4f 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml
@@ -40,6 +40,12 @@
                 <Button
                     BackgroundColor="Blue"
                     Text="Button"/>
+                <Label
+                     Text="BackgroundColor (Binding)"
+                     Style="{StaticResource Headline}" />
+                 <Button 
+                     Text="Button"
+                     BackgroundColor="{Binding ButtonBackground}" />
                 <Label
                     Text="Background"
                     Style="{StaticResource Headline}" />
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
index 7403df1737a7..7dcd9212f680 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/ButtonPage.xaml.cs
@@ -84,6 +84,8 @@ void OnBackgroundButtonClicked(object sender, System.EventArgs e)
 
 	public class ButtonPageViewModel : BindableObject
 	{
+		public string ButtonBackground => "#fc87ad";
+
 		public ICommand ButtonCommand => new Command(OnExecuteImageButtonCommand);
 
 		void OnExecuteImageButtonCommand()
diff --git a/src/Controls/src/Core/BindableProperty.cs b/src/Controls/src/Core/BindableProperty.cs
index 8faa62a363da..254f1e0f43e8 100644
--- a/src/Controls/src/Core/BindableProperty.cs
+++ b/src/Controls/src/Core/BindableProperty.cs
@@ -43,6 +43,7 @@ public sealed class BindableProperty
 		{
 			{ typeof(Uri), new UriTypeConverter() },
 			{ typeof(Easing), new Maui.Converters.EasingTypeConverter() },
+			{ typeof(Maui.Graphics.Color), new ColorTypeConverter() },
 		};
 
 		static readonly Dictionary<Type, IValueConverter> KnownIValueConverters = new Dictionary<Type, IValueConverter>
diff --git a/src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml b/src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml
new file mode 100644
index 000000000000..57a337719383
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage 
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Microsoft.Maui.Controls.Xaml.UnitTests.ColorConverter">
+    <ContentPage.Content>
+        <Button        
+            x:Name="Button0"
+            Text="Button"
+            BackgroundColor="{Binding ButtonBackground}" />
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml.cs b/src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml.cs
new file mode 100644
index 000000000000..f0db1139c9c9
--- /dev/null
+++ b/src/Controls/tests/Xaml.UnitTests/ColorConverter.xaml.cs
@@ -0,0 +1,39 @@
+using Microsoft.Maui.Controls.Core.UnitTests;
+using Microsoft.Maui.Graphics;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests
+{
+	public partial class ColorConverter : ContentPage
+	{
+		class Data
+		{
+			public string ButtonBackground => "#fc87ad";
+		}
+
+		public ColorConverter()
+		{
+			InitializeComponent();
+		}
+
+		public ColorConverter(bool useCompiledXaml)
+		{
+			//this stub will be replaced at compile time
+		}
+
+		[TestFixture]
+		public class Tests
+		{
+			[TestCase(false)]
+			[TestCase(true)]
+			public void StringsAreValidAsColor(bool useCompiledXaml)
+			{
+				var page = new ColorConverter(useCompiledXaml);
+				page.BindingContext = new Data();
+
+				var expected = Color.FromArgb("#fc87ad");
+				Assert.AreEqual(expected, page.Button0.BackgroundColor);
+			}
+		}
+	}
+}
\ No newline at end of file