Meta - Code cleanup

src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs

@@ -8,7 +8,6 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Artemis.Core.Models.Surface;
 using RGB.NET.Core;
-using Stylet;
 
 namespace Artemis.UI.Shared.Controls
 {
@@ -37,19 +36,6 @@ namespace Artemis.UI.Shared.Controls
             Unloaded += (sender, args) => SubscribeToUpdate(false);
         }
 
-        private void SubscribeToUpdate(bool subscribe)
-        {
-            if (_subscribed == subscribe)
-                return;
-
-            if (subscribe)
-                RGBSurface.Instance.Updated += RgbSurfaceOnUpdated;
-            else
-                RGBSurface.Instance.Updated -= RgbSurfaceOnUpdated;
-
-            _subscribed = subscribe;
-        }
-
         public ArtemisDevice Device
         {
             get => (ArtemisDevice) GetValue(DeviceProperty);
@@ -99,6 +85,19 @@ namespace Artemis.UI.Shared.Controls
             drawingContext.DrawDrawing(_backingStore);
         }
 
+        private void SubscribeToUpdate(bool subscribe)
+        {
+            if (_subscribed == subscribe)
+                return;
+
+            if (subscribe)
+                RGBSurface.Instance.Updated += RgbSurfaceOnUpdated;
+            else
+                RGBSurface.Instance.Updated -= RgbSurfaceOnUpdated;
+
+            _subscribed = subscribe;
+        }
+
         private static void DevicePropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var deviceVisualizer = (DeviceVisualizer) d;
@@ -180,7 +179,7 @@ namespace Artemis.UI.Shared.Controls
                 foreach (var deviceVisualizerLed in _deviceVisualizerLeds)
                     deviceVisualizerLed.RenderColor(drawingContext, false);
             }
-            
+
             drawingContext.Close();
         }
     }

src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs

@@ -34,6 +34,41 @@ namespace Artemis.UI.Shared.Controls
 
         public Geometry DisplayGeometry { get; private set; }
 
+        public void RenderColor(DrawingContext drawingContext, bool isDimmed)
+        {
+            if (DisplayGeometry == null)
+                return;
+
+            var r = Led.RgbLed.Color.GetR();
+            var g = Led.RgbLed.Color.GetG();
+            var b = Led.RgbLed.Color.GetB();
+
+            drawingContext.DrawRectangle(isDimmed
+                ? new SolidColorBrush(Color.FromArgb(100, r, g, b))
+                : new SolidColorBrush(Color.FromRgb(r, g, b)), null, LedRect);
+        }
+
+        public void RenderImage(DrawingContext drawingContext)
+        {
+            if (LedImage == null)
+                return;
+
+            drawingContext.DrawImage(LedImage, LedRect);
+        }
+
+        public void RenderOpacityMask(DrawingContext drawingContext)
+        {
+            if (DisplayGeometry == null)
+                return;
+
+            var fillBrush = new SolidColorBrush(Color.FromArgb(100, 255, 255, 255));
+            fillBrush.Freeze();
+            var penBrush = new SolidColorBrush(Color.FromArgb(255, 255, 255, 255));
+            penBrush.Freeze();
+
+            drawingContext.DrawGeometry(fillBrush, new Pen(penBrush, 1), DisplayGeometry);
+        }
+
         private void CreateLedGeometry()
         {
             // The minimum required size for geometry to be created
@@ -105,40 +140,5 @@ namespace Artemis.UI.Shared.Controls
                 CreateRectangleGeometry();
             }
         }
-
-        public void RenderColor(DrawingContext drawingContext, bool isDimmed)
-        {
-            if (DisplayGeometry == null)
-                return;
-
-            var r = Led.RgbLed.Color.GetR();
-            var g = Led.RgbLed.Color.GetG();
-            var b = Led.RgbLed.Color.GetB();
-
-            drawingContext.DrawRectangle(isDimmed
-                ? new SolidColorBrush(Color.FromArgb(100, r, g, b))
-                : new SolidColorBrush(Color.FromRgb(r, g, b)), null, LedRect);
-        }
-
-        public void RenderImage(DrawingContext drawingContext)
-        {
-            if (LedImage == null)
-                return;
-
-            drawingContext.DrawImage(LedImage, LedRect);
-        }
-
-        public void RenderOpacityMask(DrawingContext drawingContext)
-        {
-            if (DisplayGeometry == null)
-                return;
-
-            var fillBrush = new SolidColorBrush(Color.FromArgb(100, 255, 255, 255));
-            fillBrush.Freeze();
-            var penBrush = new SolidColorBrush(Color.FromArgb(255, 255, 255, 255));
-            penBrush.Freeze();
-
-            drawingContext.DrawGeometry(fillBrush, new Pen(penBrush, 1), DisplayGeometry);
-        }
     }
 }

