Refactor EditModDialogViewModel constructor usage

Author: TheBestAstroNOT

source/Reloaded.Mod.Launcher.Lib/Commands/Mod/EditModCommand.cs

@@ -23,5 +23,5 @@ public EditModCommand(PathTuple<ModConfig>? modTuple, object? parent)
     public bool CanExecute(object? parameter) => _modTuple != null;
 
     /// <inheritdoc />
-    public void Execute(object? parameter) => Actions.EditModDialog(new EditModDialogViewModel(_modTuple!, IoC.Get<ApplicationConfigService>().Items, IoC.Get<ModConfigService>().Items), _parent);
+    public void Execute(object? parameter) => Actions.EditModDialog(new EditModDialogViewModel(_modTuple!, IoC.Get<ApplicationConfigService>(), IoC.Get<ModConfigService>()), _parent);
 }

source/Reloaded.Mod.Launcher.Lib/Models/ViewModel/Dialog/EditModDialogViewModel.cs

@@ -70,6 +70,9 @@ public class EditModDialogViewModel : ObservableObject, IDisposable
     private SetModImageCommand _setModImageCommand;
     private Action? _close;
 
+    /// <inheritdoc />
+    public EditModDialogViewModel(PathTuple<ModConfig> modTuple, ApplicationConfigService applicationConfigService, ModConfigService modConfigService) : this(modTuple, applicationConfigService.Items, modConfigService.Items) { }
+
     /// <inheritdoc />
     public EditModDialogViewModel(PathTuple<ModConfig> modTuple, ObservableCollection<PathTuple<ApplicationConfig>> appItems, ObservableCollection<PathTuple<ModConfig>> modsItems)
     {

source/Reloaded.Mod.Launcher.Lib/Models/ViewModel/DownloadPackagesViewModel.cs

@@ -324,7 +324,7 @@ public void Execute(object? parameter)
                             bool loadAppPage = Actions.DisplayResourceMessageBoxOkCancel!.Invoke(Resources.NoCompatibleAppsInConfigTitle.Get(), $"{Resources.NoCompatibleAppsInConfigDescription.Get()}\n{Resources.AppSelectionQuestion.Get()}", Resources.Yes.Get(), Resources.No.Get());
                             if (loadAppPage)
                             {
-                                var viewmodel = new EditModDialogViewModel(item.Value, IoC.Get<ApplicationConfigService>().Items, modConfigService.Items);
+                                var viewmodel = new EditModDialogViewModel(item.Value, IoC.Get<ApplicationConfigService>(), modConfigService);
                                 viewmodel.Page = EditModPage.Special;
                                 var createModDialog = Actions.EditModDialog(viewmodel, null);
                             }
@@ -335,7 +335,7 @@ public void Execute(object? parameter)
                         bool loadAppPage = Actions.DisplayResourceMessageBoxOkCancel!.Invoke(Resources.NoAppsInConfigTitle.Get(), $"{Resources.NoAppsInConfigDescription.Get()}\n{Resources.AppSelectionQuestion.Get()}", Resources.Yes.Get(), Resources.No.Get());
                         if (loadAppPage)
                         {
-                            var viewmodel = new EditModDialogViewModel(item.Value, IoC.Get<ApplicationConfigService>().Items, modConfigService.Items);
+                            var viewmodel = new EditModDialogViewModel(item.Value, IoC.Get<ApplicationConfigService>(), modConfigService);
                             viewmodel.Page = EditModPage.Special;
                             var createModDialog = Actions.EditModDialog(viewmodel, null);
                         }

source/Reloaded.Mod.Launcher/MainWindow.xaml.cs

@@ -143,7 +143,7 @@ private async void InstallMod_Drop(object sender, DragEventArgs e)
                         bool loadAppPage = Actions.DisplayResourceMessageBoxOkCancel!.Invoke(NoCompatibleAppsInConfigTitle.Get(), $"{NoCompatibleAppsInConfigDescription.Get()}\n{AppSelectionQuestion.Get()}", Yes.Get(), No.Get());
                         if (loadAppPage)
                         {
-                            var createModDialog = new EditModDialog(new EditModDialogViewModel(item.Value, Lib.IoC.Get<ApplicationConfigService>().Items, modConfigService.Items));
+                            var createModDialog = new EditModDialog(new EditModDialogViewModel(item.Value, Lib.IoC.Get<ApplicationConfigService>(), modConfigService));
                             createModDialog.Owner = System.Windows.Window.GetWindow(this);
                             createModDialog.RealViewModel.Page = EditModPage.Special;
                             createModDialog.ShowDialog();
@@ -155,7 +155,7 @@ private async void InstallMod_Drop(object sender, DragEventArgs e)
                     bool loadAppPage = Actions.DisplayResourceMessageBoxOkCancel!.Invoke(NoAppsInConfigTitle.Get(), $"{NoAppsInConfigDescription.Get()}\n{AppSelectionQuestion.Get()}" , Yes.Get(), No.Get());
                     if (loadAppPage)
                     {
-                        var createModDialog = new EditModDialog(new EditModDialogViewModel(item.Value, Lib.IoC.Get<ApplicationConfigService>().Items, modConfigService.Items));
+                        var createModDialog = new EditModDialog(new EditModDialogViewModel(item.Value, Lib.IoC.Get<ApplicationConfigService>(), modConfigService));
                         createModDialog.Owner = System.Windows.Window.GetWindow(this);
                         createModDialog.RealViewModel.Page = EditModPage.Special;
                         createModDialog.ShowDialog();

source/Reloaded.Mod.Launcher/Pages/BaseSubpages/Dialogs/CreateModDialog.xaml.cs

@@ -26,7 +26,7 @@ public async Task Save()
         var mod = await ActionWrappers.TryGetValueAsync(() => modConfigService.ItemsById[createdMod.Config.ModId], 5000, 32);
         if (mod != null)
         {
-            var createModDialog = new EditModDialog(new EditModDialogViewModel(mod, Lib.IoC.Get<ApplicationConfigService>().Items, modConfigService.Items));
+            var createModDialog = new EditModDialog(new EditModDialogViewModel(mod, Lib.IoC.Get<ApplicationConfigService>(), modConfigService));
             createModDialog.Owner = Window.GetWindow(this);
             createModDialog.ShowDialog();
         }