fix: Use fallback color for unsupported brushes

(cherry picked from commit a6f162a)

# Conflicts:
#	src/Uno.UI/UI/Xaml/Media/RevealBrush.cs

src/Uno.UI/Microsoft/UI/Xaml/Media/RevealBrush.Android.cs

@@ -0,0 +1,17 @@
+using Android.Graphics;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+using Rect = Windows.Foundation.Rect;
+
+namespace Microsoft.UI.Xaml.Media;
+
+public partial class RevealBrush : XamlCompositionBrushBase
+{
+	protected override Paint GetPaintInner(Rect destinationRect)
+	{
+		var color = this.IsDependencyPropertySet(FallbackColorProperty) ?
+			GetColorWithOpacity(FallbackColor) :
+			GetColorWithOpacity(Color);
+		return new Paint() { Color = color, AntiAlias = true };
+	}
+}

src/Uno.UI/UI/Xaml/Media/RevealBackgroundBrush.cs

@@ -1,11 +1,9 @@
 
-namespace Windows.UI.Xaml.Media
+namespace Windows.UI.Xaml.Media;
+
+public partial class RevealBackgroundBrush : RevealBrush
 {
-	public partial class RevealBackgroundBrush : RevealBrush
+	public RevealBackgroundBrush()
 	{
-		public RevealBackgroundBrush()
-		{
-
-		}
 	}
 }

src/Uno.UI/UI/Xaml/Media/RevealBorderBrush.cs

@@ -1,11 +1,8 @@
-
-namespace Windows.UI.Xaml.Media
+namespace Windows.UI.Xaml.Media;
+
+public partial class RevealBorderBrush : RevealBrush
 {
-	public partial class RevealBorderBrush : RevealBrush
+	public RevealBorderBrush()
 	{
-		public RevealBorderBrush()
-		{
-
-		}
 	}
 }

src/Uno.UI/UI/Xaml/Media/RevealBrush.Android.cs

@@ -1,16 +1,15 @@
 using Android.Graphics;
 using Rect = Windows.Foundation.Rect;
 
-namespace Windows.UI.Xaml.Media
+namespace Windows.UI.Xaml.Media;
+
+partial class RevealBrush
 {
-	public partial class RevealBrush : XamlCompositionBrushBase
+	protected override Paint GetPaintInner(Rect destinationRect)
 	{
-		protected override Paint GetPaintInner(Rect destinationRect)
-		{
-			var color = this.IsDependencyPropertySet(FallbackColorProperty) ?
-				GetColorWithOpacity(FallbackColor) :
-				GetColorWithOpacity(Color);
-			return new Paint() { Color = color, AntiAlias = true };
-		}
+		var color = this.IsDependencyPropertySet(FallbackColorProperty) ?
+			GetColorWithOpacity(FallbackColor) :
+			GetColorWithOpacity(Color);
+		return new Paint() { Color = color, AntiAlias = true };
 	}
 }

src/Uno.UI/UI/Xaml/Media/RevealBrush.cs

