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);
-        }
     }
 }

src/Artemis.UI.Shared/Converters/ColorGradientToGradientStopsConverter.cs

@@ -3,7 +3,6 @@ using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 using System.Windows.Media;
-using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Colors;
 using SkiaSharp;
 using Stylet;

src/Artemis.UI.Shared/Ninject/Factories/IVMFactory.cs

@@ -1,5 +1,4 @@
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Colors;
+using Artemis.Core.Models.Profile.Colors;
 using Artemis.UI.Shared.Screens.GradientEditor;
 
 namespace Artemis.UI.Shared.Ninject.Factories

src/Artemis.UI.Shared/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using System.Windows;
 
 // Setting ComVisible to false makes the types in this assembly not visible
@@ -24,4 +23,4 @@ using System.Windows;
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
     //(used if a resource is not found in the page,
     // app, or any theme specific resource dictionaries)
-)]
+)]

src/Artemis.UI.Shared/PropertyInput/PropertyInputRegistration.cs

@@ -23,7 +23,7 @@ namespace Artemis.UI.Shared.PropertyInput
         public PluginInfo PluginInfo { get; }
         public Type SupportedType { get; }
         public Type ViewModelType { get; }
-        
+
         internal void Unsubscribe()
         {
             if (PluginInfo != Constants.CorePluginInfo)

src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogView.xaml

@@ -21,7 +21,7 @@
                         <DataTemplate>
                             <StackPanel>
                                 <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Text="Stack trace"
-                                           TextWrapping="Wrap" FontWeight="Bold"/>
+                                           TextWrapping="Wrap" FontWeight="Bold" />
 
                                 <avalonedit:TextEditor SyntaxHighlighting="C#"
                                                        FontFamily="pack://application:,,,/Resources/Fonts/#Roboto Mono"
@@ -31,8 +31,8 @@
                                                        HorizontalScrollBarVisibility="Auto"
                                                        VerticalScrollBarVisibility="Auto"
                                                        MaxWidth="1000"
-                                                       Margin="0 10 10 0" 
-                                                       Padding="10"/>
+                                                       Margin="0 10 10 0"
+                                                       Padding="10" />
 
                                 <Separator Margin="0 15" />
                             </StackPanel>

src/Artemis.UI.Shared/Screens/Dialogs/ExceptionDialogViewModel.cs

@@ -32,13 +32,13 @@ namespace Artemis.UI.Shared.Screens.Dialogs
 
     public class DialogException
     {
-        public Exception Exception { get; }
-        public IDocument Document { get; set; }
-
         public DialogException(Exception exception)
         {
             Exception = exception;
             Document = new TextDocument(new StringTextSource($"{exception.Message}\r\n\r\n{exception.StackTrace}"));
         }
+
+        public Exception Exception { get; }
+        public IDocument Document { get; set; }
     }
 }

src/Artemis.UI.Shared/Screens/GradientEditor/ColorStopViewModel.cs

@@ -1,11 +1,9 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
 using System.Linq;
 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.Utilities;
 using Stylet;
@@ -25,11 +23,6 @@ namespace Artemis.UI.Shared.Screens.GradientEditor
             ColorStop.PropertyChanged += ColorStopOnPropertyChanged;
         }
 
-        private void ColorStopOnPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            _gradientEditorViewModel.ColorGradient.OnColorValuesUpdated();
-        }
-
         public ColorGradientStop ColorStop { get; }
 
         public double Offset
@@ -66,8 +59,13 @@ namespace Artemis.UI.Shared.Screens.GradientEditor
             set => SetAndNotify(ref _willRemoveColorStop, value);
         }
 
+        private void ColorStopOnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            _gradientEditorViewModel.ColorGradient.OnColorValuesUpdated();
+        }
+
         #region Movement
-        
+
         public void StopMouseDown(object sender, MouseButtonEventArgs e)
         {
             e.Handled = true;

src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorViewModel.cs

@@ -4,7 +4,6 @@ using System.Linq;
 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.Services.Dialog;
 using Artemis.UI.Shared.Utilities;

src/Artemis.UI.Shared/Services/Dialog/DialogService.cs

@@ -123,7 +123,7 @@ namespace Artemis.UI.Shared.Services.Dialog
                 else
                     result = DialogHost.Show(view, identifier, viewModel.OnDialogOpened, viewModel.OnDialogClosed);
             });
-            
+
             return await result;
         }
     }

src/Artemis.UI.Shared/Services/GradientPickerService.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Colors;
 using Artemis.UI.Shared.Screens.GradientEditor;
 using Artemis.UI.Shared.Services.Interfaces;

src/Artemis.UI.Shared/Services/Interfaces/IGradientPickerService.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.Colors;
 
 namespace Artemis.UI.Shared.Services.Interfaces

src/Artemis.UI.Shared/Utilities/HitTestUtilities.cs

