Avalonia

.editorconfig

@@ -87,7 +87,7 @@ csharp_style_conditional_delegate_call = true:suggestion
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
 
 # Code-block preferences
-csharp_prefer_braces = true:suggestion
+csharp_prefer_braces = true:none
 
 # Expression-level preferences
 csharp_prefer_simple_default_expression = true:suggestion
@@ -144,3 +144,6 @@ csharp_space_between_square_brackets = false
 csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
 
+
+# IDE0011: Add braces
+dotnet_diagnostic.IDE0011.severity = none

.github/workflows/build.yml

@@ -83,9 +83,9 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
         shell: powershell
-        run: > 
-            .\.sonar\scanner\dotnet-sonarscanner 
-            begin /k:"TorisanKitsune_MinoriEditorShell" /o:"torisankitsune" 
+        run: >
+            .\.sonar\scanner\dotnet-sonarscanner
+            begin /k:"TorisanKitsune_MinoriEditorShell" /o:"torisankitsune"
             /d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io"
             /d:sonar.cs.opencover.reportsPaths=**/coverage.opencover.xml
             /v:${{steps.gitversion.outputs.semVer}}

.sonarlint/MinoriEditorShell.slconfig

@@ -9,7 +9,7 @@
   "Profiles": {
     "CSharp": {
       "ProfileKey": "AXHDDFLUVHc24qBALL5K",
-      "ProfileTimestamp": "2021-05-05T07:40:20Z"
+      "ProfileTimestamp": "2021-10-27T09:08:11Z"
     }
   }
 }

.sonarlint/torisankitsune_minorieditorshell2/CSharp/SonarLint.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AnalysisInput xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Settings>
+    <Setting>
+      <Key>sonar.cs.analyzeGeneratedCode</Key>
+      <Value>false</Value>
+    </Setting>
+    <Setting>
+      <Key>sonar.cs.file.suffixes</Key>
+      <Value>.cs</Value>
+    </Setting>
+    <Setting>
+      <Key>sonar.cs.ignoreHeaderComments</Key>
+      <Value>true</Value>
+    </Setting>
+    <Setting>
+      <Key>sonar.cs.roslyn.ignoreIssues</Key>
+      <Value>false</Value>
+    </Setting>
+  </Settings>
+  <Rules>
+    <Rule>
+      <Key>S107</Key>
+      <Parameters>
+        <Parameter>
+          <Key>max</Key>
+          <Value>7</Value>
+        </Parameter>
+      </Parameters>
+    </Rule>
+    <Rule>
+      <Key>S110</Key>
+      <Parameters>
+        <Parameter>
+          <Key>max</Key>
+          <Value>5</Value>
+        </Parameter>
+      </Parameters>
+    </Rule>
+    <Rule>
+      <Key>S1479</Key>
+      <Parameters>
+        <Parameter>
+          <Key>maximum</Key>
+          <Value>30</Value>
+        </Parameter>
+      </Parameters>
+    </Rule>
+    <Rule>
+      <Key>S2342</Key>
+      <Parameters>
+        <Parameter>
+          <Key>flagsAttributeFormat</Key>
+          <Value>^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?s$</Value>
+        </Parameter>
+        <Parameter>
+          <Key>format</Key>
+          <Value>^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?$</Value>
+        </Parameter>
+      </Parameters>
+    </Rule>
+    <Rule>
+      <Key>S2436</Key>
+      <Parameters>
+        <Parameter>
+          <Key>max</Key>
+          <Value>2</Value>
+        </Parameter>
+        <Parameter>
+          <Key>maxMethod</Key>
+          <Value>3</Value>
+        </Parameter>
+      </Parameters>
+    </Rule>
+    <Rule>
+      <Key>S3776</Key>
+      <Parameters>
+        <Parameter>
+          <Key>propertyThreshold</Key>
+          <Value>3</Value>
+        </Parameter>
+        <Parameter>
+          <Key>threshold</Key>
+          <Value>15</Value>
+        </Parameter>
+      </Parameters>
+    </Rule>
+  </Rules>
+</AnalysisInput>

.sonarlint/torisankitsune_minorieditorshellcsharp.ruleset

@@ -169,6 +169,7 @@
     <Rule Id="S3010" Action="Warning" />
     <Rule Id="S3011" Action="Warning" />
     <Rule Id="S3052" Action="None" />
+    <Rule Id="S3059" Action="None" />
     <Rule Id="S3060" Action="Warning" />
     <Rule Id="S3168" Action="Warning" />
     <Rule Id="S3169" Action="Warning" />
@@ -194,11 +195,13 @@
     <Rule Id="S3254" Action="None" />
     <Rule Id="S3256" Action="Info" />
     <Rule Id="S3257" Action="None" />
+    <Rule Id="S3260" Action="Info" />
     <Rule Id="S3261" Action="Info" />
     <Rule Id="S3262" Action="Warning" />
     <Rule Id="S3263" Action="Warning" />
     <Rule Id="S3264" Action="Warning" />
     <Rule Id="S3265" Action="Warning" />
+    <Rule Id="S3267" Action="Warning" />
     <Rule Id="S3329" Action="Warning" />
     <Rule Id="S3343" Action="Warning" />
     <Rule Id="S3346" Action="Warning" />

CreateArtifacts.ps1

