Remove FluentAvaloniaUI package and replace with native Avalonia controls

Editor.Desktop/Editor.Desktop.csproj

@@ -25,8 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="12.0.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="12.0.0" />
+    <PackageReference Include="Avalonia" Version="11.3.13" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.13" />
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.13" />
   </ItemGroup>
 

Editor/App.axaml

@@ -1,8 +1,7 @@
 <Application
     x:Class="Editor.App"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sty="using:FluentAvalonia.Styling">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -12,11 +11,13 @@
             <!-- These are not part of MergedDictionaries so we can add or remove them easier -->
             <!-- So we put language resources here so that we can switch them at runtime -->
             <ResourceInclude x:Key="zh-cn" Source="/Languages/zh-cn.axaml" />
+
+            <!-- Symbol icon font family (was previously provided by FluentAvaloniaUI) -->
+            <FontFamily x:Key="SymbolThemeFontFamily">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
         </ResourceDictionary>
     </Application.Resources>
 
     <Application.Styles>
-        <!--  FluentAvalonia Settings  -->
-        <sty:FluentAvaloniaTheme PreferSystemTheme="True" PreferUserAccentColor="True" />
+        <FluentTheme />
     </Application.Styles>
 </Application>

Editor/Controls/EditorControl.axaml.cs

@@ -6,7 +6,6 @@
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
-using FluentAvalonia.UI.Controls;
 using ICSharpCode.SharpZipLib.Core;
 using ICSharpCode.SharpZipLib.Zip;
 using ElapsedEventArgs = System.Timers.ElapsedEventArgs;
@@ -206,7 +205,7 @@ private void EditorControl_PointerRightButtonPressed(object? sender, PointerPres
     {
         Focus();
 
-        // Build context menu using FluentAvalonia MenuFlyout to reliably show at pointer
+        // Build context menu using native Avalonia MenuFlyout to reliably show at pointer
         var menu = new MenuFlyout();
 
         var hasSelection = _mainWindow.IsSelecting == true;
@@ -217,9 +216,9 @@ void AddMenuItem(string header, string glyph, bool isEnabled, Action action)
             var mi = new MenuItem
             {
                 Header = header,
-                Icon = new FontIcon
+                Icon = new TextBlock
                 {
-                    Glyph = glyph,
+                    Text = glyph,
                     FontFamily = (FontFamily)Application.Current!.FindResource("SymbolThemeFontFamily")!
                 },
                 IsEnabled = isEnabled

Editor/Editor.csproj

@@ -24,7 +24,7 @@
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.13" />
     <PackageReference Include="Clowd.Clipboard.Avalonia" Version="1.1.4" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageReference Include="FluentAvaloniaUI" Version="2.5.1" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.13" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.3.1.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />

Editor/Helper/ContentDialogHelper.cs

@@ -1,16 +1,14 @@
 using System;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Media;
-using FluentAvalonia.UI.Controls;
 
 namespace Editor;
 
 public static class ContentDialogHelper
 {
     public static async Task<MessageBoxResult> ShowAsync(IMainWindow owner, string messageBoxText, string caption, MessageBoxButton button)
     {
-        if (owner is not Window windowOwner)
+        if (owner is not Window)
         {
             throw new InvalidOperationException("Owner must be a Window.");
         }
@@ -19,67 +17,10 @@ public static async Task<MessageBoxResult> ShowAsync(IMainWindow owner, string m
             throw new InvalidOperationException("Owner must implement IContentDialogOwner.");
         }
 
-        var dialog = new ContentDialog
-        {
-            Title = caption
-        };
-        switch (button)
-        {
-            case MessageBoxButton.OK:
-                dialog.PrimaryButtonText = Localize.Ok();
-                break;
-            case MessageBoxButton.YesNo:
-                dialog.PrimaryButtonText = Localize.Yes();
-                dialog.SecondaryButtonText = Localize.No();
-                break;
-            case MessageBoxButton.OKCancel:
-                dialog.PrimaryButtonText = Localize.Ok();
-                dialog.SecondaryButtonText = Localize.Cancel();
-                break;
-            case MessageBoxButton.YesNoCancel:
-                dialog.PrimaryButtonText = Localize.Yes();
-                dialog.SecondaryButtonText = Localize.No();
-                dialog.CloseButtonText = Localize.Cancel();
-                break;
-        }
-        dialog.DefaultButton = ContentDialogButton.Primary;
-        dialog.Content = new TextBlock
-        {
-            Text = messageBoxText,
-            TextWrapping = TextWrapping.Wrap
-        };
-
         contentDialogOwner.ContentDialogChanged(true);
         try
         {
-            var result = await dialog.ShowAsync(windowOwner);
-            return button switch
-            {
-                MessageBoxButton.OK => result switch
-                {
-                    ContentDialogResult.Primary => MessageBoxResult.OK,
-                    _ => MessageBoxResult.None
-                },
-                MessageBoxButton.YesNo => result switch
-                {
-                    ContentDialogResult.Primary => MessageBoxResult.Yes,
-                    ContentDialogResult.Secondary => MessageBoxResult.No,
-                    _ => MessageBoxResult.None
-                },
-                MessageBoxButton.OKCancel => result switch
-                {
-                    ContentDialogResult.Primary => MessageBoxResult.OK,
-                    ContentDialogResult.Secondary => MessageBoxResult.Cancel,
-                    _ => MessageBoxResult.None
-                },
-                MessageBoxButton.YesNoCancel => result switch
-                {
-                    ContentDialogResult.Primary => MessageBoxResult.Yes,
-                    ContentDialogResult.Secondary => MessageBoxResult.No,
-                    _ => MessageBoxResult.Cancel
-                },
-                _ => MessageBoxResult.None,
-            };
+            return await MessageBox.ShowAsync(messageBoxText, caption, button);
         }
         finally
         {

Editor/Views/MainWindow.axaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Editor"
-    xmlns:ui="using:FluentAvalonia.UI.Controls"
+
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:trace="clr-namespace:System.Diagnostics;assembly=WindowsBase"
     xmlns:toolbar="clr-namespace:Avalonia.Controls.ToolBar.Controls;assembly=Avalonia.Controls.ToolBar"
@@ -63,11 +63,11 @@
                     Command="{Binding ToggleFullScreenModeCommand, Mode=OneTime}"
                     ToolTip.Tip="{DynamicResource MainWindow_ExitFullScreen}"
                     IsVisible="{Binding FullScreenButtonVisible, Mode=OneWay}">
-                    <ui:FontIcon
+                    <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                        Glyph="&#xE73F;" />
+                        Text="&#xE73F;" />
                 </Button>
                 <Button
                     Width="44"
@@ -77,11 +77,11 @@
                     Command="{Binding CloseCommand, Mode=OneTime}"
                     ToolTip.Tip="{DynamicResource Close}"
                     IsVisible="{Binding FullScreenButtonVisible, Mode=OneWay}">
-                    <ui:FontIcon
+                    <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                        Glyph="&#xE711;" />
+                        Text="&#xE711;" />
                 </Button>
             </StackPanel>