IBorder now works again for iOS/Android (#4909)

* IBorder now works again for iOS/Android * Update src/Core/src/Platform/Android/StrokeExtensions.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * Update StrokeExtensions.cs Co-authored-by: Shane Neuville <shane94@hotmail.com> Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com>
dotnet · Feb 25, 2022 · 5d8b798 · 5d8b798
1 parent 3551378
commit 5d8b798
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/Core/src/Platform/Android/StrokeExtensions.cs b/src/Core/src/Platform/Android/StrokeExtensions.cs
@@ -5,6 +5,27 @@ namespace Microsoft.Maui.Platform
 {
 	public static class StrokeExtensions
 	{
+		public static void UpdateBorderStroke(this AView platformView, IBorderStroke border)
+		{
+			//Always set the drawable first
+			platformView.UpdateMauiDrawable(border);
+
+			var borderShape = border.Shape;
+			MauiDrawable? mauiDrawable = platformView.Background as MauiDrawable;
+
+			if (mauiDrawable == null && borderShape == null)
+				return;
+
+			mauiDrawable?.SetBorderBrush(border.Stroke);
+			mauiDrawable?.SetBorderWidth(border.StrokeThickness);
+			platformView.UpdateStrokeDashPattern(border);
+			platformView.UpdateStrokeDashOffset(border);
+			mauiDrawable?.SetBorderMiterLimit(border.StrokeMiterLimit);
+			mauiDrawable?.SetBorderLineCap(border.StrokeLineCap);
+			mauiDrawable?.SetBorderLineJoin(border.StrokeLineJoin);
+
+		}
+
 		public static void UpdateStrokeShape(this AView platformView, IBorderStroke border)
 		{
 			var borderShape = border.Shape;
@@ -121,4 +142,4 @@ internal static void UpdateMauiDrawable(this AView platformView, IBorderStroke b
 			mauiDrawable.SetBorderShape(border.Shape);
 		}
 	}
-}
+}
diff --git a/src/Core/src/Platform/Android/ViewExtensions.cs b/src/Core/src/Platform/Android/ViewExtensions.cs
@@ -157,7 +157,7 @@ public static void UpdateBackground(this ContentViewGroup platformView, IBorderS
 			bool hasBorder = border.Shape != null && border.Stroke != null;
 
 			if (hasBorder)
-				platformView.UpdateMauiDrawable(border);
+				platformView.UpdateBorderStroke(border);
 		}
 
 		public static void UpdateBackground(this AView platformView, IView view, Drawable? defaultBackground = null) =>

diff --git a/src/Core/src/Platform/Android/WrapperView.cs b/src/Core/src/Platform/Android/WrapperView.cs
@@ -131,7 +131,7 @@ partial void BorderChanged()
 			{
 				this.AddView(BorderView = new AView(Context));
 			}
-			BorderView.UpdateMauiDrawable(Border);
+			BorderView.UpdateBorderStroke(Border);
 		}
 
 		void ClipChild(Canvas canvas)

diff --git a/src/Core/src/Platform/iOS/WrapperView.cs b/src/Core/src/Platform/iOS/WrapperView.cs
@@ -73,7 +73,7 @@ public override void LayoutSubviews()
 				ShadowLayer.Frame = Bounds;
 
 			if (BorderView != null)
-				BringSubviewToFront(BorderView);
+				BorderView.Frame = Bounds;
 
 			SetClip();
 			SetShadow();