Core - Refactored effects

Profile editor - Added effect creation

src/Artemis.UI.Shared/Artemis.UI.Shared.csproj

@@ -23,19 +23,13 @@
     <PackageReference Include="Avalonia.Svg.Skia" Version="0.10.12" />
     <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.13.2" />
     <PackageReference Include="DynamicData" Version="7.5.4" />
-    <PackageReference Include="FluentAvaloniaUI" Version="1.3.0" />
+    <PackageReference Include="FluentAvaloniaUI" Version="1.3.4" />
     <PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />
     <PackageReference Include="ReactiveUI" Version="17.1.50" />
     <PackageReference Include="ReactiveUI.Validation" Version="2.2.1" />
     <PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease7" />
     <PackageReference Include="SkiaSharp" Version="2.88.0-preview.178" />
    </ItemGroup>
-  <ItemGroup>
-    <Page Include="DefaultTypes\DataModel\Display\DefaultDataModelDisplayView.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Artemis.Core\Artemis.Core.csproj" />
   </ItemGroup>

src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml

@@ -4,5 +4,4 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Shared.ArtemisIcon">
-  Welcome to Avalonia!
 </UserControl>

src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs

@@ -53,7 +53,7 @@ namespace Artemis.UI.Shared
                     {
                         SvgSource source = new();
                         source.Load(iconString);
-                        Content = new SvgImage {Source = source};
+                        Content = new Image {Source = new SvgImage {Source = source}};
                     }
                     // An URI pointing to a different kind of image
                     else
@@ -79,10 +79,8 @@ namespace Artemis.UI.Shared
 
         private void OnDetachedFromLogicalTree(object? sender, LogicalTreeAttachmentEventArgs e)
         {
-            if (Content is SvgImage svgImage)
-                svgImage.Source?.Dispose();
-            else if (Content is Image image)
-                ((Bitmap) image.Source).Dispose();
+            if (Content is Image image && image.Source is IDisposable disposable)
+                disposable.Dispose();
         }
 
         private void InitializeComponent()

src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.xaml

@@ -1,47 +0,0 @@
-<UserControl x:Class="Artemis.UI.Shared.DefaultTypes.DataModel.Display.DefaultDataModelDisplayView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Artemis.UI.Shared.DefaultTypes.DataModel.Display"
-             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:shared="clr-namespace:Artemis.UI.Shared"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance local:DefaultDataModelDisplayViewModel}">
-    <UserControl.Resources>
-        <shared:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
-    </UserControl.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-        </Grid.ColumnDefinitions>
-
-        <!-- Prefix -->
-        <TextBlock Grid.Column="0" 
-                   Text="{Binding PropertyDescription.Prefix}"
-                   Visibility="{Binding PropertyDescription.Prefix, Converter={StaticResource NullToVisibilityConverter}}" 
-                   TextAlignment="Right"
-                   Margin="0 0 5 0" />
-
-        <!-- Value -->
-        <TextBlock Grid.Column="1"
-                   Text="{Binding DisplayValue, Mode=OneWay}"
-                   HorizontalAlignment="Right"
-                   Visibility="{Binding ShowToString, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
-        <TextBlock Grid.Column="1"
-                   Text="null"
-                   FontFamily="Consolas"
-                   HorizontalAlignment="Right"
-                   Foreground="{DynamicResource MaterialDesignCheckBoxDisabled}"
-                   Visibility="{Binding ShowNull, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
-
-        <!-- Affix -->
-        <TextBlock Grid.Column="2" 
-                   Text="{Binding PropertyDescription.Affix}"
-                   Visibility="{Binding PropertyDescription.Affix, Converter={StaticResource NullToVisibilityConverter}}" 
-                   Margin="5 0 0 0" />
-    </Grid>
-</UserControl>

src/Artemis.UI.Shared/Services/ProfileEditor/Commands/AddLayerEffect.cs

@@ -0,0 +1,48 @@
+using System;
+using Artemis.Core;
+using Artemis.Core.LayerEffects;
+
+namespace Artemis.UI.Shared.Services.ProfileEditor.Commands;
+
+/// <summary>
+/// Represents a profile editor command that can be used to add a layer effect to a profile element.
+/// </summary>
+public class AddLayerEffect : IProfileEditorCommand, IDisposable
+{
+    private readonly RenderProfileElement _renderProfileElement;
+    private readonly BaseLayerEffect _layerEffect;
+    private bool _executed;
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="AddLayerEffect"/> class.
+    /// </summary>
+    public AddLayerEffect(RenderProfileElement renderProfileElement, BaseLayerEffect layerEffect)
+    {
+        _renderProfileElement = renderProfileElement;
+        _layerEffect = layerEffect;
+    }
+
+    /// <inheritdoc />
+    public string DisplayName => "Add layer effect";
+
+    /// <inheritdoc />
+    public void Execute()
+    {
+        _renderProfileElement.AddLayerEffect(_layerEffect);
+        _executed = true;
+    }
+
+    /// <inheritdoc />
+    public void Undo()
+    {
+        _renderProfileElement.RemoveLayerEffect(_layerEffect);
+        _executed = false;
+    }
+    
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (!_executed)
+            _layerEffect.Dispose();
+    }
+}

src/Artemis.UI.Shared/packages.lock.json

@@ -62,9 +62,9 @@
       },
       "FluentAvaloniaUI": {
         "type": "Direct",
-        "requested": "[1.3.0, )",
-        "resolved": "1.3.0",
-        "contentHash": "xzcsuOswakMpz/EdA59NEOgaCtZ/9zsd5QWTB0YYQqSv1GF95Uk2aMVtO5gtfNrCT4lZvGNWVf3HGjYz9cHovQ==",
+        "requested": "[1.3.4, )",
+        "resolved": "1.3.4",
+        "contentHash": "INZBxCGyt4Dzm0IaNXoXuU08VUQ62FbeMHPH7MO5W1WeVdU5N8+1YTYfqYAA66twa5wba8MYqezXWhoU8Hq0DQ==",
         "dependencies": {
           "Avalonia": "0.10.13",
           "Avalonia.Desktop": "0.10.13",