@@ -7,7 +7,8 @@ namespace Artemis.UI.Shared.Utilities
     public static class HitTestUtilities
     {
         /// <summary>
-        /// Runs a hit test on children of the container within the rectangle matching all elements that have a data context of <see cref="T"/>.
+        ///     Runs a hit test on children of the container within the rectangle matching all elements that have a data context of
+        ///     <see cref="T" />.
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="container"></param>

src/Artemis.UI.Shared/Utilities/ShortcutUtilities.cs

@@ -1,44 +1,17 @@
 using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 namespace Artemis.UI.Shared.Utilities
 {
     public class ShortcutUtilities
     {
-
-        private static Type m_type = Type.GetTypeFromProgID("WScript.Shell");
-        private static object m_shell = Activator.CreateInstance(m_type);
-
-        [ComImport, TypeLibType((short)0x1040), Guid("F935DC23-1CF0-11D0-ADB9-00C04FD58A0B")]
-        private interface IWshShortcut
-        {
-            [DispId(0)]
-            string FullName { [return: MarshalAs(UnmanagedType.BStr)] [DispId(0)] get; }
-            [DispId(0x3e8)]
-            string Arguments { [return: MarshalAs(UnmanagedType.BStr)] [DispId(0x3e8)] get; [param: In, MarshalAs(UnmanagedType.BStr)] [DispId(0x3e8)] set; }
-            [DispId(0x3e9)]
-            string Description { [return: MarshalAs(UnmanagedType.BStr)] [DispId(0x3e9)] get; [param: In, MarshalAs(UnmanagedType.BStr)] [DispId(0x3e9)] set; }
-            [DispId(0x3ea)]
-            string Hotkey { [return: MarshalAs(UnmanagedType.BStr)] [DispId(0x3ea)] get; [param: In, MarshalAs(UnmanagedType.BStr)] [DispId(0x3ea)] set; }
-            [DispId(0x3eb)]
-            string IconLocation { [return: MarshalAs(UnmanagedType.BStr)] [DispId(0x3eb)] get; [param: In, MarshalAs(UnmanagedType.BStr)] [DispId(0x3eb)] set; }
-            [DispId(0x3ec)]
-            string RelativePath { [param: In, MarshalAs(UnmanagedType.BStr)] [DispId(0x3ec)] set; }
-            [DispId(0x3ed)]
-            string TargetPath { [return: MarshalAs(UnmanagedType.BStr)] [DispId(0x3ed)] get; [param: In, MarshalAs(UnmanagedType.BStr)] [DispId(0x3ed)] set; }
-            [DispId(0x3ee)]
-            int WindowStyle { [DispId(0x3ee)] get; [param: In] [DispId(0x3ee)] set; }
-            [DispId(0x3ef)]
-            string WorkingDirectory { [return: MarshalAs(UnmanagedType.BStr)] [DispId(0x3ef)] get; [param: In, MarshalAs(UnmanagedType.BStr)] [DispId(0x3ef)] set; }
-            [TypeLibFunc((short)0x40), DispId(0x7d0)]
-            void Load([In, MarshalAs(UnmanagedType.BStr)] string PathLink);
-            [DispId(0x7d1)]
-            void Save();
-        }
+        private static readonly Type m_type = Type.GetTypeFromProgID("WScript.Shell");
+        private static readonly object m_shell = Activator.CreateInstance(m_type);
 
         public static void Create(string fileName, string targetPath, string arguments, string workingDirectory, string description, string hotkey, string iconPath)
         {
-            IWshShortcut shortcut = (IWshShortcut)m_type.InvokeMember("CreateShortcut", System.Reflection.BindingFlags.InvokeMethod, null, m_shell, new object[] { fileName });
+            var shortcut = (IWshShortcut) m_type.InvokeMember("CreateShortcut", BindingFlags.InvokeMethod, null, m_shell, new object[] {fileName});
             shortcut.Description = description;
             shortcut.Hotkey = hotkey;
             shortcut.TargetPath = targetPath;
@@ -48,5 +21,117 @@ namespace Artemis.UI.Shared.Utilities
                 shortcut.IconLocation = iconPath;
             shortcut.Save();
         }
+
+        [ComImport]
+        [TypeLibType(0x1040)]
+        [Guid("F935DC23-1CF0-11D0-ADB9-00C04FD58A0B")]
+        private interface IWshShortcut
+        {
+            [DispId(0)]
+            string FullName
+            {
+                [return: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0)]
+                get;
+            }
+
+            [DispId(0x3e8)]
+            string Arguments
+            {
+                [return: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3e8)]
+                get;
+                [param: In]
+                [param: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3e8)]
+                set;
+            }
+
+            [DispId(0x3e9)]
+            string Description
+            {
+                [return: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3e9)]
+                get;
+                [param: In]
+                [param: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3e9)]
+                set;
+            }
+
+            [DispId(0x3ea)]
+            string Hotkey
+            {
+                [return: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3ea)]
+                get;
+                [param: In]
+                [param: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3ea)]
+                set;
+            }
+
+            [DispId(0x3eb)]
+            string IconLocation
+            {
+                [return: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3eb)]
+                get;
+                [param: In]
+                [param: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3eb)]
+                set;
+            }
+
+            [DispId(0x3ec)]
+            string RelativePath
+            {
+                [param: In]
+                [param: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3ec)]
+                set;
+            }
+
+            [DispId(0x3ed)]
+            string TargetPath
+            {
+                [return: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3ed)]
+                get;
+                [param: In]
+                [param: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3ed)]
+                set;
+            }
+
+            [DispId(0x3ee)]
+            int WindowStyle
+            {
+                [DispId(0x3ee)]
+                get;
+                [param: In]
+                [DispId(0x3ee)]
+                set;
+            }
+
+            [DispId(0x3ef)]
+            string WorkingDirectory
+            {
+                [return: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3ef)]
+                get;
+                [param: In]
+                [param: MarshalAs(UnmanagedType.BStr)]
+                [DispId(0x3ef)]
+                set;
+            }
+
+            [TypeLibFunc(0x40)]
+            [DispId(0x7d0)]
+            void Load([In] [MarshalAs(UnmanagedType.BStr)] string PathLink);
+
+            [DispId(0x7d1)]
+            void Save();
+        }
     }
 }