Integrate dependency injection

custom-dex-team · Nov 23, 2024 · 36fe23e · 36fe23e
1 parent 0adaf36
commit 36fe23e
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 9 deletions.
diff --git a/Directory.Packages.Props b/Directory.Packages.Props
@@ -10,5 +10,6 @@
         <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.1" />
         <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.2.1" />
         <PackageVersion Include="Avalonia.Desktop" Version="11.2.1" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     </ItemGroup>
 </Project>
diff --git a/src/Dex.AnomalyCustom.Launcher.Avalonia/App.axaml.cs b/src/Dex.AnomalyCustom.Launcher.Avalonia/App.axaml.cs
@@ -2,13 +2,20 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 
+using Dex.AnomalyCustom.Launcher.Avalonia.Extensions;
 using Dex.AnomalyCustom.Launcher.Avalonia.ViewModels;
 using Dex.AnomalyCustom.Launcher.Avalonia.Views;
 
+using Microsoft.Extensions.DependencyInjection;
+
+using System;
+
 namespace Dex.AnomalyCustom.Launcher.Avalonia;
 
 public partial class App : Application
 {
+    private IServiceProvider _serviceProvider = null!;
+
     public override void Initialize()
     {
         AvaloniaXamlLoader.Load(this);
@@ -18,17 +25,30 @@ public override void OnFrameworkInitializationCompleted()
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            desktop.MainWindow = new MainWindow
-            {
-                DataContext = new MainViewModel()
-            };
+            _serviceProvider = new ServiceCollection()
+                .AddSingleton<MainWindow>()
+                .AddViews()
+                .AddViewModels()
+                .BuildServiceProvider();
+
+            var mainViewModel = _serviceProvider.GetRequiredService<MainViewModel>();
+            var mainWindow = _serviceProvider.GetRequiredService<MainWindow>();
+            mainWindow.DataContext = mainViewModel;
+
+            desktop.MainWindow = mainWindow;
         }
         else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
         {
-            singleViewPlatform.MainView = new MainView
-            {
-                DataContext = new MainViewModel()
-            };
+            _serviceProvider = new ServiceCollection()
+                .AddViews()
+                .AddViewModels()
+                .BuildServiceProvider();
+
+            var mainViewModel = _serviceProvider.GetRequiredService<MainViewModel>();
+            var mainView = _serviceProvider.GetRequiredService<MainView>();
+            mainView.DataContext = mainViewModel;
+
+            singleViewPlatform.MainView = mainView;
         }
 
         base.OnFrameworkInitializationCompleted();

diff --git a/src/Dex.AnomalyCustom.Launcher.Avalonia/Dex.AnomalyCustom.Launcher.Avalonia.csproj b/src/Dex.AnomalyCustom.Launcher.Avalonia/Dex.AnomalyCustom.Launcher.Avalonia.csproj
@@ -12,9 +12,10 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" />
-        <PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)' == 'Debug'"/>
+        <PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)' == 'Debug'" />
         <PackageReference Include="Avalonia.Fonts.Inter" />
         <PackageReference Include="Avalonia.ReactiveUI" />
         <PackageReference Include="Avalonia.Themes.Fluent" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     </ItemGroup>
 </Project>
diff --git a/src/Dex.AnomalyCustom.Launcher.Avalonia/Extensions/ServiceCollectionExtensions.cs b/src/Dex.AnomalyCustom.Launcher.Avalonia/Extensions/ServiceCollectionExtensions.cs
@@ -0,0 +1,27 @@
+using Dex.AnomalyCustom.Launcher.Avalonia.ViewModels;
+using Dex.AnomalyCustom.Launcher.Avalonia.Views;
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Dex.AnomalyCustom.Launcher.Avalonia.Extensions;
+
+internal static class ServiceCollectionExtensions
+{
+    public static IServiceCollection AddViews(this IServiceCollection serviceCollection)
+    {
+        serviceCollection.AddSingleton<MainView>();
+
+        serviceCollection.AddTransient<SettingsView>();
+
+        return serviceCollection;
+    }
+
+    public static IServiceCollection AddViewModels(this IServiceCollection serviceCollection)
+    {
+        serviceCollection.AddSingleton<MainViewModel>();
+
+        serviceCollection.AddTransient<SettingsViewModel>();
+
+        return serviceCollection;
+    }
+}