Improved Avalonia examples

DevTeam · Aug 15, 2024 · 0cfb411 · 0cfb411
1 parent 401b2f5
commit 0cfb411
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 24 deletions.
diff --git a/readme/Avalonia.md b/readme/Avalonia.md
@@ -59,13 +59,25 @@ public class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop
-            && Resources["Composition"] is Composition composition)
+        if (Resources[nameof(Composition)] is Composition composition)
         {
-            // Assignment of the main window
-            desktop.MainWindow = composition.MainWindow;
+            // Assigns the main window/view
+            switch (ApplicationLifetime)
+            {
+                case IClassicDesktopStyleApplicationLifetime desktop:
+                    desktop.MainWindow = composition.MainWindow;
+                    break;
+
+                case ISingleViewApplicationLifetime singleViewPlatform:
+                    singleViewPlatform.MainView = composition.MainWindow;
+                    break;
+            }
+
             // Handles disposables
-            desktop.Exit += (_, _) => composition.Dispose();
+            if (ApplicationLifetime is IControlledApplicationLifetime controlledApplicationLifetime)
+            {
+                controlledApplicationLifetime.Exit += (_, _) => composition.Dispose();
+            }
         }
 
         base.OnFrameworkInitializationCompleted();

diff --git a/readme/AvaloniaPageTemplate.md b/readme/AvaloniaPageTemplate.md
@@ -59,13 +59,25 @@ public class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop
-            && Resources["Composition"] is Composition composition)
+        if (Resources[nameof(Composition)] is Composition composition)
         {
-            // Assignment of the main window
-            desktop.MainWindow = composition.MainWindow;
+            // Assigns the main window/view
+            switch (ApplicationLifetime)
+            {
+                case IClassicDesktopStyleApplicationLifetime desktop:
+                    desktop.MainWindow = composition.MainWindow;
+                    break;
+
+                case ISingleViewApplicationLifetime singleViewPlatform:
+                    singleViewPlatform.MainView = composition.MainWindow;
+                    break;
+            }
+
             // Handles disposables
-            desktop.Exit += (_, _) => composition.Dispose();
+            if (ApplicationLifetime is IControlledApplicationLifetime controlledApplicationLifetime)
+            {
+                controlledApplicationLifetime.Exit += (_, _) => composition.Dispose();
+            }
         }
 
         base.OnFrameworkInitializationCompleted();

diff --git a/samples/AvaloniaApp/App.axaml.cs b/samples/AvaloniaApp/App.axaml.cs
@@ -10,13 +10,25 @@ public class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop
-            && Resources["Composition"] is Composition composition)
+        if (Resources[nameof(Composition)] is Composition composition)
         {
-            // Assignment of the main window
-            desktop.MainWindow = composition.MainWindow;
+            // Assigns the main window/view
+            switch (ApplicationLifetime)
+            {
+                case IClassicDesktopStyleApplicationLifetime desktop:
+                    desktop.MainWindow = composition.MainWindow;
+                    break;
+
+                case ISingleViewApplicationLifetime singleViewPlatform:
+                    singleViewPlatform.MainView = composition.MainWindow;
+                    break;
+            }
+
             // Handles disposables
-            desktop.Exit += (_, _) => composition.Dispose();
+            if (ApplicationLifetime is IControlledApplicationLifetime controlledApplicationLifetime)
+            {
+                controlledApplicationLifetime.Exit += (_, _) => composition.Dispose();
+            }
         }
 
         base.OnFrameworkInitializationCompleted();

diff --git a/samples/SingleRootAvaloniaApp/App.axaml.cs b/samples/SingleRootAvaloniaApp/App.axaml.cs
@@ -10,13 +10,31 @@ public class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop
-            && Resources["Composition"] is Composition composition)
+        if (Resources[nameof(Composition)] is Composition composition)
         {
-            // Assignment of the main window
-            desktop.MainWindow = composition.Root.MainWindow.Value;
+            // Assigns the main window/view
+            switch (ApplicationLifetime)
+            {
+                case IClassicDesktopStyleApplicationLifetime desktop:
+                    desktop.MainWindow = composition.Root.CreateMainWindow();
+                    break;
+
+                case ISingleViewApplicationLifetime singleViewPlatform:
+                    singleViewPlatform.MainView = composition.Root.CreateMainWindow();
+                    break;
+            }
+
             // Handles disposables
-            desktop.Exit += (_, _) => composition.Dispose();
+            if (ApplicationLifetime is IControlledApplicationLifetime controlledApplicationLifetime)
+            {
+                controlledApplicationLifetime.Exit += (_, _) =>
+                {
+                    // Disposal of root objects with lifetime Transient, PerBlock, PerResolve
+                    composition.Root.Owned.Dispose();
+                    // Dispose of singletons
+                    composition.Dispose();
+                };
+            }
         }
 
         base.OnFrameworkInitializationCompleted();

diff --git a/samples/SingleRootAvaloniaApp/Composition.cs b/samples/SingleRootAvaloniaApp/Composition.cs
@@ -14,7 +14,7 @@ internal partial class Composition
     void Setup() => DI.Setup()
         // Single composition root for the application
         .Root<Root>(nameof(Root))
-        
+
         .Bind().As(Singleton).To<Root>()
 
         // View Models
@@ -25,7 +25,7 @@ void Setup() => DI.Setup()
         .Bind().To(_ => TimeSpan.FromSeconds(1))
         .Bind().As(Singleton).To<Clock.Models.Timer>()
         .Bind().As(PerBlock).To<SystemClock>()
-    
+
         // Infrastructure
         .Bind().To<Dispatcher>();
 }
diff --git a/samples/SingleRootAvaloniaApp/Root.cs b/samples/SingleRootAvaloniaApp/Root.cs
@@ -1,8 +1,10 @@
 namespace AvaloniaApp;
 
 using Clock.ViewModels;
+using Pure.DI;
 using Views;
 
-internal record Root(
-    Lazy<MainWindow> MainWindow,
+internal readonly record struct Root(
+    IOwned Owned,
+    Func<MainWindow> CreateMainWindow,
     IClockViewModel ClockViewModel);