Core/UI - Move from Ninject to DryIoc (#754)

src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs

@@ -4,7 +4,7 @@ using System.Reactive;
 using System.Reactive.Disposables;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared;
 using ReactiveUI;
 using RGB.NET.Core;

src/Artemis.UI/Screens/Device/DeviceSettingsViewModel.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Settings;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -82,7 +82,7 @@ public class DeviceSettingsViewModel : ActivatableViewModelBase
 
         await _windowService.CreateContentDialog()
             .WithTitle($"{Device.RgbDevice.DeviceInfo.DeviceName} - Detect input")
-            .WithViewModel<DeviceDetectInputViewModel>(out DeviceDetectInputViewModel? viewModel, ("device", Device))
+            .WithViewModel(out DeviceDetectInputViewModel viewModel, Device)
             .WithCloseButtonText("Cancel")
             .ShowAsync();
 

src/Artemis.UI/Screens/Device/Tabs/DeviceLogicalLayoutDialogViewModel.cs

@@ -54,7 +54,7 @@ public class DeviceLogicalLayoutDialogViewModel : ContentDialogViewModelBase
     {
         await windowService.CreateContentDialog()
             .WithTitle("Select logical layout")
-            .WithViewModel(out DeviceLogicalLayoutDialogViewModel vm, ("device", device))
+            .WithViewModel(out DeviceLogicalLayoutDialogViewModel vm, device)
             .WithCloseButtonText("Cancel")
             .WithDefaultButton(ContentDialogButton.Primary)
             .HavingPrimaryButton(b => b.WithText("Select").WithCommand(vm.ApplyLogicalLayout))

src/Artemis.UI/Screens/Device/Tabs/DevicePhysicalLayoutDialogViewModel.cs

@@ -25,7 +25,7 @@ public class DevicePhysicalLayoutDialogViewModel : ContentDialogViewModelBase
     {
         await windowService.CreateContentDialog()
             .WithTitle("Select physical layout")
-            .WithViewModel(out DevicePhysicalLayoutDialogViewModel vm, ("device", device))
+            .WithViewModel(out DevicePhysicalLayoutDialogViewModel vm, device)
             .WithCloseButtonText("Cancel")
             .ShowAsync();
 

src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs

@@ -7,7 +7,7 @@ using System.Reactive.Disposables;
 using System.Threading;
 using System.Threading.Tasks;
 using Artemis.Core;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Avalonia.Threading;
@@ -89,7 +89,7 @@ public class PluginPrerequisitesInstallDialogViewModel : ContentDialogViewModelB
     {
         await windowService.CreateContentDialog()
             .WithTitle("Plugin prerequisites")
-            .WithViewModel(out PluginPrerequisitesInstallDialogViewModel vm, ("subjects", subjects))
+            .WithViewModel(out PluginPrerequisitesInstallDialogViewModel vm, subjects)
             .WithCloseButtonText("Cancel")
             .HavingPrimaryButton(b => b.WithText("Install").WithCommand(vm.Install))
             .WithDefaultButton(ContentDialogButton.Primary)

src/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs

@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Avalonia.Threading;
@@ -74,7 +74,7 @@ public class PluginPrerequisitesUninstallDialogViewModel : ContentDialogViewMode
     {
         await windowService.CreateContentDialog()
             .WithTitle("Plugin prerequisites")
-            .WithViewModel(out PluginPrerequisitesUninstallDialogViewModel vm, ("subjects", subjects))
+            .WithViewModel(out PluginPrerequisitesUninstallDialogViewModel vm, subjects)
             .WithCloseButtonText(cancelLabel)
             .HavingPrimaryButton(b => b.WithText("Uninstall").WithCommand(vm.Uninstall))
             .WithDefaultButton(ContentDialogButton.Primary)

src/Artemis.UI/Screens/Plugins/PluginSettingsViewModel.cs

@@ -4,7 +4,7 @@ using System.Reactive;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using ReactiveUI;

src/Artemis.UI/Screens/Plugins/PluginViewModel.cs

@@ -13,8 +13,8 @@ using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using DryIoc;
 using Material.Icons;
-using Ninject;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Plugins;
@@ -209,8 +209,7 @@ public class PluginViewModel : ActivatableViewModelBase
 
         try
         {
-            PluginConfigurationViewModel? viewModel = Plugin.Kernel!.Get(Plugin.ConfigurationDialog.Type) as PluginConfigurationViewModel;
-            if (viewModel == null)
+            if (Plugin.Resolve(Plugin.ConfigurationDialog.Type) is not PluginConfigurationViewModel viewModel)
                 throw new ArtemisUIException($"The type of a plugin configuration dialog must inherit {nameof(PluginConfigurationViewModel)}");
 
             _window = _windowService.ShowWindow(new PluginSettingsWindowViewModel(viewModel));

src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/EventConditionViewModel.cs

@@ -78,7 +78,7 @@ public class EventConditionViewModel : ActivatableViewModelBase
 
     private async Task ExecuteOpenEditor()
     {
-        await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(("nodeScript", _eventCondition.Script));
+        await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(_eventCondition.Script);
         await _profileEditorService.SaveProfileAsync();
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/ConditionTypes/StaticConditionViewModel.cs

@@ -51,7 +51,7 @@ public class StaticConditionViewModel : ActivatableViewModelBase
 
     private async Task ExecuteOpenEditor()
     {
-        await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(("nodeScript", _staticCondition.Script));
+        await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(_staticCondition.Script);
         await _profileEditorService.SaveProfileAsync();
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Panels/DisplayCondition/DisplayConditionScriptViewModel.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Reactive.Linq;
 using Artemis.Core;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;

src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarViewModel.cs

@@ -137,10 +137,7 @@ public class MenuBarViewModel : ActivatableViewModelBase
         if (ProfileConfiguration == null)
             return;
 
-        await _windowService.ShowDialogAsync<ProfileConfigurationEditViewModel, ProfileConfiguration?>(
-            ("profileCategory", ProfileConfiguration.Category),
-            ("profileConfiguration", ProfileConfiguration)
-        );
+        await _windowService.ShowDialogAsync<ProfileConfigurationEditViewModel, ProfileConfiguration?>(ProfileConfiguration.Category, ProfileConfiguration);
     }
 
     private async Task ExecuteViewScripts()
@@ -148,7 +145,7 @@ public class MenuBarViewModel : ActivatableViewModelBase
         if (ProfileConfiguration?.Profile == null)
             return;
 
-        await _windowService.ShowDialogAsync<ScriptsDialogViewModel, object?>(("profile", ProfileConfiguration.Profile));
+        await _windowService.ShowDialogAsync<ScriptsDialogViewModel, object?>(ProfileConfiguration.Profile);
         await _profileEditorService.SaveProfileAsync();
     }
 

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogViewModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 using Artemis.UI.Shared;
 using Avalonia.Controls.Mixins;

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/FolderTreeItemViewModel.cs

@@ -4,8 +4,8 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.Storage.Entities.Profile;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Extensions;
-using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/LayerTreeItemViewModel.cs

@@ -4,8 +4,8 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.Storage.Entities.Profile;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Extensions;
-using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeViewModel.cs

@@ -7,7 +7,7 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using ReactiveUI;

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs

@@ -7,8 +7,8 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Extensions;
-using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -274,7 +274,7 @@ public abstract class TreeItemViewModel : ActivatableViewModelBase
         if (ProfileElement is not Layer layer)
             return;
 
-        await _windowService.ShowDialogAsync<LayerHintsDialogViewModel, bool>(("layer", layer));
+        await _windowService.ShowDialogAsync<LayerHintsDialogViewModel, bool>(layer);
         await ProfileEditorService.SaveProfileAsync();
     }
 

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/DataBinding/DataBindingViewModel.cs

@@ -4,8 +4,8 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Extensions;
-using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.VisualScripting;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -88,7 +88,7 @@ public class DataBindingViewModel : ActivatableViewModelBase
         try
         {
             _editorOpen = true;
-            await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(("nodeScript", LayerProperty.BaseDataBinding.Script));
+            await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(LayerProperty.BaseDataBinding.Script);
             await _profileEditorService.SaveProfileAsync();
         }
         finally

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertiesViewModel.cs

@@ -10,7 +10,7 @@ using Artemis.Core;
 using Artemis.Core.LayerBrushes;
 using Artemis.Core.LayerEffects;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.ProfileEditor.Playback;
 using Artemis.UI.Screens.ProfileEditor.Properties.DataBinding;
 using Artemis.UI.Screens.ProfileEditor.Properties.Dialogs;
@@ -124,7 +124,7 @@ public class PropertiesViewModel : ActivatableViewModelBase
 
         await _windowService.CreateContentDialog()
             .WithTitle("Add layer effect")
-            .WithViewModel(out AddEffectViewModel _, ("renderProfileElement", ProfileElement))
+            .WithViewModel(out AddEffectViewModel _, ProfileElement)
             .WithCloseButtonText("Cancel")
             .ShowAsync();
     }

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertyGroupViewModel.cs

@@ -6,7 +6,7 @@ using System.Reflection;
 using Artemis.Core;
 using Artemis.Core.LayerBrushes;
 using Artemis.Core.LayerEffects;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
 using Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes;
 using Artemis.UI.Screens.ProfileEditor.Properties.Tree;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/PropertyViewModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using Artemis.Core;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
 using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
 using DynamicData;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Segments/TimelineSegmentViewModel.cs

@@ -225,7 +225,7 @@ public abstract class TimelineSegmentViewModel : ActivatableViewModelBase
     {
         await _windowService.CreateContentDialog()
             .WithTitle("Edit segment length")
-            .WithViewModel(out TimelineSegmentEditViewModel vm, ("segmentLength", Length))
+            .WithViewModel(out TimelineSegmentEditViewModel vm, Length)
             .HavingPrimaryButton(b => b.WithText("Save").WithAction(() =>
             {
                 if (_profileElement != null)

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/TreeGroupViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reflection;
@@ -18,8 +17,6 @@ using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
-using Ninject;
-using Ninject.Parameters;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree;
@@ -88,12 +85,7 @@ public class TreeGroupViewModel : ActivatableViewModelBase
             if (constructors.Length != 1)
                 throw new ArtemisUIException("Brush configuration dialogs must have exactly one constructor");
 
-            // Find the BaseLayerBrush parameter, it is required by the base constructor so its there for sure
-            ParameterInfo brushParameter = constructors.First().GetParameters().First(p => typeof(BaseLayerBrush).IsAssignableFrom(p.ParameterType));
-            ConstructorArgument argument = new(brushParameter.Name!, LayerBrush);
-            BrushConfigurationViewModel viewModel =
-                (BrushConfigurationViewModel) LayerBrush.Descriptor.Provider.Plugin.Kernel!.Get(configurationViewModel.Type, argument);
-
+            BrushConfigurationViewModel viewModel = (BrushConfigurationViewModel) LayerBrush.Descriptor.Provider.Plugin.Resolve(configurationViewModel.Type, LayerBrush);
             _brushConfigurationWindowViewModel = new BrushConfigurationWindowViewModel(viewModel, configurationViewModel);
             await _windowService.ShowDialogAsync(_brushConfigurationWindowViewModel);
 
@@ -118,12 +110,7 @@ public class TreeGroupViewModel : ActivatableViewModelBase
             if (constructors.Length != 1)
                 throw new ArtemisUIException("Effect configuration dialogs must have exactly one constructor");
 
-            // Find the BaseLayerEffect parameter, it is required by the base constructor so its there for sure
-            ParameterInfo effectParameter = constructors.First().GetParameters().First(p => typeof(BaseLayerEffect).IsAssignableFrom(p.ParameterType));
-            ConstructorArgument argument = new(effectParameter.Name!, LayerEffect);
-            EffectConfigurationViewModel viewModel =
-                (EffectConfigurationViewModel) LayerEffect.Descriptor.Provider.Plugin.Kernel!.Get(configurationViewModel.Type, argument);
-
+            EffectConfigurationViewModel viewModel = (EffectConfigurationViewModel) LayerEffect.Descriptor.Provider.Plugin.Resolve(configurationViewModel.Type, LayerEffect);
             _effectConfigurationWindowViewModel = new EffectConfigurationWindowViewModel(viewModel, configurationViewModel);
             await _windowService.ShowDialogAsync(_effectConfigurationWindowViewModel);
 
@@ -143,7 +130,7 @@ public class TreeGroupViewModel : ActivatableViewModelBase
 
         await _windowService.CreateContentDialog()
             .WithTitle("Rename layer effect")
-            .WithViewModel(out LayerEffectRenameViewModel vm, ("layerEffect", LayerEffect))
+            .WithViewModel(out LayerEffectRenameViewModel vm, LayerEffect)
             .HavingPrimaryButton(b => b.WithText("Confirm").WithCommand(vm.Confirm))
             .WithCloseButtonText("Cancel")
             .WithDefaultButton(ContentDialogButton.Primary)

src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorViewModel.cs

@@ -7,7 +7,7 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services.ProfileEditor;

src/Artemis.UI/Screens/Root/RootViewModel.cs

@@ -3,15 +3,14 @@ using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Models;
-using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Sidebar;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.MainWindow;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform;
 using Avalonia.Threading;

src/Artemis.UI/Screens/Scripting/ScriptConfigurationViewModel.cs

@@ -44,7 +44,7 @@ public class ScriptConfigurationViewModel : ActivatableViewModelBase
     {
         ContentDialogResult contentDialogResult = await _windowService.CreateContentDialog()
             .WithTitle("Edit script")
-            .WithViewModel(out ScriptConfigurationEditViewModel vm, ("scriptConfiguration", scriptConfiguration))
+            .WithViewModel(out ScriptConfigurationEditViewModel vm, scriptConfiguration)
             .WithCloseButtonText("Cancel")
             .HavingPrimaryButton(b => b.WithText("Confirm").WithCommand(vm.Submit))
             .HavingSecondaryButton(b => b.WithText("Delete"))

src/Artemis.UI/Screens/Scripting/ScriptsDialogViewModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.ScriptingProviders;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Scripting.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;

src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml

@@ -191,6 +191,7 @@
 
                         <StackPanel Grid.Row="0" Grid.Column="0">
                             <TextBlock Classes="library-name">Avalonia</TextBlock>
+                            <TextBlock Classes="library-name">DryIoc</TextBlock>
                             <TextBlock Classes="library-name">FluentAvalonia</TextBlock>
                             <TextBlock Classes="library-name">EmbedIO</TextBlock>
                             <TextBlock Classes="library-name">Furl.Http</TextBlock>
@@ -198,7 +199,6 @@
                             <TextBlock Classes="library-name">LiteDB</TextBlock>
                             <TextBlock Classes="library-name">McMaster.NETCore.Plugins</TextBlock>
                             <TextBlock Classes="library-name">Newtonsoft.Json</TextBlock>
-                            <TextBlock Classes="library-name">Ninject</TextBlock>
                             <TextBlock Classes="library-name">RGB.NET</TextBlock>
                             <TextBlock Classes="library-name">Serilog</TextBlock>
                             <TextBlock Classes="library-name">SkiaSharp</TextBlock>
@@ -208,6 +208,9 @@
                             <controls:HyperlinkButton NavigateUri="https://avaloniaui.net/">
                                 https://avaloniaui.net/
                             </controls:HyperlinkButton>
+                            <controls:HyperlinkButton NavigateUri="https://github.com/dadhi/DryIoc">
+                                https://github.com/dadhi/DryIoc
+                            </controls:HyperlinkButton>
                             <controls:HyperlinkButton NavigateUri="https://github.com/amwx/FluentAvalonia">
                                 https://github.com/amwx/FluentAvalonia
                             </controls:HyperlinkButton>
@@ -229,9 +232,6 @@
                             <controls:HyperlinkButton NavigateUri="https://www.newtonsoft.com/json">
                                 https://www.newtonsoft.com/json
                             </controls:HyperlinkButton>
-                            <controls:HyperlinkButton NavigateUri="http://www.ninject.org/">
-                                http://www.ninject.org/
-                            </controls:HyperlinkButton>
                             <controls:HyperlinkButton NavigateUri="https://github.com/DarthAffe/RGB.NET">
                                 https://github.com/DarthAffe/RGB.NET
                             </controls:HyperlinkButton>

src/Artemis.UI/Screens/Settings/Tabs/DevicesTabViewModel.cs

@@ -6,7 +6,7 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Device;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;

src/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs

@@ -16,8 +16,8 @@ using Artemis.UI.Shared;
 using Artemis.UI.Shared.Providers;
 using Artemis.UI.Shared.Services;
 using Avalonia.Threading;
+using DryIoc;
 using DynamicData;
-using Ninject;
 using ReactiveUI;
 using Serilog.Events;
 
@@ -33,7 +33,7 @@ public class GeneralTabViewModel : ActivatableViewModelBase
     private readonly IWindowService _windowService;
     private bool _startupWizardOpen;
 
-    public GeneralTabViewModel(IKernel kernel,
+    public GeneralTabViewModel(IContainer container,
         ISettingsService settingsService,
         IPluginManagementService pluginManagementService,
         IDebugService debugService,
@@ -45,10 +45,10 @@ public class GeneralTabViewModel : ActivatableViewModelBase
         _debugService = debugService;
         _windowService = windowService;
         _updateService = updateService;
-        _autoRunProvider = kernel.TryGet<IAutoRunProvider>();
+        _autoRunProvider = container.Resolve<IAutoRunProvider>(IfUnresolved.ReturnDefault);
 
         List<LayerBrushProvider> layerBrushProviders = pluginManagementService.GetFeaturesOfType<LayerBrushProvider>();
-        List<IGraphicsContextProvider> graphicsContextProviders = kernel.Get<List<IGraphicsContextProvider>>();
+        List<IGraphicsContextProvider> graphicsContextProviders = container.Resolve<List<IGraphicsContextProvider>>();
         LayerBrushDescriptors = new ObservableCollection<LayerBrushDescriptor>(layerBrushProviders.SelectMany(l => l.LayerBrushDescriptors));
         GraphicsContexts = new ObservableCollection<string> {"Software"};
         GraphicsContexts.AddRange(graphicsContextProviders.Select(p => p.GraphicsContextName));

src/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs

@@ -7,7 +7,7 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Plugins;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;

src/Artemis.UI/Screens/Sidebar/ContentDialogs/SidebarCategoryEditViewModel.cs

@@ -15,10 +15,10 @@ public class SidebarCategoryEditViewModel : ContentDialogViewModelBase
     private readonly IProfileService _profileService;
     private string? _categoryName;
 
-    public SidebarCategoryEditViewModel(IProfileService profileService, ProfileCategory? category)
+    public SidebarCategoryEditViewModel(IProfileService profileService, ProfileCategory category)
     {
         _profileService = profileService;
-        _category = category;
+        _category = category == ProfileCategory.Empty ? null : category;
 
         if (_category != null)
             _categoryName = _category.Name;

src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditViewModel.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Modules;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.VisualScripting;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -16,7 +16,6 @@ using Artemis.UI.Shared.Services.ProfileEditor;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using Material.Icons;
-using Newtonsoft.Json;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Sidebar;
@@ -43,7 +42,7 @@ public class ProfileConfigurationEditViewModel : DialogViewModelBase<ProfileConf
 
     public ProfileConfigurationEditViewModel(
         ProfileCategory profileCategory,
-        ProfileConfiguration? profileConfiguration,
+        ProfileConfiguration profileConfiguration,
         IWindowService windowService,
         IProfileService profileService,
         IProfileEditorService profileEditorService,
@@ -54,7 +53,10 @@ public class ProfileConfigurationEditViewModel : DialogViewModelBase<ProfileConf
         _windowService = windowService;
         _profileService = profileService;
         _profileEditorService = profileEditorService;
-        _profileConfiguration = profileConfiguration ?? profileService.CreateProfileConfiguration(profileCategory, "New profile", Enum.GetValues<MaterialIconKind>().First().ToString());
+        
+        _profileConfiguration = profileConfiguration == ProfileConfiguration.Empty 
+            ? profileService.CreateProfileConfiguration(profileCategory, "New profile", Enum.GetValues<MaterialIconKind>().First().ToString()) 
+            : profileConfiguration;
         _profileName = _profileConfiguration.Name;
         _iconType = _profileConfiguration.Icon.IconType;
         _hotkeyMode = _profileConfiguration.HotkeyMode;
@@ -64,11 +66,9 @@ public class ProfileConfigurationEditViewModel : DialogViewModelBase<ProfileConf
         if (_profileConfiguration.DisableHotkey != null)
             _disableHotkey = new Hotkey {Key = _profileConfiguration.DisableHotkey.Key, Modifiers = _profileConfiguration.DisableHotkey.Modifiers};
 
-        IsNew = profileConfiguration == null;
+        IsNew = profileConfiguration == ProfileConfiguration.Empty;
         DisplayName = IsNew ? "Artemis | Add profile" : "Artemis | Edit profile properties";
-        Modules = new ObservableCollection<ProfileModuleViewModel?>(
-            pluginManagementService.GetFeaturesOfType<Module>().Where(m => !m.IsAlwaysAvailable).Select(m => new ProfileModuleViewModel(m))
-        );
+        Modules = new ObservableCollection<ProfileModuleViewModel?>(pluginManagementService.GetFeaturesOfType<Module>().Where(m => !m.IsAlwaysAvailable).Select(m => new ProfileModuleViewModel(m)));
         Modules.Insert(0, null);
         _selectedModule = Modules.FirstOrDefault(m => m?.Module == _profileConfiguration.Module);
 
@@ -258,7 +258,7 @@ public class ProfileConfigurationEditViewModel : DialogViewModelBase<ProfileConf
 
     private async Task ExecuteOpenConditionEditor()
     {
-        await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(("nodeScript", ProfileConfiguration.ActivationCondition));
+        await _windowService.ShowDialogAsync<NodeScriptWindowViewModel, bool>(ProfileConfiguration.ActivationCondition);
     }
 
     #endregion

src/Artemis.UI/Screens/Sidebar/SidebarCategoryViewModel.cs

@@ -9,7 +9,7 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
@@ -146,7 +146,7 @@ public class SidebarCategoryViewModel : ActivatableViewModelBase
     {
         await _windowService.CreateContentDialog()
             .WithTitle("Edit category")
-            .WithViewModel(out SidebarCategoryEditViewModel vm, ("category", ProfileCategory))
+            .WithViewModel(out SidebarCategoryEditViewModel vm, ProfileCategory)
             .HavingPrimaryButton(b => b.WithText("Confirm").WithCommand(vm.Confirm))
             .WithCloseButtonText("Cancel")
             .WithDefaultButton(ContentDialogButton.Primary)
@@ -165,10 +165,7 @@ public class SidebarCategoryViewModel : ActivatableViewModelBase
 
     private async Task ExecuteAddProfile()
     {
-        ProfileConfiguration? result = await _windowService.ShowDialogAsync<ProfileConfigurationEditViewModel, ProfileConfiguration?>(
-            ("profileCategory", ProfileCategory),
-            ("profileConfiguration", null)
-        );
+        ProfileConfiguration? result = await _windowService.ShowDialogAsync<ProfileConfigurationEditViewModel, ProfileConfiguration?>(ProfileCategory, ProfileConfiguration.Empty);
         if (result != null)
         {
             SidebarProfileConfigurationViewModel viewModel = _vmFactory.SidebarProfileConfigurationViewModel(result);

src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationViewModel.cs

@@ -57,10 +57,7 @@ public class SidebarProfileConfigurationViewModel : ActivatableViewModelBase
 
     private async Task ExecuteEditProfile()
     {
-        await _windowService.ShowDialogAsync<ProfileConfigurationEditViewModel, ProfileConfiguration?>(
-            ("profileCategory", ProfileConfiguration.Category),
-            ("profileConfiguration", ProfileConfiguration)
-        );
+        await _windowService.ShowDialogAsync<ProfileConfigurationEditViewModel, ProfileConfiguration?>(ProfileConfiguration.Category, ProfileConfiguration);
     }
 
     private void ExecuteToggleSuspended()

src/Artemis.UI/Screens/Sidebar/SidebarScreenViewModel.cs

@@ -1,8 +1,7 @@
 using System;
 using Artemis.UI.Shared;
+using DryIoc;
 using Material.Icons;
-using Ninject;
-using Ninject.Parameters;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Sidebar;
@@ -15,9 +14,9 @@ public class SidebarScreenViewModel<T> : SidebarScreenViewModel where T : MainSc
 
     public override Type ScreenType => typeof(T);
 
-    public override MainScreenViewModel CreateInstance(IKernel kernel, IScreen screen)
+    public override MainScreenViewModel CreateInstance(IContainer container, IScreen screen)
     {
-        return kernel.Get<T>(new ConstructorArgument("hostScreen", screen));
+        return container.Resolve<T>(new object[] { screen });
     }
 }
 
@@ -32,5 +31,5 @@ public abstract class SidebarScreenViewModel : ViewModelBase
     public MaterialIconKind Icon { get; }
 
     public abstract Type ScreenType { get; }
-    public abstract MainScreenViewModel CreateInstance(IKernel kernel, IScreen screen);
+    public abstract MainScreenViewModel CreateInstance(IContainer container, IScreen screen);
 }

src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs

@@ -7,7 +7,7 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Home;
 using Artemis.UI.Screens.ProfileEditor;
 using Artemis.UI.Screens.Settings;
@@ -18,10 +18,10 @@ using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.Builders;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Avalonia.Threading;
+using DryIoc;
 using DynamicData;
 using DynamicData.Binding;
 using Material.Icons;
-using Ninject;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Sidebar;
@@ -29,7 +29,7 @@ namespace Artemis.UI.Screens.Sidebar;
 public class SidebarViewModel : ActivatableViewModelBase
 {
     private readonly IScreen _hostScreen;
-    private readonly IKernel _kernel;
+    private readonly IContainer _container;
     private readonly IProfileEditorService _profileEditorService;
     private readonly IProfileEditorVmFactory _profileEditorVmFactory;
     private readonly IWindowService _windowService;
@@ -37,7 +37,7 @@ public class SidebarViewModel : ActivatableViewModelBase
     private ReadOnlyObservableCollection<SidebarCategoryViewModel> _sidebarCategories = new(new ObservableCollection<SidebarCategoryViewModel>());
 
     public SidebarViewModel(IScreen hostScreen,
-        IKernel kernel,
+        IContainer container,
         IProfileService profileService,
         IWindowService windowService,
         IProfileEditorService profileEditorService,
@@ -45,7 +45,7 @@ public class SidebarViewModel : ActivatableViewModelBase
         IProfileEditorVmFactory profileEditorVmFactory)
     {
         _hostScreen = hostScreen;
-        _kernel = kernel;
+        _container = container;
         _windowService = windowService;
         _profileEditorService = profileEditorService;
         _profileEditorVmFactory = profileEditorVmFactory;
@@ -120,7 +120,7 @@ public class SidebarViewModel : ActivatableViewModelBase
     {
         await _windowService.CreateContentDialog()
             .WithTitle("Add new category")
-            .WithViewModel(out SidebarCategoryEditViewModel vm, ("category", null))
+            .WithViewModel(out SidebarCategoryEditViewModel vm, ProfileCategory.Empty)
             .HavingPrimaryButton(b => b.WithText("Confirm").WithCommand(vm.Confirm))
             .WithCloseButtonText("Cancel")
             .WithDefaultButton(ContentDialogButton.Primary)
@@ -137,7 +137,7 @@ public class SidebarViewModel : ActivatableViewModelBase
 
     private void NavigateToScreen(SidebarScreenViewModel sidebarScreenViewModel)
     {
-        _hostScreen.Router.Navigate.Execute(sidebarScreenViewModel.CreateInstance(_kernel, _hostScreen));
+        _hostScreen.Router.Navigate.Execute(sidebarScreenViewModel.CreateInstance(_container, _hostScreen));
         _profileEditorService.ChangeCurrentProfileConfiguration(null);
     }
 }

src/Artemis.UI/Screens/StartupWizard/StartupWizardViewModel.cs

@@ -8,13 +8,13 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.DeviceProviders;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.Plugins;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Providers;
 using Artemis.UI.Shared.Services;
-using Ninject;
+using DryIoc;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.StartupWizard;
@@ -31,14 +31,14 @@ public class StartupWizardViewModel : DialogViewModelBase<bool>
     private bool _showFinish;
     private bool _showGoBack;
 
-    public StartupWizardViewModel(IKernel kernel, ISettingsService settingsService, IRgbService rgbService, IPluginManagementService pluginManagementService, IWindowService windowService,
+    public StartupWizardViewModel(IContainer container, ISettingsService settingsService, IRgbService rgbService, IPluginManagementService pluginManagementService, IWindowService windowService,
         IUpdateService updateService, ISettingsVmFactory settingsVmFactory)
     {
         _settingsService = settingsService;
         _rgbService = rgbService;
         _windowService = windowService;
         _updateService = updateService;
-        _autoRunProvider = kernel.TryGet<IAutoRunProvider>();
+        _autoRunProvider = container.Resolve<IAutoRunProvider>(IfUnresolved.ReturnDefault);
 
         Continue = ReactiveCommand.Create(ExecuteContinue);
         GoBack = ReactiveCommand.Create(ExecuteGoBack);

src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs

@@ -57,7 +57,7 @@ public class ListDeviceViewModel : ViewModelBase
 
         await _windowService.CreateContentDialog()
             .WithTitle($"{Device.RgbDevice.DeviceInfo.DeviceName} - Detect input")
-            .WithViewModel<DeviceDetectInputViewModel>(out DeviceDetectInputViewModel? viewModel, ("device", Device))
+            .WithViewModel(out DeviceDetectInputViewModel viewModel, Device)
             .WithCloseButtonText("Cancel")
             .ShowAsync();
 

src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs

@@ -115,7 +115,7 @@ public class SurfaceDeviceViewModel : ActivatableViewModelBase
 
         await _windowService.CreateContentDialog()
             .WithTitle($"{Device.RgbDevice.DeviceInfo.DeviceName} - Detect input")
-            .WithViewModel<DeviceDetectInputViewModel>(out DeviceDetectInputViewModel? viewModel, ("device", Device))
+            .WithViewModel(out DeviceDetectInputViewModel viewModel, Device)
             .WithCloseButtonText("Cancel")
             .ShowAsync();
 

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs

@@ -7,8 +7,8 @@ using System.Reactive.Disposables;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Extensions;
-using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Services;
 using Avalonia;
 using ReactiveUI;

src/Artemis.UI/Screens/VisualScripting/CableView.axaml.cs

@@ -8,7 +8,6 @@ using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.ReactiveUI;
-using Avalonia.Rendering;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.VisualScripting;

src/Artemis.UI/Screens/VisualScripting/NodeScriptView.axaml.cs

@@ -14,7 +14,6 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
-using Avalonia.VisualTree;
 using DynamicData.Binding;
 using ReactiveUI;
 

src/Artemis.UI/Screens/VisualScripting/NodeScriptViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
@@ -11,8 +10,8 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Events;
 using Artemis.Core.Services;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Models;
-using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.VisualScripting.Pins;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services.NodeEditor;

src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowViewModel.cs

@@ -7,7 +7,7 @@ using System.Reactive.Disposables;
 using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;

src/Artemis.UI/Screens/VisualScripting/NodeViewModel.cs

@@ -5,7 +5,7 @@ using System.Reactive;
 using System.Reactive.Linq;
 using Artemis.Core;
 using Artemis.Core.Events;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Screens.VisualScripting.Pins;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;

src/Artemis.UI/Screens/VisualScripting/Pins/InputPinCollectionViewModel.cs

@@ -1,5 +1,5 @@
 using Artemis.Core;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared.Services.NodeEditor;
 
 namespace Artemis.UI.Screens.VisualScripting.Pins;

src/Artemis.UI/Screens/VisualScripting/Pins/OutputPinCollectionViewModel.cs

@@ -1,5 +1,5 @@
 using Artemis.Core;
-using Artemis.UI.Ninject.Factories;
+using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Shared.Services.NodeEditor;
 
 namespace Artemis.UI.Screens.VisualScripting.Pins;