Windows - Fix crash when clicking on update notification

Meta - Code cleanup

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

@@ -37,6 +37,16 @@ public class DevicePropertiesViewModel : DialogViewModelBase<object>
         ClearSelectedLeds = ReactiveCommand.Create(ExecuteClearSelectedLeds);
     }
 
+    public ArtemisDevice Device
+    {
+        get => _device;
+        set => RaiseAndSetIfChanged(ref _device, value);
+    }
+
+    public ObservableCollection<ArtemisLed> SelectedLeds { get; }
+    public ObservableCollection<ActivatableViewModelBase> Tabs { get; }
+    public ReactiveCommand<Unit, Unit> ClearSelectedLeds { get; }
+
     private void RgbServiceOnDeviceAdded(object? sender, DeviceEventArgs e)
     {
         if (e.Device.Identifier != Device.Identifier || Device == e.Device)
@@ -52,16 +62,6 @@ public class DevicePropertiesViewModel : DialogViewModelBase<object>
         SelectedLeds.Clear();
     }
 
-    public ArtemisDevice Device
-    {
-        get => _device;
-        set => RaiseAndSetIfChanged(ref _device, value);
-    }
-
-    public ObservableCollection<ArtemisLed> SelectedLeds { get; }
-    public ObservableCollection<ActivatableViewModelBase> Tabs { get; }
-    public ReactiveCommand<Unit, Unit> ClearSelectedLeds { get; }
-
     private void AddTabs()
     {
         Tabs.Add(_deviceVmFactory.DevicePropertiesTabViewModel(Device));

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/ProfileTreeView.axaml.cs

@@ -15,10 +15,10 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree;
 
 public class ProfileTreeView : ReactiveUserControl<ProfileTreeViewModel>
 {
+    private readonly TreeView _treeView;
     private Image? _dragAdorner;
     private Point _dragStartPosition;
     private Point _elementDragOffset;
-    private readonly TreeView _treeView;
 
     public ProfileTreeView()
     {

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

@@ -293,6 +293,7 @@ public abstract class TreeItemViewModel : ActivatableViewModelBase
             CanPaste = false;
             return;
         }
+
         CanPaste = formats.Contains(ProfileElementExtensions.ClipboardDataFormat);
     }
 

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

@@ -22,10 +22,10 @@ public class DataBindingViewModel : ActivatableViewModelBase
     private readonly IProfileEditorService _profileEditorService;
     private readonly IWindowService _windowService;
     private ObservableAsPropertyHelper<bool>? _dataBindingEnabled;
+    private bool _editorOpen;
     private ObservableAsPropertyHelper<ILayerProperty?>? _layerProperty;
     private ObservableAsPropertyHelper<NodeScriptViewModel?>? _nodeScriptViewModel;
     private bool _playing;
-    private bool _editorOpen;
 
     public DataBindingViewModel(IProfileEditorService profileEditorService, INodeVmFactory nodeVmFactory, IWindowService windowService, ISettingsService settingsService)
     {

src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs

@@ -22,9 +22,9 @@ namespace Artemis.UI.Screens.ProfileEditor;
 
 public class ProfileEditorViewModel : MainScreenViewModel
 {
+    private readonly IMainWindowService _mainWindowService;
     private readonly IProfileEditorService _profileEditorService;
     private readonly ISettingsService _settingsService;
-    private readonly IMainWindowService _mainWindowService;
     private readonly SourceList<IToolViewModel> _tools;
     private DisplayConditionScriptViewModel? _displayConditionScriptViewModel;
     private ObservableAsPropertyHelper<ProfileEditorHistory?>? _history;
@@ -69,7 +69,7 @@ public class ProfileEditorViewModel : MainScreenViewModel
             _profileConfiguration = profileEditorService.ProfileConfiguration.ToProperty(this, vm => vm.ProfileConfiguration).DisposeWith(d);
             _history = profileEditorService.History.ToProperty(this, vm => vm.History).DisposeWith(d);
             _suspendedEditing = profileEditorService.SuspendedEditing.ToProperty(this, vm => vm.SuspendedEditing).DisposeWith(d);
-            
+
             mainWindowService.MainWindowFocused += MainWindowServiceOnMainWindowFocused;
             mainWindowService.MainWindowUnfocused += MainWindowServiceOnMainWindowUnfocused;
 
@@ -78,7 +78,7 @@ public class ProfileEditorViewModel : MainScreenViewModel
                 mainWindowService.MainWindowFocused -= MainWindowServiceOnMainWindowFocused;
                 mainWindowService.MainWindowUnfocused -= MainWindowServiceOnMainWindowUnfocused;
             }).DisposeWith(d);
-            
+
             // Slow and steady wins the race (and doesn't lock up the entire UI)
             Dispatcher.UIThread.Post(() => StatusBarViewModel = statusBarViewModel, DispatcherPriority.Loaded);
             Dispatcher.UIThread.Post(() => VisualEditorViewModel = visualEditorViewModel, DispatcherPriority.Loaded);
@@ -165,7 +165,7 @@ public class ProfileEditorViewModel : MainScreenViewModel
                 toolViewModel.IsSelected = false;
         });
     }
