Merge pull request #807 from Artemis-RGB/feature/fix-layouts

UI - Fix layout loading

src/Artemis.UI/Screens/Device/Tabs/DeviceGeneralTabViewModel.cs

@@ -66,13 +66,11 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
 
         this.WhenActivated(d =>
         {
-            Device.PropertyChanged += DeviceOnPropertyChanged;
             _coreService.FrameRendering += OnFrameRendering;
 
             Disposable.Create(() =>
             {
                 _coreService.FrameRendering -= OnFrameRendering;
-                Device.PropertyChanged -= DeviceOnPropertyChanged;
                 Apply();
             }).DisposeWith(d);
         });
@@ -244,10 +242,4 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         using SKPaint overlayPaint = new() { Color = CurrentColor };
         e.Canvas.DrawRect(0, 0, e.Canvas.LocalClipBounds.Width, e.Canvas.LocalClipBounds.Height, overlayPaint);
     }
-
-    private void DeviceOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
-    {
-        if (e.PropertyName == nameof(Device.CustomLayoutPath) || e.PropertyName == nameof(Device.DisableDefaultLayout))
-            Task.Run(() => _rgbService.ApplyBestDeviceLayout(Device));
-    }
 }

src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml

@@ -21,6 +21,7 @@
                             <Button
                                 Classes="icon-button"
                                 HorizontalAlignment="Right"
+                                IsEnabled="{CompiledBinding !!DefaultLayoutPath}"
                                 ToolTip.Tip="Copy layout file path to clipboard"
                                 Click="LayoutPathButton_OnClick">
                                 <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
@@ -31,12 +32,13 @@
                     <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
                         <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Image file path" />
-                            <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.Layout.Image.LocalPath}" />
+                            <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding ImagePath, TargetNullValue=None}" />
                         </StackPanel>
                         <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
                             <Button
                                 Classes="icon-button"
                                 HorizontalAlignment="Right"
+                                IsEnabled="{CompiledBinding !!ImagePath}"
                                 ToolTip.Tip="Copy image file path to clipboard"
                                 Click="ImagePathButton_OnClick">
                                 <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
@@ -50,14 +52,14 @@
                             <TextBlock Classes="subtitle" FontSize="12" Text="With this checked, Artemis will not load a layout for this device unless you specifically provide one." />
                         </StackPanel>
                         <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
-                            <CheckBox HorizontalAlignment="Right" Margin="0,0,-10,0" />
+                            <CheckBox HorizontalAlignment="Right" Margin="0,0,-10,0" IsChecked="{CompiledBinding Device.DisableDefaultLayout}" />
                         </StackPanel>
                     </Grid>
                     <Border Classes="card-separator" />
                     <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
                         <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Custom layout path" />
-                            <TextBlock Classes="subtitle" FontSize="12" Text="{CompiledBinding CustomLayoutPath}" />
+                            <TextBlock Classes="subtitle" FontSize="12" Text="{CompiledBinding CustomLayoutPath, TargetNullValue=None}"/>
                         </StackPanel>
                         <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
                             <Button Content="Clear" Command="{CompiledBinding ClearCustomLayout}" IsEnabled="{CompiledBinding HasCustomLayout}" />

src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs

@@ -16,12 +16,18 @@ public partial class DeviceLayoutTabView : ReactiveUserControl<DeviceLayoutTabVi
 
     private void LayoutPathButton_OnClick(object? sender, RoutedEventArgs e)
     {
+        if (ViewModel?.DefaultLayoutPath is null)
+            return;
+        
         TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.DefaultLayoutPath);
         ViewModel.ShowCopiedNotification();
     }
 
     private void ImagePathButton_OnClick(object? sender, RoutedEventArgs e)
     {
+        if (ViewModel?.Device?.Layout?.Image?.LocalPath is null)
+            return;
+        
         TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.Device.Layout.Image.LocalPath);
         ViewModel.ShowCopiedNotification();
     }

src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs

@@ -22,42 +22,52 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
 {
     private readonly IWindowService _windowService;
     private readonly INotificationService _notificationService;
+    private readonly ICoreService _coreService;
+    private readonly IRgbService _rgbService;
 
     public DeviceLayoutTabViewModel(
         IWindowService windowService,
         INotificationService notificationService,
+        ICoreService coreService,
+        IRgbService rgbService,
         ArtemisDevice device)
     {
         _windowService = windowService;
         _notificationService = notificationService;
+        _coreService = coreService;
+        _rgbService = rgbService;
 
         Device = device;
         DisplayName = "Layout";
         DefaultLayoutPath = Device.DeviceProvider.LoadLayout(Device).FilePath;
+        
+        this.WhenActivated(d =>
+        {
+            Device.PropertyChanged += DeviceOnPropertyChanged;
+
+            Disposable.Create(() =>
+            {
+                Device.PropertyChanged -= DeviceOnPropertyChanged;
+            }).DisposeWith(d);
+        });
     }
 
     public ArtemisDevice Device { get; }
     
     public string DefaultLayoutPath { get; }
 
-    public string CustomLayoutPath => Device.CustomLayoutPath ?? "None";
+    public string? ImagePath => Device.Layout?.Image?.LocalPath;
+    
+    public string CustomLayoutPath => Device.CustomLayoutPath;
     
     public bool HasCustomLayout => Device.CustomLayoutPath != null;
     
-    private void RaiseCustomLayoutChanged()
-    {
-        this.RaisePropertyChanged(nameof(CustomLayoutPath));
-        this.RaisePropertyChanged(nameof(HasCustomLayout));
-    }
-
     public void ClearCustomLayout()
     {
         Device.CustomLayoutPath = null;
         _notificationService.CreateNotification()
             .WithMessage("Cleared imported layout.")
             .WithSeverity(NotificationSeverity.Informational);
-
-        RaiseCustomLayoutChanged();
     }
 
     public async Task BrowseCustomLayout()
@@ -75,8 +85,6 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
                 .WithMessage($"File loaded from {files[0]}")
                 .WithSeverity(NotificationSeverity.Informational);
         }
-        
-        RaiseCustomLayoutChanged();
     }
 
     public async Task ExportLayout()
@@ -148,4 +156,10 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
             .WithSeverity(NotificationSeverity.Informational)
             .Show();
     }
+    
+    private void DeviceOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName is nameof(Device.CustomLayoutPath) or nameof(Device.DisableDefaultLayout))
+            Task.Run(() => _rgbService.ApplyBestDeviceLayout(Device));
+    }
 }