Code style - Use file scoped namespaces

Code style - Ran code cleanup

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

@@ -26,15 +26,15 @@ public class MenuBarViewModel : ActivatableViewModelBase
     private readonly IProfileService _profileService;
     private readonly ISettingsService _settingsService;
     private readonly IWindowService _windowService;
+    private ObservableAsPropertyHelper<bool>? _focusFolder;
+    private ObservableAsPropertyHelper<bool>? _focusNone;
+    private ObservableAsPropertyHelper<bool>? _focusSelection;
     private ProfileEditorHistory? _history;
     private ObservableAsPropertyHelper<bool>? _isSuspended;
+    private ObservableAsPropertyHelper<bool>? _keyBindingsEnabled;
     private ObservableAsPropertyHelper<ProfileConfiguration?>? _profileConfiguration;
     private ObservableAsPropertyHelper<RenderProfileElement?>? _profileElement;
     private ObservableAsPropertyHelper<bool>? _suspendedEditing;
-    private ObservableAsPropertyHelper<bool>? _focusNone;
-    private ObservableAsPropertyHelper<bool>? _focusFolder;
-    private ObservableAsPropertyHelper<bool>? _focusSelection;
-    private ObservableAsPropertyHelper<bool>? _keyBindingsEnabled;
 
     public MenuBarViewModel(ILogger logger, IProfileEditorService profileEditorService, IProfileService profileService, ISettingsService settingsService, IWindowService windowService)
     {

src/Artemis.UI/Screens/ProfileEditor/Panels/Playback/PlaybackViewModel.cs

@@ -18,19 +18,19 @@ public class PlaybackViewModel : ActivatableViewModelBase
     private ObservableAsPropertyHelper<TimeSpan>? _currentTime;
     private ObservableAsPropertyHelper<string?>? _formattedCurrentTime;
     private ObservableAsPropertyHelper<bool>? _keyBindingsEnabled;
+    private DateTime _lastUpdate;
     private ObservableAsPropertyHelper<bool>? _playing;
     private RenderProfileElement? _profileElement;
     private bool _repeating;
     private bool _repeatSegment;
     private bool _repeatTimeline;
-    private DateTime _lastUpdate;
 
     public PlaybackViewModel(IProfileEditorService profileEditorService, ISettingsService settingsService)
     {
         _profileEditorService = profileEditorService;
         _settingsService = settingsService;
         _repeatTimeline = true;
-        
+
         this.WhenActivated(d =>
         {
             _profileEditorService.ProfileElement.Subscribe(e => _profileElement = e).DisposeWith(d);
@@ -38,13 +38,13 @@ public class PlaybackViewModel : ActivatableViewModelBase
             _formattedCurrentTime = _profileEditorService.Time.Select(t => $"{Math.Floor(t.TotalSeconds):00}.{t.Milliseconds:000}").ToProperty(this, vm => vm.FormattedCurrentTime).DisposeWith(d);
             _playing = _profileEditorService.Playing.ToProperty(this, vm => vm.Playing).DisposeWith(d);
             _keyBindingsEnabled = _profileEditorService.SuspendedKeybindings.Select(s => !s).ToProperty(this, vm => vm.KeyBindingsEnabled).DisposeWith(d);
-            
+
             _lastUpdate = DateTime.MinValue;
             DispatcherTimer updateTimer = new(TimeSpan.FromMilliseconds(60.0 / 1000), DispatcherPriority.Render, Update);
             updateTimer.Start();
             Disposable.Create(() => updateTimer.Stop()).DisposeWith(d);
         });
-        
+
         PlayFromStart = ReactiveCommand.Create(ExecutePlayFromStart, this.WhenAnyValue(vm => vm.KeyBindingsEnabled));
         TogglePlay = ReactiveCommand.Create(ExecuteTogglePlay, this.WhenAnyValue(vm => vm.KeyBindingsEnabled));
         GoToStart = ReactiveCommand.Create(ExecuteGoToStart);
@@ -58,7 +58,7 @@ public class PlaybackViewModel : ActivatableViewModelBase
     public string? FormattedCurrentTime => _formattedCurrentTime?.Value;
     public bool Playing => _playing?.Value ?? false;
     public bool KeyBindingsEnabled => _keyBindingsEnabled?.Value ?? false;
-    
+
     public bool Repeating
     {
         get => _repeating;
@@ -79,11 +79,11 @@ public class PlaybackViewModel : ActivatableViewModelBase
 
     public ReactiveCommand<Unit, Unit> PlayFromStart { get; }
     public ReactiveCommand<Unit, Unit> TogglePlay { get; }
-    public ReactiveCommand<Unit,Unit> GoToStart { get; }
-    public ReactiveCommand<Unit,Unit> GoToEnd { get; }
-    public ReactiveCommand<Unit,Unit> GoToPreviousFrame { get; }
-    public ReactiveCommand<Unit,Unit> GoToNextFrame { get; }
-    public ReactiveCommand<Unit,Unit> CycleRepeating { get; }
+    public ReactiveCommand<Unit, Unit> GoToStart { get; }
+    public ReactiveCommand<Unit, Unit> GoToEnd { get; }
+    public ReactiveCommand<Unit, Unit> GoToPreviousFrame { get; }
+    public ReactiveCommand<Unit, Unit> GoToNextFrame { get; }
+    public ReactiveCommand<Unit, Unit> CycleRepeating { get; }
 
     private void ExecutePlayFromStart()
     {
@@ -154,7 +154,6 @@ public class PlaybackViewModel : ActivatableViewModelBase
             RepeatSegment = false;
             Repeating = false;
         }
-        
     }
 
     private TimeSpan GetCurrentSegmentStart()

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/CategoryAdaptionHintView.axaml.cs

@@ -1,10 +1,9 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
-public partial class CategoryAdaptionHintView : UserControl
+public class CategoryAdaptionHintView : UserControl
 {
     public CategoryAdaptionHintView()
     {

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/DeviceAdaptionHintView.axaml.cs

@@ -1,10 +1,9 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
-public partial class DeviceAdaptionHintView : UserControl
+public class DeviceAdaptionHintView : UserControl
 {
     public DeviceAdaptionHintView()
     {

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml

@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:adaptionHints="clr-namespace:Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.KeyboardSectionAdaptionHintView"

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/AdaptionHints/KeyboardSectionAdaptionHintView.axaml.cs

@@ -1,10 +1,9 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
 
-public partial class KeyboardSectionAdaptionHintView : UserControl
+public class KeyboardSectionAdaptionHintView : UserControl
 {
     public KeyboardSectionAdaptionHintView()
     {

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/Dialogs/LayerHintsDialogView.axaml.cs

@@ -1,12 +1,10 @@
 using Artemis.UI.Shared;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using FluentAvalonia.UI.Controls;
 
 namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
 
-public partial class LayerHintsDialogView : ReactiveCoreWindow<LayerHintsDialogViewModel>
+public class LayerHintsDialogView : ReactiveCoreWindow<LayerHintsDialogViewModel>
 {
     public LayerHintsDialogView()
     {

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

@@ -34,7 +34,7 @@ public class LayerHintsDialogViewModel : DialogViewModelBase<bool>
             Observable.FromEventPattern<LayerAdapterHintEventArgs>(x => layer.Adapter.AdapterHintRemoved += x, x => layer.Adapter.AdapterHintRemoved -= x)
                 .Subscribe(c => AdaptionHints.Remove(AdaptionHints.FirstOrDefault(h => h.AdaptionHint == c.EventArgs.AdaptionHint)!))
                 .DisposeWith(d);
-            
+
             AdaptionHints.AddRange(Layer.Adapter.AdaptionHints.Select(CreateHintViewModel));
         });
     }

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

@@ -3,7 +3,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 using ReactiveUI;

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

@@ -3,7 +3,6 @@ using System.Reactive.Disposables;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.LogicalTree;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 using ReactiveUI;

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

@@ -18,13 +18,13 @@ public class ProfileTreeView : ReactiveUserControl<ProfileTreeViewModel>
     private Image? _dragAdorner;
     private Point _dragStartPosition;
     private Point _elementDragOffset;
-    private TreeView _treeView;
+    private readonly TreeView _treeView;
 
     public ProfileTreeView()
     {
         InitializeComponent();
         _treeView = this.Get<TreeView>("ProfileTreeView");
-        
+
         AddHandler(DragDrop.DragEnterEvent, HandleDragEnterEvent, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
         AddHandler(DragDrop.DragOverEvent, HandleDragOver, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);
         AddHandler(PointerEnterEvent, HandlePointerEnter, RoutingStrategies.Direct | RoutingStrategies.Tunnel | RoutingStrategies.Bubble, true);

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

@@ -7,7 +7,6 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Artemis.Core;
-using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Shared.Services;
 using Artemis.UI.Shared.Services.ProfileEditor;
@@ -17,11 +16,11 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree;
 
 public class ProfileTreeViewModel : TreeItemViewModel
 {
-    private TreeItemViewModel? _selectedChild;
-    private ObservableAsPropertyHelper<bool>? _focusNone;
     private ObservableAsPropertyHelper<bool>? _focusFolder;
+    private ObservableAsPropertyHelper<bool>? _focusNone;
     private ObservableAsPropertyHelper<bool>? _focusSelection;
     private ObservableAsPropertyHelper<bool>? _keyBindingsEnabled;
+    private TreeItemViewModel? _selectedChild;
 
     public ProfileTreeViewModel(IWindowService windowService, IProfileEditorService profileEditorService, IProfileEditorVmFactory profileEditorVmFactory)
         : base(null, null, windowService, profileEditorService, profileEditorVmFactory)
@@ -67,7 +66,7 @@ public class ProfileTreeViewModel : TreeItemViewModel
     public bool FocusFolder => _focusFolder?.Value ?? false;
     public bool FocusSelection => _focusSelection?.Value ?? false;
     public bool KeyBindingsEnabled => _keyBindingsEnabled?.Value ?? false;
-    
+
     public TreeItemViewModel? SelectedChild
     {
         get => _selectedChild;

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

@@ -28,11 +28,11 @@ public abstract class TreeItemViewModel : ActivatableViewModelBase
     private RenderProfileElement? _currentProfileElement;
     private bool _isExpanded;
     private bool _isFlyoutOpen;
+    private ObservableAsPropertyHelper<bool>? _isFocused;
     private ProfileElement? _profileElement;
     private string? _renameValue;
     private bool _renaming;
     private TimeSpan _time;
-    private ObservableAsPropertyHelper<bool>? _isFocused;
 
     protected TreeItemViewModel(TreeItemViewModel? parent,
         ProfileElement? profileElement,
@@ -56,7 +56,7 @@ public abstract class TreeItemViewModel : ActivatableViewModelBase
         Copy = ReactiveCommand.CreateFromTask(ExecuteCopy);
         Paste = ReactiveCommand.CreateFromTask(ExecutePaste, this.WhenAnyValue(vm => vm.CanPaste));
         AbsorbCommand = ReactiveCommand.Create(() => true);
-        
+
         this.WhenActivated(d =>
         {
             _isFocused = ProfileEditorService.FocusMode
@@ -74,7 +74,7 @@ public abstract class TreeItemViewModel : ActivatableViewModelBase
         this.WhenAnyValue(vm => vm.IsFlyoutOpen).Subscribe(UpdateCanPaste);
     }
 
-    public ReactiveCommand<Unit,bool> AbsorbCommand { get; }
+    public ReactiveCommand<Unit, bool> AbsorbCommand { get; }
 
     public bool IsFocused => _isFocused?.Value ?? false;
 
@@ -297,10 +297,8 @@ public abstract class TreeItemViewModel : ActivatableViewModelBase
         if (focusMode == ProfileEditorFocusMode.Selection)
             return currentProfileElement == ProfileElement;
         if (focusMode == ProfileEditorFocusMode.Folder && currentProfileElement?.Parent != null)
-        {
             // Any direct parent or direct siblings cause focus
             return currentProfileElement.Parent == ProfileElement?.Parent || currentProfileElement.Parent.GetAllRenderElements().Any(e => e == ProfileElement);
-        }
 
         return false;
     }

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

@@ -1,5 +1,4 @@
 using System;
-using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -10,7 +9,6 @@ using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.VisualScripting;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
-using Artemis.UI.Shared.Services.NodeEditor;
 using Artemis.UI.Shared.Services.ProfileEditor;
 using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using Avalonia.Threading;
@@ -20,9 +18,9 @@ namespace Artemis.UI.Screens.ProfileEditor.Properties.DataBinding;
 
 public class DataBindingViewModel : ActivatableViewModelBase
 {
+    private readonly PluginSetting<bool> _alwaysApplyDataBindings;
     private readonly IProfileEditorService _profileEditorService;
     private readonly IWindowService _windowService;
-    private readonly PluginSetting<bool> _alwaysApplyDataBindings;
     private ObservableAsPropertyHelper<bool>? _dataBindingEnabled;
     private ObservableAsPropertyHelper<ILayerProperty?>? _layerProperty;
     private ObservableAsPropertyHelper<NodeScriptViewModel?>? _nodeScriptViewModel;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditView.axaml.cs

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

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Dialogs/TimelineSegmentEditViewModel.cs

@@ -5,16 +5,10 @@ namespace Artemis.UI.Screens.ProfileEditor.Properties.Dialogs;
 
 public class TimelineSegmentEditViewModel : ContentDialogViewModelBase
 {
-    private double _segmentLength;
-
     public TimelineSegmentEditViewModel(TimeSpan segmentLength)
     {
         SegmentLength = segmentLength.TotalSeconds;
     }
 
-    public double SegmentLength
-    {
-        get => _segmentLength;
-        set => _segmentLength = value;
-    }
+    public double SegmentLength { get; set; }
 }

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

@@ -37,7 +37,7 @@ public class PropertyGroupViewModel : PropertyViewModelBase, IDisposable
 
         LayerPropertyGroup.VisibilityChanged += LayerPropertyGroupOnVisibilityChanged;
         _isVisible = !LayerPropertyGroup.IsHidden;
-        
+
         PopulateChildren();
     }
 
@@ -52,7 +52,7 @@ public class PropertyGroupViewModel : PropertyViewModelBase, IDisposable
 
         LayerPropertyGroup.VisibilityChanged += LayerPropertyGroupOnVisibilityChanged;
         _isVisible = !LayerPropertyGroup.IsHidden;
-        
+
         PopulateChildren();
     }
 
@@ -67,7 +67,7 @@ public class PropertyGroupViewModel : PropertyViewModelBase, IDisposable
 
         LayerPropertyGroup.VisibilityChanged += LayerPropertyGroupOnVisibilityChanged;
         _isVisible = !LayerPropertyGroup.IsHidden;
-        
+
         PopulateChildren();
     }
 
@@ -115,7 +115,7 @@ public class PropertyGroupViewModel : PropertyViewModelBase, IDisposable
 
         return result;
     }
-    
+
     public List<ITimelineKeyframeViewModel> GetAllKeyframeViewModels(bool expandedOnly)
     {
         List<ITimelineKeyframeViewModel> result = new();
@@ -184,7 +184,7 @@ public class PropertyGroupViewModel : PropertyViewModelBase, IDisposable
             if (viewModelBase is IDisposable disposable)
                 disposable.Dispose();
         }
-        
+
         _keyframeSubscription.Dispose();
     }
 }

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

@@ -4,17 +4,16 @@ using Artemis.Core;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
 using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
-using Artemis.UI.Shared;
 using DynamicData;
 
 namespace Artemis.UI.Screens.ProfileEditor.Properties;
 
 public class PropertyViewModel : PropertyViewModelBase, IDisposable
 {
+    private readonly SourceList<ILayerPropertyKeyframe> _keyframes;
     private bool _isExpanded;
     private bool _isHighlighted;
     private bool _isVisible;
-    private readonly SourceList<ILayerPropertyKeyframe> _keyframes;
 
     public PropertyViewModel(ILayerProperty layerProperty, IPropertyVmFactory propertyVmFactory)
     {

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml

@@ -3,7 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:timeline="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes.TimelineKeyframeView"
              ClipToBounds="False">

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs

@@ -24,11 +24,11 @@ namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes;
 public class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineKeyframeViewModel
 {
     private readonly IProfileEditorService _profileEditorService;
+    private bool _canPaste;
+    private bool _isFlyoutOpen;
     private ObservableAsPropertyHelper<bool>? _isSelected;
     private string _timestamp;
     private double _x;
-    private bool _canPaste;
-    private bool _isFlyoutOpen;
 
     public TimelineKeyframeViewModel(LayerPropertyKeyframe<T> layerPropertyKeyframe, IProfileEditorService profileEditorService)
     {
@@ -58,10 +58,6 @@ public class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineK
 
     public LayerPropertyKeyframe<T> LayerPropertyKeyframe { get; }
     public ObservableCollection<TimelineEasingViewModel> EasingViewModels { get; }
-    public ReactiveCommand<Unit, Unit> Duplicate { get; }
-    public ReactiveCommand<Unit, Unit> Copy { get; }
-    public ReactiveCommand<Unit, Unit> Paste { get; }
-    public ReactiveCommand<Unit, Unit> Delete { get; }
 
     public double X
     {
@@ -93,6 +89,11 @@ public class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineK
         Timestamp = $"{Math.Floor(LayerPropertyKeyframe.Position.TotalSeconds):00}.{LayerPropertyKeyframe.Position.Milliseconds:000}";
     }
 
+    public ReactiveCommand<Unit, Unit> Duplicate { get; }
+    public ReactiveCommand<Unit, Unit> Copy { get; }
+    public ReactiveCommand<Unit, Unit> Paste { get; }
+    public ReactiveCommand<Unit, Unit> Delete { get; }
+
     public bool IsSelected => _isSelected?.Value ?? false;
     public TimeSpan Position => LayerPropertyKeyframe.Position;
     public ILayerPropertyKeyframe Keyframe => LayerPropertyKeyframe;

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

@@ -19,16 +19,16 @@ namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Segments;
 public abstract class TimelineSegmentViewModel : ActivatableViewModelBase
 {
     private static readonly TimeSpan NewSegmentLength = TimeSpan.FromSeconds(2);
+    private readonly Dictionary<ILayerPropertyKeyframe, TimeSpan> _originalKeyframePositions = new();
     private readonly IProfileEditorService _profileEditorService;
     private readonly IWindowService _windowService;
     private TimeSpan _initialLength;
-    private readonly Dictionary<ILayerPropertyKeyframe, TimeSpan> _originalKeyframePositions = new();
     private int _pixelsPerSecond;
     private RenderProfileElement? _profileElement;
+    private ReactiveCommand<Unit, Unit>? _removeSegment;
     private ObservableAsPropertyHelper<bool>? _showAddEnd;
     private ObservableAsPropertyHelper<bool>? _showAddMain;
     private ObservableAsPropertyHelper<bool>? _showAddStart;
-    private ReactiveCommand<Unit, Unit>? _removeSegment;
 
     protected TimelineSegmentViewModel(IProfileEditorService profileEditorService, IWindowService windowService)
     {
@@ -62,28 +62,22 @@ public abstract class TimelineSegmentViewModel : ActivatableViewModelBase
                 .DisposeWith(d);
 
             if (Type == ResizeTimelineSegment.SegmentType.Start)
-            {
                 RemoveSegment = ReactiveCommand.Create(
                     ExecuteRemoveSegment,
                     this.WhenAnyValue(vm => vm.ShowAddMain).CombineLatest(this.WhenAnyValue(vm => vm.ShowAddEnd)).Select(tuple => !tuple.First || !tuple.Second)
                 );
-            }
 
             if (Type == ResizeTimelineSegment.SegmentType.Main)
-            {
                 RemoveSegment = ReactiveCommand.Create(
                     ExecuteRemoveSegment,
                     this.WhenAnyValue(vm => vm.ShowAddEnd).CombineLatest(this.WhenAnyValue(vm => vm.ShowAddStart)).Select(tuple => !tuple.First || !tuple.Second)
                 );
-            }
 
             if (Type == ResizeTimelineSegment.SegmentType.End)
-            {
                 RemoveSegment = ReactiveCommand.Create(
                     ExecuteRemoveSegment,
                     this.WhenAnyValue(vm => vm.ShowAddStart).CombineLatest(this.WhenAnyValue(vm => vm.ShowAddMain)).Select(tuple => !tuple.First || !tuple.Second)
                 );
-            }
         });
     }
 
@@ -167,12 +161,44 @@ public abstract class TimelineSegmentViewModel : ActivatableViewModelBase
         TimeSpan time = TimeSpan.FromMilliseconds(Math.Max(GetTimeFromX(x, snap, round).TotalMilliseconds, 100));
         if (_initialLength == time)
             return;
-        
+
         using ProfileEditorCommandScope scope = _profileEditorService.CreateCommandScope("Resize segment");
         ApplyPendingKeyframeMovement();
         _profileEditorService.ExecuteCommand(new ResizeTimelineSegment(Type, _profileElement, time, _initialLength));
     }
 
+    protected TimeSpan GetTimeFromX(double x, bool snap, bool round)
+    {
+        TimeSpan time = TimeSpan.FromSeconds(x / _pixelsPerSecond);
+        if (time < TimeSpan.Zero)
+            time = TimeSpan.Zero;
+
+        if (round)
+            time = _profileEditorService.RoundTime(time);
+        if (snap)
+            time = SnapToTimeline(time);
+
+        return time;
+    }
+
+    protected void ShiftKeyframes(IEnumerable<ILayerPropertyKeyframe> keyframes, TimeSpan amount)
+    {
+        foreach (ILayerPropertyKeyframe layerPropertyKeyframe in keyframes)
+        {
+            if (!_originalKeyframePositions.ContainsKey(layerPropertyKeyframe))
+                _originalKeyframePositions[layerPropertyKeyframe] = layerPropertyKeyframe.Position;
+            layerPropertyKeyframe.Position = layerPropertyKeyframe.Position.Add(amount);
+        }
+    }
+
+    protected void ApplyPendingKeyframeMovement()
+    {
+        foreach ((ILayerPropertyKeyframe keyframe, TimeSpan originalPosition) in _originalKeyframePositions)
+            _profileEditorService.ExecuteCommand(new MoveKeyframe(keyframe, keyframe.Position, originalPosition));
+
+        _originalKeyframePositions.Clear();
+    }
+
     private void ExecuteRemoveSegment()
     {
         if (_profileElement == null)
@@ -210,38 +236,6 @@ public abstract class TimelineSegmentViewModel : ActivatableViewModelBase
             .ShowAsync();
     }
 
-    protected TimeSpan GetTimeFromX(double x, bool snap, bool round)
-    {
-        TimeSpan time = TimeSpan.FromSeconds(x / _pixelsPerSecond);
-        if (time < TimeSpan.Zero)
-            time = TimeSpan.Zero;
-
-        if (round)
-            time = _profileEditorService.RoundTime(time);
-        if (snap)
-            time = SnapToTimeline(time);
-
-        return time;
-    }
-
-    protected void ShiftKeyframes(IEnumerable<ILayerPropertyKeyframe> keyframes, TimeSpan amount)
-    {
-        foreach (ILayerPropertyKeyframe layerPropertyKeyframe in keyframes)
-        {
-            if (!_originalKeyframePositions.ContainsKey(layerPropertyKeyframe))
-                _originalKeyframePositions[layerPropertyKeyframe] = layerPropertyKeyframe.Position;
-            layerPropertyKeyframe.Position = layerPropertyKeyframe.Position.Add(amount);
-        }
-    }
-
-    protected void ApplyPendingKeyframeMovement()
-    {
-        foreach ((ILayerPropertyKeyframe keyframe, TimeSpan originalPosition) in _originalKeyframePositions)
-            _profileEditorService.ExecuteCommand(new MoveKeyframe(keyframe, keyframe.Position, originalPosition));
-
-        _originalKeyframePositions.Clear();
-    }
-
     private TimeSpan SnapToTimeline(TimeSpan time)
     {
         TimeSpan tolerance = TimeSpan.FromMilliseconds(1000f / _pixelsPerSecond * 5);

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/TimelinePropertyViewModel.cs

@@ -15,8 +15,8 @@ namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
 
 public class TimelinePropertyViewModel<T> : ActivatableViewModelBase, ITimelinePropertyViewModel
 {
-    private readonly IProfileEditorService _profileEditorService;
     private readonly SourceList<LayerPropertyKeyframe<T>> _keyframes;
+    private readonly IProfileEditorService _profileEditorService;
     private ObservableAsPropertyHelper<bool>? _keyframesEnabled;
 
     public TimelinePropertyViewModel(LayerProperty<T> layerProperty, PropertyViewModel propertyViewModel, IProfileEditorService profileEditorService)

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetView.axaml.cs

@@ -1,13 +1,12 @@
 using Artemis.Core.LayerBrushes;
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs;
 
-public partial class LayerBrushPresetView : ReactiveUserControl<LayerBrushPresetViewModel>
+public class LayerBrushPresetView : ReactiveUserControl<LayerBrushPresetViewModel>
 {
     public LayerBrushPresetView()
     {

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Tree/Dialogs/LayerBrushPresetViewModel.cs

@@ -1,13 +1,8 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Reactive.Linq;
-using Artemis.Core;
 using Artemis.Core.LayerBrushes;
-using Artemis.Core.LayerEffects;
-using Artemis.Core.Services;
 using Artemis.UI.Shared;
-using Artemis.UI.Shared.Services.ProfileEditor;
-using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using DynamicData;
 using ReactiveUI;
 
@@ -48,7 +43,7 @@ public class LayerBrushPresetViewModel : ContentDialogViewModelBase
         preset.Apply();
         ContentDialog?.Hide();
     }
-    
+
     private Func<ILayerBrushPreset, bool> CreatePredicate(string? search)
     {
         if (string.IsNullOrWhiteSpace(search))

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/BrushConfigurationWindowView.axaml.cs

@@ -8,7 +8,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Properties.Windows;
 public class BrushConfigurationWindowView : ReactiveCoreWindow<BrushConfigurationWindowViewModel>
 {
     private bool _canClose;
-    
+
     public BrushConfigurationWindowView()
     {
         InitializeComponent();
@@ -27,7 +27,7 @@ public class BrushConfigurationWindowView : ReactiveCoreWindow<BrushConfiguratio
     {
         if (_canClose)
             return;
-        
+
         e.Cancel = true;
         if (ViewModel == null || await ViewModel.CanClose())
         {

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Windows/EffectConfigurationWindowView.axaml.cs

@@ -27,7 +27,7 @@ public class EffectConfigurationWindowView : ReactiveCoreWindow<EffectConfigurat
     {
         if (_canClose)
             return;
-        
+
         e.Cancel = true;
         if (ViewModel == null || await ViewModel.CanClose())
         {

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

@@ -74,6 +74,23 @@ public class VisualEditorViewModel : ActivatableViewModelBase
     public ReadOnlyObservableCollection<IVisualizerViewModel> Visualizers { get; }
     public ObservableCollection<ArtemisDevice> Devices { get; }
 
+    public void SetTools(SourceList<IToolViewModel> tools)
+    {
+        tools.Connect()
+            .AutoRefreshOnObservable(t => t.WhenAnyValue(vm => vm.IsSelected))
+            .Filter(t => t.IsSelected)
+            .Bind(out ReadOnlyObservableCollection<IToolViewModel> selectedTools)
+            .Subscribe();
+        Tools = selectedTools;
+    }
+
+    public void RequestAutoFit()
+    {
+        AutoFitRequested?.Invoke(this, EventArgs.Empty);
+    }
+
+    public event EventHandler? AutoFitRequested;
+
     private void RemoveElement(EventPattern<ProfileElementEventArgs> eventPattern)
     {
         List<IVisualizerViewModel> visualizers = Visualizers.Where(v => v.ProfileElement == eventPattern.EventArgs.ProfileElement).ToList();
@@ -104,21 +121,4 @@ public class VisualEditorViewModel : ActivatableViewModelBase
         visualizerViewModels.Add(_vmFactory.LayerShapeVisualizerViewModel(layer));
         visualizerViewModels.Add(_vmFactory.LayerVisualizerViewModel(layer));
     }
-
-    public void SetTools(SourceList<IToolViewModel> tools)
-    {
-        tools.Connect()
-            .AutoRefreshOnObservable(t => t.WhenAnyValue(vm => vm.IsSelected))
-            .Filter(t => t.IsSelected)
-            .Bind(out ReadOnlyObservableCollection<IToolViewModel> selectedTools)
-            .Subscribe();
-        Tools = selectedTools;
-    }
-
-    public void RequestAutoFit()
-    {
-        AutoFitRequested?.Invoke(this, EventArgs.Empty);
-    }
-
-    public event EventHandler? AutoFitRequested;
 }

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

@@ -24,13 +24,13 @@ public class ProfileEditorViewModel : MainScreenViewModel
     private readonly IProfileEditorService _profileEditorService;
     private readonly ISettingsService _settingsService;
     private readonly SourceList<IToolViewModel> _tools;
+    private DisplayConditionScriptViewModel? _displayConditionScriptViewModel;
     private ObservableAsPropertyHelper<ProfileEditorHistory?>? _history;
     private ObservableAsPropertyHelper<ProfileConfiguration?>? _profileConfiguration;
-    private ObservableAsPropertyHelper<bool>? _suspendedEditing;
-    private StatusBarViewModel? _statusBarViewModel;
-    private DisplayConditionScriptViewModel? _displayConditionScriptViewModel;
-    private PropertiesViewModel? _propertiesViewModel;
     private ProfileTreeViewModel? _profileTreeViewModel;
+    private PropertiesViewModel? _propertiesViewModel;
+    private StatusBarViewModel? _statusBarViewModel;
+    private ObservableAsPropertyHelper<bool>? _suspendedEditing;
     private VisualEditorViewModel? _visualEditorViewModel;
 
     /// <inheritdoc />
@@ -144,7 +144,7 @@ public class ProfileEditorViewModel : MainScreenViewModel
 
         if (!changed.IsSelected || !changed.IsExclusive)
             return;
-        
+
         // Disable all others if the changed one is selected and exclusive
         _tools.Edit(list =>
         {