From b9a55b896a1bfd5dcf7aa347dd7fc1026f9d5029 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <spoinky.nl@gmail.com>
Date: Tue, 10 May 2016 09:43:34 +0200
Subject: [PATCH] Moved KeyboardProviders to DI

---
 Artemis/Artemis/Artemis.csproj                |  1 -
 .../InjectionModules/ArtemisModules.cs        | 11 +++++++++-
 .../KeyboardProviders/Corsair/CorsairRGB.cs   |  2 +-
 .../KeyboardProviders/ProviderHelper.cs       | 20 -------------------
 Artemis/Artemis/Managers/KeyboardManager.cs   |  4 ++--
 5 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 Artemis/Artemis/KeyboardProviders/ProviderHelper.cs

diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index b84e937a0..c87636a42 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -292,7 +292,6 @@
     <Compile Include="KeyboardProviders\Logitech\Utilities\KeyMap.cs" />
     <Compile Include="KeyboardProviders\Logitech\Utilities\LogitechGSDK.cs" />
     <Compile Include="KeyboardProviders\Logitech\Utilities\OrionUtilities.cs" />
-    <Compile Include="KeyboardProviders\ProviderHelper.cs" />
     <Compile Include="KeyboardProviders\Razer\BlackWidow.cs" />
     <Compile Include="KeyboardProviders\Razer\Utilities\RazerUtilities.cs" />
     <Compile Include="Managers\EffectManager.cs" />
diff --git a/Artemis/Artemis/InjectionModules/ArtemisModules.cs b/Artemis/Artemis/InjectionModules/ArtemisModules.cs
index 63f55cce0..4d981cdad 100644
--- a/Artemis/Artemis/InjectionModules/ArtemisModules.cs
+++ b/Artemis/Artemis/InjectionModules/ArtemisModules.cs
@@ -1,4 +1,8 @@
-using Artemis.Modules.Effects.AudioVisualizer;
+using Artemis.KeyboardProviders;
+using Artemis.KeyboardProviders.Corsair;
+using Artemis.KeyboardProviders.Logitech;
+using Artemis.KeyboardProviders.Razer;
+using Artemis.Modules.Effects.AudioVisualizer;
 using Artemis.Modules.Effects.Debug;
 using Artemis.Modules.Effects.TypeWave;
 using Artemis.Modules.Games.CounterStrike;
@@ -31,6 +35,11 @@ namespace Artemis.InjectionModules
 
             // Overlays
             Bind<OverlayViewModel>().To<VolumeDisplayViewModel>().InSingletonScope();
+
+            // Keyboard Providers
+            Bind<KeyboardProvider>().To<CorsairRGB>().InSingletonScope();
+            Bind<KeyboardProvider>().To<Orion>().InSingletonScope();
+            Bind<KeyboardProvider>().To<BlackWidow>().InSingletonScope();
         }
     }
 }
\ No newline at end of file
diff --git a/Artemis/Artemis/KeyboardProviders/Corsair/CorsairRGB.cs b/Artemis/Artemis/KeyboardProviders/Corsair/CorsairRGB.cs
index a3a674566..93069f2c2 100644
--- a/Artemis/Artemis/KeyboardProviders/Corsair/CorsairRGB.cs
+++ b/Artemis/Artemis/KeyboardProviders/Corsair/CorsairRGB.cs
@@ -13,7 +13,7 @@ using Point = System.Drawing.Point;
 
 namespace Artemis.KeyboardProviders.Corsair
 {
-    internal class CorsairRGB : KeyboardProvider
+    public class CorsairRGB : KeyboardProvider
     {
         private CorsairKeyboard _keyboard;
 
diff --git a/Artemis/Artemis/KeyboardProviders/ProviderHelper.cs b/Artemis/Artemis/KeyboardProviders/ProviderHelper.cs
deleted file mode 100644
index a28ef0f8b..000000000
--- a/Artemis/Artemis/KeyboardProviders/ProviderHelper.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using Artemis.KeyboardProviders.Corsair;
-using Artemis.KeyboardProviders.Logitech;
-using Artemis.KeyboardProviders.Razer;
-
-namespace Artemis.KeyboardProviders
-{
-    public static class ProviderHelper
-    {
-        public static List<KeyboardProvider> GetKeyboardProviders()
-        {
-            return new List<KeyboardProvider>
-            {
-                new CorsairRGB(),
-                new Orion(),
-                new BlackWidow()
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Artemis/Artemis/Managers/KeyboardManager.cs b/Artemis/Artemis/Managers/KeyboardManager.cs
index 34542cd1c..5d0e72ad1 100644
--- a/Artemis/Artemis/Managers/KeyboardManager.cs
+++ b/Artemis/Artemis/Managers/KeyboardManager.cs
@@ -20,13 +20,13 @@ namespace Artemis.Managers
         private readonly ILogger _logger;
         private KeyboardProvider _activeKeyboard;
 
-        public KeyboardManager(IEventAggregator events, ILogger logger)
+        public KeyboardManager(IEventAggregator events, ILogger logger, List<KeyboardProvider> keyboardProviders)
         {
             _logger = logger;
             _logger.Info("Intializing KeyboardManager");
 
             _events = events;
-            KeyboardProviders = ProviderHelper.GetKeyboardProviders();
+            KeyboardProviders = keyboardProviders;
 
             _logger.Info("Intialized KeyboardManager");
         }