[create-pull-request] automated change

github-actions[bot] · web-flow · commit d7ec1fa76573 · 2022-06-18T01:18:49.000Z
diff --git a/src/Controls/src/Core/ScrollView.cs b/src/Controls/src/Core/ScrollView.cs
@@ -146,7 +146,7 @@ public View Content
 					InternalChildren.Add(_content);
 					_content.SizeChanged += ContentSizeChanged;
 				}
-				
+
 				OnPropertyChanged();
 				Handler?.UpdateValue(nameof(Content));
 			}
@@ -163,9 +163,9 @@ void ContentSizeChanged(object sender, EventArgs e)
 
 			var margin = view.Margin;
 			var frameSize = view.Frame.Size;
-			
+
 			// The ContentSize includes the margins for the content
-			ContentSize = new Size(frameSize.Width + margin.HorizontalThickness, 
+			ContentSize = new Size(frameSize.Width + margin.HorizontalThickness,
 				frameSize.Height + margin.VerticalThickness);
 		}
 
diff --git a/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs b/src/Controls/tests/DeviceTests/Elements/ScrollView/ScrollViewTests.cs
@@ -65,14 +65,14 @@ await handler.PlatformView.AttachAndRun(async () =>
 
 			});
 		}
-		
+
 		[Theory]
 		[InlineData(ScrollOrientation.Vertical, 100, 300, 0, 100)]
 		[InlineData(ScrollOrientation.Horizontal, 0, 100, 100, 300)]
 		[InlineData(ScrollOrientation.Both, 100, 300, 100, 300)]
