Moving Input related classes from Utils to Input folder and namespace

JustoSenka · JustoSenka · commit 905b90fe38c6 · 2019-09-18T21:52:03.000+02:00
diff --git a/Robot/Abstractions/IInputCallbacks.cs b/Robot/Abstractions/IInputCallbacks.cs
@@ -1,4 +1,4 @@
-﻿using Robot.Utils.Win32;
+﻿using Robot.Input;
 using System;
 using System.ComponentModel;
 
diff --git a/Robot/Input/HotkeyCallbacks.cs b/Robot/Input/HotkeyCallbacks.cs
@@ -6,7 +6,7 @@
 using System.Windows.Forms;
 using Unity.Lifetime;
 
-namespace Robot.Utils.Win32
+namespace Robot.Input
 {
     [RegisterTypeToContainer(typeof(IHotkeyCallbacks), typeof(ContainerControlledLifetimeManager))]
     public class HotkeyCallbacks : IHotkeyCallbacks
diff --git a/Robot/Input/InputCallbacks.cs b/Robot/Input/InputCallbacks.cs
@@ -10,7 +10,7 @@
 using RobotRuntime;
 using Unity.Lifetime;
 
-namespace Robot.Utils.Win32
+namespace Robot.Input
 {
     [RegisterTypeToContainer(typeof(IInputCallbacks), typeof(ContainerControlledLifetimeManager))]
     public class InputCallbacks : IInputCallbacks
diff --git a/Robot/Input/KeyEvent.cs b/Robot/Input/KeyEvent.cs
@@ -1,7 +1,7 @@
 ﻿using System.Drawing;
 using System.Windows.Forms;
 
-namespace Robot.Utils.Win32
+namespace Robot.Input
 {
     public enum KeyAction { KeyDown, KeyUp }
 
diff --git a/Robot/RecordingCreation/RecordingManager.cs b/Robot/RecordingCreation/RecordingManager.cs
@@ -1,6 +1,6 @@
 ﻿using Robot.Abstractions;
+using Robot.Input;
 using Robot.Settings;
-using Robot.Utils.Win32;
 using RobotRuntime;
 using RobotRuntime.Abstractions;
 using RobotRuntime.Commands;
@@ -148,7 +148,7 @@ private void RecordCommand(KeyEvent e, Recording activeRecording, RecordingSetti
                         AddCommand(new CommandRelease(e.X, e.Y, false));
                     }
                     // Did not drag a mouse, treat it as a Press
-                    else 
+                    else
                     {
                         AddCommand(new CommandPress(e.X, e.Y, false, mouseButton));
                     }
diff --git a/Robot/Robot.csproj b/Robot/Robot.csproj
@@ -236,10 +236,10 @@
     <Compile Include="Tests\TestFixtureManager.cs" />
     <Compile Include="Tests\TestRunnerManager.cs" />
     <Compile Include="Utils\CodeEditorVS.cs" />
-    <Compile Include="Utils\Win32\HotkeyCallbacks.cs" />
+    <Compile Include="Input\HotkeyCallbacks.cs" />
     <Compile Include="Abstractions\IHotkeyCallbacks.cs" />
-    <Compile Include="Utils\Win32\InputCallbacks.cs" />
-    <Compile Include="Utils\Win32\KeyEvent.cs" />
+    <Compile Include="Input\InputCallbacks.cs" />
+    <Compile Include="Input\KeyEvent.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/RobotRuntime/RobotRuntime.csproj b/RobotRuntime/RobotRuntime.csproj
@@ -356,6 +356,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Input\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\EMGU.CV.3.3.0.2824\build\Emgu.CV.targets" Condition="Exists('..\packages\EMGU.CV.3.3.0.2824\build\Emgu.CV.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Robot.Utils.Win32;`
	`1`	`+using Robot.Input;`
`2`	`2`	`using System;`
`3`	`3`	`using System.ComponentModel;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Windows.Forms;`
`7`	`7`	`using Unity.Lifetime;`
`8`	`8`
`9`		`-namespace Robot.Utils.Win32`
	`9`	`+namespace Robot.Input`
`10`	`10`	`{`
`11`	`11`	`[RegisterTypeToContainer(typeof(IHotkeyCallbacks), typeof(ContainerControlledLifetimeManager))]`
`12`	`12`	`public class HotkeyCallbacks : IHotkeyCallbacks`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using RobotRuntime;`
`11`	`11`	`using Unity.Lifetime;`
`12`	`12`
`13`		`-namespace Robot.Utils.Win32`
	`13`	`+namespace Robot.Input`
`14`	`14`	`{`
`15`	`15`	`[RegisterTypeToContainer(typeof(IInputCallbacks), typeof(ContainerControlledLifetimeManager))]`
`16`	`16`	`public class InputCallbacks : IInputCallbacks`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Drawing;`
`2`	`2`	`using System.Windows.Forms;`
`3`	`3`
`4`		`-namespace Robot.Utils.Win32`
	`4`	`+namespace Robot.Input`
`5`	`5`	`{`
`6`	`6`	`public enum KeyAction { KeyDown, KeyUp }`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Robot.Abstractions;`
	`2`	`+using Robot.Input;`
`2`	`3`	`using Robot.Settings;`
`3`		`-using Robot.Utils.Win32;`
`4`	`4`	`using RobotRuntime;`
`5`	`5`	`using RobotRuntime.Abstractions;`
`6`	`6`	`using RobotRuntime.Commands;`
`@@ -148,7 +148,7 @@ private void RecordCommand(KeyEvent e, Recording activeRecording, RecordingSetti`
`148`	`148`	`AddCommand(new CommandRelease(e.X, e.Y, false));`
`149`	`149`	`}`
`150`	`150`	`// Did not drag a mouse, treat it as a Press`
`151`		`- else`
	`151`	`+ else`
`152`	`152`	`{`
`153`	`153`	`AddCommand(new CommandPress(e.X, e.Y, false, mouseButton));`
`154`	`154`	`}`