[Android] Align dash effect between Border and Shapes (dotnet#12693)

* Align dash effect between Border and Shapes on Android * Update src/Core/src/Graphics/MauiDrawable.Android.cs Co-authored-by: Manuel de la Pena <mandel@microsoft.com> --------- Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
jonathanpeppers · Feb 9, 2023 · 2218065 · 2218065
1 parent fbba9d1
commit 2218065
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/Core/src/Graphics/MauiDrawable.Android.cs b/src/Core/src/Graphics/MauiDrawable.Android.cs
@@ -270,7 +270,7 @@ public void SetBorderWidth(double strokeWidth)
 
 		public void SetBorderDash(float[]? strokeDashArray, double strokeDashOffset)
 		{
-			if (strokeDashArray == null || strokeDashArray.Length == 0 || strokeDashOffset <= 0)
+			if (strokeDashArray is null || strokeDashArray.Length == 0)
 				_borderPathEffect = null;
 			else
 			{

diff --git a/src/Core/tests/DeviceTests/Handlers/Border/BorderHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Border/BorderHandlerTests.cs
@@ -53,6 +53,29 @@ public async Task StrokeInitializesCorrectly(uint color)
 			await ValidateHasColor(border, expected);
 		}
 
+		[Theory(DisplayName = "Dashed Stroke Initializes Correctly")]
+		[InlineData(0xFFFF0000)]
+		[InlineData(0xFF00FF00)]
+		[InlineData(0xFF0000FF)]
+		public async Task DashedStrokeInitializesCorrectly(uint color)
+		{
+			var expected = Color.FromUint(color);
+
+			var border = new BorderStub()
+			{
+				Content = new LabelStub { Text = "Stroke", TextColor = Colors.Black },
+				Shape = new RectangleShapeStub(),
+				Background = new SolidPaintStub(Colors.White),
+				Stroke = new SolidPaintStub(expected),
+				StrokeDashPattern = new float[2] { 1, 1 }, 
+				StrokeThickness = 6,
+				Height = 100,
+				Width = 300
+			};
+
+			await ValidateHasColor(border, expected);
+		}
+
 		[Theory(DisplayName = "StrokeShape Initializes Correctly")]
 		[InlineData("Rectangle")]
 		[InlineData("RoundRectangle")]