@@ -19,7 +19,7 @@ foreach ($nupkg in $nupkgs) {
 #mkdir Artifacts\$basedir\Demos
 cp Demos\SimpleDemo\SimpleDemo.WPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\SimpleDemo.WPF -Recurse
 cp Demos\SimpleDemo\SimpleDemo.RibbonWPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\SimpleDemo.RibbonWPF -Recurse
-cp Demos\MinoriDemo\MinoriDemo.WPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\MinoriDemo.WPF -Recurse
+cp Demos\SimpleDemo\SimpleDemo.Avalonia\bin\Release\net5.0 Artifacts\$basedir\Demos\SimpleDemo.Avalonia -Recurse
 cp Demos\MinoriDemo\MinoriDemo.RibbonWPF\bin\Release\net5.0-windows Artifacts\$basedir\Demos\MinoriDemo.RibbonWPF -Recurse
 
 # Compress folder into 7z file

Demos/MinoriDemo/MinoriDemo.Core/ViewModels/MainViewModel.cs

@@ -1,8 +1,6 @@
-using Microsoft.Extensions.Logging;
 using MinoriEditorShell.Services;
 using MvvmCross;
 using MvvmCross.Commands;
-using MvvmCross.Logging;
 using MvvmCross.Navigation;
 using MvvmCross.ViewModels;
 using System;

Demos/MinoriDemo/MinoriDemo.RibbonWPF/DataClasses/ThemeItem.cs

@@ -0,0 +1,63 @@
+using MinoriDemo.RibbonWPF.Modules.Themes;
+using MvvmCross;
+using MvvmCross.Base;
+using MvvmCross.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Windows.Media;
+
+namespace MinoriDemo.RibbonWPF.DataClasses
+{
+    internal class ThemeItem : MvxNotifyPropertyChanged
+    {
+        private Color _color;
+        private String _key;
+        private Boolean _canEdit = false;
+        private String _modeText = "Edit";
+
+        public ThemeHelper ThemeHelper { get; set; }
+
+        public String ModeText
+        {
+            get => _modeText;
+            set => SetProperty(ref _modeText, value);
+        }
+
+        public Boolean CanEdit
+        {
+            get => _canEdit;
+            set
+            {
+                if (SetProperty(ref _canEdit, value))
+                {
+                    ModeText = value ? "Done" : "Edit";
+                }
+            }
+        }
+
+        public String Key
+        {
+            get => _key;
+            set => SetProperty(ref _key, value);
+        }
+
+        public Color Color
+        {
+            get => _color;
+            set
+            {
+                _color = value;
+
+                Mvx.IoCProvider.Resolve<IMvxMainThreadAsyncDispatcher>()
+                .ExecuteOnMainThreadAsync(() =>
+                {
+                    IDictionary<String, SolidColorBrush> brushes = ThemeHelper.GetBrushes();
+                    brushes[Key] = new SolidColorBrush(value);
+                    ThemeHelper.SetBrushes(brushes);
+                });
+            }
+        }
+
+        public String OriginalKey { get; internal set; }
+    }
+}

Demos/MinoriDemo/MinoriDemo.RibbonWpf/MainWindow.xaml → Demos/MinoriDemo/MinoriDemo.RibbonWPF/MainWindow.xaml

@@ -1,4 +1,4 @@
-<ribbon:MesRibbonWindow
+<ribbon:MesRibbonWindow
     x:Class="MinoriDemo.RibbonWPF.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -9,4 +9,4 @@
     Title="Minori Demo App" Height="450" Width="800">
     <Grid>
     </Grid>
-</ribbon:MesRibbonWindow>
+</ribbon:MesRibbonWindow>

Demos/MinoriDemo/MinoriDemo.Wpf/Setup.cs → Demos/MinoriDemo/MinoriDemo.RibbonWPF/Setup.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using MinoriEditorShell.Platforms.Wpf;
 
-namespace MinoriDemo.WpfCore
+namespace MinoriDemo.RibbonWPF
 {
     internal class Setup : MesWpfSetup<Core.App>
     {

Demos/MinoriDemo/MinoriDemo.RibbonWPF/Views/ThemeEditorView.xaml

@@ -0,0 +1,68 @@
+<views:MvxWpfView
+    x:Class="MinoriDemo.RibbonWPF.Views.ThemeEditorView"
+    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:MinoriDemo.RibbonWPF.Views"
+    xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
+    xmlns:picker="clr-namespace:ColorPickerLib.Controls;assembly=ColorPickerLib"
+    mc:Ignorable="d" x:Name="root"
+    d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="35" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="200" />
+                <ColumnDefinition Width="44" />
+                <ColumnDefinition Width="82" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="244" />
+                <ColumnDefinition Width="56" />
+            </Grid.ColumnDefinitions>
+            <ComboBox
+                IsReadOnly="True"
+                VerticalAlignment="Center"
+                x:Name="ThemeSelection" SelectionChanged="ThemeChanged" Height="25">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Source}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <Button
+                Grid.Column="1" Content="Export"
+                VerticalAlignment="Center" HorizontalAlignment="Center"
+                Height="25" Margin="3,5"
+                Click="Export_Click" Width="38" />
+            <Button
+                Grid.Column="2" Content="Add Color" Margin="3,5"
+                Click="Add_Click" />
+            <TextBox x:Name="search" Grid.Column="4" Margin="3" KeyDown="search_KeyDown" />
+            <Button Grid.Column="5" Margin="3" Content="Search" Click="Search_Click" />
+        </Grid>
+        <ListView x:Name="MainResourceList" Grid.Row="1">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal" Height="25">
+                        <picker:ColorPicker Width="50" Height="25" SelectedColor="{Binding Color}" />
+                        <TextBox Text="{Binding Key}" IsEnabled="{Binding CanEdit}" Height="25" />
+                        <Button
+                            Click="RenameClick"
+                            Content="{Binding ModeText}"
+                            CommandParameter="{Binding}"
+                            Height="25" Width="50" />
+                        <Button
+                            Content="X"
+                            Click="RemoveClick"
+                            Height="25" Width="25" />
+                    </StackPanel>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</views:MvxWpfView>