Think better of move

UI - Move profile editor into Profile screen, profile page no longer always has to show the editor

src/Artemis.Core/Plugins/IPluginConfigurationDialog.cs

@@ -11,4 +11,10 @@ public interface IPluginConfigurationDialog
     ///     The type of view model the tab contains
     /// </summary>
     Type Type { get; }
+
+    /// <summary>
+    ///     A value indicating whether it's mandatory to configure this plugin.
+    ///     <remarks>If set to <see langword="true"/>, the dialog will open the first time the plugin is enabled.</remarks>
+    /// </summary>
+    bool IsMandatory { get; }
 }

src/Artemis.UI.Shared/Controls/TagsInput/TagsInputStyles.axaml

@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ui="using:FluentAvalonia.UI.Controls"
                     xmlns:tagsInput="clr-namespace:Artemis.UI.Shared.TagsInput"
                     xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
                     x:CompileBindings="True">

src/Artemis.UI.Shared/Plugins/PluginConfigurationDialog.cs

@@ -6,6 +6,22 @@ namespace Artemis.UI.Shared;
 /// <inheritdoc />
 public class PluginConfigurationDialog<T> : PluginConfigurationDialog where T : PluginConfigurationViewModel
 {
+    /// <summary>
+    ///     Creates a new instance of the <see cref="PluginConfigurationDialog{T}"/> class.
+    /// </summary>
+    public PluginConfigurationDialog()
+    {
+    }
+
+    /// <summary>
+    ///     Creates a new instance of the <see cref="PluginConfigurationDialog{T}"/> class with the specified <paramref name="isMandatory"/> flag.
+    /// </summary>
+    /// <param name="isMandatory">A value indicating whether the configuration dialog is mandatory.</param>
+    public PluginConfigurationDialog(bool isMandatory)
+    {
+        IsMandatory = isMandatory;
+    }
+
     /// <inheritdoc />
     public override Type Type => typeof(T);
 }
@@ -17,4 +33,7 @@ public abstract class PluginConfigurationDialog : IPluginConfigurationDialog
 {
     /// <inheritdoc />
     public abstract Type Type { get; }
+
+    /// <inheritdoc />
+    public bool IsMandatory { get; protected set; }
 }

src/Artemis.UI.Shared/Styles/BrokenState.axaml

@@ -1,6 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
         xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia">
     <Design.PreviewWith>
         <HyperlinkButton Grid.Column="0" Classes="icon-button icon-button-small broken-state-button" Margin="50">

src/Artemis.UI.Shared/Styles/Button.axaml

@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
+        xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia">
-        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
     <!-- Preview -->
     <Design.PreviewWith>
 		<Border Padding="20">

src/Artemis.UI.Shared/Styles/Controls/DataModelPicker.axaml

@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:dataModel="clr-namespace:Artemis.UI.Shared.DataModelVisualization.Shared"
         xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
         xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker">
     <Design.PreviewWith>
         <dataModelPicker:DataModelPicker />

src/Artemis.UI.Shared/Styles/Controls/DataModelPickerButton.axaml

@@ -1,6 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
         xmlns:dataModelPicker="clr-namespace:Artemis.UI.Shared.DataModelPicker"
         xmlns:gradientPicker="clr-namespace:Artemis.UI.Shared.Controls.GradientPicker">
     <Design.PreviewWith>

src/Artemis.UI/Artemis.UI.csproj

@@ -42,4 +42,8 @@
         <SubType>Code</SubType>
       </Compile>
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Screens\Profiles\" />
+    </ItemGroup>
 </Project>

src/Artemis.UI/Artemis.UI.csproj.DotSettings

@@ -1,5 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib"
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-                        xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=events/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cdebugger_005Ctabs/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cdevice_005Ctabs/@EntryIndexedValue">True</s:Boolean>
@@ -7,6 +6,8 @@
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cprofileeditor_005Cpanels/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cprofileeditor_005Cpanels_005Cproperties_005Ctimeline_005Ckeyframes/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cprofileeditor_005Ctools/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cprofile_005Cprofileeditor_005Cpanels_005Cproperties_005Ctimeline_005Ckeyframes/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Cprofile_005Cprofileeditor_005Cpanels/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Csettings_005Ctabs/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Csidebar_005Ccontentdialogs/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=screens_005Csidebar_005Cdialogs/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Artemis.UI/Controls/SplitMarkdownEditor.axaml

