Merge pull request #14 from nullinside-development-group/feat/di

feat: Convert new version window to DI

Author: ProgrammingByPermutation

src/TwitchStreamingTools/App.axaml.cs

@@ -43,7 +43,8 @@ public override void OnFrameworkInitializationCompleted() {
     var vm = services.GetRequiredService<MainWindowViewModel>();
     if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
       desktop.MainWindow = new MainWindow {
-        DataContext = vm
+        DataContext = vm,
+        ServiceProvider = services
       };
     }
 

src/TwitchStreamingTools/Services/ServiceCollectionExtensions.cs

@@ -28,6 +28,7 @@ public static void AddCommonServices(this IServiceCollection collection) {
     collection.AddTransient<MainWindowViewModel>();
     collection.AddTransient<AccountViewModel>();
     collection.AddTransient<ChatViewModel>();
+    collection.AddTransient<NewVersionWindowViewModel>();
     collection.AddTransient<ITwitchApiProxy, TwitchApiWrapper>(TwitchApiWrapperFactory);
   }
 

src/TwitchStreamingTools/Views/MainWindow.axaml.cs

@@ -6,6 +6,8 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 
+using Microsoft.Extensions.DependencyInjection;
+
 using Nullinside.Api.Common.Desktop;
 #if !DEBUG
 using TwitchStreamingTools.ViewModels;
@@ -17,6 +19,11 @@ namespace TwitchStreamingTools.Views;
 ///   The main application window.
 /// </summary>
 public partial class MainWindow : Window {
+  /// <summary>
+  /// The service provider for DI.
+  /// </summary>
+  public IServiceProvider? ServiceProvider { get; set; }
+  
   /// <summary>
   ///   Initializes a new instance of the <see cref="MainWindow" /> class.
   /// </summary>
@@ -53,11 +60,15 @@ protected override void OnInitialized() {
       }
 
 #if !DEBUG
+      var vm = ServiceProvider?.GetRequiredService<NewVersionWindowViewModel>();
+      if (null == vm) {
+        return;
+      }
+      
+      vm.LocalVersion = localVersion;
       Dispatcher.UIThread.Post(async () => {
         var versionWindow = new NewVersionWindow {
-          DataContext = new NewVersionWindowViewModel {
-            LocalVersion = localVersion
-          }
+          DataContext = vm
         };
 
         await versionWindow.ShowDialog(this);