Simplify basic scenarios

AvaloniaUI · Sep 21, 2023 · 5c46c1b · 5c46c1b
1 parent 432d015
commit 5c46c1b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 22 deletions.
diff --git a/Avalonia.Maui/Avalonia.Maui.csproj b/Avalonia.Maui/Avalonia.Maui.csproj
@@ -26,7 +26,7 @@
 	<!-- Packaging -->
 	<PropertyGroup>
 		<IsPackable>true</IsPackable>
-		<Version>11.0-preview1</Version>
+		<Version>11.0-preview2</Version>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryUrl>https://github.com/AvaloniaUI/AvaloniaMauiHybrid</RepositoryUrl>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/Avalonia.Maui/AvaloniaAppBuilderExtensions.cs b/Avalonia.Maui/AvaloniaAppBuilderExtensions.cs
@@ -22,10 +22,13 @@ namespace Avalonia.Maui;
 public static class AvaloniaAppBuilderExtensions
 {
 #if ANDROID
-    public static AppBuilder WithMaui<TMauiApplication>(this AppBuilder appBuilder, global::Android.App.Activity activity, Action<MauiAppBuilder>? configure  = null)
+    public static AppBuilder UseMaui<TMauiApplication>(this AppBuilder appBuilder, global::Android.App.Activity activity, Action<MauiAppBuilder>? configure  = null)
+        where TMauiApplication : Microsoft.Maui.Controls.Application
+#elif IOS
+    public static AppBuilder UseMaui<TMauiApplication>(this AppBuilder appBuilder, IUIApplicationDelegate applicationDelegate, Action<MauiAppBuilder>? configure  = null)
         where TMauiApplication : Microsoft.Maui.Controls.Application
 #else
-    public static AppBuilder WithMaui<TMauiApplication>(this AppBuilder appBuilder, Action<MauiAppBuilder>? configure  = null)
+    public static AppBuilder UseMaui<TMauiApplication>(this AppBuilder appBuilder, Action<MauiAppBuilder>? configure  = null)
         where TMauiApplication : Microsoft.Maui.Controls.Application
 #endif
     {
@@ -41,8 +44,8 @@ public static AppBuilder WithMaui<TMauiApplication>(this AppBuilder appBuilder,
 	                .AddSingleton<global::Android.Content.Context>(activity)
 	                .AddSingleton(activity)
 #elif IOS
-	                .AddSingleton(UIApplication.SharedApplication.Delegate)
-	                .AddSingleton<UIWindow>(_ => UIApplication.SharedApplication.Delegate.GetWindow())
+	                .AddSingleton(applicationDelegate ?? UIApplication.SharedApplication.Delegate)
+	                .AddSingleton<UIWindow>(static p => p.GetService<IUIApplicationDelegate>()!.GetWindow())
 #endif
                     .AddSingleton<IMauiInitializeService, MauiEmbeddingInitializer>();
 
@@ -69,7 +72,7 @@ private static void InitializeMauiEmbeddingApp(this MauiApp mauiApp)
 		var rootContext = new MauiContext(mauiApp.Services);
 	    var services = mauiApp.Services;
 #if IOS
-	    var platformApplication = UIApplication.SharedApplication.Delegate;
+	    var platformApplication = mauiApp.Services.GetRequiredService<IUIApplicationDelegate>();
 	    var window = platformApplication.GetWindow();
 	    if (window == null)
 	    {   // hack for older Avalonia versions.

diff --git a/Avalonia.Maui/MauiAppHostBuilderExtensions.cs b/Avalonia.Maui/MauiAppHostBuilderExtensions.cs
@@ -1,22 +1,32 @@
 using System;
+using Avalonia.Maui.Controls;
+using Avalonia.Maui.Handlers;
 using Microsoft.Maui.Hosting;
 
 namespace Avalonia.Maui
 {
     public static class MauiAppHostBuilderExtensions
     {
-        public static MauiAppBuilder UseAvalonia<TApp>(this MauiAppBuilder builder, Action<AppBuilder> customizeBuilder) where TApp : Application, new()
+        public static MauiAppBuilder UseAvalonia<TApp>(this MauiAppBuilder builder, Action<AppBuilder>? customizeBuilder = null) where TApp : Application, new()
         {
             var avaloniaBuilder = AppBuilder.Configure<TApp>();
-            customizeBuilder(avaloniaBuilder);
 #if ANDROID
             avaloniaBuilder.UseAndroid();
 #elif IOS
             avaloniaBuilder.UseiOS();
 #endif
 
+            customizeBuilder?.Invoke(avaloniaBuilder);
+
             avaloniaBuilder.SetupWithoutStarting();
-            return builder;
+
+            return builder
+                .ConfigureMauiHandlers(handlers =>
+                {
+#if ANDROID || IOS
+                    handlers.AddHandler(typeof(AvaloniaView), typeof(AvaloniaViewHandler));
+#endif
+                });;
         }
     }
 }
diff --git a/AvaloniaSample/AvaloniaSample.Android/MainActivity.cs b/AvaloniaSample/AvaloniaSample.Android/MainActivity.cs
@@ -19,7 +19,7 @@ public class MainActivity : AvaloniaMainActivity<App>
     protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
         return base.CustomizeAppBuilder(builder)
-            .WithMaui<AvaloniaSample.Maui.MauiApplication>(this, b => b
+            .UseMaui<AvaloniaSample.Maui.MauiApplication>(this, b => b
                 .ConfigureSyncfusionCore()
                 .UseMauiCommunityToolkit()
                 .UseMauiCommunityToolkitMediaElement());

diff --git a/AvaloniaSample/AvaloniaSample.iOS/AppDelegate.cs b/AvaloniaSample/AvaloniaSample.iOS/AppDelegate.cs
@@ -22,7 +22,7 @@ protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
         AVAudioSession.SharedInstance().SetCategory(AVAudioSessionCategory.Playback);
 
         return base.CustomizeAppBuilder(builder)
-            .WithMaui<AvaloniaSample.Maui.MauiApplication>(b => b
+            .UseMaui<AvaloniaSample.Maui.MauiApplication>(this, b => b
                 .ConfigureSyncfusionCore()
                 .UseMauiCommunityToolkit()
                 .UseMauiCommunityToolkitMediaElement());

diff --git a/AvaloniaSample/AvaloniaSample/AvaloniaSample.csproj b/AvaloniaSample/AvaloniaSample/AvaloniaSample.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <UseMaui>true</UseMaui>
+    <UseMauiEssentials>true</UseMauiEssentials>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>

diff --git a/MauiSample/AvaloniaApp.axaml.cs b/MauiSample/AvaloniaApp.axaml.cs
@@ -10,11 +10,6 @@ public override void Initialize()
             AvaloniaXamlLoader.Load(this);
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
         public override void OnFrameworkInitializationCompleted()
         {
             base.OnFrameworkInitializationCompleted();

diff --git a/MauiSample/MauiProgram.cs b/MauiSample/MauiProgram.cs
@@ -19,12 +19,6 @@ public static MauiApp CreateMauiApp()
                 {
                     fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                     fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-                })
-                .ConfigureMauiHandlers(handlers =>
-                {
-#if ANDROID || IOS
-                    handlers.AddHandler(typeof(AvaloniaView), typeof(AvaloniaViewHandler));
-#endif
                 });
 
             return builder.Build();