Implement Padding in ILabel Handlers

src/Controls/samples/Controls.Sample/Pages/MainPage.cs

@@ -33,6 +33,7 @@ void SetupMauiLayout()
 			verticalStack.Add(new Label { Text = "This should be BIG text!", FontSize = 24 });
 			verticalStack.Add(new Label { Text = "This should be BOLD text!", FontAttributes = FontAttributes.Bold });
 			verticalStack.Add(new Label { Text = "This should be a CUSTOM font!", FontFamily = "Dokdo" });
+			verticalStack.Add(new Label { Text = "This should have padding", Padding = new Thickness(40), BackgroundColor = Color.LightBlue });
 
 			var button = new Button() { Text = _viewModel.Text, WidthRequest = 200 };
 			var button2 = new Button()

src/Core/src/Core/ILabel.cs

@@ -2,5 +2,6 @@ namespace Microsoft.Maui
 {
 	public interface ILabel : IView, IText, IFont
 	{
+		Thickness Padding { get; }
 	}
 }

src/Core/src/Handlers/Label/LabelHandler.Android.cs

@@ -48,6 +48,11 @@ public static void MapFontAttributes(LabelHandler handler, ILabel label)
 			MapFont(handler, label);
 		}
 
+		public static void MapPadding(LabelHandler handler, ILabel label) 
+		{
+			handler.TypedNativeView?.UpdatePadding(label);
+		}
+
 		static void MapFont(LabelHandler handler, ILabel label)
 		{
 			var services = App.Current?.Services ?? throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");

src/Core/src/Handlers/Label/LabelHandler.Standard.cs

@@ -11,5 +11,6 @@ public static void MapTextColor(IViewHandler handler, ILabel label) { }
 		public static void MapFontFamily(LabelHandler handler, ILabel label) { }
 		public static void MapFontSize(LabelHandler handler, ILabel label) { }
 		public static void MapFontAttributes(LabelHandler handler, ILabel label) { }
+		public static void MapPadding(LabelHandler handler, ILabel label) {	}
 	}
 }

src/Core/src/Handlers/Label/LabelHandler.cs

@@ -9,6 +9,7 @@ public partial class LabelHandler
 			[nameof(ILabel.FontFamily)] = MapFontFamily,
 			[nameof(ILabel.FontSize)] = MapFontSize,
 			[nameof(ILabel.FontAttributes)] = MapFontAttributes,
+			[nameof(ILabel.Padding)] = MapPadding,
 		};
 
 		public LabelHandler() : base(LabelMapper)

src/Core/src/Handlers/Label/LabelHandler.iOS.cs

@@ -1,12 +1,13 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class LabelHandler : AbstractViewHandler<ILabel, UILabel>
+	public partial class LabelHandler : AbstractViewHandler<ILabel, MauiLabel>
 	{
-		protected override UILabel CreateNativeView() => new UILabel();
+		protected override MauiLabel CreateNativeView() => new MauiLabel();
 
 		public static void MapText(LabelHandler handler, ILabel label)
 		{
@@ -33,6 +34,11 @@ public static void MapFontAttributes(LabelHandler handler, ILabel label)
 			MapFont(handler, label);
 		}
 
+		public static void MapPadding(LabelHandler handler, ILabel label)
+		{
+			handler.TypedNativeView?.UpdatePadding(label);
+		}
+
 		static void MapFont(LabelHandler handler, ILabel label)
 		{
 			var services = App.Current?.Services ?? throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");

src/Core/src/Platform/Android/LabelExtensions.cs

@@ -34,5 +34,21 @@ public static void UpdateFont(this TextView textView, ILabel label, IFontManager
 			var sp = fontManager.GetScaledPixel(font);
 			textView.SetTextSize(ComplexUnitType.Sp, sp);
 		}
+
+		public static void UpdatePadding(this TextView textView, ILabel label) 
+		{
+			var context = textView.Context;
+
+			if (context == null)
+			{
+				return;
+			}
+
+			textView.SetPadding(
+					(int)context.ToPixels(label.Padding.Left),
+					(int)context.ToPixels(label.Padding.Top),
+					(int)context.ToPixels(label.Padding.Right),
+					(int)context.ToPixels(label.Padding.Bottom));
+		}
 	}
 }

src/Core/src/Platform/Standard/LabelExtensions.cs

@@ -11,5 +11,10 @@ public static void UpdateTextColor(this object nothing, ILabel label)
 		{
 
 		}
+
+		public static void UpdatePadding(this object nothing, ILabel label)
+		{ 
+
+		}
 	}
 }