-    
+
     private void MainWindowServiceOnMainWindowFocused(object? sender, EventArgs e)
     {
         if (_settingsService.GetSetting("ProfileEditor.AutoSuspend", true).Value)

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

@@ -54,7 +54,7 @@ public class RootViewModel : ActivatableViewModelBase, IScreen, IMainWindowProvi
         _defaultTitleBarViewModel = defaultTitleBarViewModel;
         _sidebarVmFactory = sidebarVmFactory;
         _lifeTime = (IClassicDesktopStyleApplicationLifetime) Application.Current!.ApplicationLifetime!;
-        
+
         mainWindowService.ConfigureMainWindowProvider(this);
 
         DisplayAccordingToSettings();
@@ -162,20 +162,17 @@ public class RootViewModel : ActivatableViewModelBase, IScreen, IMainWindowProvi
     /// <inheritdoc />
     public void OpenMainWindow()
     {
-        Dispatcher.UIThread.Post(() =>
+        if (_lifeTime.MainWindow == null)
         {
-            if (_lifeTime.MainWindow == null)
-            {
-                SidebarViewModel = _sidebarVmFactory.SidebarViewModel(this);
-                _lifeTime.MainWindow = new MainWindow {DataContext = this};
-                _lifeTime.MainWindow.Show();
-                _lifeTime.MainWindow.Closing += CurrentMainWindowOnClosing;
-            }
+            SidebarViewModel = _sidebarVmFactory.SidebarViewModel(this);
+            _lifeTime.MainWindow = new MainWindow {DataContext = this};
+            _lifeTime.MainWindow.Show();
+            _lifeTime.MainWindow.Closing += CurrentMainWindowOnClosing;
+        }
 
-            _lifeTime.MainWindow.WindowState = WindowState.Normal;
-            _lifeTime.MainWindow.Activate();
-            OnMainWindowOpened();
-        });
+        _lifeTime.MainWindow.WindowState = WindowState.Normal;
+        _lifeTime.MainWindow.Activate();
+        OnMainWindowOpened();
     }
 
     /// <inheritdoc />
@@ -183,7 +180,7 @@ public class RootViewModel : ActivatableViewModelBase, IScreen, IMainWindowProvi
     {
         Dispatcher.UIThread.Post(() => { _lifeTime.MainWindow?.Close(); });
     }
-    
+
     public void Focused()
     {
         IsMainWindowFocused = true;
@@ -201,7 +198,7 @@ public class RootViewModel : ActivatableViewModelBase, IScreen, IMainWindowProvi
 
     /// <inheritdoc />
     public event EventHandler? MainWindowClosed;
-    
+
     /// <inheritdoc />
     public event EventHandler? MainWindowFocused;
 
@@ -217,7 +214,7 @@ public class RootViewModel : ActivatableViewModelBase, IScreen, IMainWindowProvi
     {
         MainWindowClosed?.Invoke(this, EventArgs.Empty);
     }
-    
+
     protected virtual void OnMainWindowFocused()
     {
         MainWindowFocused?.Invoke(this, EventArgs.Empty);

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

@@ -21,8 +21,8 @@ public class SurfaceEditorViewModel : MainScreenViewModel
     private readonly IDeviceService _deviceService;
     private readonly IDeviceVmFactory _deviceVmFactory;
     private readonly IRgbService _rgbService;
-    private readonly ISurfaceVmFactory _surfaceVmFactory;
     private readonly ISettingsService _settingsService;
+    private readonly ISurfaceVmFactory _surfaceVmFactory;
     private readonly IWindowService _windowService;
     private bool _colorDevices;
     private bool _colorFirstLedOnly;
@@ -72,27 +72,6 @@ public class SurfaceEditorViewModel : MainScreenViewModel
         });
     }
 
