Minor improvements.

GDI unit test, fix typos, extension method to get image, etc.

Author: wischi-chr

src/OpenMacroBoard.SDK/ButtonPressEffectAdapter.cs

@@ -99,12 +99,7 @@ private KeyBitmap ResizeBitmap(KeyBitmap keyBitmap)
             var targetWidth = (int)Math.Round(Config.Scale * keyBitmap.Width);
             var targetHeight = (int)Math.Round(Config.Scale * keyBitmap.Height);
 
-            var smallerImage = Image.LoadPixelData<Bgr24>(
-                bitmapDataAccess.GetData(),
-                keyBitmap.Width,
-                keyBitmap.Height
-            );
-
+            var smallerImage = bitmapDataAccess.ToImage();
             smallerImage.Mutate(x => x.Resize(targetWidth, targetHeight));
 
             var offsetLeft = (int)Math.Round((keyBitmap.Width - targetWidth) * Config.OriginX);

src/OpenMacroBoard.SDK/IKeyBitmapDataAccess.cs

@@ -7,6 +7,16 @@ namespace OpenMacroBoard.SDK
     /// </summary>
     public interface IKeyBitmapDataAccess
     {
+        /// <summary>
+        /// Gets the width of the bitmap.
+        /// </summary>
+        int Width { get; }
+
+        /// <summary>
+        /// Gets the height of the bitmap.
+        /// </summary>
+        int Height { get; }
+
         /// <summary>
         /// Gets a value indicating whether the underlying byte array is null.
         /// </summary>

src/OpenMacroBoard.SDK/KeyBitmapDataAccessExtensions.cs

@@ -0,0 +1,24 @@
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace OpenMacroBoard.SDK
+{
+    /// <summary>
+    /// Extension methods for <see cref="IKeyBitmapDataAccess"/>.
+    /// </summary>
+    public static class KeyBitmapDataAccessExtensions
+    {
+        /// <summary>
+        /// Creates a new <see cref="Image{Bgr24}"/> for this <see cref="IKeyBitmapDataAccess"/>.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Keep in mind that this operation allocates and creates a copy under the hood.
+        /// </para>
+        /// </remarks>
+        public static Image<Bgr24> ToImage(this IKeyBitmapDataAccess dataAccess)
+        {
+            return Image.LoadPixelData<Bgr24>(dataAccess.GetData(), dataAccess.Width, dataAccess.Height);
+        }
+    }
+}

src/OpenMacroBoard.Tests/DeviceContextTests.cs

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using OpenMacroBoard.SDK;
 using System;
 using System.Collections.Generic;
@@ -186,7 +186,7 @@ public IDisposable Subscribe(IObserver<DeviceStateReport> observer)
             }
         }
 
-        private class DoNothingDisposable : IDisposable
+        private sealed class DoNothingDisposable : IDisposable
         {
             public static IDisposable Instance { get; } = new DoNothingDisposable();
 

src/OpenMacroBoard.Tests/ExtendedVerifierImageExtensions.cs

@@ -1,4 +1,7 @@
 using OpenMacroBoard.Meta.TestUtils;
+using OpenMacroBoard.SDK;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 using System.Threading.Tasks;
 
 namespace OpenMacroBoard.Tests
@@ -17,5 +20,17 @@ await settings
                 .WithExtension("png")
                 .VerifyAsync(target.BoardImage);
         }
+
+        public static Task VerifyAsync(this ExtendedVerifySettings settings, KeyBitmap keyBitmap)
+        {
+            var dataAccess = (IKeyBitmapDataAccess)keyBitmap;
+
+            using var img = dataAccess.ToImage();
+
+            return settings
+                .WithFileNameSuffix("_KeyBitmapImg")
+                .WithExtension("png")
+                .VerifyAsync(img);
+        }
     }
 }

src/OpenMacroBoard.Tests/FakeMacroBoard.cs

@@ -125,12 +125,7 @@ public void SetKeyBitmap(int keyId, KeyBitmap bitmapData)
             else
             {
                 // load given image
-                using var keyImage = Image.LoadPixelData<Bgr24>(
-                    dataAccess.GetData(),
-                    bitmapData.Width,
-                    bitmapData.Height
-                );
-
+                using var keyImage = dataAccess.ToImage();
                 ResizeAndApplyImage(keyId, keyImage);
             }
         }

