Now quitting properly dependign on platforms

Mrcubix · Oct 1, 2023 · b594965 · b594965
1 parent 08ac7d4
commit b594965
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/ColorTiles/Views/MainView.axaml.cs b/ColorTiles/Views/MainView.axaml.cs
@@ -1,9 +1,8 @@
 using System;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
+using ColorTiles.Interfaces;
 using ColorTiles.ViewModels;
-using ColorTiles.Views.Controls;
+using Splat;
 
 namespace ColorTiles.Views;
 
@@ -15,7 +14,7 @@ public MainView()
     {
         InitializeComponent();
 
-        Loaded += (_,_) => 
+        Loaded += (_, _) =>
         {
             _window = TopLevel.GetTopLevel(this) as Window;
         };
@@ -54,20 +53,17 @@ protected override void OnDataContextChanged(EventArgs e)
     /// </summary>
     private void OnGameOverMenuQuitButtonClicked(object? sender, EventArgs e)
     {
-        if (DataContext is MainViewModel viewModel)
-        {
-            viewModel.Dispose();
-        }
-
-        // TODO: might want to use DI to provide a proper implementation of quitting native to each platforms without classic desktop lifetime
-        //_window?.Close();
-        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            desktop.Shutdown();
-        }
-        else if (Application.Current?.ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+        // Obtain currently binded IPlatformQuit
+        var platformQuit = Locator.Current.GetService<IPlatformQuit>();
+
+        if (platformQuit != null)
         {
-
+            if (DataContext is MainViewModel viewModel)
+            {
+                viewModel.Dispose();
+            }
+
+            platformQuit.Quit();
         }
     }
 }