@@ -4,8 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit"
              xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
-             xmlns:fa="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:input="clr-namespace:System.Windows.Input;assembly=System.ObjectModel"
              xmlns:ui="clr-namespace:Artemis.UI"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Controls.SplitMarkdownEditor">

src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
+using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
 using Avalonia;
 using Avalonia.Data.Converters;
 

src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs

@@ -14,6 +14,7 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands;
 using Artemis.UI.Shared.Services.PropertyInput;
 using Avalonia.Threading;
 using ReactiveUI;
+using LayerBrushPresetViewModel = Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel;
 
 namespace Artemis.UI.DefaultTypes.PropertyInput;
 

src/Artemis.UI/DryIoc/Factories/IVMFactory.cs

@@ -11,15 +11,12 @@ using Artemis.UI.Screens.Device.Leds;
 using Artemis.UI.Screens.Plugins;
 using Artemis.UI.Screens.Plugins.Features;
 using Artemis.UI.Screens.Plugins.Prerequisites;
-using Artemis.UI.Screens.ProfileEditor;
 using Artemis.UI.Screens.ProfileEditor.DisplayCondition.ConditionTypes;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints;
-using Artemis.UI.Screens.ProfileEditor.Properties;
 using Artemis.UI.Screens.ProfileEditor.Properties.DataBinding;
 using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
 using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
-using Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers;
 using Artemis.UI.Screens.Settings;
 using Artemis.UI.Screens.Settings.Updating;
 using Artemis.UI.Screens.Sidebar;
@@ -29,6 +26,14 @@ using Artemis.UI.Screens.VisualScripting.Pins;
 using Artemis.WebClient.Updating;
 using DryIoc;
 using ReactiveUI;
+using LayerShapeVisualizerViewModel = Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers.LayerShapeVisualizerViewModel;
+using LayerVisualizerViewModel = Artemis.UI.Screens.ProfileEditor.VisualEditor.Visualizers.LayerVisualizerViewModel;
+using ProfileEditorViewModel = Artemis.UI.Screens.ProfileEditor.ProfileEditorViewModel;
+using PropertyGroupViewModel = Artemis.UI.Screens.ProfileEditor.Properties.PropertyGroupViewModel;
+using PropertyViewModel = Artemis.UI.Screens.ProfileEditor.Properties.PropertyViewModel;
+using SingleLedAdaptionHintViewModel = Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs.AdaptionHints.SingleLedAdaptionHintViewModel;
+using TimelineGroupViewModel = Artemis.UI.Screens.ProfileEditor.Properties.Timeline.TimelineGroupViewModel;
+using TreeItemViewModel = Artemis.UI.Screens.ProfileEditor.ProfileTree.TreeItemViewModel;
 
 namespace Artemis.UI.DryIoc.Factories;
 

src/Artemis.UI/DryIoc/InstanceProviders/LayerPropertyViewModelInstanceProvider.cs

@@ -2,10 +2,13 @@
 using Artemis.Core;
 using Artemis.UI.DryIoc.Factories;
 using Artemis.UI.Exceptions;
+using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
+using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
 using Artemis.UI.Screens.ProfileEditor.Properties;
 using Artemis.UI.Screens.ProfileEditor.Properties.Timeline;
 using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
 using DryIoc;
+using PropertyViewModel = Artemis.UI.Screens.ProfileEditor.Properties.PropertyViewModel;
 
 namespace Artemis.UI.DryIoc.InstanceProviders;
 

src/Artemis.UI/Routing/Routes.cs

@@ -16,6 +16,7 @@ using Artemis.UI.Screens.Workshop.Plugins;
 using Artemis.UI.Screens.Workshop.Profile;
 using Artemis.UI.Shared.Routing;
 using PluginDetailsViewModel = Artemis.UI.Screens.Workshop.Plugins.PluginDetailsViewModel;