-    private void RgbServiceOnDeviceAdded(object? sender, DeviceEventArgs e)
-    {
-        if (!e.Device.IsEnabled)
-            return;
-
-        SurfaceDeviceViewModels.Add(_surfaceVmFactory.SurfaceDeviceViewModel(e.Device, this));
-        ListDeviceViewModels.Add(_surfaceVmFactory.ListDeviceViewModel(e.Device, this));
-        SurfaceDeviceViewModels.Sort(l => l.Device.ZIndex * -1);
-        ListDeviceViewModels.Sort(l => l.Device.ZIndex * -1);
-    }
-
-    private void RgbServiceOnDeviceRemoved(object? sender, DeviceEventArgs e)
-    {
-        SurfaceDeviceViewModel? surfaceVm = SurfaceDeviceViewModels.FirstOrDefault(vm => vm.Device == e.Device);
-        ListDeviceViewModel? listVm = ListDeviceViewModels.FirstOrDefault(vm => vm.Device == e.Device);
-        if (surfaceVm != null)
-            SurfaceDeviceViewModels.Remove(surfaceVm);
-        if (listVm != null)
-            ListDeviceViewModels.Remove(listVm);
-    }
-
     public bool ColorDevices
     {
         get => _colorDevices;
@@ -180,6 +159,27 @@ public class SurfaceEditorViewModel : MainScreenViewModel
             surfaceDeviceViewModel.UpdateMouseDrag(mousePosition, round, ignoreOverlap);
     }
 
+    private void RgbServiceOnDeviceAdded(object? sender, DeviceEventArgs e)
+    {
+        if (!e.Device.IsEnabled)
+            return;
+
+        SurfaceDeviceViewModels.Add(_surfaceVmFactory.SurfaceDeviceViewModel(e.Device, this));
+        ListDeviceViewModels.Add(_surfaceVmFactory.ListDeviceViewModel(e.Device, this));
+        SurfaceDeviceViewModels.Sort(l => l.Device.ZIndex * -1);
+        ListDeviceViewModels.Sort(l => l.Device.ZIndex * -1);
+    }
+
+    private void RgbServiceOnDeviceRemoved(object? sender, DeviceEventArgs e)
+    {
+        SurfaceDeviceViewModel? surfaceVm = SurfaceDeviceViewModels.FirstOrDefault(vm => vm.Device == e.Device);
+        ListDeviceViewModel? listVm = ListDeviceViewModels.FirstOrDefault(vm => vm.Device == e.Device);
+        if (surfaceVm != null)
+            SurfaceDeviceViewModels.Remove(surfaceVm);
+        if (listVm != null)
+            ListDeviceViewModels.Remove(listVm);
+    }
+
     private async Task ExecuteAutoArrange()
     {
         bool confirmed = await _windowService.ShowConfirmContentDialog("Auto-arrange layout", "Are you sure you want to auto-arrange your layout? Your current settings will be overwritten.");

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

@@ -12,7 +12,6 @@ using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.NodeEditor.Commands;
-using Artemis.UI.Shared.Services.ProfileEditor;
 using Avalonia;
 using Avalonia.Threading;
 using DynamicData;
@@ -25,8 +24,8 @@ public class NodeScriptWindowViewModel : DialogViewModelBase<bool>
 {
     private readonly INodeEditorService _nodeEditorService;
     private readonly INodeService _nodeService;
-    private readonly ISettingsService _settingsService;
     private readonly IProfileService _profileService;
+    private readonly ISettingsService _settingsService;
     private readonly IWindowService _windowService;
 
     public NodeScriptWindowViewModel(NodeScript nodeScript,
@@ -66,10 +65,10 @@ public class NodeScriptWindowViewModel : DialogViewModelBase<bool>
             DispatcherTimer updateTimer = new(TimeSpan.FromMilliseconds(25.0 / 1000), DispatcherPriority.Normal, Update);
             // TODO: Remove in favor of saving each time a node editor command is executed
             DispatcherTimer saveTimer = new(TimeSpan.FromMinutes(2), DispatcherPriority.Normal, Save);
-            
+
             updateTimer.Start();
             saveTimer.Start();
-            
+
             Disposable.Create(() =>
             {
                 updateTimer.Stop();