feat: Update Maui Embedding for .NET 8

unoplatform · Jan 23, 2024 · 5f3daa9 · 5f3daa9
1 parent 4ae0aa8
commit 5f3daa9
Show file tree

Hide file tree

Showing 12 changed files with 202 additions and 328 deletions.
diff --git a/samples/MauiEmbedding/MauiEmbedding/App.cs b/samples/MauiEmbedding/MauiEmbedding/App.cs
@@ -1,9 +1,8 @@
 using MauiEmbedding.MauiControls;
-using Uno.Extensions.Maui.Platform;
 
 namespace MauiEmbedding;
 
-public class App : EmbeddingApplication
+public class App : Application
 {
 	protected Window? MainWindow { get; private set; }
 	protected IHost? Host { get; private set; }

diff --git a/src/Uno.Extensions.Maui.UI/MauiEmbedding.android.cs b/src/Uno.Extensions.Maui.UI/MauiEmbedding.android.cs
@@ -34,15 +34,10 @@ private static void InitializeMauiEmbeddingApp(this MauiApp mauiApp, Application
 		rootContext.InitializeScopedServices();
 
 		var iApp = mauiApp.Services.GetRequiredService<IApplication>();
-		if(app is not EmbeddingApplication embeddingApp)
-		{
-			throw new MauiEmbeddingException(Properties.Resources.TheApplicationMustInheritFromEmbeddingApplication);
-		}
-
-		embeddingApp.InitializeApplication(scope.ServiceProvider, iApp);
-
-		// Initializing with the Activity to set the current activity.
-		// The Bundle is not actually used by Maui
+		_ = new EmbeddedApplication(mauiApp.Services, iApp);
+
+		// Initializing with the Activity to set the current activity.
+		// The Bundle is not actually used by Maui
 		Microsoft.Maui.ApplicationModel.Platform.Init(activity, null);
 
 		androidApp.SetApplicationHandler(iApp, rootContext);

diff --git a/src/Uno.Extensions.Maui.UI/MauiEmbedding.apple.cs b/src/Uno.Extensions.Maui.UI/MauiEmbedding.apple.cs
@@ -34,13 +34,9 @@ private static void InitializeMauiEmbeddingApp(this MauiApp mauiApp, Application
 		rootContext.InitializeScopedServices();
 
 		var iApp = mauiApp.Services.GetRequiredService<IApplication>();
-		if (app is not EmbeddingApplication embeddingApp)
-		{
-			throw new MauiEmbeddingException(Properties.Resources.TheApplicationMustInheritFromEmbeddingApplication);
-		}
 
 		Microsoft.Maui.ApplicationModel.Platform.Init(() => mauiApp.Services.GetRequiredService<UIWindow>().RootViewController!);
-		embeddingApp.InitializeApplication(mauiApp.Services, iApp);
+		_ = new EmbeddedApplication(mauiApp.Services, iApp);
 		app.SetApplicationHandler(iApp, rootContext);
 		InitializeApplicationMainPage(iApp);
 	}