Code style - Use file scoped namespaces

Code style - Ran code cleanup

src/Artemis.UI/Screens/Scripting/Dialogs/ScriptConfigurationCreateView.axaml.cs

@@ -1,11 +1,9 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Screens.Scripting.Dialogs;
 
-public partial class ScriptConfigurationCreateView : ReactiveUserControl<ScriptConfigurationCreateViewModel>
+public class ScriptConfigurationCreateView : ReactiveUserControl<ScriptConfigurationCreateViewModel>
 {
     public ScriptConfigurationCreateView()
     {

src/Artemis.UI/Screens/Scripting/Dialogs/ScriptConfigurationCreateViewModel.cs

@@ -20,7 +20,7 @@ public class ScriptConfigurationCreateViewModel : ContentDialogViewModelBase
         ScriptingProviders = new List<ScriptingProvider>(scriptingService.ScriptingProviders);
         Submit = ReactiveCommand.Create(ExecuteSubmit, ValidationContext.Valid);
         _selectedScriptingProvider = ScriptingProviders.First();
-        
+
         this.ValidationRule(vm => vm.ScriptName, s => !string.IsNullOrWhiteSpace(s), "Script name cannot be empty.");
     }
 

src/Artemis.UI/Screens/Scripting/Dialogs/ScriptConfigurationEditView.axaml

@@ -3,7 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:dialogs="clr-namespace:Artemis.UI.Screens.Scripting.Dialogs"
-             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Scripting.Dialogs.ScriptConfigurationEditView"
              x:DataType="dialogs:ScriptConfigurationEditViewModel">

src/Artemis.UI/Screens/Scripting/Dialogs/ScriptConfigurationEditView.axaml.cs

@@ -1,12 +1,11 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Scripting.Dialogs;
 
-public partial class ScriptConfigurationEditView : ReactiveUserControl<ScriptConfigurationEditViewModel>
+public class ScriptConfigurationEditView : ReactiveUserControl<ScriptConfigurationEditViewModel>
 {
     public ScriptConfigurationEditView()
     {

src/Artemis.UI/Screens/Scripting/Dialogs/ScriptConfigurationEditViewModel.cs

@@ -16,7 +16,7 @@ public class ScriptConfigurationEditViewModel : ContentDialogViewModelBase
         ScriptConfiguration = scriptConfiguration;
         Submit = ReactiveCommand.Create(ExecuteSubmit, ValidationContext.Valid);
         ScriptName = ScriptConfiguration.Name;
-        
+
         this.ValidationRule(vm => vm.ScriptName, s => !string.IsNullOrWhiteSpace(s), "Script name cannot be empty.");
     }
 

src/Artemis.UI/Screens/Scripting/ScriptsDialogView.axaml.cs

@@ -1,12 +1,11 @@
 using System.ComponentModel;
 using Artemis.UI.Shared;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace Artemis.UI.Screens.Scripting;
 
-public partial class ScriptsDialogView : ReactiveCoreWindow<ScriptsDialogViewModel>
+public class ScriptsDialogView : ReactiveCoreWindow<ScriptsDialogViewModel>
 {
     private bool _canClose;
 
@@ -23,7 +22,7 @@ public partial class ScriptsDialogView : ReactiveCoreWindow<ScriptsDialogViewMod
     {
         if (_canClose)
             return;
-        
+
         e.Cancel = true;
         if (ViewModel == null || await ViewModel.CanClose())
         {

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

@@ -13,23 +13,22 @@ using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Scripting.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
+using Artemis.UI.Shared.Services.Builders;
 using DynamicData;
 using DynamicData.Binding;
-using FluentAvalonia.UI.Controls;
 using ReactiveUI;
-using ContentDialogButton = Artemis.UI.Shared.Services.Builders.ContentDialogButton;
 
 namespace Artemis.UI.Screens.Scripting;
 
 public class ScriptsDialogViewModel : DialogViewModelBase<object?>
 {
+    private readonly Dictionary<ScriptingProvider, IScriptEditorViewModel> _providerViewModels = new();
     private readonly IScriptingService _scriptingService;
     private readonly IWindowService _windowService;
-    private readonly Dictionary<ScriptingProvider, IScriptEditorViewModel> _providerViewModels = new();
     private ObservableAsPropertyHelper<bool>? _hasScripts;
-    private ScriptConfigurationViewModel? _selectedScript;
-    private IScriptEditorViewModel? _scriptEditorViewModel;
     private ReadOnlyObservableCollection<ScriptConfigurationViewModel> _scriptConfigurations;
+    private IScriptEditorViewModel? _scriptEditorViewModel;
+    private ScriptConfigurationViewModel? _selectedScript;
 
     public ScriptsDialogViewModel(IScriptingService scriptingService, IWindowService windowService, IProfileService profileService, IScriptVmFactory scriptVmFactory)
     {
@@ -96,6 +95,20 @@ public class ScriptsDialogViewModel : DialogViewModelBase<object?>
 
     public ReactiveCommand<Unit, Unit> AddScriptConfiguration { get; }
 
+    public async Task<bool> CanClose()
+    {
+        if (!ScriptConfigurations.Any(s => s.ScriptConfiguration.HasChanges))
+            return true;
+
+        bool result = await _windowService.ShowConfirmContentDialog("Discard changes", "One or more scripts still have pending changes, do you want to discard them?");
+        if (!result)
+            return false;
+
+        foreach (ScriptConfigurationViewModel scriptConfigurationViewModel in ScriptConfigurations)
+            scriptConfigurationViewModel.ScriptConfiguration.DiscardPendingChanges();
+        return true;
+    }
+
 
     private void SetupScriptEditor(ScriptConfiguration? scriptConfiguration)
     {
@@ -144,18 +157,4 @@ public class ScriptsDialogViewModel : DialogViewModelBase<object?>
         // Select the new script
         SelectedScript = ScriptConfigurations.LastOrDefault();
     }
-
-    public async Task<bool> CanClose()
-    {
-        if (!ScriptConfigurations.Any(s => s.ScriptConfiguration.HasChanges))
-            return true;
-        
-        bool result = await _windowService.ShowConfirmContentDialog("Discard changes", "One or more scripts still have pending changes, do you want to discard them?");
-        if (!result)
-            return false;
-        
-        foreach (ScriptConfigurationViewModel scriptConfigurationViewModel in ScriptConfigurations)
-            scriptConfigurationViewModel.ScriptConfiguration.DiscardPendingChanges();
-        return true;
-    }
 }