Move the iOS code and implement the changes for iOS15 plus.

Author: tj-devel709

src/Controls/samples/Controls.Sample.UITests/Issues/Issue18242.xaml.cs

@@ -4,7 +4,7 @@
 namespace Maui.Controls.Sample.Issues
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
-	[Issue(IssueTracker.Github, 18242, "Button ImageSource not Scaling as expected", PlatformAffected.UWP)]
+	[Issue(IssueTracker.Github, 18242, "Button ImageSource not Scaling as expected", PlatformAffected.All)]
 	public partial class Issue18242 : ContentPage
 	{
 		public Issue18242()

src/Controls/src/Core/Platform/iOS/Extensions/ButtonExtensions.cs

@@ -3,8 +3,8 @@
 using CoreGraphics;
 using Foundation;
 using Microsoft.Maui.Controls.Internals;
-using ObjCRuntime;
 using UIKit;
+using Microsoft.Extensions.Logging;
 using static Microsoft.Maui.Controls.Button;
 
 namespace Microsoft.Maui.Controls.Platform
@@ -182,15 +182,82 @@ public static void UpdateContentLayout(this UIButton platformButton, Button butt
 
 			platformButton.UpdatePadding(button);
 
-#pragma warning disable CA1416, CA1422 // TODO: [UnsupportedOSPlatform("ios15.0")]
-			if (platformButton.ImageEdgeInsets != imageInsets ||
-				platformButton.TitleEdgeInsets != titleInsets)
+
+			// On iOS 15+, we will resize the image and then use the UIButton.Configuration to adjust the padding
+			if (OperatingSystem.IsIOSVersionAtLeast(15) && platformButton.Configuration is not null)
+			{
+				ResizeImage(platformButton, button, image);
+				var config = platformButton.Configuration;  
+
+				config.ImagePadding = imageInsets.Right - imageInsets.Left + titleInsets.Left - titleInsets.Right;
+				platformButton.Configuration = config;
+			}
+
+			else if (!OperatingSystem.IsIOSVersionAtLeast(15))
+			{
+				if (platformButton.ImageEdgeInsets != imageInsets ||
+					platformButton.TitleEdgeInsets != titleInsets)
+				{
+					platformButton.ImageEdgeInsets = imageInsets;
+					platformButton.TitleEdgeInsets = titleInsets;
+					platformButton.Superview?.SetNeedsLayout();
+				}
+			}
+		}
+
+		static void ResizeImage(UIButton platformButton, Button button, UIImage image)
+		{
+			nfloat buttonSize = 0;
+
+			if (!OperatingSystem.IsIOSVersionAtLeast(15))
 			{
-				platformButton.ImageEdgeInsets = imageInsets;
-				platformButton.TitleEdgeInsets = titleInsets;
-				platformButton.Superview?.SetNeedsLayout();
+				var contentEdgeInsets = platformButton.ContentEdgeInsets;
+				if (platformButton.Bounds != CGRect.Empty)
+				{
+					if (platformButton.Bounds.Height > platformButton.Bounds.Width)
+						buttonSize = platformButton.Bounds.Width - (contentEdgeInsets.Left + contentEdgeInsets.Right);
+					else
+						buttonSize = platformButton.Bounds.Height - (contentEdgeInsets.Top + contentEdgeInsets.Bottom);
+				}
 			}
-#pragma warning restore CA1416, CA1422
+			else
+			{
+				if (platformButton.Bounds != CGRect.Empty && platformButton.Configuration?.ContentInsets is NSDirectionalEdgeInsets contentInsets)
+				{
+					if (platformButton.Bounds.Height > platformButton.Bounds.Width)
+						buttonSize = platformButton.Bounds.Width - (contentInsets.Leading + contentInsets.Trailing);
+					else
+						buttonSize = platformButton.Bounds.Height - (contentInsets.Top + contentInsets.Bottom);
+				}
+			}
+
+			try
+			{
+				if (buttonSize != 0)
+					image = ResizeImageSource(image, buttonSize, buttonSize);
+
+				image = image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+
+				platformButton.SetImage(image, UIControlState.Normal);
+			}
+			catch (Exception)
+			{
+				button.Handler.MauiContext?.CreateLogger<ButtonHandler>()?.LogWarning("Can not load Button ImageSource");
+			}
+		}
+
+		static UIImage ResizeImageSource(UIImage sourceImage, nfloat maxWidth, nfloat maxHeight)
+		{
+			if (sourceImage is null || sourceImage.CGImage is null)
+				return null;
+
+			var sourceSize = sourceImage.Size;
+			float maxResizeFactor = (float)Math.Min(maxWidth / sourceSize.Width, maxHeight / sourceSize.Height);
+
+			if (maxResizeFactor > 1)
+				return sourceImage;
+
+			return UIImage.FromImage(sourceImage.CGImage, sourceImage.CurrentScale / maxResizeFactor, sourceImage.Orientation);
 		}
 
 		public static void UpdateText(this UIButton platformButton, Button button)

src/Controls/tests/UITests/Tests/Issues/Issue18242.cs

@@ -15,7 +15,7 @@ public Issue18242(TestDevice device) : base(device)
 		[Test]
 		public void Issue18242Test()
 		{
-			this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android, TestDevice.Mac, TestDevice.iOS }, "Only Windows for now");
+			this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Android }, "Ignore Android until https://github.com/dotnet/maui/pull/19834 lands.");
 
 			App.WaitForElement("WaitForStubControl");
 

