Review of the "Essentials" interface API

src/BlazorWebView/src/Maui/Android/BlazorWebChromeClient.cs

@@ -45,7 +45,7 @@ private static async Task CallFilePickerAsync(IValueCallback filePathCallback, F
 			var pickOptions = GetPickOptions(fileChooserParams);
 			var fileResults = fileChooserParams?.Mode == ChromeFileChooserMode.OpenMultiple ?
 					await FilePicker.PickMultipleAsync(pickOptions) :
-					new[] { await FilePicker.PickAsync(pickOptions) };
+					new[] { (await FilePicker.PickAsync(pickOptions))! };
 
 			if (fileResults?.All(f => f is null) ?? true)
 			{

src/Controls/samples/Controls.Sample/Pages/Others/RenderViewPage.xaml

@@ -9,10 +9,9 @@
             <Button x:Name="RenderButton" Text="Render This Button As Image" Clicked="RenderButton_Clicked" />
             <Button Text="Render Window As Image" Clicked="RenderWindow_Clicked" />
             <HorizontalStackLayout Spacing="5" RadioButtonGroup.GroupName="Image Type" HorizontalOptions="Center"
-                      RadioButtonGroup.SelectedValue="{Binding Selection}">
+                                   RadioButtonGroup.SelectedValue="{Binding Selection}">
                 <RadioButton Content="JPEG" Value="JPEG"/>
                 <RadioButton Content="PNG" Value="PNG"/>
-                <RadioButton Content="BMP" Value="BMP"/>
             </HorizontalStackLayout>
         </VerticalStackLayout>
         <Image x:Name="TestImage" Grid.Row="1"/>

src/Controls/samples/Controls.Sample/Pages/Others/RenderViewPage.xaml.cs

@@ -1,125 +1,112 @@
 #nullable enable
-
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Threading.Tasks;
+using Maui.Controls.Sample.ViewModels.Base;
 using Microsoft.Maui;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Devices;
-using Microsoft.Maui.Platform;
 using Microsoft.Maui.ApplicationModel.DataTransfer;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Media;
+using Microsoft.Maui.Storage;
 
 namespace Maui.Controls.Sample.Pages
 {
 	public partial class RenderViewPage
 	{
-		Stopwatch stopwatch = new Stopwatch();
-		RenderBindingModel vm;
+		readonly Stopwatch stopwatch = new Stopwatch();
+		readonly RenderBindingModel vm;
+
 		MemoryStream? imageStream;
-		byte[]? byteStream;
 
 		public RenderViewPage()
 		{
 			InitializeComponent();
-			this.BindingContext = this.vm = new RenderBindingModel();
-
+			BindingContext = vm = new RenderBindingModel();
 		}
 
-		private async void RenderWindow_Clicked(object sender, System.EventArgs e)
+		async void RenderWindow_Clicked(object sender, EventArgs e)
 		{
 			Reset();
-			RenderedView? renderImage = null;
-			var window = this.GetParentWindow() as IWindow;
 			stopwatch.Start();
-			try
-			{
-				if (window is not null)
-				{
-					renderImage = await window.RenderAsImage(vm.RenderType);
-				}
 
-			}
-			catch (System.Exception ex)
-			{
-				System.Diagnostics.Debug.WriteLine(ex.Message);
-			}
+			var renderImage = await Window.CaptureAsync();
+
 			stopwatch.Stop();
 
-			RenderView(renderImage);
+			await RenderView(renderImage);
 		}
 
-		private async void RenderButton_Clicked(object sender, System.EventArgs e)
+		async void RenderButton_Clicked(object sender, EventArgs e)
 		{
 			Reset();
-			RenderedView? renderImage = null;
 			stopwatch.Start();
-			try
-			{
-				renderImage = await this.RenderButton.RenderAsImage(vm.RenderType);
-
-			}
-			catch (System.Exception ex)
-			{
-				System.Diagnostics.Debug.WriteLine(ex.Message);
-			}
+
+			var renderImage = await RenderButton.CaptureAsync();
+
 			stopwatch.Stop();
 
-			RenderView(renderImage);
+			await RenderView(renderImage);
 		}
 
-		private async void RenderViewSaved_Clicked(object sender, System.EventArgs e)
+		async void RenderViewSaved_Clicked(object sender, EventArgs e)
 		{
-			if (byteStream is not null)
+			if (imageStream is not null)
 			{
 				var extension = vm.RenderType switch
 				{
-					RenderType.JPEG => "jpg",
-					RenderType.PNG => "png",
-					RenderType.BMP => "bmp",
-					_ => "jpg",
+					ScreenshotFormat.Jpeg => ".jpg",
+					ScreenshotFormat.Png => ".png",
+					_ => ".jpg",
 				};
-				string fileName = $"{System.IO.Path.GetTempFileName()}.{extension}";
-				string filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), fileName);
-				File.WriteAllBytes(filePath, byteStream);
-				await Share.RequestAsync(new ShareFileRequest() { Title = fileName, File = new ShareFile(filePath) });
+
+				var fileName = Path.GetTempFileName() + extension;
+				var filePath = Path.Combine(FileSystem.CacheDirectory, fileName);
+
+				File.WriteAllBytes(filePath, imageStream.ToArray());
+
+				await Share.RequestAsync(new ShareFileRequest
+				{
+					Title = fileName,
+					File = new ShareFile(filePath)
+				});
 			}
 		}
 
-		private void RenderView(RenderedView? renderImage)
+		async Task RenderView(IScreenshotResult? renderImage)
 		{
-			if (renderImage?.Render is not null)
+			if (renderImage is not null)
 			{
-				try
-				{
-					byteStream = renderImage.Render;
-					imageStream = new MemoryStream(renderImage.Render);
-					this.TestImage.Source = ImageSource.FromStream(() => imageStream);
-				}
-				catch (System.Exception ex)
-				{
-					System.Diagnostics.Debug.WriteLine(ex.Message);
-				}
+				imageStream = new MemoryStream();
+				await renderImage.CopyToAsync(imageStream, vm.RenderType);
+				imageStream.Position = 0;
+
+				TestImage.Source = ImageSource.FromStream(() => imageStream);
 			}
-			this.StopwatchTime.Text = stopwatch.Elapsed.ToString();
-			this.RenderStats.Text = $"Type: {renderImage?.RenderType}; Size: {SizeInBytes(renderImage?.Render)}";
+
+			StopwatchTime.Text = stopwatch.Elapsed.ToString();
+			RenderStats.Text = $"Size: {SizeInBytes(imageStream)}";
 		}
 
-		private void Reset()
+		void Reset()
 		{
 			stopwatch.Reset();
+
 			StopwatchTime.Text = string.Empty;
 			RenderStats.Text = string.Empty;
-			this.TestImage.Source = null;
+
+			TestImage.Source = null;
 		}
 
-		private string SizeInBytes(byte[]? array)
+		static string SizeInBytes(Stream? stream)
 		{
-			if (array is null)
-				return string.Empty;
+			if (stream is null)
+				return "<null>";
+
 			string[] sizes = { "B", "KB", "MB", "GB", "TB" };
-			double len = System.Convert.ToDouble(array.Length);
+
+			double len = stream.Length;
 			int order = 0;
 			while (len >= 1024D && order < sizes.Length - 1)
 			{
@@ -131,36 +118,19 @@ private string SizeInBytes(byte[]? array)
 		}
 	}
 
-	public class RenderBindingModel : INotifyPropertyChanged
+	public class RenderBindingModel : BaseViewModel
 	{
-		private string? _selection;
-
-		public event PropertyChangedEventHandler? PropertyChanged;
-
-		void OnPropertyChanged(string propertyName)
-		{
-			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-		}
+		string? _selection;
 
 		public string? Selection
 		{
 			get => _selection;
-			set
-			{
-				_selection = value;
-				OnPropertyChanged(nameof(Selection));
-			}
+			set => SetProperty(ref _selection, value);
 		}
 
-		public RenderType RenderType
-		{
-			get
-			{
-				if (_selection is null)
-					return RenderType.JPEG;
-
-				return (RenderType)System.Enum.Parse(typeof(RenderType), _selection);
-			}
-		}
+		public ScreenshotFormat RenderType =>
+			Enum.TryParse<ScreenshotFormat>(Selection, out var format)
+				? format
+				: ScreenshotFormat.Jpeg;
 	}
 }

src/Controls/tests/Core.UnitTests/MockDeviceDisplay.cs

@@ -13,7 +13,7 @@ internal class MockDeviceDisplay : IDeviceDisplay
 
 		public event EventHandler<DisplayInfoChangedEventArgs>? MainDisplayInfoChanged;
 
-		public DisplayInfo GetMainDisplayInfo() => _mainDisplayInfo;
+		public DisplayInfo MainDisplayInfo => _mainDisplayInfo;
 
 		public void UpdateMainDisplayInfo(DisplayInfo displayInfo)
 		{

src/Core/src/Fonts/FontRegistrar.Windows.cs

@@ -9,19 +9,19 @@ public partial class FontRegistrar : IFontRegistrar
 	{
 		string? LoadNativeAppFont(string font, string filename, string? alias)
 		{
-			if (FileSystemImplementation.AppPackageFileExists(filename))
+			if (FileSystemUtils.AppPackageFileExists(filename))
 				return $"ms-appx:///{filename}";
 
 			var packagePath = Path.Combine("Assets", filename);
-			if (FileSystemImplementation.AppPackageFileExists(packagePath))
+			if (FileSystemUtils.AppPackageFileExists(packagePath))
 				return $"ms-appx:///Assets/{filename}";
 
 			packagePath = Path.Combine("Fonts", filename);
-			if (FileSystemImplementation.AppPackageFileExists(packagePath))
+			if (FileSystemUtils.AppPackageFileExists(packagePath))
 				return $"ms-appx:///Fonts/{filename}";
 
 			packagePath = Path.Combine("Assets", "Fonts", filename);
-			if (FileSystemImplementation.AppPackageFileExists(packagePath))
+			if (FileSystemUtils.AppPackageFileExists(packagePath))
 				return $"ms-appx:///Assets/Fonts/{filename}";
 
 			// TODO: check other folders as well

src/Core/src/Hosting/EssentialsMauiAppBuilderExtensions.cs

@@ -64,7 +64,7 @@ internal static MauiAppBuilder UseEssentials(this MauiAppBuilder builder)
 				life.AddWindows(windows => windows
 					.OnPlatformMessage((window, args) =>
 					{
-						ApplicationModel.Platform.NewWindowProc(args.Hwnd, args.MessageId, args.WParam, args.LParam);
+						ApplicationModel.Platform.OnWindowMessage(args.Hwnd, args.MessageId, args.WParam, args.LParam);
 					})
 					.OnActivated((window, args) =>
 					{

src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.Windows.cs

@@ -28,7 +28,7 @@ public partial class StreamImageSourceService
 
 				var image = new BitmapImage();
 
-				using var ras = stream.AsRandomAccessStream();
+				var ras = stream.AsRandomAccessStream();
 				await image.SetSourceAsync(ras);
 
 				var result = new ImageSourceServiceResult(image);

src/Core/src/Platform/Android/ViewExtensions.cs

@@ -307,50 +307,6 @@ public static void RemoveFromParent(this AView view)
 				PlatformInterop.RemoveFromParent(view);
 		}
 
-		public static Task<byte[]?> RenderAsBMP(this IView view)
-		{
-			var platformView = view?.ToPlatform();
-			if (platformView == null)
-				return Task.FromResult<byte[]?>(null);
-
-			return Task.FromResult<byte[]?>(platformView.RenderAsBMP());
-		}
-
-		public static Task<byte[]?> RenderAsPNG(this IView view)
-		{
-			var platformView = view?.ToPlatform();
-			if (platformView == null)
-				return Task.FromResult<byte[]?>(null);
-
-			return platformView.RenderAsPNG();
-		}
-
-		public static Task<byte[]?> RenderAsJPEG(this IView view)
-		{
-			var platformView = view?.ToPlatform();
-			if (platformView == null)
-				return Task.FromResult<byte[]?>(null);
-
-			return platformView.RenderAsJPEG();
-		}
-
-		public static Task<byte[]?> RenderAsImage(this AView view, RenderType type)
-		{
-			return type switch
-			{
-				RenderType.JPEG => view.RenderAsJPEG(),
-				RenderType.PNG => view.RenderAsPNG(),
-				RenderType.BMP => Task.FromResult<byte[]?>(view.RenderAsBMP()),
-				_ => throw new NotImplementedException()
-			};
-		}
-
-		public static Task<byte[]?> RenderAsPNG(this AView view)
-			=> Task.FromResult<byte[]?>(view.RenderAsImage(Android.Graphics.Bitmap.CompressFormat.Png));
-
-		public static Task<byte[]?> RenderAsJPEG(this AView view)
-			=> Task.FromResult<byte[]?>(view.RenderAsImage(Android.Graphics.Bitmap.CompressFormat.Jpeg));
-
 		internal static Rect GetPlatformViewBounds(this IView view)
 		{
 			var platformView = view?.ToPlatform();

src/Core/src/Platform/Standard/ViewExtensions.cs

@@ -58,15 +58,6 @@ public static void UpdateMinimumWidth(this object platformView, IView view) { }
 
 		public static void UpdateMaximumWidth(this object platformView, IView view) { }
 
-		public static System.Threading.Tasks.Task<byte[]?> RenderAsBMP(this IView view)
-			=> System.Threading.Tasks.Task.FromResult<byte[]?>(null);
-
-		public static System.Threading.Tasks.Task<byte[]?> RenderAsPNG(this IView view)
-			=> System.Threading.Tasks.Task.FromResult<byte[]?>(null);
-
-		public static System.Threading.Tasks.Task<byte[]?> RenderAsJPEG(this IView view)
-			=> System.Threading.Tasks.Task.FromResult<byte[]?>(null);
-
 		internal static Graphics.Rect GetPlatformViewBounds(this IView view) => view.Frame;
 
 		internal static System.Numerics.Matrix4x4 GetViewTransform(this IView view) => new System.Numerics.Matrix4x4();