src/Core/src/Platform/iOS/LabelExtensions.cs

@@ -1,3 +1,4 @@
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 
 namespace Microsoft.Maui
@@ -31,5 +32,15 @@ public static void UpdateFont(this UILabel nativeLabel, ILabel label, IFontManag
 			var uiFont = fontManager.GetFont(font);
 			nativeLabel.Font = uiFont;
 		}
+
+		public static void UpdatePadding(this MauiLabel nativeLabel, ILabel label) 
+		{
+			nativeLabel.TextInsets = new UIEdgeInsets(
+					(float)label.Padding.Top,
+					(float)label.Padding.Left,
+					(float)label.Padding.Bottom,
+					(float)label.Padding.Right);
+
+		}
 	}
 }

src/Core/src/Platform/iOS/MauiLabel.cs

@@ -0,0 +1,26 @@
+using CoreGraphics;
+using UIKit;
+
+namespace Microsoft.Maui.Platform.iOS
+{
+	public class MauiLabel : UILabel
+	{
+		public UIEdgeInsets TextInsets { get; set; }
+
+		public MauiLabel(CGRect frame) : base(frame)
+		{
+		}
+
+		public MauiLabel()
+		{
+		}
+
+		public override void DrawText(CGRect rect) => base.DrawText(TextInsets.InsetRect(rect));
+
+		public override CGSize SizeThatFits(CGSize size) => AddInsets(base.SizeThatFits(size));
+
+		CGSize AddInsets(CGSize size) => new CGSize(
+			width: size.Width + TextInsets.Left + TextInsets.Right,
+			height: size.Height + TextInsets.Top + TextInsets.Bottom);
+	}
+}

src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.Android.cs

@@ -36,6 +36,31 @@ public async Task FontFamilyInitializesCorrectly(string family)
 				Assert.NotEqual(fontManager.DefaultTypeface, nativeLabel.Typeface);
 		}
 
+		[Fact]
+		public async Task PaddingInitializesCorrectly()
+		{
+			var label = new LabelStub()
+			{
+				Text = "Test",
+				Padding = new Thickness(5, 10, 15, 20)
+			};
+
+			var handler = await CreateHandlerAsync(label);
+			var (left, top, right, bottom) = GetNativePadding((TextView)handler.NativeView);
+
+			var context = handler.View.Context;
+
+			var expectedLeft = context.ToPixels(5);
+			var expectedTop = context.ToPixels(10);
+			var expectedRight = context.ToPixels(15);
+			var expectedBottom = context.ToPixels(20);
+
+			Assert.Equal(expectedLeft, left);
+			Assert.Equal(expectedTop, top);
+			Assert.Equal(expectedRight, right);
+			Assert.Equal(expectedBottom, bottom);
+		}
+
 		TextView GetNativeLabel(LabelHandler labelHandler) =>
 			(TextView)labelHandler.View;
 
@@ -64,5 +89,10 @@ Task ValidateNativeBackgroundColor(ILabel label, Color color)
 				return GetNativeLabel(CreateHandler(label)).AssertContainsColor(color);
 			});
 		}
+
+		(double left, double top, double right, double bottom) GetNativePadding(Android.Views.View view) 
+		{
+			return (view.PaddingLeft, view.PaddingTop, view.PaddingRight, view.PaddingBottom);
+		}
 	}
 }

src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.iOS.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 using Xunit;
 
@@ -34,6 +35,24 @@ public async Task FontFamilyInitializesCorrectly(string family)
 				Assert.NotEqual(fontManager.DefaultFont.FamilyName, nativeFont.FamilyName);
 		}
 
+		[Fact]
+		public async Task PaddingInitializesCorrectly()
+		{
+			var label = new LabelStub()
+			{
+				Text = "Test",
+				Padding = new Thickness(5, 10, 15, 20)
+			};
+
+			var handler = await CreateHandlerAsync(label);
+			var insets = ((MauiLabel)handler.NativeView).TextInsets;
+
+			Assert.Equal(5, insets.Left);
+			Assert.Equal(10, insets.Top);
+			Assert.Equal(15, insets.Right);
+			Assert.Equal(20, insets.Bottom);
+		}
+
 		UILabel GetNativeLabel(LabelHandler labelHandler) =>
 			(UILabel)labelHandler.View;
 

src/Core/tests/DeviceTests/Stubs/LabelStub.cs

@@ -11,5 +11,7 @@ public partial class LabelStub : StubBase, ILabel
 		public string FontFamily { get; set; }
 
 		public double FontSize { get; set; }
+
+		public Thickness Padding { get; set; }
 	}
 }