+using ProfileEditorViewModel = Artemis.UI.Screens.ProfileEditor.ProfileEditorViewModel;
 
 namespace Artemis.UI.Routing
 {

src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml

@@ -2,8 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+             xmlns:debugger="clr-namespace:Artemis.UI.Screens.Debugger.Performance;assembly=Artemis.UI"
-            xmlns:debugger="clr-namespace:Artemis.UI.Screens.Debugger.Performance;assembly=Artemis.UI"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="debugger:PerformanceDebugViewModel"
              x:Class="Artemis.UI.Screens.Debugger.Performance.PerformanceDebugView">

src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml

@@ -3,7 +3,6 @@
              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:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              xmlns:local="clr-namespace:Artemis.UI.Screens.Device"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml

@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
-             xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
              xmlns:general="clr-namespace:Artemis.UI.Screens.Device.General"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="650"
              x:Class="Artemis.UI.Screens.Device.General.DeviceGeneralTabView"

src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:inputMappings="clr-namespace:Artemis.UI.Screens.Device.InputMappings"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:services="clr-namespace:Artemis.WebClient.Workshop.Services;assembly=Artemis.WebClient.Workshop"
              xmlns:layoutProviders="clr-namespace:Artemis.UI.Screens.Device.Layout.LayoutProviders"
              xmlns:models="clr-namespace:Artemis.WebClient.Workshop.Models;assembly=Artemis.WebClient.Workshop"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/Artemis.UI/Screens/Device/Tabs/Leds/DeviceLedsTabView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:device="clr-namespace:Artemis.UI.Screens.Device"
              xmlns:converters="clr-namespace:Artemis.UI.Converters"
              xmlns:shared="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
              xmlns:leds="clr-namespace:Artemis.UI.Screens.Device.Leds"

src/Artemis.UI/Screens/Plugins/Features/PluginFeatureView.axaml

@@ -3,8 +3,6 @@
              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:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins"
              xmlns:features="clr-namespace:Artemis.UI.Screens.Plugins.Features"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Plugins.Features.PluginFeatureView"

src/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml

@@ -4,7 +4,6 @@
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
                      xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins"
-                     xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
                      xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
                      xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
                      mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/Artemis.UI/Screens/Plugins/PluginView.axaml

@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              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.Plugins.PluginView"

src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteActionView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins"
              xmlns:prerequisites="clr-namespace:Artemis.UI.Screens.Plugins.Prerequisites"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Plugins.Prerequisites.PluginPrerequisiteActionView"

src/Artemis.UI/Screens/Plugins/Prerequisites/PluginPrerequisiteView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins"
              xmlns:prerequisites="clr-namespace:Artemis.UI.Screens.Plugins.Prerequisites"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Plugins.Prerequisites.PluginPrerequisiteView"

src/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:vm="clr-namespace:Artemis.UI.Screens.Settings;assembly=Artemis.UI"
              xmlns:il="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"

src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml

@@ -3,7 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:settings="clr-namespace:Artemis.UI.Screens.Settings"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:plugins="clr-namespace:Artemis.UI.Screens.Plugins"
              mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Settings.PluginsTabView"

src/Artemis.UI/Screens/Settings/Tabs/ReleasesTabView.axaml

@@ -3,7 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:settings="clr-namespace:Artemis.UI.Screens.Settings"
-             xmlns:updating="clr-namespace:Artemis.UI.Screens.Settings.Updating"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:ui="clr-namespace:Artemis.UI"

src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationView.axaml

@@ -72,19 +72,15 @@
           Background="Transparent" 
           ContextFlyout="{StaticResource ProfileMenuFlyout}"
           Classes.flyout-open="{CompiledBinding IsOpen, Source={StaticResource ProfileMenuFlyout}}">
-        <shared:ProfileConfigurationIcon Grid.Column="0"
+        <Border CornerRadius="4" ClipToBounds="True" Grid.Column="0" Width="22" Height="22" Margin="0 0 5 0" VerticalAlignment="Center">
-                                         x:Name="ProfileIcon"
+            <shared:ProfileConfigurationIcon x:Name="ProfileIcon" ConfigurationIcon="{CompiledBinding ProfileConfiguration.Icon}">
-                                         VerticalAlignment="Center"
+                <shared:ProfileConfigurationIcon.Transitions>
-                                         ConfigurationIcon="{CompiledBinding ProfileConfiguration.Icon}"
+                    <Transitions>
-                                         Width="22"
+                        <DoubleTransition Property="Opacity" Duration="0:0:0.2" />
-                                         Height="22" 
+                    </Transitions>
-                                         Margin="0 0 5 0">
+                </shared:ProfileConfigurationIcon.Transitions>
-            <shared:ProfileConfigurationIcon.Transitions>
+            </shared:ProfileConfigurationIcon>
-                <Transitions>
+        </Border>
-                    <DoubleTransition Property="Opacity" Duration="0:0:0.2" />
-                </Transitions>
-            </shared:ProfileConfigurationIcon.Transitions>
-        </shared:ProfileConfigurationIcon>
 
         <Panel Grid.Column="1" HorizontalAlignment="Left">
             <TextBlock Classes="fadable"

src/Artemis.UI/Screens/Sidebar/SidebarView.axaml

@@ -3,7 +3,6 @@
              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:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:sidebar="clr-namespace:Artemis.UI.Screens.Sidebar"
              mc:Ignorable="d" d:DesignWidth="240" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Sidebar.SidebarView"

src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemView.axaml

@@ -11,9 +11,8 @@
              x:DataType="steps:DefaultEntryItemViewModel">
     <UserControl.Resources>
         <converters:EntryIconUriConverter x:Key="EntryIconUriConverter" />
-        <converters:DateTimeConverter x:Key="DateTimeConverter" />
     </UserControl.Resources>
-    <Border Classes="card" Padding="15" Margin="0 5">
+    <Border Classes="card" Padding="15" Margin="0 5" PointerPressed="HandlePointerPressed">
         <Grid ColumnDefinitions="Auto,*,Auto,Auto" RowDefinitions="*, Auto">
             <!-- Icon -->
             <Border Grid.Column="0"

src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemView.axaml.cs

@@ -1,4 +1,5 @@
-using Avalonia.ReactiveUI;
+using Avalonia.Input;
+using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Screens.StartupWizard.Steps;
 
@@ -8,4 +9,12 @@ public partial class DefaultEntryItemView : ReactiveUserControl<StartupWizard.St
     {
         InitializeComponent();
     }
+
+    private void HandlePointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (ViewModel != null && !ViewModel.IsInstalled)
+        {
+            ViewModel.ShouldInstall = !ViewModel.ShouldInstall;
+        }
+    }
 }

