refactor: Cleanup

furesoft · Oct 1, 2024 · eab548b · eab548b
1 parent 623d339
commit eab548b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/src/MimaSim/MimaSim/App.axaml.cs b/src/MimaSim/MimaSim/App.axaml.cs
@@ -1,7 +1,9 @@
 using System.Reflection;
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
+using Avalonia.Platform.Storage;
 using MimaSim.MIMA.Components;
 using MimaSim.Views;
 using ReactiveUI;
@@ -28,13 +30,16 @@ public override void OnFrameworkInitializationCompleted()
             {
                 //DataContext = new MainViewModel()
             };
+            Locator.CurrentMutable.Register<IStorageProvider>(() => desktop.MainWindow.StorageProvider);
+
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         {
             singleViewPlatform.MainView = new MainView
             {
                 //DataContext = new MainViewModel()
             };
+            Locator.CurrentMutable.Register<IStorageProvider>(() => TopLevel.GetTopLevel(singleViewPlatform.MainView)!.StorageProvider);
         }
 
         base.OnFrameworkInitializationCompleted();

diff --git a/src/MimaSim/MimaSim/ViewModels/ExecutionTabViewModel.cs b/src/MimaSim/MimaSim/ViewModels/ExecutionTabViewModel.cs
@@ -14,6 +14,7 @@
 using System.Windows.Input;
 using Avalonia.Platform.Storage;
 using MimaSim.ViewModels.Mima;
+using Splat;
 
 namespace MimaSim.ViewModels;
 
@@ -39,20 +40,7 @@ public ExecutionTabViewModel()
 
         OpenMemoryPopupCommand = DialogService.CreateOpenCommand(new MemoryPopupControl(), new MemoryPopupViewModel());
 
-        IStorageProvider storage;
-
-        if (App.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            storage = desktop.MainWindow!.StorageProvider;
-        }
-        else if (App.Current.ApplicationLifetime is ISingleViewApplicationLifetime singleView)
-        {
-            storage = TopLevel.GetTopLevel(singleView.MainView)!.StorageProvider;
-        }
-        else
-        {
-            throw new Exception("No storage");
-        }
+        IStorageProvider storage = Locator.Current.GetService<IStorageProvider>();
 
         LoadCommand = ReactiveCommand.Create(async () =>
         {