src/Artemis.UI.Shared/Controls/DraggableFloat.xaml.cs

@@ -24,13 +24,11 @@ namespace Artemis.UI.Shared.Controls
                 typeof(RoutedPropertyChangedEventHandler<float>),
                 typeof(DraggableFloat));
 
-        public event EventHandler DragStarted;
-        public event EventHandler DragEnded;
+        private bool _calledDragStarted;
 
         private bool _inCallback;
         private Point _mouseDragStartPoint;
         private float _startValue;
-        private bool _calledDragStarted;
 
         public DraggableFloat()
         {
@@ -51,11 +49,24 @@ namespace Artemis.UI.Shared.Controls
 
         public event PropertyChangedEventHandler PropertyChanged;
 
+        public event EventHandler DragStarted;
+        public event EventHandler DragEnded;
+
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
+        protected virtual void OnDragStarted()
+        {
+            DragStarted?.Invoke(this, EventArgs.Empty);
+        }
+
+        protected virtual void OnDragEnded()
+        {
+            DragEnded?.Invoke(this, EventArgs.Empty);
+        }
+
         private static void FloatPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var draggableFloat = (DraggableFloat) d;
@@ -149,15 +160,5 @@ namespace Artemis.UI.Shared.Controls
         {
             return Math.Floor(amountToRound / nearstOf + fairness) * nearstOf;
         }
-
-        protected virtual void OnDragStarted()
-        {
-            DragStarted?.Invoke(this, EventArgs.Empty);
-        }
-
-        protected virtual void OnDragEnded()
-        {
-            DragEnded?.Invoke(this, EventArgs.Empty);
-        }
     }
 }

src/Artemis.UI.Shared/Controls/GradientPicker.xaml

@@ -37,9 +37,10 @@
             Background="{StaticResource Checkerboard}">
         <Rectangle Stroke="{DynamicResource NormalBorderBrush}" Cursor="Hand" MouseUp="UIElement_OnMouseUp">
             <Rectangle.Fill>
-                <LinearGradientBrush GradientStops="{Binding ColorGradient.Stops, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Converter={StaticResource ColorGradientToGradientStopsConverter}}" 
-                                     EndPoint="1,0"
-                                     StartPoint="0,0"/>
+                <LinearGradientBrush
+                    GradientStops="{Binding ColorGradient.Stops, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Converter={StaticResource ColorGradientToGradientStopsConverter}}"
+                    EndPoint="1,0"
+                    StartPoint="0,0" />
             </Rectangle.Fill>
         </Rectangle>
     </Border>

src/Artemis.UI.Shared/Controls/GradientPicker.xaml.cs

@@ -1,11 +1,9 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Colors;
 using Artemis.UI.Shared.Annotations;
 using Artemis.UI.Shared.Services.Interfaces;
@@ -21,9 +19,6 @@ namespace Artemis.UI.Shared.Controls
         private static IGradientPickerService _gradientPickerService;
         private bool _inCallback;
 
-        public event EventHandler DialogOpened;
-        public event EventHandler DialogClosed;
-
         public GradientPicker()
         {
             InitializeComponent();
@@ -63,12 +58,25 @@ namespace Artemis.UI.Shared.Controls
 
         public event PropertyChangedEventHandler PropertyChanged;
 
+        public event EventHandler DialogOpened;
+        public event EventHandler DialogClosed;
+
         [NotifyPropertyChangedInvocator]
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
+        protected virtual void OnDialogOpened()
+        {
+            DialogOpened?.Invoke(this, EventArgs.Empty);
+        }
+
+        protected virtual void OnDialogClosed()
+        {
+            DialogClosed?.Invoke(this, EventArgs.Empty);
+        }
+
         private static void ColorGradientPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var gradientPicker = (GradientPicker) d;
@@ -102,15 +110,5 @@ namespace Artemis.UI.Shared.Controls
             EventManager.RegisterRoutedEvent(nameof(ColorGradient), RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<ColorGradient>), typeof(GradientPicker));
 
         #endregion
-
-        protected virtual void OnDialogOpened()
-        {
-            DialogOpened?.Invoke(this, EventArgs.Empty);
-        }
-
-        protected virtual void OnDialogClosed()
-        {
-            DialogClosed?.Invoke(this, EventArgs.Empty);
-        }
     }
 }