Profile editor - Fixed easing options not applying

Device properties - Fixed layout changes not saving

src/Artemis.Core/Services/Interfaces/IRenderService.cs

@@ -31,11 +31,6 @@ public interface IRenderService : IArtemisService
     /// </summary>
     bool IsPaused { get; set; }
     
-    /// <summary>
-    ///     Gets or sets a boolean indicating whether to flush the RGB.NET LEDs during next update
-    /// </summary>
-    bool FlushLeds { get; set; }
-    
     /// <summary>
     ///     The time the last frame took to render
     /// </summary>

src/Artemis.Core/Services/RenderService.cs

@@ -70,21 +70,10 @@ internal class RenderService : IRenderService, IRenderer, IDisposable
     /// <inheritdoc />
     public TimeSpan FrameTime { get; private set; }
 
-    /// <inheritdoc />
-    public bool FlushLeds { get; set; }
-
     /// <inheritdoc />
     public void Render(SKCanvas canvas, double delta)
     {
         _frameStopWatch.Restart();
-        
-        if (FlushLeds)
-        {
-            FlushLeds = false;
-            Surface.Update(true);
-            return;
-        }
-
         try
         {
             OnFrameRendering(new FrameRenderingEventArgs(canvas, delta, _surfaceManager.Surface));

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

@@ -218,8 +218,7 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         Device.RedScale = RedScale / 100f;
         Device.GreenScale = GreenScale / 100f;
         Device.BlueScale = BlueScale / 100f;
-
+        Device.RgbDevice.Update(true);
-        _renderService.FlushLeds = true;
     }
 
     public void ResetScaling()
@@ -227,6 +226,7 @@ public class DeviceGeneralTabViewModel : ActivatableViewModelBase
         RedScale = _initialRedScale * 100;
         GreenScale = _initialGreenScale * 100;
         BlueScale = _initialBlueScale * 100;
+        Device.RgbDevice.Update(true);
     }
 
     private void OnFrameRendering(object? sender, FrameRenderingEventArgs e)

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

@@ -37,11 +37,7 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
         this.WhenActivated(d =>
         {
             Device.PropertyChanged += DeviceOnPropertyChanged;
-
+            Disposable.Create(() => Device.PropertyChanged -= DeviceOnPropertyChanged).DisposeWith(d);
-            Disposable.Create(() =>
-            {
-                Device.PropertyChanged -= DeviceOnPropertyChanged;
-            }).DisposeWith(d);
         });
     }
 
@@ -51,7 +47,7 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
 
     public string? ImagePath => Device.Layout?.Image?.LocalPath;
     
-    public string CustomLayoutPath => Device.CustomLayoutPath;
+    public string? CustomLayoutPath => Device.CustomLayoutPath;
     
     public bool HasCustomLayout => Device.CustomLayoutPath != null;
     
@@ -61,6 +57,8 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
         _notificationService.CreateNotification()
             .WithMessage("Cleared imported layout.")
             .WithSeverity(NotificationSeverity.Informational);
+        
+        _deviceService.SaveDevice(Device);
     }
 
     public async Task BrowseCustomLayout()
@@ -77,6 +75,8 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
                 .WithTitle("Imported layout")
                 .WithMessage($"File loaded from {files[0]}")
                 .WithSeverity(NotificationSeverity.Informational);
+            
+            _deviceService.SaveDevice(Device);
         }
     }
 
@@ -153,6 +153,10 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
     private void DeviceOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName is nameof(Device.CustomLayoutPath) or nameof(Device.DisableDefaultLayout))
+        {
             Task.Run(() => _deviceService.ApplyDeviceLayout(Device, Device.GetBestDeviceLayout()));
+            this.RaisePropertyChanged(nameof(CustomLayoutPath));
+            this.RaisePropertyChanged(nameof(HasCustomLayout));
+        }
     }
 }

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingView.axaml

@@ -3,17 +3,21 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:keyframes="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes"
+             xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes.TimelineEasingView"
              x:DataType="keyframes:TimelineEasingViewModel">
-    <StackPanel Orientation="Horizontal">
+    <Grid ColumnDefinitions="25,30,*">
-        <Polyline Stroke="{DynamicResource TextFillColorPrimaryBrush}"
+        <avalonia:MaterialIcon Grid.Column="0" Kind="Check" IsVisible="{CompiledBinding IsEasingModeSelected}" HorizontalAlignment="Left"/>
+        <Polyline Grid.Column="1" 
+                  Stroke="{DynamicResource TextFillColorPrimaryBrush}"
                   StrokeThickness="1"
                   Points="{CompiledBinding EasingPoints}"
                   Stretch="Uniform"
                   Width="20"
                   Height="20"
