Shared UI - Resolved all remaining warnings

UI - Resolved all remaining warnings
Layer properties - Fixed DisableKeyframes layer property attribute not being applied

src/Artemis.UI/Screens/Modules/Tabs/ActivationRequirementViewModel.cs

@@ -1,11 +1,12 @@
-using System.Timers;
+using System;
+using System.Timers;
 using Artemis.Core.Modules;
 using Humanizer;
 using Stylet;
 
 namespace Artemis.UI.Screens.Modules.Tabs
 {
-    public class ActivationRequirementViewModel : Screen
+    public sealed class ActivationRequirementViewModel : Screen, IDisposable
     {
         private readonly IModuleActivationRequirement _activationRequirement;
         private readonly Timer _updateTimer;
@@ -60,5 +61,15 @@ namespace Artemis.UI.Screens.Modules.Tabs
             RequirementDescription = _activationRequirement.GetUserFriendlyDescription();
             RequirementMet = _activationRequirement.Evaluate();
         }
+
+        #region IDisposable
+        
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            _updateTimer?.Dispose();
+        }
+
+        #endregion
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Conditions/Abstract/DataModelConditionPredicateViewModel.cs

@@ -5,27 +5,25 @@ using System.Windows;
 using System.Windows.Media;
 using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Input;
 using Artemis.UI.Shared.Services;
 using Stylet;
 