src/OpenMacroBoard.Tests/KeyBitmapFactoryTests.cs

@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit;
 
-namespace StreamDeckSharp.Tests
+namespace OpenMacroBoard.Tests
 {
     public class KeyBitmapFactoryTests
     {

src/OpenMacroBoard.Tests/KeyBitmapFactoryVisualTests.cs

@@ -0,0 +1,37 @@
+using OpenMacroBoard.Meta.TestUtils;
+using OpenMacroBoard.SDK;
+using System.Drawing;
+using System.Runtime.Versioning;
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+namespace OpenMacroBoard.Tests
+{
+    [UsesVerify]
+    public class KeyBitmapFactoryVisualTests
+    {
+        public ExtendedVerifySettings Verifier { get; } = DefaultVerifySettings.Build();
+
+        [Fact]
+        [SupportedOSPlatform("windows")]
+        public async Task GDI_arc_is_drawn_correctly()
+        {
+            Verifier.Initialize();
+            Verifier.UseFileNameAsDirectory();
+
+            var key = KeyBitmap.Create
+                .FromGraphics(
+                    width: 64,
+                    height: 64,
+                    g =>
+                    {
+                        g.Clear(Color.Red);
+                        g.DrawArc(Pens.Blue, new Rectangle(10, 10, 40, 40), 10, 180);
+                    }
+                );
+
+            await Verifier.VerifyAsync(key);
+        }
+    }
+}

src/OpenMacroBoard.Tests/KeyBitmapTests.cs

@@ -39,7 +39,7 @@ public void NegativeOrZeroHeightCausesConstructorToThrow()
         }
 
         [Fact]
-        public void ImageDataArrayLengthMissmatchThrowsException()
+        public void ImageDataArrayLengthMismatchThrowsException()
         {
             Action act_correctParams = () => _ = KeyBitmap.Create.FromBgr24Array(2, 2, new byte[12]);
             Action act_incorrectParams = () => _ = KeyBitmap.Create.FromBgr24Array(3, 3, new byte[5]);
@@ -122,11 +122,14 @@ public void AllEqualityMethodsBehaveTheSameWay()
             var key2 = KeyBitmap.Create.FromBgr24Array(1, 1, key2Data);
             var key3 = KeyBitmap.Create.FromBgr24Array(1, 1, new byte[3]);
 
+
             var equalityMethods = new List<Func<KeyBitmap, KeyBitmap, bool>>()
             {
                 KeyBitmap.Equals,
                 (a,b) => a == b,
+                #pragma warning disable S1940 // Boolean checks should not be inverted
                 (a,b) => !(a != b),
+                #pragma warning restore S1940
                 (a,b) => a.Equals(b),
             };
 
@@ -140,7 +143,7 @@ public void AllEqualityMethodsBehaveTheSameWay()
         }
 
         [Fact]
-        public void HashCodesDontMatchEasilyForDifferentObjects()
+        public void HashCodesDonNotMatchEasilyForDifferentObjects()
         {
             var key2Data = new byte[3] { 1, 2, 3 };
 

src/OpenMacroBoard.Tests/KeyBitmapVisualTests.cs

@@ -18,7 +18,7 @@ public class KeyBitmapVisualTests
 
         [Theory]
         [ClassData(typeof(DeviceGridKeyPositionDataProvider))]
-        public async Task FakeMacroboardSelfCheck(string deviceName, GridKeyLayout keys)
+        public async Task FakeMacroBoardSelfCheck(string deviceName, GridKeyLayout keys)
         {
             Verifier.Initialize();
 
@@ -185,7 +185,7 @@ async Task TestKey(KeyBitmap key, string state)
         }
 
         [Fact]
-        public async Task BitmapKeyChannelsWorkAsExpectedFor32bitExtentsions()
+        public async Task BitmapKeyChannelsWorkAsExpectedFor32bitExtensions()
         {
             Verifier.Initialize();
             Verifier.UseFileNameAsDirectory();