src/Artemis.UI/Screens/StartupWizard/Steps/DefaultEntryItemViewModel.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.DryIoc.Factories;
+using Artemis.UI.Exceptions;
 using Artemis.UI.Screens.Plugins;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
@@ -55,7 +56,7 @@ public partial class DefaultEntryItemViewModel : ActivatableViewModelBase
             return true;
 
         // Most entries install so fast it looks broken without a small delay
-        Task minimumDelay = Task.Delay(200, cancellationToken);
+        Task minimumDelay = Task.Delay(100, cancellationToken);
         EntryInstallResult result = await _workshopService.InstallEntry(Entry, Entry.LatestRelease, _progress, cancellationToken);
         await minimumDelay;
 
@@ -103,5 +104,14 @@ public partial class DefaultEntryItemViewModel : ActivatableViewModelBase
                 _logger.Warning(e, "Failed to enable plugin feature '{FeatureName}', skipping", pluginFeatureInfo.Name);
             }
         }
+        
+        // If the plugin has a mandatory settings window, open it and wait
+        if (plugin.ConfigurationDialog != null && plugin.ConfigurationDialog.IsMandatory)
+        {
+            if (plugin.Resolve(plugin.ConfigurationDialog.Type) is not PluginConfigurationViewModel viewModel)
+                throw new ArtemisUIException($"The type of a plugin configuration dialog must inherit {nameof(PluginConfigurationViewModel)}");
+            
+            await _windowService.ShowDialogAsync(new PluginSettingsWindowViewModel(viewModel));
+        }
     }
 }