-namespace Artemis.UI.Screens.ProfileEditor.Conditions
+namespace Artemis.UI.Screens.ProfileEditor.Conditions.Abstract
 {
     public abstract class DataModelConditionPredicateViewModel : DataModelConditionViewModel, IDisposable
     {
         private readonly IConditionOperatorService _conditionOperatorService;
         private readonly IDataModelUIService _dataModelUIService;
         private readonly IProfileEditorService _profileEditorService;
-        private BindableCollection<BaseConditionOperator> _operators;
         private DataModelStaticViewModel _rightSideInputViewModel;
         private DataModelDynamicViewModel _rightSideSelectionViewModel;
         private BaseConditionOperator _selectedOperator;
 
         private List<Type> _supportedInputTypes;
 
-        public DataModelConditionPredicateViewModel(
+        protected DataModelConditionPredicateViewModel(
             DataModelConditionPredicate dataModelConditionPredicate,
             IProfileEditorService profileEditorService,
             IDataModelUIService dataModelUIService,
@@ -199,17 +197,27 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
         #region IDisposable
 
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (LeftSideSelectionViewModel != null)
+                {
+                    LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
+                    LeftSideSelectionViewModel.Dispose();
+                    LeftSideSelectionViewModel = null;
+                }
+
+                DisposeRightSideStaticViewModel();
+                DisposeRightSideDynamicViewModel();
+            }
+        }
+
+        /// <inheritdoc />
         public void Dispose()
         {
-            if (LeftSideSelectionViewModel != null)
-            {
-                LeftSideSelectionViewModel.PropertySelected -= LeftSideOnPropertySelected;
-                LeftSideSelectionViewModel.Dispose();
-                LeftSideSelectionViewModel = null;
-            }
-
-            DisposeRightSideStaticViewModel();
-            DisposeRightSideDynamicViewModel();
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         #endregion
@@ -284,7 +292,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             Update();
         }
 
-        private void RightSideInputViewModelOnSwitchToDynamicRequested(object? sender, EventArgs e)
+        private void RightSideInputViewModelOnSwitchToDynamicRequested(object sender, EventArgs e)
         {
             DataModelConditionPredicate.PredicateType = ProfileRightSideType.Dynamic;
             Update();

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionEventViewModel.cs

@@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services;
 
 namespace Artemis.UI.Screens.ProfileEditor.Conditions
 {
-    public class DataModelConditionEventViewModel : DataModelConditionViewModel, IDisposable
+    public sealed class DataModelConditionEventViewModel : DataModelConditionViewModel, IDisposable
     {
         private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
         private readonly IDataModelUIService _dataModelUIService;
@@ -90,7 +90,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
         #region Event handlers
 
-        private void LeftSideSelectionViewModelOnPropertySelected(object? sender, DataModelInputDynamicEventArgs e)
+        private void LeftSideSelectionViewModelOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             ApplyEvent();
         }
@@ -104,7 +104,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             LeftSideSelectionViewModel.Dispose();
             LeftSideSelectionViewModel.PropertySelected -= LeftSideSelectionViewModelOnPropertySelected;
         }
-
+        
         #endregion
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Conditions/DataModelConditionListViewModel.cs

@@ -11,7 +11,7 @@ using Humanizer;
 
 namespace Artemis.UI.Screens.ProfileEditor.Conditions
 {
-    public class DataModelConditionListViewModel : DataModelConditionViewModel, IDisposable
+    public sealed class DataModelConditionListViewModel : DataModelConditionViewModel, IDisposable
     {
         private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
         private readonly IDataModelUIService _dataModelUIService;
@@ -92,7 +92,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
 
             Update();
         }
-        
+
         public override void Update()
         {
             LeftSideSelectionViewModel.ChangeDataModelPath(DataModelConditionList.ListPath);
@@ -130,15 +130,19 @@ namespace Artemis.UI.Screens.ProfileEditor.Conditions
             base.OnInitialActivate();
         }
 
-        private void LeftSideSelectionViewModelOnPropertySelected(object? sender, DataModelInputDynamicEventArgs e)
+        private void LeftSideSelectionViewModelOnPropertySelected(object sender, DataModelInputDynamicEventArgs e)
         {
             ApplyList();
         }
 
+        #region IDisposable
+
         public void Dispose()
         {
             LeftSideSelectionViewModel.Dispose();
             LeftSideSelectionViewModel.PropertySelected -= LeftSideSelectionViewModelOnPropertySelected;
         }
+
+        #endregion
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionEventPredicateViewModel.cs

@@ -5,6 +5,7 @@ using System.Windows.Media;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Extensions;
+using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionGeneralPredicateViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 

src/Artemis.UI/Screens/ProfileEditor/Conditions/Predicate/DataModelConditionListPredicateViewModel.cs

@@ -5,6 +5,7 @@ using System.Windows.Media;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Extensions;
+using Artemis.UI.Screens.ProfileEditor.Conditions.Abstract;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 

src/Artemis.UI/Screens/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs

@@ -114,7 +114,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
             RenderProfileElement.DisplayCondition.ChildRemoved += DisplayConditionOnChildrenModified;
         }
 
-        private void DisplayConditionOnChildrenModified(object? sender, EventArgs e)
+        private void DisplayConditionOnChildrenModified(object sender, EventArgs e)
         {
             DisplayStartHint = !RenderProfileElement.DisplayCondition.Children.Any();
             IsEventCondition = RenderProfileElement.DisplayCondition.Children.Any(c => c is DataModelConditionEvent);

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/ConditionalDataBinding/ConditionalDataBindingModeViewModel.cs

@@ -10,7 +10,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.ConditionalDataBinding
 {
-    public class ConditionalDataBindingModeViewModel<TLayerProperty, TProperty> : Conductor<DataBindingConditionViewModel<TLayerProperty, TProperty>>.Collection.AllActive, IDataBindingModeViewModel
+    public sealed class ConditionalDataBindingModeViewModel<TLayerProperty, TProperty> : Conductor<DataBindingConditionViewModel<TLayerProperty, TProperty>>.Collection.AllActive, IDataBindingModeViewModel
     {
         private readonly IDataBindingsVmFactory _dataBindingsVmFactory;
         private readonly IProfileEditorService _profileEditorService;
@@ -109,7 +109,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
         }
 
         #region IDisposable
-
+        
+        /// <inheritdoc />
         public void Dispose()
         {
             ConditionalDataBinding.ConditionsUpdated -= ConditionalDataBindingOnConditionsUpdated;

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/ConditionalDataBinding/DataBindingConditionViewModel.cs

@@ -10,11 +10,11 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.ConditionalDataBinding
 {
-    public class DataBindingConditionViewModel<TLayerProperty, TProperty> : Conductor<DataModelConditionGroupViewModel>, IDisposable
+    public sealed class DataBindingConditionViewModel<TLayerProperty, TProperty> : Conductor<DataModelConditionGroupViewModel>, IDisposable
     {
-        private readonly IProfileEditorService _profileEditorService;
         private readonly IDataModelConditionsVmFactory _dataModelConditionsVmFactory;
         private readonly IDataModelUIService _dataModelUIService;
+        private readonly IProfileEditorService _profileEditorService;
 
         public DataBindingConditionViewModel(DataBindingCondition<TLayerProperty, TProperty> dataBindingCondition,
             IProfileEditorService profileEditorService,
@@ -44,11 +44,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
             ValueViewModel.Value = DataBindingCondition.Value;
         }
 
-        public void Dispose()
-        {
-            ValueViewModel.Dispose();
-        }
-
         private void ActiveItemOnUpdated(object sender, EventArgs e)
         {
             if (!ActiveItem.GetChildren().Any())
@@ -60,5 +55,15 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.Conditio
             DataBindingCondition.Value = (TProperty) Convert.ChangeType(e.Value, typeof(TProperty));
             _profileEditorService.UpdateSelectedProfileElement();
         }
+
+        #region IDisposable
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            ValueViewModel?.Dispose();
+        }
+
+        #endregion
     }
 }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs

@@ -10,17 +10,17 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
 {
-    public class DataBindingViewModel<TLayerProperty, TProperty> : Conductor<IDataBindingModeViewModel>, IDataBindingViewModel
+    public sealed class DataBindingViewModel<TLayerProperty, TProperty> : Conductor<IDataBindingModeViewModel>, IDataBindingViewModel
     {
         private readonly IDataBindingsVmFactory _dataBindingsVmFactory;
         private readonly IProfileEditorService _profileEditorService;
         private readonly Timer _updateTimer;
+        private bool _applyTestResultToLayer;
         private int _easingTime;
         private bool _isDataBindingEnabled;
         private bool _isEasingTimeEnabled;
         private DataBindingModeType _selectedDataBindingMode;
         private TimelineEasingViewModel _selectedEasingViewModel;
-        private bool _applyTestResultToLayer;
 
         private bool _updating;
         private bool _updatingTestResult;
@@ -46,12 +46,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             TestResultValue = dataModelUIService.GetDataModelDisplayViewModel(typeof(TProperty), null, true);
         }
 
-        protected override void OnInitialActivate()
-        {
-            base.OnInitialActivate();
-            Initialize();
-        }
-
         public DataBindingRegistration<TLayerProperty, TProperty> Registration { get; }
 
         public BindableCollection<ValueDescription> DataBindingModes { get; }
@@ -115,12 +109,10 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             }
         }
 
-        public void Dispose()
+        protected override void OnInitialActivate()
         {
-            _updateTimer.Dispose();
-            _updateTimer.Elapsed -= OnUpdateTimerOnElapsed;
-
-            Registration.LayerProperty.Updated -= LayerPropertyOnUpdated;
+            base.OnInitialActivate();
+            Initialize();
         }
 
         private void Initialize()
@@ -171,18 +163,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             EasingTime = (int) Registration.DataBinding.EasingTime.TotalMilliseconds;
             SelectedEasingViewModel = EasingViewModels.First(vm => vm.EasingFunction == Registration.DataBinding.EasingFunction);
             IsEasingTimeEnabled = EasingTime > 0;
-            switch (Registration.DataBinding.DataBindingMode)
+            SelectedDataBindingMode = Registration.DataBinding.DataBindingMode switch
             {
-                case DirectDataBinding<TLayerProperty, TProperty> _:
-                    SelectedDataBindingMode = DataBindingModeType.Direct;
-                    break;
-                case ConditionalDataBinding<TLayerProperty, TProperty> _:
-                    SelectedDataBindingMode = DataBindingModeType.Conditional;
-                    break;
-                default:
-                    SelectedDataBindingMode = DataBindingModeType.None;
-                    break;
-            }
+                DirectDataBinding<TLayerProperty, TProperty> _ => DataBindingModeType.Direct,
+                ConditionalDataBinding<TLayerProperty, TProperty> _ => DataBindingModeType.Conditional,
+                _ => DataBindingModeType.None
+            };
 
             ActiveItem?.Update();
 
@@ -250,7 +236,9 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
                 TestResultValue.UpdateValue(Registration.DataBinding != null ? Registration.DataBinding.GetValue(currentValue) : default);
             }
             else
+            {
                 TestResultValue.UpdateValue(Registration.DataBinding != null ? Registration.DataBinding.GetValue(default) : default);
+            }
 
             if (ApplyTestResultToLayer)
             {
@@ -288,11 +276,24 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             UpdateTestResult();
         }
 
-        private void LayerPropertyOnUpdated(object? sender, LayerPropertyEventArgs<TLayerProperty> e)
+        private void LayerPropertyOnUpdated(object sender, LayerPropertyEventArgs<TLayerProperty> e)
         {
-            if (ApplyTestResultToLayer) 
+            if (ApplyTestResultToLayer)
                 Registration.DataBinding?.Apply();
         }
+
+        #region IDisposable
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            _updateTimer.Dispose();
+            _updateTimer.Elapsed -= OnUpdateTimerOnElapsed;
+
+            Registration.LayerProperty.Updated -= LayerPropertyOnUpdated;
+        }
+
+        #endregion
     }
 
     public interface IDataBindingViewModel : IScreen, IDisposable

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingsViewModel.cs