-                  Margin="0 0 10 0" />
+                  HorizontalAlignment="Left"/>
-        <TextBlock Text="{CompiledBinding Description}" />
+        <TextBlock Grid.Column="2" Text="{CompiledBinding Description}" HorizontalAlignment="Left"/>
-    </StackPanel>
+    </Grid>
+
 </UserControl>

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineEasingViewModel.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
+using System.Reactive;
 using Artemis.Core;
 using Artemis.UI.Shared;
 using Avalonia;
 using Humanizer;
+using ReactiveUI;
 
 namespace Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes;
 
@@ -10,11 +12,12 @@ public class TimelineEasingViewModel : ViewModelBase
 {
     private readonly ILayerPropertyKeyframe _keyframe;
 
-    public TimelineEasingViewModel(Easings.Functions easingFunction, ILayerPropertyKeyframe keyframe)
+    public TimelineEasingViewModel(Easings.Functions easingFunction, ILayerPropertyKeyframe keyframe, ReactiveCommand<Easings.Functions, Unit> selectEasingFunction)
     {
         _keyframe = keyframe;
 
         EasingFunction = easingFunction;
+        SelectEasingFunction = selectEasingFunction;
         Description = easingFunction.Humanize();
 
         EasingPoints = new List<Point>();
@@ -27,6 +30,7 @@ public class TimelineEasingViewModel : ViewModelBase
     }
 
     public Easings.Functions EasingFunction { get; }
+    public ReactiveCommand<Easings.Functions, Unit> SelectEasingFunction { get; }
     public List<Point> EasingPoints { get; }
     public string Description { get; }
     public bool IsEasingModeSelected => _keyframe.EasingFunction == EasingFunction;

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeView.axaml

@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+             xmlns:keyframes="clr-namespace:Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.Properties.Timeline.Keyframes.TimelineKeyframeView"
              ClipToBounds="False">
@@ -34,16 +35,9 @@
             <MenuFlyout Opening="FlyoutBase_OnOpening">
                 <MenuItem Header="Easing" ItemsSource="{Binding EasingViewModels}">
                     <MenuItem.Styles>
-                        <Style Selector="MenuItem > MenuItem">
+                        <Style Selector="MenuItem > MenuItem" x:DataType="keyframes:TimelineEasingViewModel">
-                            <Setter Property="Icon">
+                            <Setter Property="Command" Value="{CompiledBinding SelectEasingFunction}" />
-                                <Setter.Value>
+                            <Setter Property="CommandParameter" Value="{CompiledBinding EasingFunction}" />
-                                    <Template>
-                                        <CheckBox IsHitTestVisible="False" IsChecked="{Binding IsEasingModeSelected}" />
-                                    </Template>
-                                </Setter.Value>
-                            </Setter>
-                            <Setter Property="Command" Value="{Binding $parent[UserControl].DataContext.SelectEasingFunction}" />
-                            <Setter Property="CommandParameter" Value="{Binding EasingFunction}" />
                         </Style>
                     </MenuItem.Styles>
                     <MenuItem.Icon>

src/Artemis.UI/Screens/ProfileEditor/Panels/Properties/Timeline/Keyframes/TimelineKeyframeViewModel.cs

@@ -54,10 +54,12 @@ public class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineK
         Copy = ReactiveCommand.CreateFromTask(ExecuteCopy);
         Paste = ReactiveCommand.CreateFromTask(ExecutePaste);
         Delete = ReactiveCommand.Create(ExecuteDelete);
+        SelectEasingFunction = ReactiveCommand.Create<Easings.Functions>(ExecuteSelectEasingFunction);
     }
 
     public LayerPropertyKeyframe<T> LayerPropertyKeyframe { get; }
     public ObservableCollection<TimelineEasingViewModel> EasingViewModels { get; }
+    
 
     public double X
     {
@@ -93,7 +95,8 @@ public class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineK
     public ReactiveCommand<Unit, Unit> Copy { get; }
     public ReactiveCommand<Unit, Unit> Paste { get; }
     public ReactiveCommand<Unit, Unit> Delete { get; }
-
+    public ReactiveCommand<Easings.Functions, Unit> SelectEasingFunction { get; }
+    
     public bool IsSelected => _isSelected?.Value ?? false;
     public TimeSpan Position => LayerPropertyKeyframe.Position;
     public ILayerPropertyKeyframe Keyframe => LayerPropertyKeyframe;
@@ -255,10 +258,10 @@ public class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, ITimelineK
 
         EasingViewModels.AddRange(Enum.GetValues(typeof(Easings.Functions))
             .Cast<Easings.Functions>()
-            .Select(e => new TimelineEasingViewModel(e, Keyframe)));
+            .Select(e => new TimelineEasingViewModel(e, Keyframe, SelectEasingFunction)));
     }
 
-    public void SelectEasingFunction(Easings.Functions easingFunction)
+    private void ExecuteSelectEasingFunction(Easings.Functions easingFunction)
     {
         _profileEditorService.ExecuteCommand(new ChangeKeyframeEasing(Keyframe, easingFunction));
     }