Devices - Added input identification

UI - Tweaked style and enabled Mica on Windows 11

src/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs

@@ -1,27 +1,43 @@
 using System;
+using System.Reactive;
+using System.Threading.Tasks;
 using Artemis.Core;
+using Artemis.Core.Services;
+using Artemis.UI.Screens.Device;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using ReactiveUI;
+using RGB.NET.Core;
 using SkiaSharp;
 
 namespace Artemis.UI.Screens.SurfaceEditor;
 
 public class ListDeviceViewModel : ViewModelBase
 {
+    private readonly IWindowService _windowService;
+    private readonly IRgbService _rgbService;
     private static readonly Random Random = new();
     
     private SKColor _color;
     private bool _isSelected;
 
-    public ListDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel)
+    public ListDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel, IWindowService windowService, IRgbService rgbService)
     {
+        _windowService = windowService;
+        _rgbService = rgbService;
+        
         Device = device;
         SurfaceEditorViewModel = surfaceEditorViewModel;
         Color = SKColor.FromHsv(Random.NextSingle() * 360, 95, 100);
+        DetectInput = ReactiveCommand.CreateFromTask(ExecuteDetectInput, this.WhenAnyValue(vm => vm.CanDetectInput));
     }
 
+    public ReactiveCommand<Unit,Unit> DetectInput { get; }
+    
     public ArtemisDevice Device { get; }
     public SurfaceEditorViewModel SurfaceEditorViewModel { get; }
-
+    public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard || Device.DeviceType == RGBDeviceType.Mouse;
+    
     public bool IsSelected
     {
         get => _isSelected;
@@ -33,4 +49,19 @@ public class ListDeviceViewModel : ViewModelBase
         get => _color;
         set => RaiseAndSetIfChanged(ref _color, value);
     }
+    
+    private async Task ExecuteDetectInput()
+    {
+        if (!CanDetectInput)
+            return;
+
+        await _windowService.CreateContentDialog()
+            .WithTitle($"{Device.RgbDevice.DeviceInfo.DeviceName} - Detect input")
+            .WithViewModel<DeviceDetectInputViewModel>(out DeviceDetectInputViewModel? viewModel, ("device", Device))
+            .WithCloseButtonText("Cancel")
+            .ShowAsync();
+
+        if (viewModel.MadeChanges)
+            _rgbService.SaveDevice(Device);
+    }
 }

src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs

@@ -1,9 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive;
+using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
+using Artemis.UI.Screens.Device;
 using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
+using ReactiveUI;
 using RGB.NET.Core;
 using SkiaSharp;
 using Point = Avalonia.Point;
@@ -14,30 +19,34 @@ public class SurfaceDeviceViewModel : ActivatableViewModelBase
 {
     private readonly IRgbService _rgbService;
     private readonly ISettingsService _settingsService;
+    private readonly IWindowService _windowService;
     private double _dragOffsetX;
     private double _dragOffsetY;
     private bool _isSelected;
 
-    public SurfaceDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel, IRgbService rgbService, ISettingsService settingsService)
+    public SurfaceDeviceViewModel(ArtemisDevice device, SurfaceEditorViewModel surfaceEditorViewModel, IRgbService rgbService, ISettingsService settingsService, IWindowService windowService)
     {
         _rgbService = rgbService;
         _settingsService = settingsService;
+        _windowService = windowService;
 
         Device = device;
         SurfaceEditorViewModel = surfaceEditorViewModel;
+        DetectInput = ReactiveCommand.CreateFromTask(ExecuteDetectInput, this.WhenAnyValue(vm => vm.CanDetectInput));
     }
 
+    public ReactiveCommand<Unit,Unit> DetectInput { get; }
+    
     public ArtemisDevice Device { get; }
     public SurfaceEditorViewModel SurfaceEditorViewModel { get; }
-
+    public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard || Device.DeviceType == RGBDeviceType.Mouse;
+    
     public bool IsSelected
     {
         get => _isSelected;
         set => RaiseAndSetIfChanged(ref _isSelected, value);
     }
 
-    public bool CanDetectInput => Device.DeviceType == RGBDeviceType.Keyboard || Device.DeviceType == RGBDeviceType.Mouse;
-
     public void StartMouseDrag(Point mouseStartPosition)
     {
         if (!IsSelected)
@@ -98,4 +107,19 @@ public class SurfaceDeviceViewModel : ActivatableViewModelBase
 
         return !own.Any(o => others.Any(l => l.IntersectsWith(o)));
     }
+    
+    private async Task ExecuteDetectInput()
+    {
+        if (!CanDetectInput)
+            return;
+
+        await _windowService.CreateContentDialog()
+            .WithTitle($"{Device.RgbDevice.DeviceInfo.DeviceName} - Detect input")
+            .WithViewModel<DeviceDetectInputViewModel>(out DeviceDetectInputViewModel? viewModel, ("device", Device))
+            .WithCloseButtonText("Cancel")
+            .ShowAsync();
+
+        if (viewModel.MadeChanges)
+            _rgbService.SaveDevice(Device);
+    }
 }

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml

@@ -50,7 +50,6 @@
             <MenuItem Header="-" />
             <MenuItem Header="Identify input"
                       Command="{Binding DetectInput}"
-                      CommandParameter="{Binding Device}"
                       ToolTip.Tip="Teach Artemis which keypresses and/or button presses belong to this device">
                 <MenuItem.Icon>
                     <avalonia:MaterialIcon Kind="GestureDoubleTap" />