@@ -52,7 +52,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
             SelectedItemIndex = 0;
         }
 
-        private void ProfileEditorServiceOnSelectedDataBindingChanged(object? sender, EventArgs e)
+        private void ProfileEditorServiceOnSelectedDataBindingChanged(object sender, EventArgs e)
         {
             CreateDataBindingViewModels();
         }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DirectDataBinding/DataBindingModifierViewModel.cs

@@ -12,7 +12,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDataBinding
 {
-    public class DataBindingModifierViewModel<TLayerProperty, TProperty> : PropertyChangedBase, IDisposable
+    public sealed class DataBindingModifierViewModel<TLayerProperty, TProperty> : PropertyChangedBase, IDisposable
     {
         private readonly IDataBindingService _dataBindingService;
         private readonly IDataModelUIService _dataModelUIService;
@@ -161,6 +161,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
 
         #region IDisposable
 
+        /// <inheritdoc />
         public void Dispose()
         {
             DisposeDynamicSelectionViewModel();
@@ -193,13 +194,13 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
 
         #region Event handlers
 
-        private void DynamicSelectionViewModelOnSwitchToStaticRequested(object? sender, EventArgs e)
+        private void DynamicSelectionViewModelOnSwitchToStaticRequested(object sender, EventArgs e)
         {
             Modifier.ParameterType = ProfileRightSideType.Static;
             Update();
         }
 
-        private void StaticInputViewModelOnSwitchToDynamicRequested(object? sender, EventArgs e)
+        private void StaticInputViewModelOnSwitchToDynamicRequested(object sender, EventArgs e)
         {
             Modifier.ParameterType = ProfileRightSideType.Dynamic;
             Update();

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DirectDataBinding/DirectDataBindingModeViewModel.cs

@@ -12,7 +12,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDataBinding
 {
-    public class DirectDataBindingModeViewModel<TLayerProperty, TProperty> : Screen, IDataBindingModeViewModel
+    public sealed class DirectDataBindingModeViewModel<TLayerProperty, TProperty> : Screen, IDataBindingModeViewModel
     {
         private readonly IDataBindingsVmFactory _dataBindingsVmFactory;
         private readonly IDataModelUIService _dataModelUIService;
@@ -70,6 +70,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings.DirectDa
 
         #region IDisposable
 
+        /// <inheritdoc />
         public void Dispose()
         {
             TargetSelectionViewModel.PropertySelected -= TargetSelectionViewModelOnPropertySelected;

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyGroupViewModel.cs

@@ -9,7 +9,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
 {
-    public class LayerPropertyGroupViewModel : PropertyChangedBase, IDisposable
+    public sealed class LayerPropertyGroupViewModel : PropertyChangedBase, IDisposable
     {
         private readonly ILayerPropertyVmFactory _layerPropertyVmFactory;
         private bool _isVisible;
@@ -40,9 +40,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
             get => _isVisible;
             set => SetAndNotify(ref _isVisible, value);
         }
-
-        public bool IsHighlighted => false;
-
+        
         public bool IsExpanded
         {
             get => LayerPropertyGroup.ProfileElement.IsPropertyGroupExpanded(LayerPropertyGroup);
@@ -53,6 +51,9 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
             }
         }
 
+        #region IDisposable
+        
+        /// <inheritdoc />
         public void Dispose()
         {
             TimelineGroupViewModel.Dispose();
@@ -64,6 +65,8 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
             }
         }
 
+        #endregion
+
         public void UpdateOrder(int order)
         {
             LayerPropertyGroup.LayerEffect.Order = order;
@@ -93,7 +96,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
         /// </summary>
         /// <param name="start">The position at which to start removing keyframes, if null this will start at the first keyframe</param>
         /// <param name="end">The position at which to start removing keyframes, if null this will end at the last keyframe</param>
-        public virtual void WipeKeyframes(TimeSpan? start, TimeSpan? end)
+        public void WipeKeyframes(TimeSpan? start, TimeSpan? end)
         {
             foreach (PropertyChangedBase child in Children)
             {
@@ -139,7 +142,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
             {
                 PropertyDescriptionAttribute propertyAttribute = (PropertyDescriptionAttribute) Attribute.GetCustomAttribute(propertyInfo, typeof(PropertyDescriptionAttribute));
                 PropertyGroupDescriptionAttribute groupAttribute = (PropertyGroupDescriptionAttribute) Attribute.GetCustomAttribute(propertyInfo, typeof(PropertyGroupDescriptionAttribute));
-                object? value = propertyInfo.GetValue(LayerPropertyGroup);
+                object value = propertyInfo.GetValue(LayerPropertyGroup);
 
                 // Create VMs for properties on the group
                 if (propertyAttribute != null && value is ILayerProperty layerProperty)

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs

@@ -7,7 +7,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
 {
-    public class LayerPropertyViewModel : PropertyChangedBase, IDisposable
+    public sealed class LayerPropertyViewModel : PropertyChangedBase, IDisposable
     {
         private bool _isVisible;
         private bool _isHighlighted;

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineGroupViewModel.cs

@@ -7,7 +7,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
-    public class TimelineGroupViewModel : PropertyChangedBase, IDisposable
+    public sealed class TimelineGroupViewModel : PropertyChangedBase, IDisposable
     {
         private readonly IProfileEditorService _profileEditorService;
 

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineKeyframeViewModel.cs

@@ -7,11 +7,10 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
-    public class TimelineKeyframeViewModel<T> : Screen, ITimelineKeyframeViewModel
+    public sealed class TimelineKeyframeViewModel<T> : Screen, ITimelineKeyframeViewModel
     {
         private readonly IProfileEditorService _profileEditorService;
 
-        private BindableCollection<TimelineEasingViewModel> _easingViewModels;
         private bool _isSelected;
         private string _timestamp;
         private double _x;
@@ -65,7 +64,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             Timestamp = $"{Math.Floor(LayerPropertyKeyframe.Position.TotalSeconds):00}.{LayerPropertyKeyframe.Position.Milliseconds:000}";
         }
 
-        private void ProfileEditorServiceOnPixelsPerSecondChanged(object? sender, EventArgs e)
+        private void ProfileEditorServiceOnPixelsPerSecondChanged(object sender, EventArgs e)
         {
             Update();
         }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelinePropertyViewModel.cs

@@ -7,7 +7,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
-    public class TimelinePropertyViewModel<T> : Conductor<TimelineKeyframeViewModel<T>>.Collection.AllActive, ITimelinePropertyViewModel
+    public sealed class TimelinePropertyViewModel<T> : Conductor<TimelineKeyframeViewModel<T>>.Collection.AllActive, ITimelinePropertyViewModel
     {
         private readonly IProfileEditorService _profileEditorService;
         private double _width;

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineSegmentViewModel.cs

@@ -7,7 +7,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using Artemis.Core;
-using Artemis.UI.Screens.ProfileEditor.Dialogs;
 using Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -15,19 +14,19 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
-    public class TimelineSegmentViewModel : Screen, IDisposable
+    public sealed class TimelineSegmentViewModel : Screen, IDisposable
     {
         private readonly IDialogService _dialogService;
         private bool _draggingSegment;
+        private bool _segmentEnabled;
+        private TimeSpan _segmentEnd;
+        private TimeSpan _segmentLength;
+        private TimeSpan _segmentStart;
+        private double _segmentStartPosition;
+        private double _segmentWidth;
         private bool _showDisableButton;
         private bool _showRepeatButton;
         private bool _showSegmentName;
-        private TimeSpan _segmentLength;
-        private TimeSpan _segmentStart;
-        private TimeSpan _segmentEnd;
-        private double _segmentWidth;
-        private bool _segmentEnabled;
-        private double _segmentStartPosition;
 
         public TimelineSegmentViewModel(SegmentViewModelType segment, BindableCollection<LayerPropertyGroupViewModel> layerPropertyGroups,
             IProfileEditorService profileEditorService, IDialogService dialogService)
@@ -139,6 +138,40 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             await _dialogService.ShowDialog<TimelineSegmentDialogViewModel>(new Dictionary<string, object> {{"segment", this}});
         }
 
+        public void ShiftNextSegment(TimeSpan amount)
+        {
+            if (Segment == SegmentViewModelType.Start)
+                ShiftKeyframes(SelectedProfileElement.Timeline.StartSegmentEndPosition, null, amount);
+            else if (Segment == SegmentViewModelType.Main)
+                ShiftKeyframes(SelectedProfileElement.Timeline.MainSegmentEndPosition, null, amount);
+            else if (Segment == SegmentViewModelType.End)
+                ShiftKeyframes(SelectedProfileElement.Timeline.EndSegmentEndPosition, null, amount);
+        }
+
+        private void WipeKeyframes(TimeSpan? start, TimeSpan? end)
+        {
+            foreach (LayerPropertyGroupViewModel layerPropertyGroupViewModel in LayerPropertyGroups)
+                layerPropertyGroupViewModel.WipeKeyframes(start, end);
+        }
+
+        private void ShiftKeyframes(TimeSpan? start, TimeSpan? end, TimeSpan amount)
+        {
+            foreach (LayerPropertyGroupViewModel layerPropertyGroupViewModel in LayerPropertyGroups)
+                layerPropertyGroupViewModel.ShiftKeyframes(start, end, amount);
+        }
+
+        #region IDIsposable
+
+        public void Dispose()
+        {
+            ProfileEditorService.PixelsPerSecondChanged -= ProfileEditorServiceOnPixelsPerSecondChanged;
+            ProfileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
+            if (SelectedProfileElement != null)
+                SelectedProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
+        }
+
+        #endregion
+
         #region Updating
 
         private void UpdateHeader()
@@ -283,7 +316,9 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             }
             // If holding down control, round to the closest 50ms
             else if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+            {
                 newTime = TimeSpan.FromMilliseconds(Math.Round(newTime.TotalMilliseconds / 50.0) * 50.0);
+            }
 
             UpdateLength(newTime);
         }
@@ -304,7 +339,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
                 SelectedProfileElement.Timeline.MainSegmentEndPosition = newTime;
             else if (Segment == SegmentViewModelType.End)
                 SelectedProfileElement.Timeline.EndSegmentEndPosition = newTime;
-            
+
             if (difference < TimeSpan.Zero)
                 ShiftNextSegment(difference);
 
@@ -313,21 +348,9 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 
         #endregion
 
-        #region IDIsposable
-
-        public void Dispose()
-        {
-            ProfileEditorService.PixelsPerSecondChanged -= ProfileEditorServiceOnPixelsPerSecondChanged;
-            ProfileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
-            if (SelectedProfileElement != null)
-                SelectedProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
-        }
-
-        #endregion
-
         #region Event handlers
 
-        private void ProfileEditorServiceOnProfileElementSelected(object? sender, RenderProfileElementEventArgs e)
+        private void ProfileEditorServiceOnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
         {
             if (e.PreviousRenderProfileElement != null)
                 e.PreviousRenderProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
@@ -347,34 +370,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
                 NotifyOfPropertyChange(nameof(RepeatSegment));
         }
 
-        private void ProfileEditorServiceOnPixelsPerSecondChanged(object? sender, EventArgs e)
+        private void ProfileEditorServiceOnPixelsPerSecondChanged(object sender, EventArgs e)
         {
             Update();
         }
 
         #endregion
-
-        public void ShiftNextSegment(TimeSpan amount)
-        {
-            if (Segment == SegmentViewModelType.Start)
-                ShiftKeyframes(SelectedProfileElement.Timeline.StartSegmentEndPosition, null, amount);
-            else if (Segment == SegmentViewModelType.Main)
-                ShiftKeyframes(SelectedProfileElement.Timeline.MainSegmentEndPosition, null, amount);
-            else if (Segment == SegmentViewModelType.End)
-                ShiftKeyframes(SelectedProfileElement.Timeline.EndSegmentEndPosition, null, amount);
-        }
-
-        private void WipeKeyframes(TimeSpan? start, TimeSpan? end)
-        {
-            foreach (LayerPropertyGroupViewModel layerPropertyGroupViewModel in LayerPropertyGroups)
-                layerPropertyGroupViewModel.WipeKeyframes(start, end);
-        }
-
-        private void ShiftKeyframes(TimeSpan? start, TimeSpan? end, TimeSpan amount)
-        {
-            foreach (LayerPropertyGroupViewModel layerPropertyGroupViewModel in LayerPropertyGroups)
-                layerPropertyGroupViewModel.ShiftKeyframes(start, end, amount);
-        }
     }
 
     public enum SegmentViewModelType

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Timeline/TimelineViewModel.cs

@@ -6,14 +6,13 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
-using Artemis.Core;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 {
-    public class TimelineViewModel : Screen, IDisposable
+    public sealed class TimelineViewModel : Screen, IDisposable
     {
         private readonly IProfileEditorService _profileEditorService;
         private RectangleGeometry _selectionRectangle;
@@ -88,7 +87,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             Update();
         }
 
-        private void ProfileEditorServiceOnProfileElementSelected(object? sender, RenderProfileElementEventArgs e)
+        private void ProfileEditorServiceOnProfileElementSelected(object sender, RenderProfileElementEventArgs e)
         {
             if (e.PreviousRenderProfileElement != null)
                 e.PreviousRenderProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
@@ -98,6 +97,18 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             Update();
         }
 
+        #region IDisposable
+
+        public void Dispose()
+        {
+            _profileEditorService.PixelsPerSecondChanged -= ProfileEditorServiceOnPixelsPerSecondChanged;
+            _profileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
+            if (_profileEditorService.SelectedProfileElement != null)
+                _profileEditorService.SelectedProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
+        }
+
+        #endregion
+
         #region Command handlers
 
         public void KeyframeMouseDown(object sender, MouseButtonEventArgs e)
@@ -105,8 +116,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
             // if (e.LeftButton == MouseButtonState.Released)
             //     return;
 
-            ITimelineKeyframeViewModel viewModel = (sender as Ellipse)?.DataContext as ITimelineKeyframeViewModel;
-            if (viewModel == null)
+            if (!((sender as Ellipse)?.DataContext is ITimelineKeyframeViewModel viewModel))
                 return;
 
             ((IInputElement) sender).CaptureMouse();
@@ -206,7 +216,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
                 keyframeViewModel.SaveOffsetToKeyframe(sourceKeyframeViewModel);
 
             if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
-            {
                 cursorTime = _profileEditorService.SnapToTimeline(
                     cursorTime,
                     TimeSpan.FromMilliseconds(1000f / _profileEditorService.PixelsPerSecond * 5),
@@ -214,7 +223,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
                     false,
                     keyframeViewModels.Where(k => k != sourceKeyframeViewModel).Select(k => k.Position).ToList()
                 );
-            }
 
             sourceKeyframeViewModel.UpdatePosition(cursorTime);
 
@@ -306,15 +314,11 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
 
                 int clickedIndex = keyframeViewModels.IndexOf(clicked);
                 if (clickedIndex < selectedIndex)
-                {
                     foreach (ITimelineKeyframeViewModel keyframeViewModel in keyframeViewModels.Skip(clickedIndex).Take(selectedIndex - clickedIndex + 1))
                         keyframeViewModel.IsSelected = true;
-                }
                 else
-                {
                     foreach (ITimelineKeyframeViewModel keyframeViewModel in keyframeViewModels.Skip(selectedIndex).Take(clickedIndex - selectedIndex + 1))
                         keyframeViewModel.IsSelected = true;
-                }
             }
             else if (toggle)
             {
@@ -340,17 +344,5 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
         }
 
         #endregion
-
-        #region IDisposable
-
-        public void Dispose()
-        {
-            _profileEditorService.PixelsPerSecondChanged -= ProfileEditorServiceOnPixelsPerSecondChanged;
-            _profileEditorService.ProfileElementSelected -= ProfileEditorServiceOnProfileElementSelected;
-            if (_profileEditorService.SelectedProfileElement != null)
-                _profileEditorService.SelectedProfileElement.Timeline.PropertyChanged -= TimelineOnPropertyChanged;
-        }
-
-        #endregion
     }
 }

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/Tree/TreePropertyViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Linq;
 using Artemis.Core;
 using Artemis.UI.Shared;
@@ -8,7 +7,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 {
-    public class TreePropertyViewModel<T> : Screen, ITreePropertyViewModel
+    public sealed class TreePropertyViewModel<T> : Screen, ITreePropertyViewModel
     {
         private readonly IProfileEditorService _profileEditorService;
         private PropertyInputViewModel<T> _propertyInputViewModel;
@@ -26,7 +25,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
             LayerProperty.DataBindingDisabled += LayerPropertyOnDataBindingChange;
             LayerPropertyViewModel.IsVisible = !LayerProperty.IsHidden;
         }
-        
+
         public LayerProperty<T> LayerProperty { get; }
         public LayerPropertyViewModel LayerPropertyViewModel { get; }
 
@@ -36,22 +35,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
             set => SetAndNotify(ref _propertyInputViewModel, value);
         }
 
-        public bool HasDataBinding => LayerProperty.HasDataBinding;
-        public double GetDepth()
-        {
-            int depth = 0;
-            LayerPropertyGroup current = LayerProperty.LayerPropertyGroup;
-            while (current != null)
-            {
-                depth++;
-                current = current.Parent;
-            }
-
-            return depth;
-        }
-
-        public bool HasPropertyInputViewModel => PropertyInputViewModel != null;
-
         public bool KeyframesEnabled
         {
             get => LayerProperty.KeyframesEnabled;
@@ -66,6 +49,42 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
                 _profileEditorService.ChangeSelectedDataBinding(LayerProperty);
         }
 
+        private void ApplyKeyframesEnabled(bool enable)
+        {
+            // If enabling keyframes for the first time, add a keyframe with the current value at the current position
+            if (enable && !LayerProperty.Keyframes.Any())
+                LayerProperty.AddKeyframe(new LayerPropertyKeyframe<T>(
+                    LayerProperty.CurrentValue,
+                    _profileEditorService.CurrentTime,
+                    Easings.Functions.Linear,
+                    LayerProperty
+                ));
+            // If disabling keyframes, set the base value to the current value
+            else if (!enable && LayerProperty.Keyframes.Any())
+                LayerProperty.BaseValue = LayerProperty.CurrentValue;
+
+            LayerProperty.KeyframesEnabled = enable;
+
+            _profileEditorService.UpdateSelectedProfileElement();
+        }
+
+        public bool HasDataBinding => LayerProperty.HasDataBinding;
+
+        public double GetDepth()
+        {
+            int depth = 0;
+            LayerPropertyGroup current = LayerProperty.LayerPropertyGroup;
+            while (current != null)
+            {
+                depth++;
+                current = current.Parent;
+            }
+
+            return depth;
+        }
+
+        public bool HasPropertyInputViewModel => PropertyInputViewModel != null;
+
         #region IDisposable
 
         public void Dispose()
@@ -79,27 +98,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
 
         #endregion
 
-        private void ApplyKeyframesEnabled(bool enable)
-        {
-            // If enabling keyframes for the first time, add a keyframe with the current value at the current position
-            if (enable && !LayerProperty.Keyframes.Any())
-            {
-                LayerProperty.AddKeyframe(new LayerPropertyKeyframe<T>(
-                    LayerProperty.CurrentValue,
-                    _profileEditorService.CurrentTime,
-                    Easings.Functions.Linear,
-                    LayerProperty
-                ));
-            }
-            // If disabling keyframes, set the base value to the current value
-            else if (!enable && LayerProperty.Keyframes.Any())
-                LayerProperty.BaseValue = LayerProperty.CurrentValue;
-
-            LayerProperty.KeyframesEnabled = enable;
-
-            _profileEditorService.UpdateSelectedProfileElement();
-        }
-
         #region Event handlers
 
         private void ProfileEditorServiceOnSelectedDataBindingChanged(object sender, EventArgs e)
@@ -107,12 +105,12 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Tree
             LayerPropertyViewModel.IsHighlighted = _profileEditorService.SelectedDataBinding == LayerProperty;
         }
 
-        private void LayerPropertyOnVisibilityChanged(object? sender, LayerPropertyEventArgs<T> e)
+        private void LayerPropertyOnVisibilityChanged(object sender, LayerPropertyEventArgs<T> e)
         {
             LayerPropertyViewModel.IsVisible = !LayerProperty.IsHidden;
         }
 
-        private void LayerPropertyOnDataBindingChange(object? sender, LayerPropertyEventArgs<T> e)
+        private void LayerPropertyOnDataBindingChange(object sender, LayerPropertyEventArgs<T> e)
         {
             NotifyOfPropertyChange(nameof(HasDataBinding));
         }

src/Artemis.UI/Screens/ProfileEditor/ProfileTree/TreeItem/LayerViewModel.cs

@@ -21,12 +21,11 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
             _profileEditorService = profileEditorService;
         }
 
-        public async void CopyElement()
+        public void CopyElement()
         {
             Layer layer = Layer.CreateCopy();
             
             _profileEditorService.UpdateSelectedProfile();
-            // await Task.Delay(200);
             _profileEditorService.ChangeSelectedProfileElement(layer);
         }
 

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

@@ -16,9 +16,9 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
     public abstract class TreeItemViewModel : Conductor<TreeItemViewModel>.Collection.AllActive, IDisposable
     {
         private readonly IDialogService _dialogService;
+        private readonly ILayerBrushService _layerBrushService;
         private readonly IProfileEditorService _profileEditorService;
         private readonly IProfileTreeVmFactory _profileTreeVmFactory;
-        private readonly ILayerBrushService _layerBrushService;
         private readonly ISurfaceService _surfaceService;
         private ProfileElement _profileElement;
 
@@ -49,11 +49,6 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
 
         public abstract bool SupportsChildren { get; }
 
-        public void Dispose()
-        {
-            Unsubscribe();
-        }
-
         public List<TreeItemViewModel> GetAllChildren()
         {
             List<TreeItemViewModel> children = new List<TreeItemViewModel>();
@@ -142,7 +137,7 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
             Layer layer = new Layer(ProfileElement, "New layer");
 
             // Could be null if the default brush got disabled
-            LayerBrushDescriptor? brush = _layerBrushService.GetDefaultLayerBrush();
+            LayerBrushDescriptor brush = _layerBrushService.GetDefaultLayerBrush();
             if (brush != null)
                 layer.ChangeLayerBrush(brush);
 
@@ -212,7 +207,6 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
 
             List<TreeItemViewModel> newChildren = new List<TreeItemViewModel>();
             foreach (ProfileElement profileElement in ProfileElement.Children.OrderBy(c => c.Order))
-            {
                 if (profileElement is Folder folder)
                 {
                     if (Items.FirstOrDefault(p => p is FolderViewModel vm && vm.ProfileElement == folder) == null)
@@ -223,7 +217,6 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
                     if (Items.FirstOrDefault(p => p is LayerViewModel vm && vm.ProfileElement == layer) == null)
                         newChildren.Add(_profileTreeVmFactory.LayerViewModel(layer));
                 }
-            }
 
             if (!newChildren.Any())
                 return;
@@ -262,5 +255,21 @@ namespace Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItem
         {
             UpdateProfileElements();
         }
+
+        #region IDisposable
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing) Unsubscribe();
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        #endregion
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileViewModel.cs

@@ -391,7 +391,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
             UpdateCanSelectEditTool();
         }
         
-        private void TransformValueChanged(object? sender, LayerPropertyEventArgs e)
+        private void TransformValueChanged(object sender, LayerPropertyEventArgs e)
         {
             if (ActiveToolIndex != 1)
                 ActivateToolByIndex(1);

src/Artemis.UI/Screens/ProfileEditor/Visualization/Tools/EditToolViewModel.cs

@@ -192,7 +192,7 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
                     height = layer.Transform.Scale.CurrentValue.Height;
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException();
+                    throw new ArgumentOutOfRangeException(nameof(e));
             }
 
             // Make the sides even if shift is held down
@@ -326,10 +326,14 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
             {
                 // Keep the X position static if dragging vertically
                 if (_draggingVertically)
+                {
                     position.X = _dragStart.X;
+                }
                 // Keep the Y position static if dragging horizontally
                 else if (_draggingHorizontally)
+                {
                     position.Y = _dragStart.Y;
+                }
                 // Snap into place only if the mouse moved atleast a full pixel
                 else if (Math.Abs(position.X - _dragStart.X) > 1 || Math.Abs(position.Y - _dragStart.Y) > 1)
                 {
@@ -386,23 +390,23 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 
         #region Private methods
 
-        private SKPoint RoundPoint(SKPoint point, int decimals)
+        private static SKPoint RoundPoint(SKPoint point, int decimals)
         {
             return new SKPoint((float) Math.Round(point.X, decimals, MidpointRounding.AwayFromZero), (float) Math.Round(point.Y, decimals, MidpointRounding.AwayFromZero));
         }
 
-        private SKPoint[] UnTransformPoints(SKPoint[] skPoints, Layer layer, SKPoint pivot, bool includeScale)
+        private static SKPoint[] UnTransformPoints(SKPoint[] skPoints, Layer layer, SKPoint pivot, bool includeScale)
         {
             using SKPath counterRotatePath = new SKPath();
             counterRotatePath.AddPoly(skPoints, false);
-            counterRotatePath.Transform(SKMatrix.MakeRotationDegrees(layer.Transform.Rotation.CurrentValue * -1, pivot.X, pivot.Y));
+            counterRotatePath.Transform(SKMatrix.CreateRotationDegrees(layer.Transform.Rotation.CurrentValue * -1, pivot.X, pivot.Y));
             if (includeScale)
-                counterRotatePath.Transform(SKMatrix.MakeScale(1f / (layer.Transform.Scale.CurrentValue.Width / 100f), 1f / (layer.Transform.Scale.CurrentValue.Height / 100f)));
+                counterRotatePath.Transform(SKMatrix.CreateScale(1f / (layer.Transform.Scale.CurrentValue.Width / 100f), 1f / (layer.Transform.Scale.CurrentValue.Height / 100f)));
 
             return counterRotatePath.Points;
         }
 
-        private Point GetRelativePosition(object sender, MouseEventArgs mouseEventArgs)
+        private static Point GetRelativePosition(object sender, MouseEventArgs mouseEventArgs)
         {
             DependencyObject parent = VisualTreeHelper.GetParent((DependencyObject) sender);
             return mouseEventArgs.GetPosition((IInputElement) parent);
@@ -410,7 +414,6 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 
         private float CalculateAngle(Layer layer, object mouseEventSender, MouseEventArgs mouseEvent)
         {
-            Rect layerBounds = _layerEditorService.GetLayerBounds(layer);
             Point start = _layerEditorService.GetLayerAnchorPosition(layer);
             Point arrival = GetRelativePosition(mouseEventSender, mouseEvent);
 

src/Artemis.UI/Screens/RootViewModel.cs

@@ -20,22 +20,22 @@ using Stylet;
 
 namespace Artemis.UI.Screens
 {
-    public class RootViewModel : Conductor<IScreen>
+    public sealed class RootViewModel : Conductor<IScreen>, IDisposable
     {
         private readonly IRegistrationService _builtInRegistrationService;
         private readonly PluginSetting<ApplicationColorScheme> _colorScheme;
         private readonly ICoreService _coreService;
         private readonly IDebugService _debugService;
         private readonly IEventAggregator _eventAggregator;
+        private readonly Timer _frameTimeUpdateTimer;
         private readonly ISnackbarMessageQueue _snackbarMessageQueue;
         private readonly ThemeWatcher _themeWatcher;
-        private readonly Timer _frameTimeUpdateTimer;
         private readonly PluginSetting<WindowSize> _windowSize;
         private bool _activeItemReady;
+        private string _frameTime;
         private bool _lostFocus;
         private ISnackbarMessageQueue _mainMessageQueue;
         private string _windowTitle;
-        private string _frameTime;
 
         public RootViewModel(
             IEventAggregator eventAggregator,
@@ -64,7 +64,7 @@ namespace Artemis.UI.Screens
             ActiveItem = SidebarViewModel.SelectedItem;
             ActiveItemReady = true;
 
-            AssemblyInformationalVersionAttribute? versionAttribute = typeof(RootViewModel).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            AssemblyInformationalVersionAttribute versionAttribute = typeof(RootViewModel).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
             WindowTitle = $"Artemis {versionAttribute?.InformationalVersion}";
         }
 
@@ -141,19 +141,18 @@ namespace Artemis.UI.Screens
 
         private void UpdateFrameTime()
         {
-            
             FrameTime = $"Frame time: {_coreService.FrameTime.TotalMilliseconds:F2} ms";
         }
-        
+
         private void SidebarViewModelOnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(SidebarViewModel.SelectedItem) && ActiveItem != SidebarViewModel.SelectedItem)
             {
                 SidebarViewModel.IsSidebarOpen = false;
                 // Don't do a fade when selecting a module because the editor is so bulky the animation slows things down
-                if (!(SidebarViewModel.SelectedItem is ModuleRootViewModel)) 
+                if (!(SidebarViewModel.SelectedItem is ModuleRootViewModel))
                     ActiveItemReady = false;
-                
+
                 // Allow the menu to close, it's slower but feels more responsive, funny how that works right
                 Execute.PostToUIThreadAsync(async () =>
                 {
@@ -209,13 +208,25 @@ namespace Artemis.UI.Screens
             ApplyColorSchemeSetting();
         }
 
+        #region IDisposable
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            _frameTimeUpdateTimer?.Dispose();
+        }
+
+        #endregion
+
         #region Overrides of Screen
 
         protected override void OnViewLoaded()
         {
             MaterialWindow window = (MaterialWindow) View;
             if (_windowSize.Value != null)
+            {
                 _windowSize.Value.ApplyToWindow(window);
+            }
             else
             {
                 _windowSize.Value = new WindowSize();
@@ -269,7 +280,7 @@ namespace Artemis.UI.Screens
         protected override void OnClose()
         {
             SidebarViewModel.Dispose();
-            
+
             // Lets force the GC to run after closing the window so it is obvious to users watching task manager
             // that closing the UI will decrease the memory footprint of the application.
             Task.Run(async () =>

src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using System.Timers;
 using Artemis.Core;
@@ -10,14 +10,14 @@ using Stylet;
 
 namespace Artemis.UI.Screens.Settings.Debug.Tabs
 {
-    public class DataModelDebugViewModel : Screen
+    public sealed class DataModelDebugViewModel : Screen, IDisposable
     {
         private readonly IDataModelUIService _dataModelUIService;
         private readonly IPluginManagementService _pluginManagementService;
         private readonly Timer _updateTimer;
+
         private bool _isModuleFilterEnabled;
         private DataModelPropertiesViewModel _mainDataModel;
-        private List<Module> _modules;
         private string _propertySearch;
         private Module _selectedModule;
 
@@ -69,6 +69,17 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
             }
         }
 
+        #region Overrides of Screen
+
+        /// <inheritdoc />
+        protected override void OnClose()
+        {
+            _updateTimer.Dispose();
+            base.OnClose();
+        }
+
+        #endregion
+
         protected override void OnActivate()
         {
             GetDataModel();
@@ -126,5 +137,15 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
             else if (!SelectedModule.IsEnabled)
                 SelectedModule = null;
         }
+
+        #region IDisposable
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            _updateTimer?.Dispose();
+        }
+
+        #endregion
     }
 }

src/Artemis.UI/Screens/Settings/Tabs/Devices/DeviceSettingsTabViewModel.cs

@@ -11,7 +11,6 @@ namespace Artemis.UI.Screens.Settings.Tabs.Devices
     {
         private readonly ISettingsVmFactory _settingsVmFactory;
         private readonly ISurfaceService _surfaceService;
-        private BindableCollection<DeviceSettingsViewModel> _deviceSettingsViewModels;
 
         public DeviceSettingsTabViewModel(ISurfaceService surfaceService, ISettingsVmFactory settingsVmFactory)
         {

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginFeatureViewModel.cs

@@ -125,34 +125,27 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
 
         private PackIconKind GetIconKind()
         {
-            switch (Feature)
+            return Feature switch
             {
-                case BaseDataModelExpansion _:
-                    return PackIconKind.TableAdd;
-                case DeviceProvider _:
-                    return PackIconKind.Devices;
-                case ProfileModule _:
-                    return PackIconKind.VectorRectangle;
-                case Module _:
-                    return PackIconKind.GearBox;
-                case LayerBrushProvider _:
-                    return PackIconKind.Brush;
-                case LayerEffectProvider _:
-                    return PackIconKind.AutoAwesome;
-            }
-
-            return PackIconKind.Plugin;
+                BaseDataModelExpansion => PackIconKind.TableAdd,
+                DeviceProvider => PackIconKind.Devices,
+                ProfileModule => PackIconKind.VectorRectangle,
+                Module => PackIconKind.GearBox,
+                LayerBrushProvider => PackIconKind.Brush,
+                LayerEffectProvider => PackIconKind.AutoAwesome,
+                _ => PackIconKind.Plugin
+            };
         }
 
         #region Event handlers
 
-        private void OnFeatureEnabling(object? sender, PluginFeatureEventArgs e)
+        private void OnFeatureEnabling(object sender, PluginFeatureEventArgs e)
         {
             if (e.PluginFeature != Feature) return;
             Enabling = true;
         }
 
-        private void OnFeatureEnableStopped(object? sender, PluginFeatureEventArgs e)
+        private void OnFeatureEnableStopped(object sender, PluginFeatureEventArgs e)
         {
             if (e.PluginFeature != Feature) return;
             Enabling = false;

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

@@ -146,14 +146,14 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
             NotifyOfPropertyChange(nameof(CanOpenSettings));
         }
 
-        private void PluginOnFeatureRemoved(object? sender, PluginFeatureEventArgs e)
+        private void PluginOnFeatureRemoved(object sender, PluginFeatureEventArgs e)
         {
             PluginFeatureViewModel viewModel = Items.FirstOrDefault(i => i.Feature == e.PluginFeature);
             if (viewModel != null)
                 Items.Remove(viewModel);
         }
 
-        private void PluginOnFeatureAdded(object? sender, PluginFeatureEventArgs e)
+        private void PluginOnFeatureAdded(object sender, PluginFeatureEventArgs e)
         {
             Items.Add(_settingsVmFactory.CreatePluginFeatureViewModel(e.PluginFeature));
         }

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

@@ -22,7 +22,7 @@ using Stylet;
 
 namespace Artemis.UI.Screens.Sidebar
 {
-    public class SidebarViewModel : PropertyChangedBase, IHandle<RequestSelectSidebarItemEvent>, IDisposable
+    public sealed class SidebarViewModel : PropertyChangedBase, IHandle<RequestSelectSidebarItemEvent>, IDisposable
     {
         private readonly Timer _activeModulesUpdateTimer;
         private readonly IKernel _kernel;
@@ -196,16 +196,9 @@ namespace Artemis.UI.Screens.Sidebar
 
         #region IDisposable
 
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-                _activeModulesUpdateTimer?.Dispose();
-        }
-
         public void Dispose()
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            _activeModulesUpdateTimer?.Dispose();
         }
 
         #endregion

src/Artemis.UI/Screens/Splash/SplashViewModel.cs

@@ -81,12 +81,12 @@ namespace Artemis.UI.Screens.Splash
             Status = "Enabling plugin: " + args.Plugin.Info.Name;
         }
 
-        private void PluginManagementServiceOnPluginFeatureEnabling(object? sender, PluginFeatureEventArgs e)
+        private void PluginManagementServiceOnPluginFeatureEnabling(object sender, PluginFeatureEventArgs e)
         {
             Status = "Enabling: " + e.PluginFeature.GetType().Name.Humanize();
         }
 
-        private void PluginManagementServiceOnPluginFeatureEnabled(object? sender, PluginFeatureEventArgs e)
+        private void PluginManagementServiceOnPluginFeatureEnabled(object sender, PluginFeatureEventArgs e)
         {
             Status = "Initializing UI";
         }