Merge branch 'development' into feature/releases

src/Artemis.Core/Models/Surface/LayoutSelection.cs

@@ -7,6 +7,7 @@ public class LayoutSelection : CorePropertyChanged
 {
     private string? _type;
     private string? _parameter;
+    private string? _errorState;
 
     /// <summary>
     ///     Gets or sets what kind of layout reference this is.
@@ -25,4 +26,13 @@ public class LayoutSelection : CorePropertyChanged
         get => _parameter;
         set => SetAndNotify(ref _parameter, value);
     }
+
+    /// <summary>
+    ///     Gets or sets the error state of the layout reference.
+    /// </summary>
+    public string? ErrorState
+    {
+        get => _errorState;
+        set => SetAndNotify(ref _errorState, value);
+    }
 }

src/Artemis.Core/Services/DeviceService.cs

@@ -184,13 +184,14 @@ internal class DeviceService : IDeviceService
                 device.ApplyLayout(null, false, false);
             else
                 provider?.ApplyLayout(device, layout);
+            
+            UpdateLeds();
         }
         catch (Exception e)
         {
+            device.LayoutSelection.ErrorState = e.Message;
             _logger.Error(e, "Failed to apply device layout");
         }
-
-        UpdateLeds();
     }
 
     /// <inheritdoc />

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

@@ -9,7 +9,16 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
              x:Class="Artemis.UI.Screens.Device.Layout.DeviceLayoutTabView"
              x:DataType="layout:DeviceLayoutTabViewModel">
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+    <Grid RowDefinitions="Auto,*">
+        <controls:InfoBar Grid.Row="0"
+                          Title="Failed to apply layout"
+                          IsOpen="{CompiledBinding Device.LayoutSelection.ErrorState, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                          Message="{CompiledBinding Device.LayoutSelection.ErrorState}"
+                          Severity="Error"
+                          IsClosable="False" 
+                          Margin="5 0"/>
+
+        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
             <Border Classes="card" Margin="5">
                 <Grid RowDefinitions="*,Auto">
                     <StackPanel Grid.Row="0">
@@ -105,4 +114,6 @@
                 </Grid>
             </Border>
         </ScrollViewer>
+    </Grid>
+
 </UserControl>

src/Artemis.UI/Screens/ProfileEditor/Panels/ProfileTree/TreeItemViewModel.cs

@@ -250,15 +250,11 @@ public abstract partial class TreeItemViewModel : ActivatableViewModelBase
 
     private async void UpdateCanPaste(bool isFlyoutOpen)
     {
-        string[] formats = await Shared.UI.Clipboard.GetFormatsAsync();
+        string[]? formats = await Shared.UI.Clipboard.GetFormatsAsync();
-        //diogotr7: This can be null on Linux sometimes. I'm not sure why.
-        if (formats == null!)
-        {
-            CanPaste = false;
-            return;
-        }
         
-        CanPaste = formats.Contains(ProfileElementExtensions.ClipboardDataFormat);
+        // Can be null on some platforms
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+        CanPaste = formats != null && formats.Contains(ProfileElementExtensions.ClipboardDataFormat);
     }
 
     private bool GetIsFocused(ProfileEditorFocusMode focusMode, RenderProfileElement? currentProfileElement)

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

@@ -174,8 +174,11 @@ public partial class TimelineKeyframeViewModel<T> : ActivatableViewModelBase, IT
 
     private async void UpdateCanPaste(bool isFlyoutOpen)
     {
-        string[] formats = await Shared.UI.Clipboard.GetFormatsAsync();
+        string[]? formats = await Shared.UI.Clipboard.GetFormatsAsync();
-        CanPaste = formats.Contains("Artemis.Keyframes");
+        
+        // Can be null on some platforms
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+        CanPaste = formats != null && formats.Contains("Artemis.Keyframes");
     }
 
     #endregion

src/Artemis.UI/Styles/Markdown.axaml

@@ -1,10 +1,11 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:avalonia="clr-namespace:Markdown.Avalonia;assembly=Markdown.Avalonia"
-        xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia">
+        xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"
+        xmlns:controls="clr-namespace:Markdown.Avalonia.Controls;assembly=Markdown.Avalonia">
     <Design.PreviewWith>
-        <avalonia:MarkdownScrollViewer>
+        <avalonia:MarkdownScrollViewer MarkdownStyleName="FluentAvalonia">
-            Test
+            Markdown.Xaml support ```inline code ``` and block code.
         </avalonia:MarkdownScrollViewer>
     </Design.PreviewWith>
     <Style Selector="ScrollViewer > StackPanel">
@@ -65,4 +66,21 @@
             <Setter Property="Margin" Value="0,10,0,5" />
         </Style.Setters>
     </Style>
+
+    <Style Selector="ctxt|CCode">
+        <Style.Setters>
+            <Setter Property="Foreground" Value="#CE9178" />
+            <Setter Property="Background" Value="#333333" />
+            <Setter Property="Padding" Value="4 3 4 -1"></Setter>
+            <Setter Property="Margin" Value="0 2 0 0"></Setter>
+            <Setter Property="CornerRadius" Value="5" />
+            <Setter Property="TextVerticalAlignment" Value="Bottom"></Setter>
+        </Style.Setters>
+    </Style>
+
+    <Style Selector="controls|Rule">
+        <Style.Setters>
+            <Setter Property="Foreground" Value="{DynamicResource ButtonBorderBrush}"/>
+        </Style.Setters>
+    </Style>
 </Styles>