From 9d2a1cc6b5c5bc6ba98447332b08cf41459ce298 Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Thu, 31 Aug 2023 23:28:55 +1000
Subject: [PATCH] chore: Tidy up api

(cherry picked from commit a17b1bbfe669666ea2912459f801588e0fef4b08)
---
 .../MauiEmbedding.Mobile.csproj               |  2 +-
 src/Uno.Extensions.Maui.UI/MauiEmbedding.cs   | 42 +++----------------
 2 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj b/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
index b34f083e07..7cf59e3ff2 100644
--- a/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
@@ -39,7 +39,7 @@
 		<PackageReference Include="Telerik.UI.for.Maui" Condition="$(_UseTelerik)"/>
 		<PackageReference Include="CommunityToolkit.Maui" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
+		<!--<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />-->
 	</ItemGroup>
 	<Choose>
 		<When Condition="$(IsAndroid)">
diff --git a/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs b/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs
index 41cb6effa3..fd71de410e 100644
--- a/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs
@@ -9,15 +9,6 @@ namespace Uno.Extensions.Maui;
 /// </summary>
 public static partial class MauiEmbedding
 {
-	/// <summary>
-	/// Registers Maui embedding in the Uno Platform app builder.
-	/// </summary>
-	/// <returns>The updated app builder.</returns>
-	/// <param name="builder">The IHost builder.</param>
-	/// <param name="configure">Optional lambda to configure the Maui app builder.</param>
-	public static IApplicationBuilder UseMauiEmbedding(this IApplicationBuilder builder, Action<MauiAppBuilder>? configure = null) =>
-		builder.UseMauiEmbedding<MauiApplication>(configure);
-
 	/// <summary>
 	/// Registers Maui embedding in the Uno Platform app builder.
 	/// </summary>
@@ -26,21 +17,7 @@ public static IApplicationBuilder UseMauiEmbedding(this IApplicationBuilder buil
 	/// <param name="configure">Optional lambda to configure the Maui app builder.</param>
 	public static IApplicationBuilder UseMauiEmbedding<TApp>(this IApplicationBuilder builder, Action<MauiAppBuilder>? configure = null)
 		where TApp : MauiApplication
-	{
-		builder.App.UseMauiEmbedding<TApp>(builder.Window, configure);
-		return builder;
-	}
-
-	/// <summary>
-	/// Registers Maui embedding in the Uno Platform app builder.
-	/// </summary>
-	/// <returns>The updated app builder.</returns>
-	/// <param name="builder">The IHost builder.</param>
-	/// <param name="app">The Uno app.</param>
-	/// <param name="window">The Main Application Window.</param>
-	/// <param name="configure">Optional lambda to configure the Maui app builder.</param>
-	public static IHostBuilder UseMauiEmbedding(this IHostBuilder builder, Microsoft.UI.Xaml.Application app, Microsoft.UI.Xaml.Window window, Action<MauiAppBuilder>? configure = null) =>
-		builder.UseMauiEmbedding<MauiApplication>(app, window, configure);
+		=> builder.Configure(hostBuilder => hostBuilder.UseMauiEmbedding<TApp>(builder.App, builder.Window, configure));
 
 	/// <summary>
 	/// Registers Maui embedding in the Uno Platform app builder.
@@ -63,16 +40,7 @@ public static IHostBuilder UseMauiEmbedding<TApp>(this IHostBuilder builder, Mic
 	/// <param name="app">The Uno app.</param>
 	/// <param name="window">The Main Application Window.</param>
 	/// <param name="configure">Optional lambda to configure the Maui app builder.</param>
-	public static Microsoft.UI.Xaml.Application UseMauiEmbedding(this Microsoft.UI.Xaml.Application app, Microsoft.UI.Xaml.Window window, Action<MauiAppBuilder>? configure = null) =>
-		app.UseMauiEmbedding<MauiApplication>(window, configure);
-
-	/// <summary>
-	/// Registers Maui embedding with WinUI3 and WPF application builder.
-	/// </summary>
-	/// <param name="app">The Uno app.</param>
-	/// <param name="window">The Main Application Window.</param>
-	/// <param name="configure">Optional lambda to configure the Maui app builder.</param>
-	public static Microsoft.UI.Xaml.Application UseMauiEmbedding<TApp>(this Microsoft.UI.Xaml.Application app, Microsoft.UI.Xaml.Window window, Action<MauiAppBuilder>? configure = null)
+	public static MauiApp UseMauiEmbedding<TApp>(this Microsoft.UI.Xaml.Application app, Microsoft.UI.Xaml.Window window, Action<MauiAppBuilder>? configure = null)
 		where TApp : MauiApplication
 	{
 #if MAUI_EMBEDDING
@@ -99,10 +67,10 @@ public static Microsoft.UI.Xaml.Application UseMauiEmbedding<TApp>(this Microsof
 			WindowStateManager.Default.OnActivated(window, args);
 		};
 #endif
-
-
+		return mauiApp;
+#else
+		return default!;
 #endif
-		return app;
 	}
 
 #if MAUI_EMBEDDING