src/Controls/tests/UITests/snapshots/ios/Issue18242Test.png

@@ -19,6 +19,15 @@ public partial class ButtonHandler : ViewHandler<IButton, UIButton>
 		protected override UIButton CreatePlatformView()
 		{
 			var button = new UIButton(UIButtonType.System);
+
+			// Starting with iOS 15, we can use the button.Configuration and assign future UIButton.Configuration.ContentInsets here instead of the deprecated UIButton.ContentEdgeInsets.
+			// It is important to note that the configuration will change any set style changes so we will do this right after creating the button.
+			if (OperatingSystem.IsIOSVersionAtLeast(15))
+			{
+				var config = UIButtonConfiguration.PlainButtonConfiguration;
+				button.Configuration = config;
+			}
+
 			SetControlPropertiesFromProxy(button);
 			return button;
 		}

src/Core/src/Handlers/Button/ButtonHandler.iOS.cs

@@ -9,10 +9,16 @@ public partial class ImageButtonHandler : ViewHandler<IImageButton, UIButton>
 
 		protected override UIButton CreatePlatformView()
 		{
-			var platformView = new UIButton(UIButtonType.System)
+			var platformView = new UIButton(UIButtonType.System);
+
+			// Starting with iOS 15, we can use the UIButton.Configuration and assign future UIButton.Configuration.ContentInsets here instead of the deprecated UIButton.ContentEdgeInsets.
+			// It is important to note that the configuration will change any set style changes so we will do this right after creating the button.
+			if (OperatingSystem.IsIOSVersionAtLeast(15))
 			{
-				ClipsToBounds = true
-			};
+				platformView.Configuration = UIButtonConfiguration.PlainButtonConfiguration;
+			}
+
+			platformView.ClipsToBounds = true;
 
 			return platformView;
 		}

src/Core/src/Handlers/ImageButton/ImageButtonHandler.iOS.cs

@@ -54,6 +54,18 @@ public static void UpdateCharacterSpacing(this UIButton platformButton, ITextSty
 		public static void UpdateFont(this UIButton platformButton, ITextStyle textStyle, IFontManager fontManager)
 		{
 			platformButton.TitleLabel.UpdateFont(textStyle, fontManager, UIFont.ButtonFontSize);
+
+			// If iOS 15+, update the configuration with the new font
+			if (OperatingSystem.IsIOSVersionAtLeast(15) && platformButton.Configuration is UIButtonConfiguration config)
+			{
+				config.TitleTextAttributesTransformer = (incoming) =>
+				{
+					var outgoing = incoming;
+					outgoing[UIStringAttributeKey.Font] = platformButton.TitleLabel.Font;
+					return outgoing;
+				};
+				platformButton.Configuration = config;
+			}
 		}
 
 		public static void UpdatePadding(this UIButton platformButton, IButton button, Thickness? defaultPadding = null) =>
@@ -73,15 +85,24 @@ public static void UpdatePadding(this UIButton platformButton, Thickness padding
 			if (bottom == 0.0)
 				bottom = AlmostZero;
 
-#pragma warning disable CA1416 // TODO: 'UIButton.ContentEdgeInsets' is unsupported on: 'ios' 15.0 and later.
-#pragma warning disable CA1422 // Validate platform compatibility
-			platformButton.ContentEdgeInsets = new UIEdgeInsets(
-				(float)top,
-				(float)padding.Left,
-				(float)bottom,
-				(float)padding.Right);
-#pragma warning restore CA1422 // Validate platform compatibility
-#pragma warning restore CA1416
+			if (OperatingSystem.IsIOSVersionAtLeast(15) && platformButton.Configuration is not null)
+			{
+				var config = platformButton.Configuration;
+				config.ContentInsets = new NSDirectionalEdgeInsets (
+					(float)top,
+					(float)padding.Left,
+					(float)bottom,
+					(float)padding.Right);
+				platformButton.Configuration = config;
+			}
+			else if (!OperatingSystem.IsIOSVersionAtLeast(15))
+			{
+				platformButton.ContentEdgeInsets = new UIEdgeInsets(
+					(float)top,
+					(float)padding.Left,
+					(float)bottom,
+					(float)padding.Right);
+			}
 		}
 	}
 }