@@ -1,11 +1,11 @@
-
-namespace Windows.UI.Xaml.Media
+namespace Windows.UI.Xaml.Media;
+
+public partial class RevealBrush : XamlCompositionBrushBase
 {
-	public partial class RevealBrush : XamlCompositionBrushBase
+	public RevealBrush()
 	{
-		public RevealBrush()
-		{
 
+<<<<<<< HEAD
 		}
 
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
@@ -27,5 +27,27 @@ public RevealBrush()
 			nameof(Color), typeof(global::Windows.UI.Color),
 			typeof(global::Windows.UI.Xaml.Media.RevealBrush),
 			new FrameworkPropertyMetadata(default(global::Windows.UI.Color)));
+=======
+>>>>>>> a6f162abde (fix: Use fallback color for unsupported brushes)
+	}
+
+	[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
+	public global::Windows.UI.Color Color
+	{
+		get
+		{
+			return (global::Windows.UI.Color)this.GetValue(ColorProperty);
+		}
+		set
+		{
+			this.SetValue(ColorProperty, value);
+		}
 	}
+
+	[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "IS_UNIT_TESTS", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
+	public static global::Windows.UI.Xaml.DependencyProperty ColorProperty { get; } =
+	Windows.UI.Xaml.DependencyProperty.Register(
+		nameof(Color), typeof(global::Windows.UI.Color),
+		typeof(global::Windows.UI.Xaml.Media.RevealBrush),
+		new FrameworkPropertyMetadata(default(global::Windows.UI.Color)));
 }

src/Uno.UI/UI/Xaml/Media/SolidColorBrush.Android.cs

@@ -6,7 +6,6 @@ namespace Windows.UI.Xaml.Media
 	// Android partial for SolidColorBrush
 	public partial class SolidColorBrush : Brush
 	{
-
 		protected override Paint GetPaintInner(Rect destinationRect)
 		{
 			return new Paint() { Color = this.ColorWithOpacity, AntiAlias = true };

src/Uno.UI/UI/Xaml/Media/XamlCompositionBrushBase.Android.cs

@@ -0,0 +1,14 @@
+using Android.Graphics;
+using Rect = Windows.Foundation.Rect;
+
+namespace Windows.UI.Xaml.Media;
+
+public partial class XamlCompositionBrushBase : Brush
+{
+	protected override Paint GetPaintInner(Rect destinationRect)
+	{
+		// By default fallback to FallbackColor, unless overridden by a derived class.
+		var color = GetColorWithOpacity(FallbackColor);
+		return new Paint() { Color = color, AntiAlias = true };
+	}
+}

src/Uno.UI/UI/Xaml/Media/XamlCompositionBrushBase.cs

@@ -1,42 +1,39 @@
-using Color = Windows.UI.Color;
+namespace Windows.UI.Xaml.Media;
 
-namespace Windows.UI.Xaml.Media
+public partial class XamlCompositionBrushBase : Brush
 {
-	public partial class XamlCompositionBrushBase : Brush
+	protected XamlCompositionBrushBase() : base()
 	{
-		protected XamlCompositionBrushBase() : base()
+	}
+
+	public Color FallbackColor
+	{
+		get
 		{
+			return (Color)this.GetValue(FallbackColorProperty);
 		}
-
-		public Color FallbackColor
+		set
 		{
-			get
-			{
-				return (Color)this.GetValue(FallbackColorProperty);
-			}
-			set
-			{
-				this.SetValue(FallbackColorProperty, value);
-			}
+			this.SetValue(FallbackColorProperty, value);
 		}
+	}
 
-		public static DependencyProperty FallbackColorProperty { get; } =
-			DependencyProperty.Register(
-				nameof(FallbackColor), typeof(Color),
-				typeof(XamlCompositionBrushBase),
-				new FrameworkPropertyMetadata(default(Color)));
+	public static DependencyProperty FallbackColorProperty { get; } =
+		DependencyProperty.Register(
+			nameof(FallbackColor), typeof(Color),
+			typeof(XamlCompositionBrushBase),
+			new FrameworkPropertyMetadata(default(Color)));
 
-		/// <summary>
-		/// Returns the fallback color mixed with opacity value.
-		/// </summary>
-		internal Color FallbackColorWithOpacity => FallbackColor.WithOpacity(Opacity);
+	/// <summary>
+	/// Returns the fallback color mixed with opacity value.
+	/// </summary>
+	internal Color FallbackColorWithOpacity => FallbackColor.WithOpacity(Opacity);
 
-		protected virtual void OnConnected()
-		{
-		}
+	protected virtual void OnConnected()
+	{
+	}
 
-		protected virtual void OnDisconnected()
-		{
-		}
+	protected virtual void OnDisconnected()
+	{
 	}
 }