src/Artemis.UI/Screens/StartupWizard/Steps/LayoutsStepView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:startupWizard="clr-namespace:Artemis.UI.Screens.StartupWizard"
              xmlns:steps="clr-namespace:Artemis.UI.Screens.StartupWizard.Steps"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.StartupWizard.Steps.LayoutsStepView"
@@ -12,14 +11,9 @@
             Device layouts provide Artemis with an image of your devices and exact LED positions. <LineBreak />
             While not strictly necessary, this helps to create effects that are perfectly aligned with your hardware.
         </TextBlock>
-        <TextBlock TextWrapping="Wrap" Margin="0 10">
+        <TextBlock TextWrapping="Wrap" Margin="0 10 0 0">
-            Below you can automatically search the Artemis Workshop for device layouts of your devices.
+            We've searched for layouts for your connected devices, you can see the results below. If one or more are missing consider creating your own for the best experience.
         </TextBlock>
-        <Button
-            Content="Auto-install layouts"
-            Command="{CompiledBinding LayoutFinderViewModel.SearchAll}"
-            ToolTip.Tip="Search layouts and if found install them automatically"
-            HorizontalAlignment="Right" />
         <Border Classes="card">
             <StackPanel>
                 <ScrollViewer>
@@ -27,5 +21,10 @@
                 </ScrollViewer>
             </StackPanel>
         </Border>
+        <HyperlinkButton
+            Content="Learn more about layouts on the wiki"
+            NavigateUri="https://wiki.artemis-rgb.com/en/guides/developer/layouts?mtm_campaign=artemis&amp;mtm_kwd=wizard"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom" />
     </StackPanel>
 </UserControl>

src/Artemis.UI/Screens/StartupWizard/Steps/LayoutsStepViewModel.cs

@@ -1,4 +1,7 @@
-using Artemis.UI.Screens.Workshop.LayoutFinder;
+using System;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using Artemis.UI.Screens.Workshop.LayoutFinder;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.StartupWizard.Steps;
@@ -8,10 +11,12 @@ public class LayoutsStepViewModel : WizardStepViewModel
     public LayoutsStepViewModel(LayoutFinderViewModel layoutFinderViewModel)
     {
         LayoutFinderViewModel = layoutFinderViewModel;
-        
-        Continue = ReactiveCommand.Create(() => Wizard.ChangeScreen<SurfaceStepViewModel>());
-        GoBack = ReactiveCommand.Create(() => Wizard.ChangeScreen<DefaultEntriesStepViewModel>());
-    }
 
+        Continue = ReactiveCommand.Create(() => Wizard.ChangeScreen<SurfaceStepViewModel>(), LayoutFinderViewModel.SearchAll.IsExecuting.Select(isExecuting => !isExecuting));
+        GoBack = ReactiveCommand.Create(() => Wizard.ChangeScreen<DefaultEntriesStepViewModel>(), LayoutFinderViewModel.SearchAll.IsExecuting.Select(isExecuting => !isExecuting));
+
+        LayoutFinderViewModel.WhenActivated((CompositeDisposable _) => LayoutFinderViewModel.SearchAll.Execute().Subscribe());
+    }
+    
     public LayoutFinderViewModel LayoutFinderViewModel { get; }
 }

src/Artemis.UI/Screens/StartupWizard/Steps/SettingsStepView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:startupWizard="clr-namespace:Artemis.UI.Screens.StartupWizard"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:behaviors="clr-namespace:Artemis.UI.Shared.Behaviors;assembly=Artemis.UI.Shared"
              xmlns:steps="clr-namespace:Artemis.UI.Screens.StartupWizard.Steps"

src/Artemis.UI/Screens/StartupWizard/Steps/SurfaceStepView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:startupWizard="clr-namespace:Artemis.UI.Screens.StartupWizard"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:steps="clr-namespace:Artemis.UI.Screens.StartupWizard.Steps"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/Artemis.UI/Screens/StartupWizard/WizardPluginFeatureView.axaml

@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:startupWizard="clr-namespace:Artemis.UI.Screens.StartupWizard"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.StartupWizard.WizardPluginFeatureView"

