finetune

Author: Vit Nemecky

…ts/UI/Images/DeviceImagesResouceTests.cs …s/UI/Images/DeviceImagesResourceTests.csBrickController2/BrickController2.Tests/UI/Images/DeviceImagesResouceTests.cs renamed to BrickController2/BrickController2.Tests/UI/Images/DeviceImagesResourceTests.cs BrickController2/BrickController2.Tests/UI/Images/DeviceImagesResouceTests.cs renamed to BrickController2/BrickController2.Tests/UI/Images/DeviceImagesResourceTests.cs

@@ -9,11 +9,10 @@
 
 namespace BrickController2.Tests.UI.Images;
 
-public class DeviceImagesResouceTests
+public class DeviceImagesResourceTests
 {
     public static IEnumerable<object[]> DeviceTypesData =>
-        Enum.GetValues(typeof(DeviceType))
-            .Cast<DeviceType>()
+        Enum.GetValues<DeviceType>()
             .Where(deviceType => deviceType != DeviceType.Unknown) // Exclude Unknown
             .Select(deviceType => new object[] { deviceType });
 

BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs

@@ -58,6 +58,7 @@ public BuWizz2Device(string name, string address, byte[] deviceData, IEnumerable
 
         public static string TypeName => "BuWizz 2";
         public static DeviceType Type => DeviceType.BuWizz2;
+
         public override DeviceType DeviceType => DeviceType.BuWizz2;
         public override int NumberOfChannels => 4;
         public override int NumberOfOutputLevels => 4;

BrickController2/BrickController2/UI/Converters/DeviceTypeToImageConverter.cs

@@ -10,9 +10,11 @@ public class DeviceTypeToImageConverter : DeviceTypeToImageConverterBase, IValue
     {
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            var deviceType = (DeviceType)value!;
-            var imageInfo = GetImage(deviceType);
-            return ResourceHelper.GetImageResource(imageInfo.ImageResourceName);
+            if (TryGetImage((DeviceType)value!, out var imageInfo))
+            {
+                return ResourceHelper.GetImageResource(imageInfo.ImageResourceName);
+            }
+            return null;
         }
 
         public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)

BrickController2/BrickController2/UI/Converters/DeviceTypeToImageConverterBase.cs

@@ -3,19 +3,22 @@
 using Microsoft.Maui;
 using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace BrickController2.UI.Converters;
 
 public abstract class DeviceTypeToImageConverterBase
 {
-    private readonly Lazy<IDeviceImageRegistry> _registry = new(() => IPlatformApplication.Current?.Services.GetRequiredService<IDeviceImageRegistry>()!);
+    private readonly Lazy<IDeviceImageRegistry> _registry = new(() => IPlatformApplication.Current!.Services.GetRequiredService<IDeviceImageRegistry>());
 
-    public DeviceImageInfo? GetImage(DeviceType deviceType)
+    protected bool TryGetImage(DeviceType deviceType, [NotNullWhen(true)] out DeviceImageInfo? imageInfo)
     {
         if (deviceType != DeviceType.Unknown)
         {
-            return _registry.Value.GetImages(deviceType);
+            imageInfo = _registry.Value.GetImages(deviceType);
+            return true;
         }
-        return null;
+        imageInfo = null;
+        return false;
     }
 }

BrickController2/BrickController2/UI/Converters/DeviceTypeToSmallImageConverter.cs

@@ -10,15 +10,11 @@ public class DeviceTypeToSmallImageConverter : DeviceTypeToImageConverterBase, I
     {
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            var deviceType = (DeviceType)value!;
-            if (deviceType == DeviceType.Unknown)
-                return null;
-
-            var imageInfo = GetImage(deviceType);
-            if (imageInfo is null)
-                return null;
-
-            return ResourceHelper.GetImageResource(imageInfo.SmallImageResourceName);
+            if (TryGetImage((DeviceType)value!, out var imageInfo))
+            {
+                return ResourceHelper.GetImageResource(imageInfo.SmallImageResourceName);
+            }
+            return null;
         }
 
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)

BrickController2/BrickController2/UI/Images/DeviceImageRegistry.cs

@@ -39,13 +39,14 @@ public void Register(DeviceType deviceType, string imageResourceName, string sma
 
     public DeviceImageInfo GetImages(DeviceType deviceType)
     {
-        if (_registry.TryGetValue(deviceType, out var info))
+        if (!_registry.TryGetValue(deviceType, out var info))
         {
-            return info;
+            // Convention-based fallback
+            var typeName = deviceType.ToString().ToLowerInvariant();
+            info = new DeviceImageInfo($"{typeName}_image.png", $"{typeName}_image_small.png");
+            // Cache the convention-based result for future calls
+            _registry[deviceType] = info;
         }
-
-        // Convention-based fallback
-        var typeName = deviceType.ToString().ToLower();
-        return new DeviceImageInfo($"{typeName}_image.png", $"{typeName}_image_small.png");
+        return info;
     }
 }