-		public async Task TestScrollContentMargin(ScrollOrientation orientation, int verticalMargin, 
+		public async Task TestScrollContentMargin(ScrollOrientation orientation, int verticalMargin,
 			int expectedHeight, int horizontalMargin, int expectedWidth)
-{
+		{
 			var handler = await SetUpScrollView(orientation, verticalMargin: verticalMargin, horizontalMargin: horizontalMargin);
 			var scroll = handler.VirtualView as ScrollView;
 
@@ -87,19 +87,19 @@ await handler.PlatformView.AttachAndRun(async () =>
 			});
 		}
 
-		static async Task AssertContentSizeChanged(Task<bool> changed) 
+		static async Task AssertContentSizeChanged(Task<bool> changed)
 		{
 			await WaitAssert(() => changed.IsCompleted && changed.Result, timeout: 5000, message: "PropertyChanged event with PropertyName 'ContentSize' did not fire").ConfigureAwait(false);
 		}
 
-		static async Task AssertContentSize(Func<Size> actual, Size expected) 
+		static async Task AssertContentSize(Func<Size> actual, Size expected)
 		{
 			await WaitAssert(() => CloseEnough(actual(), expected, 0.2), timeout: 5000, message: $"ContentSize was {actual()}, expected {expected}");
 		}
 
-		static bool CloseEnough(Size a, Size b, double tolerance) 
+		static bool CloseEnough(Size a, Size b, double tolerance)
 		{
-			if (System.Math.Abs(a.Width - b.Width) > tolerance) 
+			if (System.Math.Abs(a.Width - b.Width) > tolerance)
 			{
 				return false;
 			}
@@ -150,7 +150,7 @@ async Task<ScrollViewHandler> SetUpScrollView(ScrollOrientation orientation, int
 			return await CreateHandlerAsync<ScrollViewHandler>(scroll);
 		}
 
-		static async Task WaitAssert(Func<bool> predicate, int interval = 100, int timeout = 1000, string message = "") 
+		static async Task WaitAssert(Func<bool> predicate, int interval = 100, int timeout = 1000, string message = "")
 		{
 			System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch();
 			watch.Start();
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Android.cs
@@ -78,7 +78,7 @@ alone and the ScrollView will size to its content as usual. */
 			return Context.FromPixels(platformView.MeasuredWidth, platformView.MeasuredHeight);
 		}
 
-		static int AdjustSpecForAlignment(int measureSpec, Primitives.LayoutAlignment alignment) 
+		static int AdjustSpecForAlignment(int measureSpec, Primitives.LayoutAlignment alignment)
 		{
 			if (alignment == Primitives.LayoutAlignment.Fill && measureSpec.GetMode() == MeasureSpecMode.AtMost)
 			{
diff --git a/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Windows.cs b/src/Core/src/Handlers/ScrollView/ScrollViewHandler.Windows.cs
@@ -119,7 +119,7 @@ static void UpdateContentPanel(IScrollView scrollView, IScrollViewHandler handle
 				{
 					currentPaddingLayer.Children.Clear();
 					currentPaddingLayer.Children.Add(nativeContent);
-					
+
 				}
 			}
 			else
diff --git a/src/Core/src/Layouts/GridLayoutManager.cs b/src/Core/src/Layouts/GridLayoutManager.cs
@@ -28,7 +28,7 @@ public override Size Measure(double widthConstraint, double heightConstraint)
 
 		public override Size ArrangeChildren(Rect bounds)
 		{
-			if (_gridStructure  == null || NeedsRemeasure(bounds, Grid, _gridStructure))
+			if (_gridStructure == null || NeedsRemeasure(bounds, Grid, _gridStructure))
 			{
 				_gridStructure = new GridStructure(Grid, bounds.Width, bounds.Height);
 			}
@@ -58,14 +58,14 @@ public override Size ArrangeChildren(Rect bounds)
 			return actual.AdjustForFill(bounds, Grid);
 		}
 
-		static bool NeedsRemeasure(Rect bounds, IGridLayout grid, GridStructure structure) 
+		static bool NeedsRemeasure(Rect bounds, IGridLayout grid, GridStructure structure)
 		{
 			if (grid.VerticalLayoutAlignment == Primitives.LayoutAlignment.Fill
 					&& structure.HeightConstraint != bounds.Height)
 			{
 				return true;
 			}
-			
+
 			if (grid.HorizontalLayoutAlignment == Primitives.LayoutAlignment.Fill
 				&& structure.WidthConstraint != bounds.Width)
 			{
@@ -83,7 +83,7 @@ class GridStructure
 			readonly IGridLayout _grid;
 			readonly double _gridWidthConstraint;
 			readonly double _gridHeightConstraint;
-			
+
 			readonly double _explicitGridHeight;
 			readonly double _explicitGridWidth;
 			readonly double _gridMaxHeight;
diff --git a/src/Core/src/Platform/Android/ContextExtensions.cs b/src/Core/src/Platform/Android/ContextExtensions.cs
@@ -72,7 +72,7 @@ public static void ShowKeyboard(this Context self, global::Android.Views.View vi
 				service.ShowSoftInput(view, ShowFlags.Implicit);
 		}
 
-		internal static float ToPixels (this View view, double dp)
+		internal static float ToPixels(this View view, double dp)
 		{
 			if (s_displayDensity != float.MinValue)
 				return (float)Math.Ceiling(dp * s_displayDensity);
diff --git a/src/Core/src/Platform/iOS/MauiLabel.cs b/src/Core/src/Platform/iOS/MauiLabel.cs
@@ -14,14 +14,14 @@ public class MauiLabel : UILabel
 		UIControlContentVerticalAlignment _verticalAlignment = UIControlContentVerticalAlignment.Center;
 
 		public UIEdgeInsets TextInsets { get; set; }
-		internal UIControlContentVerticalAlignment VerticalAlignment 
+		internal UIControlContentVerticalAlignment VerticalAlignment
 		{
 			get => _verticalAlignment;
 			set
 			{
 				_verticalAlignment = value;
 				SetNeedsDisplay();
-			} 
+			}
 		}
 
 		public MauiLabel(RectangleF frame) : base(frame)
@@ -36,7 +36,7 @@ public override void DrawText(RectangleF rect)
 		{
 			rect = TextInsets.InsetRect(rect);
 
-			if (_verticalAlignment != UIControlContentVerticalAlignment.Center 
+			if (_verticalAlignment != UIControlContentVerticalAlignment.Center
 				&& _verticalAlignment != UIControlContentVerticalAlignment.Fill)
 			{
 				rect = AlignVertical(rect);
@@ -45,7 +45,7 @@ public override void DrawText(RectangleF rect)
 			base.DrawText(rect);
 		}
 
-		RectangleF AlignVertical(RectangleF rect) 
+		RectangleF AlignVertical(RectangleF rect)
 		{
 			var frameSize = Frame.Size;
 			var height = Lines == 1 ? Font.LineHeight : SizeThatFits(frameSize).Height;
diff --git a/src/Core/tests/DeviceTests/Handlers/ScrollView/ScrollViewHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/ScrollView/ScrollViewHandlerTests.Android.cs
@@ -34,7 +34,7 @@ public async Task ContentInitializesCorrectly()
 				for (int n = 0; n < scrollViewHandler.PlatformView.ChildCount; n++)
 				{
 					var platformView = scrollViewHandler.PlatformView.GetChildAt(n);
-					
+
 					// ScrollView on Android uses an intermediate ContentViewGroup to handle measurement/arrangement/padding
 					if (platformView is ContentViewGroup contentViewGroup)
 					{
diff --git a/src/Core/tests/DeviceTests/Handlers/ScrollView/ScrollViewHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/ScrollView/ScrollViewHandlerTests.iOS.cs
@@ -35,7 +35,7 @@ public async Task ContentInitializesCorrectly()
 				foreach (var platformView in scrollViewHandler.PlatformView.Subviews)
 				{
 					// ScrollView on iOS uses an intermediate ContentView to handle conetent measurement/arrangement
-					if (platformView is ContentView contentView) 
+					if (platformView is ContentView contentView)
 					{
 						foreach (var content in contentView.Subviews)
 						{
diff --git a/src/Templates/src/templates/maui-blazor/App.xaml.cs b/src/Templates/src/templates/maui-blazor/App.xaml.cs
@@ -2,10 +2,10 @@
 
 public partial class App : Application
 {
-    public App()
-    {
-        InitializeComponent();
+	public App()
+	{
+		InitializeComponent();
 
-        MainPage = new MainPage();
-    }
+		MainPage = new MainPage();
+	}
 }
diff --git a/src/Templates/src/templates/maui-blazor/Data/WeatherForecast.cs b/src/Templates/src/templates/maui-blazor/Data/WeatherForecast.cs
@@ -2,11 +2,11 @@ namespace MauiApp._1.Data;
 
 public class WeatherForecast
 {
-    public DateTime Date { get; set; }
+	public DateTime Date { get; set; }
 
-    public int TemperatureC { get; set; }
+	public int TemperatureC { get; set; }
 
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+	public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
 
-    public string Summary { get; set; }
+	public string Summary { get; set; }
 }
diff --git a/src/Templates/src/templates/maui-blazor/Data/WeatherForecastService.cs b/src/Templates/src/templates/maui-blazor/Data/WeatherForecastService.cs
@@ -2,19 +2,19 @@ namespace MauiApp._1.Data;
 
 public class WeatherForecastService
 {
-    private static readonly string[] Summaries = new[]
-    {
-        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-    };
+	private static readonly string[] Summaries = new[]
+	{
+		"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+	};
 
-    public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
-    {
-        return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
-        {
-            Date = startDate.AddDays(index),
-            TemperatureC = Random.Shared.Next(-20, 55),
-            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-        }).ToArray());
-    }
+	public Task<WeatherForecast[]> GetForecastAsync(DateTime startDate)
+	{
+		return Task.FromResult(Enumerable.Range(1, 5).Select(index => new WeatherForecast
+		{
+			Date = startDate.AddDays(index),
+			TemperatureC = Random.Shared.Next(-20, 55),
+			Summary = Summaries[Random.Shared.Next(Summaries.Length)]
+		}).ToArray());
+	}
 }
 
diff --git a/src/Templates/src/templates/maui-blazor/MainPage.xaml.cs b/src/Templates/src/templates/maui-blazor/MainPage.xaml.cs
@@ -2,8 +2,8 @@
 
 public partial class MainPage : ContentPage
 {
-    public MainPage()
-    {
-        InitializeComponent();
-    }
+	public MainPage()
+	{
+		InitializeComponent();
+	}
 }
diff --git a/src/Templates/src/templates/maui-blazor/MauiProgram.cs b/src/Templates/src/templates/maui-blazor/MauiProgram.cs
@@ -5,25 +5,25 @@ namespace MauiApp._1;
 
 public static class MauiProgram
 {
-    public static MauiApp CreateMauiApp()
-    {
-        var builder = MauiApp.CreateBuilder();
-        builder
-            .UseMauiApp<App>()
-            .ConfigureFonts(fonts =>
-            {
-                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-            });
+	public static MauiApp CreateMauiApp()
+	{
+		var builder = MauiApp.CreateBuilder();
+		builder
+			.UseMauiApp<App>()
+			.ConfigureFonts(fonts =>
+			{
+				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+			});
 
-        builder.Services.AddMauiBlazorWebView();
-        //-:cnd:noEmit
+		builder.Services.AddMauiBlazorWebView();
+		//-:cnd:noEmit
 #if DEBUG
         builder.Services.AddBlazorWebViewDeveloperTools();
 #endif
-        //+:cnd:noEmit
+		//+:cnd:noEmit
 
-        builder.Services.AddSingleton<WeatherForecastService>();
+		builder.Services.AddSingleton<WeatherForecastService>();
 
-        return builder.Build();
-    }
+		return builder.Build();
+	}
 }
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/Android/MainApplication.cs b/src/Templates/src/templates/maui-blazor/Platforms/Android/MainApplication.cs
@@ -6,10 +6,10 @@ namespace MauiApp._1;
 [Application]
 public class MainApplication : MauiApplication
 {
-    public MainApplication(IntPtr handle, JniHandleOwnership ownership)
-        : base(handle, ownership)
-    {
-    }
+	public MainApplication(IntPtr handle, JniHandleOwnership ownership)
+		: base(handle, ownership)
+	{
+	}
 
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 }
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/AppDelegate.cs b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/AppDelegate.cs
@@ -5,5 +5,5 @@ namespace MauiApp._1;
 [Register("AppDelegate")]
 public class AppDelegate : MauiUIApplicationDelegate
 {
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 }
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Program.cs b/src/Templates/src/templates/maui-blazor/Platforms/MacCatalyst/Program.cs
@@ -5,11 +5,11 @@ namespace MauiApp._1;
 
 public class Program
 {
-    // This is the main entry point of the application.
-    static void Main(string[] args)
-    {
-        // if you want to use a different Application Delegate class from "AppDelegate"
-        // you can specify it here.
-        UIApplication.Main(args, null, typeof(AppDelegate));
-    }
+	// This is the main entry point of the application.
+	static void Main(string[] args)
+	{
+		// if you want to use a different Application Delegate class from "AppDelegate"
+		// you can specify it here.
+		UIApplication.Main(args, null, typeof(AppDelegate));
+	}
 }
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/Tizen/Main.cs b/src/Templates/src/templates/maui-blazor/Platforms/Tizen/Main.cs
@@ -6,11 +6,11 @@ namespace MauiApp._1;
 
 class Program : MauiApplication
 {
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 
-    static void Main(string[] args)
-    {
-        var app = new Program();
-        app.Run(args);
-    }
+	static void Main(string[] args)
+	{
+		var app = new Program();
+		app.Run(args);
+	}
 }
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/Windows/App.xaml.cs b/src/Templates/src/templates/maui-blazor/Platforms/Windows/App.xaml.cs
@@ -10,15 +10,15 @@ namespace MauiApp._1.WinUI;
 /// </summary>
 public partial class App : MauiWinUIApplication
 {
-    /// <summary>
-    /// Initializes the singleton application object.  This is the first line of authored code
-    /// executed, and as such is the logical equivalent of main() or WinMain().
-    /// </summary>
-    public App()
-    {
-        this.InitializeComponent();
-    }
+	/// <summary>
+	/// Initializes the singleton application object.  This is the first line of authored code
+	/// executed, and as such is the logical equivalent of main() or WinMain().
+	/// </summary>
+	public App()
+	{
+		this.InitializeComponent();
+	}
 
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 }
 
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/iOS/AppDelegate.cs b/src/Templates/src/templates/maui-blazor/Platforms/iOS/AppDelegate.cs
@@ -5,5 +5,5 @@ namespace MauiApp._1;
 [Register("AppDelegate")]
 public class AppDelegate : MauiUIApplicationDelegate
 {
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 }
diff --git a/src/Templates/src/templates/maui-blazor/Platforms/iOS/Program.cs b/src/Templates/src/templates/maui-blazor/Platforms/iOS/Program.cs
diff --git a/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs b/src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public View Content`
`146`	`146`	`InternalChildren.Add(_content);`
`147`	`147`	`_content.SizeChanged += ContentSizeChanged;`
`148`	`148`	`}`
`149`		`-`
	`149`	`+`
`150`	`150`	`OnPropertyChanged();`
`151`	`151`	`Handler?.UpdateValue(nameof(Content));`
`152`	`152`	`}`
`@@ -163,9 +163,9 @@ void ContentSizeChanged(object sender, EventArgs e)`
`163`	`163`
`164`	`164`	`var margin = view.Margin;`
`165`	`165`	`var frameSize = view.Frame.Size;`
`166`		`-`
	`166`	`+`
`167`	`167`	`// The ContentSize includes the margins for the content`
`168`		`- ContentSize = new Size(frameSize.Width + margin.HorizontalThickness,`
	`168`	`+ ContentSize = new Size(frameSize.Width + margin.HorizontalThickness,`
`169`	`169`	`frameSize.Height + margin.VerticalThickness);`
`170`	`170`	`}`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,14 @@ await handler.PlatformView.AttachAndRun(async () =>`
`65`	`65`
`66`	`66`	`});`
`67`	`67`	`}`
`68`		`-`
	`68`	`+`
`69`	`69`	`[Theory]`
`70`	`70`	`[InlineData(ScrollOrientation.Vertical, 100, 300, 0, 100)]`
`71`	`71`	`[InlineData(ScrollOrientation.Horizontal, 0, 100, 100, 300)]`
`72`	`72`	`[InlineData(ScrollOrientation.Both, 100, 300, 100, 300)]`
`73`		`- public async Task TestScrollContentMargin(ScrollOrientation orientation, int verticalMargin,`
	`73`	`+ public async Task TestScrollContentMargin(ScrollOrientation orientation, int verticalMargin,`
`74`	`74`	`int expectedHeight, int horizontalMargin, int expectedWidth)`
`75`		`-{`
	`75`	`+ {`
`76`	`76`	`var handler = await SetUpScrollView(orientation, verticalMargin: verticalMargin, horizontalMargin: horizontalMargin);`
`77`	`77`	`var scroll = handler.VirtualView as ScrollView;`
`78`	`78`
`@@ -87,19 +87,19 @@ await handler.PlatformView.AttachAndRun(async () =>`
`87`	`87`	`});`
`88`	`88`	`}`
`89`	`89`
`90`		`- static async Task AssertContentSizeChanged(Task<bool> changed)`
	`90`	`+ static async Task AssertContentSizeChanged(Task<bool> changed)`
`91`	`91`	`{`
`92`	`92`	`await WaitAssert(() => changed.IsCompleted && changed.Result, timeout: 5000, message: "PropertyChanged event with PropertyName 'ContentSize' did not fire").ConfigureAwait(false);`
`93`	`93`	`}`
`94`	`94`
`95`		`- static async Task AssertContentSize(Func<Size> actual, Size expected)`
	`95`	`+ static async Task AssertContentSize(Func<Size> actual, Size expected)`
`96`	`96`	`{`
`97`	`97`	`await WaitAssert(() => CloseEnough(actual(), expected, 0.2), timeout: 5000, message: $"ContentSize was {actual()}, expected {expected}");`
`98`	`98`	`}`
`99`	`99`
`100`		`- static bool CloseEnough(Size a, Size b, double tolerance)`
	`100`	`+ static bool CloseEnough(Size a, Size b, double tolerance)`
`101`	`101`	`{`
`102`		`- if (System.Math.Abs(a.Width - b.Width) > tolerance)`
	`102`	`+ if (System.Math.Abs(a.Width - b.Width) > tolerance)`
`103`	`103`	`{`
`104`	`104`	`return false;`
`105`	`105`	`}`
`@@ -150,7 +150,7 @@ async Task<ScrollViewHandler> SetUpScrollView(ScrollOrientation orientation, int`
`150`	`150`	`return await CreateHandlerAsync<ScrollViewHandler>(scroll);`
`151`	`151`	`}`
`152`	`152`
`153`		`- static async Task WaitAssert(Func<bool> predicate, int interval = 100, int timeout = 1000, string message = "")`
	`153`	`+ static async Task WaitAssert(Func<bool> predicate, int interval = 100, int timeout = 1000, string message = "")`
`154`	`154`	`{`
`155`	`155`	`System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch();`
`156`	`156`	`watch.Start();`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ alone and the ScrollView will size to its content as usual. */`
`78`	`78`	`return Context.FromPixels(platformView.MeasuredWidth, platformView.MeasuredHeight);`
`79`	`79`	`}`
`80`	`80`
`81`		`- static int AdjustSpecForAlignment(int measureSpec, Primitives.LayoutAlignment alignment)`
	`81`	`+ static int AdjustSpecForAlignment(int measureSpec, Primitives.LayoutAlignment alignment)`
`82`	`82`	`{`
`83`	`83`	`if (alignment == Primitives.LayoutAlignment.Fill && measureSpec.GetMode() == MeasureSpecMode.AtMost)`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ static void UpdateContentPanel(IScrollView scrollView, IScrollViewHandler handle`
`119`	`119`	`{`
`120`	`120`	`currentPaddingLayer.Children.Clear();`
`121`	`121`	`currentPaddingLayer.Children.Add(nativeContent);`
`122`		`-`
	`122`	`+`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`else`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override Size Measure(double widthConstraint, double heightConstraint)`
`28`	`28`
`29`	`29`	`public override Size ArrangeChildren(Rect bounds)`
`30`	`30`	`{`
`31`		`- if (_gridStructure == null \|\| NeedsRemeasure(bounds, Grid, _gridStructure))`
	`31`	`+ if (_gridStructure == null \|\| NeedsRemeasure(bounds, Grid, _gridStructure))`
`32`	`32`	`{`
`33`	`33`	`_gridStructure = new GridStructure(Grid, bounds.Width, bounds.Height);`
`34`	`34`	`}`
`@@ -58,14 +58,14 @@ public override Size ArrangeChildren(Rect bounds)`
`58`	`58`	`return actual.AdjustForFill(bounds, Grid);`
`59`	`59`	`}`
`60`	`60`
`61`		`- static bool NeedsRemeasure(Rect bounds, IGridLayout grid, GridStructure structure)`
	`61`	`+ static bool NeedsRemeasure(Rect bounds, IGridLayout grid, GridStructure structure)`
`62`	`62`	`{`
`63`	`63`	`if (grid.VerticalLayoutAlignment == Primitives.LayoutAlignment.Fill`
`64`	`64`	`&& structure.HeightConstraint != bounds.Height)`
`65`	`65`	`{`
`66`	`66`	`return true;`
`67`	`67`	`}`
`68`		`-`
	`68`	`+`
`69`	`69`	`if (grid.HorizontalLayoutAlignment == Primitives.LayoutAlignment.Fill`
`70`	`70`	`&& structure.WidthConstraint != bounds.Width)`
`71`	`71`	`{`
`@@ -83,7 +83,7 @@ class GridStructure`
`83`	`83`	`readonly IGridLayout _grid;`
`84`	`84`	`readonly double _gridWidthConstraint;`
`85`	`85`	`readonly double _gridHeightConstraint;`
`86`		`-`
	`86`	`+`
`87`	`87`	`readonly double _explicitGridHeight;`
`88`	`88`	`readonly double _explicitGridWidth;`
`89`	`89`	`readonly double _gridMaxHeight;`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public static void ShowKeyboard(this Context self, global::Android.Views.View vi`
`72`	`72`	`service.ShowSoftInput(view, ShowFlags.Implicit);`
`73`	`73`	`}`
`74`	`74`
`75`		`- internal static float ToPixels (this View view, double dp)`
	`75`	`+ internal static float ToPixels(this View view, double dp)`
`76`	`76`	`{`
`77`	`77`	`if (s_displayDensity != float.MinValue)`
`78`	`78`	`return (float)Math.Ceiling(dp * s_displayDensity);`
Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ public class MauiLabel : UILabel`
`14`	`14`	`UIControlContentVerticalAlignment _verticalAlignment = UIControlContentVerticalAlignment.Center;`
`15`	`15`
`16`	`16`	`public UIEdgeInsets TextInsets { get; set; }`
`17`		`- internal UIControlContentVerticalAlignment VerticalAlignment`
	`17`	`+ internal UIControlContentVerticalAlignment VerticalAlignment`
`18`	`18`	`{`
`19`	`19`	`get => _verticalAlignment;`
`20`	`20`	`set`
`21`	`21`	`{`
`22`	`22`	`_verticalAlignment = value;`
`23`	`23`	`SetNeedsDisplay();`
`24`		`- }`
	`24`	`+ }`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public MauiLabel(RectangleF frame) : base(frame)`
`@@ -36,7 +36,7 @@ public override void DrawText(RectangleF rect)`
`36`	`36`	`{`
`37`	`37`	`rect = TextInsets.InsetRect(rect);`
`38`	`38`
`39`		`- if (_verticalAlignment != UIControlContentVerticalAlignment.Center`
	`39`	`+ if (_verticalAlignment != UIControlContentVerticalAlignment.Center`
`40`	`40`	`&& _verticalAlignment != UIControlContentVerticalAlignment.Fill)`
`41`	`41`	`{`
`42`	`42`	`rect = AlignVertical(rect);`
`@@ -45,7 +45,7 @@ public override void DrawText(RectangleF rect)`
`45`	`45`	`base.DrawText(rect);`
`46`	`46`	`}`
`47`	`47`
`48`		`- RectangleF AlignVertical(RectangleF rect)`
	`48`	`+ RectangleF AlignVertical(RectangleF rect)`
`49`	`49`	`{`
`50`	`50`	`var frameSize = Frame.Size;`
`51`	`51`	`var height = Lines == 1 ? Font.LineHeight : SizeThatFits(frameSize).Height;`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public async Task ContentInitializesCorrectly()`
`34`	`34`	`for (int n = 0; n < scrollViewHandler.PlatformView.ChildCount; n++)`
`35`	`35`	`{`
`36`	`36`	`var platformView = scrollViewHandler.PlatformView.GetChildAt(n);`
`37`		`-`
	`37`	`+`
`38`	`38`	`// ScrollView on Android uses an intermediate ContentViewGroup to handle measurement/arrangement/padding`
`39`	`39`	`if (platformView is ContentViewGroup contentViewGroup)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public async Task ContentInitializesCorrectly()`
`35`	`35`	`foreach (var platformView in scrollViewHandler.PlatformView.Subviews)`
`36`	`36`	`{`
`37`	`37`	`// ScrollView on iOS uses an intermediate ContentView to handle conetent measurement/arrangement`
`38`		`- if (platformView is ContentView contentView)`
	`38`	`+ if (platformView is ContentView contentView)`
`39`	`39`	`{`
`40`	`40`	`foreach (var content in contentView.Subviews)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`
`3`	`3`	`public partial class App : Application`
`4`	`4`	`{`
`5`		`- public App()`
`6`		`- {`
`7`		`- InitializeComponent();`
	`5`	`+ public App()`
	`6`	`+ {`
	`7`	`+ InitializeComponent();`
`8`	`8`
`9`		`- MainPage = new MainPage();`
`10`		`- }`
	`9`	`+ MainPage = new MainPage();`
	`10`	`+ }`
`11`	`11`	`}`