src/Artemis.UI/Screens/VisualScripting/NodeScriptWindowView.axaml

@@ -3,11 +3,8 @@
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:visualScripting="clr-namespace:Artemis.UI.Screens.VisualScripting"
-                     xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
                      xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-                     xmlns:core="clr-namespace:Artemis.Core;assembly=Artemis.Core"
                      xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
-                     xmlns:system="clr-namespace:System;assembly=System.Runtime"
                      mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                      x:Class="Artemis.UI.Screens.VisualScripting.NodeScriptWindowView"
                      x:DataType="visualScripting:NodeScriptWindowViewModel"

src/Artemis.UI/Screens/VisualScripting/NodeView.axaml

@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:visualScripting="clr-namespace:Artemis.UI.Screens.VisualScripting"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              mc:Ignorable="d" d:DesignWidth="250" d:DesignHeight="150"
              x:Class="Artemis.UI.Screens.VisualScripting.NodeView"
              x:DataType="visualScripting:NodeViewModel">

src/Artemis.UI/Screens/Workshop/CurrentUser/CurrentUserView.axaml

@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:currentUser="clr-namespace:Artemis.UI.Screens.Workshop.CurrentUser"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Workshop.CurrentUser.CurrentUserView"

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListView.axaml

@@ -3,7 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:list="clr-namespace:Artemis.UI.Screens.Workshop.Entries.List"
-             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.Workshop.Entries.List.EntryListView"
              x:DataType="list:EntryListViewModel">

src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderDeviceView.axaml

@@ -44,7 +44,13 @@
                                    Margin="0 0 0 0" 
                                    VerticalAlignment="Center"/>
             <Panel IsVisible="{CompiledBinding !Searching}">
-                <avalonia:MaterialIcon IsVisible="{CompiledBinding Entry, Converter={x:Static ObjectConverters.IsNull}}"
+                <avalonia:MaterialIcon IsVisible="{CompiledBinding SearchPending}"
+                                       Width="28" 
+                                       Height="28" 
+                                       Kind="QuestionMarkCircle"
+                                       Foreground="#DAA520"
+                                       ToolTip.Tip="Search pending"/>
+                <avalonia:MaterialIcon IsVisible="{CompiledBinding NoLayoutFound}"
                                        Width="28" 
                                        Height="28" 
                                        Kind="MultiplyCircle"

src/Artemis.UI/Screens/Workshop/LayoutFinder/LayoutFinderDeviceViewModel.cs

@@ -25,6 +25,8 @@ public partial class LayoutFinderDeviceViewModel : ViewModelBase
 
     [Notify] private bool _searching;
     [Notify] private bool _hasLayout;
+    [Notify] private bool _searchPending = true;
+    [Notify] private bool _noLayoutFound;
 
     [Notify] private IEntrySummary? _entry;
     [Notify] private IRelease? _release;
@@ -50,7 +52,7 @@ public partial class LayoutFinderDeviceViewModel : ViewModelBase
     {
         if (HasLayout)
             return;
-        
+
         try
         {
             Searching = true;
@@ -64,6 +66,8 @@ public partial class LayoutFinderDeviceViewModel : ViewModelBase
             if (Entry != null && Release != null)
                 await InstallAndApplyEntry(Entry, Release);
 
+            SearchPending = false;
+            NoLayoutFound = Entry == null || Release == null;
             await delayTask;
         }
         finally

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Layout/LayoutInfoStepView.axaml

@@ -4,7 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:layout="clr-namespace:Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout"
              xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Layout.LayoutInfoStepView"
              x:DataType="layout:LayoutInfoStepViewModel">

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsLayerViewModel.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
+using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
 using PropertyChanged.SourceGenerator;

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:profile="clr-namespace:Artemis.UI.Screens.Workshop.SubmissionWizard.Steps.Profile"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/Profile/ProfileAdaptionHintsStepViewModel.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
+using Artemis.UI.Screens.ProfileEditor.ProfileTree.Dialogs;
 using Artemis.UI.Screens.Workshop.SubmissionWizard.Models;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop.Handlers.UploadHandlers;