misc: Update package version.

Remove default implementation of ContentControl and UserControl

README.md

@@ -1,16 +1,24 @@
-# Semi.Avalonia
+# Semi Avalonia
 
 [![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
 [![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
 
+[中文](./README_CN.md)
+
 Avalonia Theme inspired by Semi Design
 
-# How to Use
+If you are looking for more customized controls, Please try [Ursa](https://github.com/irihitech/Ursa.Avalonia)
+
+![Light](./docs/demo.jpg)
+
+## How to Use
+
+### Installation
 
-## Installation
 ```bash
-dotnet add package Semi.Avalonia
+dotnet add package Semi.Avalonia --version 11.0.7
 ```
+
 Include Semi Design Styles in application:
 
 ```xaml
@@ -19,14 +27,16 @@ Include Semi Design Styles in application:
 </Application.Styles>
 ```
 
-That's all. 
+That's all.
 
 ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need. 
+
 ```bash
-dotnet add package Semi.Avalonia.ColorPicker
-dotnet add package Semi.Avalonia.DataGrid
-dotnet add package Semi.Avalonia.TreeDataGrid
+dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7
+dotnet add package Semi.Avalonia.DataGrid --version 11.0.7
+dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7
 ```
+
 ```xaml
 <Application.Styles>
     <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
@@ -38,7 +48,7 @@ dotnet add package Semi.Avalonia.TreeDataGrid
 ## Demo
 
 You can always download demo executable to play around with Semi Avalonia Themes.
-https://github.com/irihitech/Semi.Avalonia/releases
+<https://github.com/irihitech/Semi.Avalonia/releases>
 
 ## Version compatibility
 
@@ -48,6 +58,7 @@ https://github.com/irihitech/Semi.Avalonia/releases
 | 11.0.1              | <=11.0.6         |
 
 ## TODO
+
 * FocusAdorner
 
 ## Credits
@@ -62,10 +73,3 @@ https://github.com/irihitech/Semi.Avalonia/releases
 
 [CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
 
-## Screenshot
-
-Light Mode
-![Light](./docs/Light.png)
-
-Dark Mode
-![Dark](./docs/Dark.png)

README_CN.md

@@ -0,0 +1,76 @@
+# Semi Avalonia
+
+[![Semi Avalonia](https://img.shields.io/nuget/v/Semi.Avalonia.svg?color=red&style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
+[![Semi Avalonia](https://img.shields.io/nuget/dt/Semi.Avalonia.svg?style=flat-square)](https://www.nuget.org/packages/Semi.Avalonia/)
+
+[English](./README.md)
+
+Avalonia UI 控件主题，灵感来自 Semi Design
+
+如果您希望使用更多的拓展控件，欢迎尝试 [Ursa](https://github.com/irihitech/Ursa.Avalonia)
+
+![Light](./docs/demo.jpg)
+
+## 如何使用
+
+### 安装
+
+```bash
+dotnet add package Semi.Avalonia --version 11.0.7
+```
+
+在样式中引用 Semi 主题：
+
+```xaml
+<Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
+</Application.Styles>
+```
+
+这样就可以了。
+
+ColorPicker， DataGrid 和 TreeDataGrid 的样式单独分发，如果需要请安装并引用。
+
+```bash
+dotnet add package Semi.Avalonia.ColorPicker --version 11.0.7
+dotnet add package Semi.Avalonia.DataGrid --version 11.0.7
+dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.7
+```
+
+```xaml
+<Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
+    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
+</Application.Styles>
+```
+
+## 示例
+
+您可以从 Semi Avalonia 的 release 页下载并试用 Semi Avalonia 的展示应用。
+
+<https://github.com/irihitech/Semi.Avalonia/releases>
+
+## 版本兼容性
+
+| Semi Design Version | Avalonia Version |
+|:--------------------|:-----------------|
+| 11.0.7              | >=11.0.7           |
+| 11.0.1              | <=11.0.6         |
+
+## 代办事项
+
+* FocusAdorner
+
+## 致谢
+
+[Semi Design](https://semi.design/)
+
+[Avalonia](https://github.com/AvaloniaUI/Avalonia)
+
+[FluentAvalonia](https://github.com/amwx/FluentAvalonia)
+
+[Material Design Icons](https://pictogrammers.com/library/mdi/)
+
+[CommunityToolKit](https://github.com/CommunityToolkit/dotnet)
+

demo/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.7</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0-beta1</AvaloniaVersion>
   </PropertyGroup>
 </Project>

demo/Semi.Avalonia.Demo.Web/Program.cs

@@ -7,9 +7,9 @@ using Avalonia.Browser;
 
 namespace Semi.Avalonia.Demo.Web;
 
-internal partial class Program
+internal sealed partial class Program
 {
-    private static async Task Main(string[] args) => await BuildAvaloniaApp()
+    private static Task Main(string[] args) => BuildAvaloniaApp()
         .StartBrowserAppAsync("out");
 
     public static AppBuilder BuildAvaloniaApp()

demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-        <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
         <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0-browser</TargetFramework>
+        <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+        <WasmMainJSPath>wwwroot\main.js</WasmMainJSPath>
+        <WasmRuntimeAssetsLocation>./_framework</WasmRuntimeAssetsLocation>
     </PropertyGroup>
 
     <ItemGroup>
-        <WasmExtraFilesToDeploy Include="AppBundle\**" />
+        <WasmExtraFilesToDeploy Include="wwwroot\**"/>
     </ItemGroup>
 
     <ItemGroup>

demo/Semi.Avalonia.Demo.Web/wwwroot/index.html

@@ -7,8 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <base href="/" />
     <link rel="modulepreload" href="./main.js" />
-    <link rel="modulepreload" href="./dotnet.js" />
-    <link rel="modulepreload" href="./avalonia.js" />
+    <link rel="modulepreload" href="./_framework/dotnet.js" />
+    <link rel="modulepreload" href="./_framework/avalonia.js" />
     <link rel="stylesheet" href="./app.css" />
 </head>
 

demo/Semi.Avalonia.Demo.Web/wwwroot/main.js

@@ -1,4 +1,4 @@
-import { dotnet } from './dotnet.js'
+import { dotnet } from './_framework/dotnet.js'
 
 const is_browser = typeof window != "undefined";
 if (!is_browser) throw new Error(`Expected to be running in a browser`);
@@ -10,4 +10,4 @@ const dotnetRuntime = await dotnet
 
 const config = dotnetRuntime.getConfig();
 
-await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
+await dotnetRuntime.runMain(config.mainAssemblyName, [window.location.search]);

demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml

@@ -70,5 +70,16 @@
                 </DataTemplate>
             </AutoCompleteBox.ItemTemplate>
         </AutoCompleteBox>
+        <AutoCompleteBox 
+            InnerLeftContent="https://"
+            InnerRightContent=".com"
+            ItemsSource="{Binding States}"
+            ValueMemberBinding="{ReflectionBinding Name}">
+            <AutoCompleteBox.ItemTemplate>
+                <DataTemplate DataType="local:StateData">
+                    <TextBlock Text="{Binding Name}" />
+                </DataTemplate>
+            </AutoCompleteBox.ItemTemplate>
+        </AutoCompleteBox>
     </StackPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml

@@ -29,6 +29,12 @@
                     <colorPicker:SemiColorLightPalette />
                 </ColorPicker.Palette>
             </ColorPicker>
+            
+            <ColorPicker ColorSpectrumShape="Box" Theme="{DynamicResource HexColorPicker}">
+                <ColorPicker.Palette>
+                    <colorPicker:SemiColorLightPalette />
+                </ColorPicker.Palette>
+            </ColorPicker>
         </StackPanel>
     </StackPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml

@@ -0,0 +1,43 @@
+<UserControl
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
+    x:Class="Semi.Avalonia.Demo.Pages.HyperlinkButtonDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StackPanel HorizontalAlignment="Left" Spacing="20">
+        <StackPanel Orientation="Horizontal">
+            <HyperlinkButton Height="20" NavigateUri="http://www.irihi.tech/">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Text="iRihi Homepage"
+                    TextDecorations="Underline"
+                    VerticalAlignment="Center" />
+            </HyperlinkButton>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <HyperlinkButton Height="20" IsEnabled="False">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Text="Not Enabled"
+                    TextDecorations="Underline"
+                    VerticalAlignment="Center" />
+            </HyperlinkButton>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <HyperlinkButton
+                BorderThickness="1"
+                Classes="WithIcon"
+                Height="20"
+                NavigateUri="http://www.irihi.tech/">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Text="Link with Icon"
+                    TextDecorations="Underline"
+                    VerticalAlignment="Center" />
+            </HyperlinkButton>
+        </StackPanel>
+    </StackPanel>
+</UserControl>

demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs

@@ -0,0 +1,14 @@
+using System;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class HyperlinkButtonDemo : UserControl
+{
+    public HyperlinkButtonDemo()
+    {
+        InitializeComponent();
+    }
+}

demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml

@@ -37,5 +37,11 @@
             Classes="Small"
             Maximum="100"
             Minimum="0" />
+        <NumericUpDown
+            Width="200"
+            InnerLeftContent="Price"
+            InnerRightContent="$"
+            Maximum="100"
+            Minimum="0" />
     </StackPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml

@@ -4,12 +4,24 @@
     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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
     d:DesignHeight="450"
     d:DesignWidth="800"
+    x:DataType="pages:RefreshContainerDemoViewModel"
+    x:CompileBindings="True"
     mc:Ignorable="d">
-    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <RefreshContainer Name="container">
-            <TextBlock Text="Content" />
+    <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
+        <Label DockPanel.Dock="Top">A control that supports pull to refresh</Label>
+        <RefreshContainer Name="Refresh"
+                          DockPanel.Dock="Bottom"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Stretch"
+                          PullDirection="TopToBottom"
+                          RefreshRequested="RefreshContainerPage_RefreshRequested"
+                          Margin="5">
+            <ListBox HorizontalAlignment="Stretch"
+                     VerticalAlignment="Top"
+                     ItemsSource="{Binding Items}" />
         </RefreshContainer>
-    </StackPanel>
+    </DockPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/RefreshContainerDemo.axaml.cs

@@ -1,14 +1,46 @@
-using Avalonia;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Semi.Avalonia.Demo.Pages;
 
 public partial class RefreshContainerDemo : UserControl
 {
+    private RefreshContainerDemoViewModel _viewModel;
+
     public RefreshContainerDemo()
     {
         InitializeComponent();
+
+        _viewModel = new RefreshContainerDemoViewModel();
+
+        DataContext = _viewModel;
+    }
+
+    private async void RefreshContainerPage_RefreshRequested(object? sender, RefreshRequestedEventArgs e)
+    {
+        var deferral = e.GetDeferral();
+
+        await _viewModel.AddToTop();
+
+        deferral.Complete();
+    }
+}
+
+public class RefreshContainerDemoViewModel : ObservableObject
+{
+    public ObservableCollection<string> Items { get; }
+
+    public RefreshContainerDemoViewModel()
+    {
+        Items = new ObservableCollection<string>(Enumerable.Range(1, 200).Select(i => $"Item {i}"));
+    }
+
+    public async Task AddToTop()
+    {
+        await Task.Delay(1000);
+        Items.Insert(0, $"Item {200 - Items.Count}");
     }
 }

demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml

@@ -4,194 +4,147 @@
     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:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
-    d:DesignHeight="1000"
+    d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <Design.DataContext>
-        <pages:SplitViewDemoViewModel />
-    </Design.DataContext>
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <StreamGeometry x:Key="NavigationMenuExpandIconGlyph">M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z</StreamGeometry>
-        </ResourceDictionary>
-    </UserControl.Resources>
     <Border>
         <Grid ColumnDefinitions="*,400">
-            <Border Grid.Column="1" VerticalAlignment="Top" Margin="10 0 0 0">
-                <Grid RowDefinitions="*, *, *, *, *, *" ColumnDefinitions="Auto, *">
-                    <Label
-                        Grid.Row="0" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="IsPaneOpen" />
-                    <ToggleSwitch
-                        Grid.Row="0" Grid.Column="1"
-                        Name="PaneOpenButton"
-                        IsChecked="{Binding #SplitView.IsPaneOpen}" />
+            <StackPanel
+                Grid.Column="1"
+                Orientation="Vertical"
+                Spacing="4">
+                <ToggleButton
+                    Name="PaneOpenButton"
+                    Content="IsPaneOpen"
+                    IsChecked="{Binding IsPaneOpen, ElementName=SplitView}" />
 
-                    <Label
-                        Grid.Row="1" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="UseLightDismissOverlayMode" />
-                    <ToggleSwitch
-                        Grid.Row="1" Grid.Column="1"
-                        Name="UseLightDismissOverlayModeButton"
-                        IsChecked="{Binding #SplitView.UseLightDismissOverlayMode}" />
+                <ToggleButton
+                    Name="UseLightDismissOverlayModeButton"
+                    Content="UseLightDismissOverlayMode"
+                    IsChecked="{Binding UseLightDismissOverlayMode, ElementName=SplitView}" />
 
-                    <Label
-                        Grid.Row="2" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="Placement" />
-                    <ToggleSwitch
-                        Grid.Row="2" Grid.Column="1"
-                        OffContent="Left"
-                        OnContent="Right"
-                        IsChecked="{Binding #SplitView.PanePlacement, Mode=OneWayToSource}" />
+                <ToggleSwitch
+                    Content="Placement"
+                    OffContent="Left"
+                    OnContent="Right" />
 
-                    <Label
-                        Grid.Row="3" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="DisplayMode" />
-                    <ComboBox
-                        Grid.Row="3" Grid.Column="1"
-                        Name="DisplayModeSelector"
-                        HorizontalAlignment="Stretch"
-                        ItemsSource="{Binding DisplayModes}"
-                        SelectedIndex="{Binding #SplitView.DisplayMode}" />
+                <TextBlock Text="DisplayMode" />
+                <ComboBox
+                    Name="DisplayModeSelector"
+                    Width="170"
+                    Margin="10"
+                    SelectedIndex="{Binding DisplayMode}">
+                    <ComboBoxItem>Inline</ComboBoxItem>
+                    <ComboBoxItem>CompactInline</ComboBoxItem>
+                    <ComboBoxItem>Overlay</ComboBoxItem>
+                    <ComboBoxItem>CompactOverlay</ComboBoxItem>
+                </ComboBox>
 
-                    <Label
-                        Grid.Row="4" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="{Binding #CompactPaneLengthSlider.Value, StringFormat='{}CompactPaneLength: {0}'}" />
-                    <Slider
-                        Grid.Row="4" Grid.Column="1"
-                        Name="CompactPaneLengthSlider"
-                        Maximum="128"
-                        Minimum="0"
-                        TickFrequency="1"
-                        IsSnapToTickEnabled="True"
-                        Value="{Binding #SplitView.CompactPaneLength}" />
+                <TextBlock Text="PaneBackground" />
+                <ComboBox
+                    Name="PaneBackgroundSelector"
+                    Width="170"
+                    Margin="10"
+                    SelectedIndex="0">
+                    <ComboBoxItem Tag="White">White</ComboBoxItem>
+                    <ComboBoxItem Tag="Red">Red</ComboBoxItem>
+                    <ComboBoxItem Tag="Blue">Blue</ComboBoxItem>
+                    <ComboBoxItem Tag="Green">Green</ComboBoxItem>
+                </ComboBox>
 
-                    <Label
-                        Grid.Row="5" Grid.Column="0"
-                        VerticalAlignment="Center"
-                        Content="{Binding #OpenPaneLengthSlider.Value,StringFormat='{}OpenPaneLength: {0}'}" />
-                    <Slider
-                        Grid.Row="5" Grid.Column="1"
-                        Name="OpenPaneLengthSlider"
-                        Maximum="500"
-                        Minimum="128"
-                        TickFrequency="1"
-                        IsSnapToTickEnabled="True"
-                        Value="{Binding #SplitView.OpenPaneLength}" />
-                </Grid>
-            </Border>
-            <Border
-                Grid.Column="0"
-                BorderBrush="{DynamicResource SemiGrey1}"
-                BorderThickness="1">
+                <TextBlock Text="{Binding Value, ElementName=OpenPaneLengthSlider, StringFormat='{}OpenPaneLength: {0}'}" />
+                <Slider
+                    Name="OpenPaneLengthSlider"
+                    Width="150"
+                    Maximum="500"
+                    Minimum="128"
+                    Value="256" />
+
+                <TextBlock Text="{Binding Value, ElementName=CompactPaneLengthSlider, StringFormat='{}CompactPaneLength: {0}'}" />
+                <Slider
+                    Name="CompactPaneLengthSlider"
+                    Width="150"
+                    Maximum="128"
+                    Minimum="24"
+                    Value="48" />
+            </StackPanel>
+            <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}" BorderThickness="1">
+                <!--  {Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}  -->
                 <SplitView
                     Name="SplitView"
+                    CompactPaneLength="{Binding Value, ElementName=CompactPaneLengthSlider}"
                     DisplayMode="CompactOverlay"
-                    CompactPaneLength="48"
-                    OpenPaneLength="256">
-                    <SplitView.Background>
-                        <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
-                            <GradientStop Color="#6b4c1b" Offset="0" />
-                            <GradientStop Color="#291e10" Offset="1" />
-                        </LinearGradientBrush>
-                    </SplitView.Background>
+                    OpenPaneLength="{Binding Value, ElementName=OpenPaneLengthSlider}"
+                    PaneBackground="{Binding SelectedItem.Tag, ElementName=PaneBackgroundSelector}"
+                    PanePlacement="{Binding PanePlacement}">
                     <SplitView.Pane>
-                        <Grid RowDefinitions="Auto,*,Auto">
+                        <Grid RowDefinitions="Auto,Auto,*,Auto">
                             <TextBlock
-                                Grid.Row="0"
                                 Name="PaneHeader"
-                                Margin="8,12"
+                                Margin="5,12,0,0"
                                 FontWeight="Bold"
-                                Text="Playlist" />
-                            <ListBox
-                                Grid.Row="1"
-                                ItemsSource="{Binding Songs}" />
-                            <ToggleSwitch
+                                Text="PANE CONTENT" />
+                            <ComboBox Grid.Row="1" Width="150">
+                                <ComboBoxItem Content="Item1" />
+                                <ComboBoxItem Content="Item2" />
+                                <ComboBoxItem Content="Item3" />
+                            </ComboBox>
+                            <ListBoxItem
                                 Grid.Row="2"
-                                Theme="{DynamicResource ButtonToggleSwitch}"
-                                IsChecked="{Binding #SplitView.IsPaneOpen}">
-                                <ToggleSwitch.OnContent>
-                                    <PathIcon
-                                        Width="16"
-                                        Height="16"
-                                        Data="{StaticResource NavigationMenuExpandIconGlyph}" />
-                                </ToggleSwitch.OnContent>
-                                <ToggleSwitch.OffContent>
-                                    <PathIcon
-                                        Width="16"
-                                        Height="16"
-                                        Data="{StaticResource NavigationMenuExpandIconGlyph}" />
-                                </ToggleSwitch.OffContent>
-                            </ToggleSwitch>
+                                Margin="0,10"
+                                VerticalAlignment="Top">
+                                <StackPanel Orientation="Horizontal">
+                                    <!--  Path glyph from materialdesignicons.com  -->
+                                    <Border Width="48">
+                                        <Viewbox
+                                            Width="24"
+                                            Height="24"
+                                            HorizontalAlignment="Left">
+                                            <Canvas Width="24" Height="24">
+                                                <Path Data="M16 17V19H2V17S2 13 9 13 16 17 16 17M12.5 7.5A3.5 3.5 0 1 0 9 11A3.5 3.5 0 0 0 12.5 7.5M15.94 13A5.32 5.32 0 0 1 18 17V19H22V17S22 13.37 15.94 13M15 4A3.39 3.39 0 0 0 13.07 4.59A5 5 0 0 1 13.07 10.41A3.39 3.39 0 0 0 15 11A3.5 3.5 0 0 0 15 4Z" Fill="{DynamicResource SystemControlForegroundBaseHighBrush}" />
+                                            </Canvas>
+                                        </Viewbox>
+                                    </Border>
+                                    <TextBlock VerticalAlignment="Center" Text="People" />
+                                </StackPanel>
+                            </ListBoxItem>
+                            <TextBlock
+                                Grid.Row="3"
+                                Margin="60,12"
+                                Text="Item at bottom" />
                         </Grid>
                     </SplitView.Pane>
 
-                    <Panel>
-                        <Panel.Styles>
-                            <Style Selector="Image#AlbumCover">
-                                <Style.Animations>
-                                    <Animation IterationCount="Infinite" Duration="0:0:40">
-                                        <KeyFrame Cue="0%">
-                                            <Setter Property="RotateTransform.Angle" Value="0" />
-                                        </KeyFrame>
-                                        <KeyFrame Cue="100%">
-                                            <Setter Property="RotateTransform.Angle" Value="360" />
-                                        </KeyFrame>
-                                    </Animation>
-                                </Style.Animations>
+                    <Grid>
+                        <Grid.Styles>
+                            <Style Selector="TextBlock">
+                                <Setter Property="FontSize" Value="14" />
+                                <Setter Property="FontWeight" Value="700" />
                             </Style>
-                        </Panel.Styles>
-                        <Image
-                            Source="/Assets/WORLD.png"
-                            Name="AlbumCover"
-                            Width="200"
-                            Height="200" />
-                        <Arc
-                            Width="290"
-                            Height="290"
-                            StartAngle="0"
-                            SweepAngle="360"
-                            StrokeJoin="Round"
-                            StrokeLineCap="Round"
-                            StrokeThickness="45">
-                            <Arc.Stroke>
-                                <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,0%">
-                                    <GradientStop Color="#010101" Offset="0" />
-                                    <GradientStop Color="#363636" Offset="0.5" />
-                                    <GradientStop Color="#010101" Offset="1" />
-                                </LinearGradientBrush>
-                            </Arc.Stroke>
-                        </Arc>
-                        <Arc
-                            Width="294"
-                            Height="294"
-                            StartAngle="0"
-                            SweepAngle="360"
-                            StrokeJoin="Round"
-                            StrokeLineCap="Round"
-                            StrokeThickness="4"
-                            Stroke="Black" />
-                        <Arc
-                            Width="310"
-                            Height="310"
-                            StartAngle="0"
-                            SweepAngle="360"
-                            StrokeJoin="Round"
-                            StrokeLineCap="Round"
-                            StrokeThickness="10"
-                            Stroke="#C6CACD"
-                            Opacity="0.1" />
-                    </Panel>
+                        </Grid.Styles>
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="SplitViewContent" />
+                        <TextBlock Text="SplitViewContent" TextAlignment="Left" />
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            Text="SplitViewContent"
+                            TextAlignment="Left" />
+                        <TextBlock
+                            VerticalAlignment="Bottom"
+                            Text="SplitViewContent"
+                            TextAlignment="Left" />
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Bottom"
+                            Text="SplitViewContent"
+                            TextAlignment="Left" />
+                    </Grid>
 
                 </SplitView>
             </Border>
 
         </Grid>
     </Border>
-</UserControl>
+</UserControl>

demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml.cs

@@ -1,7 +1,6 @@
-using System.Collections.ObjectModel;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Semi.Avalonia.Demo.Pages;
 
@@ -10,35 +9,10 @@ public partial class SplitViewDemo : UserControl
     public SplitViewDemo()
     {
         InitializeComponent();
-        this.DataContext = new SplitViewDemoViewModel();
     }
 
     private void InitializeComponent()
     {
         AvaloniaXamlLoader.Load(this);
     }
-}
-
-public class SplitViewDemoViewModel : ObservableObject
-{
-    public ObservableCollection<string> Songs { get; set; } =
-    [
-        "320万年前",
-        "隐德来希",
-        "孔明",
-        "锦鲤卟噜噜",
-        "指鹿为马",
-        "热带季风Remix",
-        "加州梦境",
-        "渐近自由",
-        "世界所有的烂漫",
-    ];
-
-    public ObservableCollection<SplitViewDisplayMode> DisplayModes { get; set; } =
-    [
-        SplitViewDisplayMode.Inline,
-        SplitViewDisplayMode.CompactInline,
-        SplitViewDisplayMode.Overlay,
-        SplitViewDisplayMode.CompactOverlay,
-    ];
 }

demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml

@@ -42,7 +42,6 @@
                 InnerLeftContent="http://"
                 InnerRightContent=".com"
                 IsEnabled="False" />
-            <TextBox Width="300" Classes="TextArea" />
         </StackPanel>
     </ScrollViewer>
 </UserControl>

demo/Semi.Avalonia.Demo/ViewModels/DataGridDemoViewModel.cs

@@ -121,7 +121,7 @@ public class Song
         new("指鹿为马", "熊猫堂ProducePandas", 3, 12, "W.O.R.L.D.", 74, 2063175272),
         new("热带季风Remix", "熊猫堂ProducePandas", 3, 22, "W.O.R.L.D.", 23, 2063173319),
         new("加州梦境", "熊猫堂ProducePandas", 2, 56, "W.O.R.L.D.", 1662, 2063173324),
-        new("渐近自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
+        new("渐进自由", "熊猫堂ProducePandas", 4, 19, "W.O.R.L.D.", 124, 2063173321),
         new("世界所有的烂漫", "熊猫堂ProducePandas", 3, 30, "W.O.R.L.D.", 335, 2053388775),
     };
 }

demo/Semi.Avalonia.Demo/Views/MainView.axaml

@@ -1,13 +1,13 @@
 <UserControl
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
     x:Class="Semi.Avalonia.Demo.Views.MainView"
     xmlns="https://github.com/avaloniaui"
-    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:pages="using:Semi.Avalonia.Demo.Pages"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -21,52 +21,52 @@
             Margin="8"
             Padding="12,4"
             Theme="{DynamicResource CardBorder}">
-            <Grid VerticalAlignment="Center" ColumnDefinitions="*, Auto">
+            <Grid ColumnDefinitions="*, Auto" VerticalAlignment="Center">
                 <StackPanel Grid.Column="0" Orientation="Horizontal">
                     <TextBlock
-                        VerticalAlignment="Center"
                         Classes="H6"
                         Text="Semi Avalonia"
-                        Theme="{DynamicResource TitleTextBlock}" />
+                        Theme="{DynamicResource TitleTextBlock}"
+                        VerticalAlignment="Center" />
                     <TextBlock
                         Margin="8,0"
-                        VerticalAlignment="Center"
-                        Text="/" />
+                        Text="/"
+                        VerticalAlignment="Center" />
                     <TextBlock
-                        Margin="8,0"
-                        VerticalAlignment="Center"
                         Classes="Secondary"
-                        Text="{Binding #tab.SelectedItem.Header}" />
+                        Margin="8,0"
+                        Text="{Binding #tab.SelectedItem.Header}"
+                        VerticalAlignment="Center" />
                 </StackPanel>
                 <ToggleSwitch
                     Grid.Column="1"
-                    Padding="4"
                     IsCheckedChanged="ToggleButton_OnIsCheckedChanged"
+                    Padding="4"
                     Theme="{DynamicResource ButtonToggleSwitch}">
                     <ToggleSwitch.OnContent>
                         <PathIcon
-                            Width="16"
-                            Height="16"
                             Data="M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17 15C17.476 15 17.9408 14.9525 18.3901 14.862C17.296 17.3011 14.8464 19 12 19C8.13401 19 5 15.866 5 12C5 8.60996 7.40983 5.78277 10.6099 5.13803C10.218 6.01173 10 6.98041 10 8C10 11.866 13.134 15 17 15Z"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}"
+                            Height="16"
+                            Width="16" />
                     </ToggleSwitch.OnContent>
                     <ToggleSwitch.OffContent>
                         <PathIcon
-                            Width="16"
-                            Height="16"
                             Data="M3.55 19.09L4.96 20.5L6.76 18.71L5.34 17.29M12 6C8.69 6 6 8.69 6 12S8.69 18 12 18 18 15.31 18 12C18 8.68 15.31 6 12 6M20 13H23V11H20M17.24 18.71L19.04 20.5L20.45 19.09L18.66 17.29M20.45 5L19.04 3.6L17.24 5.39L18.66 6.81M13 1H11V4H13M6.76 5.39L4.96 3.6L3.55 5L5.34 6.81L6.76 5.39M1 13H4V11H1M13 20H11V23H13"
-                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}"
+                            Height="16"
+                            Width="16" />
                     </ToggleSwitch.OffContent>
                 </ToggleSwitch>
             </Grid>
 
         </Border>
         <TabControl
-            Name="tab"
             Grid.Row="1"
-            Margin="8"
-            Padding="20,0,0,0"
             HorizontalAlignment="Stretch"
+            Margin="8"
+            Name="tab"
+            Padding="20,0,0,0"
             TabStripPlacement="Left"
             Theme="{DynamicResource NavigationTab}">
             <TabItem Header="Overview">
@@ -126,6 +126,9 @@
             <TabItem Header="HeaderedContentControl">
                 <pages:HeaderedContentControlDemo />
             </TabItem>
+            <TabItem Header="HyperlinkButton">
+                <pages:HyperlinkButtonDemo />
+            </TabItem>
             <TabItem Header="Label">
                 <pages:LabelDemo />
             </TabItem>
@@ -145,7 +148,7 @@
                 <pages:NumericUpDownDemo />
             </TabItem>
             <TabItem Header="PathIcon">
-                <pages:PathIconDemo/>
+                <pages:PathIconDemo />
             </TabItem>
             <TabItem Header="ProgressBar">
                 <pages:ProgressBarDemo />

demo/global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "8.0"
+        "version": "7.0"
     }
 }

src/Package.props

@@ -2,18 +2,13 @@
     <PropertyGroup>
         <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
         <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.0.7.4</Version>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
+        <LangVersion>11</LangVersion>
+        <Version>11.1.0-beta1</Version>
+        <Authors>IRIHI Technology</Authors>
         <Description>Avalonia Theme inspired by Semi Design.</Description>
         <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
         <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.0.7</AvaloniaVersion>
+        <AvaloniaVersion>11.1.0-beta1</AvaloniaVersion>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="irihi.png" Pack="true" PackagePath=""/>
-    </ItemGroup>
 </Project>

src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml

@@ -17,10 +17,33 @@
     <converters:ToBrushConverter x:Key="ToBrushConverter" />
 
     <ControlTheme x:Key="{x:Type ColorPicker}" TargetType="ColorPicker">
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Height" Value="32" />
         <Setter Property="Width" Value="64" />
         <Setter Property="MinWidth" Value="64" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Content">
+            <Template>
+                <Panel>
+                    <Border
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
+                        CornerRadius="{TemplateBinding CornerRadius,
+                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                    <Border
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{TemplateBinding HsvColor,
+                                                     Converter={StaticResource ToBrushConverter}}"
+                        CornerRadius="{TemplateBinding CornerRadius,
+                                                       Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                </Panel>
+            </Template>
+        </Setter>
         <Setter Property="Palette">
             <controls:FluentColorPalette />
         </Setter>
@@ -33,6 +56,8 @@
                     HorizontalContentAlignment="Stretch"
                     VerticalContentAlignment="Stretch"
                     ClipToBounds="True"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     UseLayoutRounding="False">
                     <DropDownButton.Styles>
@@ -40,26 +65,6 @@
                             <Setter Property="Padding" Value="0" />
                         </Style>
                     </DropDownButton.Styles>
-                    <DropDownButton.Content>
-                        <!--  Preview color  -->
-                        <Panel>
-                            <Border
-                                Margin="1,1,0,1"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
-                                CornerRadius="{TemplateBinding CornerRadius,
-                                                               Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-                            <Border
-                                Margin="1,1,0,1"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                Background="{TemplateBinding HsvColor,
-                                                             Converter={StaticResource ToBrushConverter}}"
-                                CornerRadius="{TemplateBinding CornerRadius,
-                                                               Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
-                        </Panel>
-                    </DropDownButton.Content>
                     <DropDownButton.Flyout>
                         <Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}">
 
@@ -471,4 +476,42 @@
         </Setter>
     </ControlTheme>
 
+    <ControlTheme
+        x:Key="HexColorPicker"
+        BasedOn="{StaticResource {x:Type ColorPicker}}"
+        TargetType="ColorPicker">
+        <Setter Property="Width" Value="200" />
+        <Setter Property="Content">
+            <Template>
+                <Grid ColumnDefinitions="Auto, *">
+                    <Border
+                        Grid.Column="0"
+                        Width="{Binding $self.Bounds.Height}"
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{DynamicResource ColorControlCheckeredBackgroundBrush}"
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                    <Border
+                        Grid.Column="0"
+                        Width="{Binding $self.Bounds.Height}"
+                        Margin="1,1,0,1"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Background="{TemplateBinding HsvColor,
+                                                     Converter={StaticResource ToBrushConverter}}"
+                        CornerRadius="{TemplateBinding CornerRadius}" />
+                    <TextBlock
+                        Grid.Column="1"
+                        Margin="8,0,0,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontWeight="Regular"
+                        Foreground="{DynamicResource TextBlockDefaultForeground}"
+                        Text="{Binding $parent[ColorPicker].Color}" />
+                </Grid>
+            </Template>
+        </Setter>
+    </ControlTheme>
+
 </ResourceDictionary>

src/Semi.Avalonia.DataGrid/Dark.axaml

@@ -9,7 +9,6 @@
 
     <SolidColorBrush x:Key="DataGridColumnHeaderForeground" Opacity="0.6" Color="#F9F9F9" />
     <SolidColorBrush x:Key="DataGridColumnHeaderBackground" Color="Transparent" />
-
     <SolidColorBrush x:Key="DataGridColumnHeaderPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="DataGridColumnHeaderPressedBackground" Opacity="0.20" Color="White" />
 

src/Semi.Avalonia.DataGrid/Light.axaml

@@ -18,9 +18,8 @@
     <SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />
 
     <SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Color="#CBE7FE" />
-
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Opacity="0.2" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Opacity="0.3" Color="#CBE7FE" />
     <SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
     <SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.05" Color="#2E3238" />
 

src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj

@@ -3,20 +3,17 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
+        <LangVersion>11</LangVersion>
         <Version>11.0.1</Version>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
+        <Authors>IRIHI Technology</Authors>
         <Description>Avalonia Theme inspired by Semi Design.</Description>
-        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
         <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
         <AvaloniaVersion>11.0.0</AvaloniaVersion>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="$(AvaloniaVersion)"/>
-        <None Include="irihi.png" Pack="true" PackagePath=""/>
     </ItemGroup>
 
 </Project>

src/Semi.Avalonia/Controls/AdornerLayer.axaml

@@ -1,16 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:ClassModifier="internal">
-    <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
-        <Setter Property="DefaultFocusAdorner">
-            <FocusAdornerTemplate>
-                <Rectangle
-                    Margin="{DynamicResource AdornerLayerMargin}"
-                    Stroke="{DynamicResource AdornerLayerBackground}"
-                    StrokeDashArray="1,2"
-                    StrokeThickness="{DynamicResource AdornerLayerThickness}" />
-            </FocusAdornerTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>

src/Semi.Avalonia/Controls/AutoCompleteBox.axaml

@@ -19,6 +19,8 @@
                             VerticalAlignment="Center"
                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                             Theme="{DynamicResource NonErrorTextBox}"
+                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                            InnerRightContent="{TemplateBinding InnerRightContent}"
                             Watermark="{TemplateBinding Watermark}" />
                         <Popup
                             Name="PART_Popup"

src/Semi.Avalonia/Controls/CheckBox.axaml

@@ -123,8 +123,8 @@
                     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                 </Style>
 
-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
@@ -166,8 +166,8 @@
                     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                 </Style>
 
-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
@@ -275,8 +275,8 @@
                     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                 </Style>
 
-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
@@ -315,8 +315,8 @@
                     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                 </Style>
 
-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
@@ -457,8 +457,8 @@
                     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                 </Style>
 
-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>
@@ -512,8 +512,8 @@
                     <Setter Property="Background" Value="{DynamicResource CheckBoxCheckedDisabledBackground}" />
                 </Style>
 
-                <Style Selector="^ /template/ PathIcon#CheckGlyph">
-                    <Setter Property="Foreground" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
+                <Style Selector="^ /template/ Path#CheckGlyph">
+                    <Setter Property="Fill" Value="{DynamicResource CheckBoxGlyphDisabledFill}" />
                 </Style>
             </Style>
         </Style>

src/Semi.Avalonia/Controls/ComboBox.axaml

@@ -61,7 +61,6 @@
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            TextTrimming="CharacterEllipsis"
                             Foreground="{TemplateBinding Foreground}"
                             IsVisible="{TemplateBinding SelectionBoxItem,
                                                         Converter={x:Static ObjectConverters.IsNull}}"

src/Semi.Avalonia/Controls/ContentControl.axaml

@@ -1,22 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
-    <ControlTheme x:Key="{x:Type ContentControl}" TargetType="ContentControl">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="ContentControl">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>

src/Semi.Avalonia/Controls/HyperlinkButton.axaml

@@ -0,0 +1,118 @@
+<ResourceDictionary
+    x:CompileBindings="True"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme TargetType="HyperlinkButton" x:Key="{x:Type HyperlinkButton}">
+        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="{DynamicResource HyperlinkButtonFontSize}" />
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
+        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonDefaultBackground}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="HyperlinkButton">
+                <Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
+                    <Grid
+                        Grid.Column="0"
+                        IsVisible="False"
+                        Margin="0,0,8,0"
+                        VerticalAlignment="Center"
+                        x:Name="IconGrid">
+                        <Border
+                            Background="{DynamicResource HyperlinkButtonDefaultBackground}"
+                            Height="{DynamicResource HyperlinkButtonIconHeight}"
+                            Opacity="0"
+                            UseLayoutRounding="False"
+                            Width="{DynamicResource HyperlinkButtonIconWidth}"
+                            x:Name="BackgroundRectangle" />
+                        <PathIcon
+                            Data="{DynamicResource HyperlinkButtonLinkGlyph}"
+                            Foreground="{DynamicResource HyperlinkButtonForeground}"
+                            Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}"
+                            Name="LinkGlyph"
+                            VerticalAlignment="Center"
+                            Width="{DynamicResource HyperlinkButtonLinkGlyphWidth}" />
+                    </Grid>
+                    <ContentPresenter
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        Cursor="{TemplateBinding Cursor}"
+                        Grid.Column="1"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        Padding="0,0,0,0"
+                        RecognizesAccessKey="True"
+                        VerticalAlignment="Center"
+                        x:Name="ContentPresenter" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover">
+            <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+            </Style>
+        </Style>
+
+        <!--  Unvisited Pressed State  -->
+        <Style Selector="^:pressed">
+            <Setter Property="RenderTransform" Value="scale(0.98)" />
+        </Style>
+
+        <!--  Unvisited Disabled state  -->
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+            </Style>
+        </Style>
+
+        <Style Selector="^:visited">
+            <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
+            </Style>
+
+            <!--  Visited Pointerover State  -->
+            <Style Selector="^:pointerover">
+                <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
+                </Style>
+            </Style>
+
+            <!--  Visited Pressed State  -->
+            <Style Selector="^:pressed">
+                <Setter Property="RenderTransform" Value="scale(0.98)" />
+            </Style>
+
+            <!--  Visited Disabled State  -->
+            <Style Selector="^:disabled">
+                <Style Selector="^ /template/ PathIcon#LinkGlyph">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+                </Style>
+                <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
+                </Style>
+            </Style>
+        </Style>
+
+        <Style Selector="^.WithIcon">
+            <Style Selector="^ /template/ Grid#IconGrid">
+                <Setter Property="IsVisible" Value="True" />
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/ManagedFileChooser.axaml

@@ -131,13 +131,13 @@
                                     <ColumnDefinition Width="200" SharedSizeGroup="Size" />
                                 </Grid.ColumnDefinitions>
                                 <GridSplitter Grid.Column="1" Width="1" />
-                                <TextBlock Grid.Column="2" Text="{DynamicResource STRING_CHOOSER_NAME_COLUMN}" />
+                                <TextBlock Grid.Column="2" Text="Name" />
                                 <GridSplitter Grid.Column="3" Width="1" />
-                                <TextBlock Grid.Column="4" Text="{DynamicResource STRING_CHOOSER_DATEMODIFIED_COLUMN}" />
+                                <TextBlock Grid.Column="4" Text="Date Modified" />
                                 <GridSplitter Grid.Column="5" Width="1" />
-                                <TextBlock Grid.Column="6" Text="{DynamicResource STRING_CHOOSER_TYPE_COLUMN}" />
+                                <TextBlock Grid.Column="6" Text="Type" />
                                 <GridSplitter Grid.Column="7" Width="1" />
-                                <TextBlock Grid.Column="8" Text="{DynamicResource STRING_CHOOSER_SIZE_COLUMN}" />
+                                <TextBlock Grid.Column="8" Text="Size" />
                             </Grid>
                             <ListBox
                                 Name="PART_Files"

src/Semi.Avalonia/Controls/Menu.axaml

@@ -147,7 +147,6 @@
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Header}"
-                                ContentTemplate="{TemplateBinding HeaderTemplate}"
                                 RecognizesAccessKey="True" />
                             <TextBlock
                                 x:Name="PART_InputGestureText"
@@ -268,7 +267,6 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
                             RecognizesAccessKey="True" />
                         <Popup
                             Name="PART_Popup"

src/Semi.Avalonia/Controls/NumericUpDown.axaml

@@ -35,6 +35,8 @@
                             Text="{TemplateBinding Text}"
                             TextWrapping="NoWrap"
                             Theme="{DynamicResource NonErrorTextBox}"
+                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
+                            InnerRightContent="{TemplateBinding InnerRightContent}"
                             Watermark="{TemplateBinding Watermark}" />
                     </ButtonSpinner>
                 </DataValidationErrors>

src/Semi.Avalonia/Controls/RefreshContainer.axaml

@@ -28,21 +28,27 @@
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="IsHitTestVisible" Value="False" />
         <Setter Property="Height" Value="100" />
-        <Setter Property="Background" Value="{DynamicResource RefreshContainerIconBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource RefreshContainerIconForeground}" />
+        <Setter Property="Background" Value="{DynamicResource RefreshVisualizerIconBackground}" />
+        <Setter Property="Foreground" Value="{DynamicResource RefreshVisualizerIconForeground}" />
+        <Setter Property="Content">
+            <Template>
+                <Arc
+                    Name="PART_Icon"
+                    Width="{DynamicResource RefreshVisualizerIconSize}"
+                    Height="{DynamicResource RefreshVisualizerIconSize}"
+                    StartAngle="0"
+                    Stroke="{DynamicResource RefreshVisualizerIconForeground}"
+                    StrokeThickness="3"
+                    StrokeLineCap="Round"
+                    SweepAngle="270" />
+            </Template>
+        </Setter>
         <Setter Property="Template">
             <ControlTemplate>
-                <Grid
-                    Name="PART_Root"
-                    MinHeight="80"
-                    Background="{TemplateBinding Background}">
-                    <Grid.Styles>
-                        <Style Selector="PathIcon#PART_Icon">
-                            <Setter Property="Data" Value="{DynamicResource RefreshContainerIconGlyph}" />
-                        </Style>
-                    </Grid.Styles>
-                </Grid>
+                <Grid Name="PART_Root"
+                      MinHeight="80"
+                      Background="{TemplateBinding Background}" />
             </ControlTemplate>
         </Setter>
     </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>

src/Semi.Avalonia/Controls/TextBox.axaml

@@ -240,13 +240,6 @@
                 </Style>
             </Style>
         </Style>
-        
-        <Style Selector="^.TextArea">
-            <Setter Property="AcceptsReturn" Value="True"></Setter>
-            <Setter Property="VerticalContentAlignment" Value="Top"></Setter>
-            <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}"></Setter>
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}"></Setter>
-        </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="NonErrorTextBox" TargetType="TextBox">
@@ -276,7 +269,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *">
+                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
                             <ContentPresenter
                                 Grid.Column="0"
                                 Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
@@ -320,6 +313,13 @@
                                         TextWrapping="{TemplateBinding TextWrapping}" />
                                 </Panel>
                             </ScrollViewer>
+                            <ContentPresenter
+                                Grid.Column="2"
+                                Padding="{DynamicResource TextBoxInnerRightContentPadding}"
+                                VerticalAlignment="Center"
+                                Content="{TemplateBinding InnerRightContent}"
+                                Foreground="{DynamicResource TextBoxInnerForeground}"
+                                IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
                         </Grid>
                     </Border>
                 </DataValidationErrors>

src/Semi.Avalonia/Controls/UserControl.axaml

@@ -1,23 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
-    <!--  Add Resources Here  -->
-    <ControlTheme x:Key="{x:Type UserControl}" TargetType="UserControl">
-        <Setter Property="Template">
-            <ControlTemplate TargetType="UserControl">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>

src/Semi.Avalonia/Controls/_index.axaml

@@ -1,9 +1,8 @@
 <ResourceDictionary
+    x:CompileBindings="True"
     xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:CompileBindings="True">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Border.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Button.axaml" />
@@ -14,7 +13,6 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Carousel.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/CheckBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/ComboBox.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ContentControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/ContextMenu.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/DataValidationErrors.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/DatePicker.axaml" />
@@ -25,6 +23,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/FlyoutPresenter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/GridSplitter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/HyperlinkButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/ItemsControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Label.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/ListBox.axaml" />
@@ -57,7 +56,6 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Tooltip.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/TransitioningContentControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/TreeView.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Controls/UserControl.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Window.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/WindowNotificationManager.axaml" />
     </ResourceDictionary.MergedDictionaries>

src/Semi.Avalonia/Locale/en-us.axaml

@@ -1,16 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- TextBox/SelectableTextBox flyout -->
-    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
-    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">Paste</x:String>
-    <!-- ManagedFileChooser -->
     <x:String x:Key="STRING_CHOOSER_FILE_NAME">File name</x:String>
     <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">Show hidden flies</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_OK">OK</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">Cancel</x:String>
-    <x:String x:Key="STRING_CHOOSER_NAME_COLUMN">Name</x:String>
-    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">Date Modified</x:String>
-    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">Type</x:String>
-    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">Size</x:String>
+    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
+    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
+    <x:String x:Key="STRING_MENU_PASTE">Paste</x:String>
 </ResourceDictionary>

src/Semi.Avalonia/Locale/zh-cn.axaml

@@ -1,16 +1,10 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- TextBox/SelectableTextBox flyout -->
-    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
-    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
-    <x:String x:Key="STRING_MENU_PASTE">粘贴</x:String>
-    <!-- ManagedFileChooser -->
     <x:String x:Key="STRING_CHOOSER_FILE_NAME">文件名</x:String>
     <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">显示隐藏文件</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_OK">确认</x:String>
     <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">取消</x:String>
-    <x:String x:Key="STRING_CHOOSER_NAME_COLUMN">名称</x:String>
-    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">修改日期</x:String>
-    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">类型</x:String>
-    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">大小</x:String>
+    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
+    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
+    <x:String x:Key="STRING_MENU_PASTE">粘贴</x:String>
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/AdornerLayer.axaml

@@ -1,3 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBackground" Color="White" />
-</ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml

@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush Color="#F9F9F9" x:Key="HyperlinkButtonForeground" />
+    <SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
+    <SolidColorBrush Color="#54A9FF" x:Key="HyperlinkButtonOverForeground" />
+    <SolidColorBrush
+        Color="#F9F9F9"
+        Opacity="0.35"
+        x:Key="HyperlinkButtonDisabledForeground" />
+
+    <SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
+</ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/RefreshContainer.axaml

@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RefreshContainerIconForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="RefreshContainerIconBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Dark/_index.axaml

@@ -2,7 +2,6 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Palette.axaml" />
         <!--  Controls  -->
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Border.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Button.axaml" />
@@ -21,6 +20,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Flyout.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/GridSplitter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Label.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ListBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/ManagedFileChooser.axaml" />

src/Semi.Avalonia/Themes/DarkTheme.axaml

@@ -8,7 +8,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>

src/Semi.Avalonia/Themes/Index.axaml

@@ -13,7 +13,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>

src/Semi.Avalonia/Themes/Light/AdornerLayer.axaml

@@ -1,3 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AdornerLayerBackground" Color="#1C1F23" />
-</ResourceDictionary>

src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml

@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush Color="#1C1F23" x:Key="HyperlinkButtonForeground" />
+    <SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
+    <SolidColorBrush Color="#0077FA" x:Key="HyperlinkButtonOverForeground" />
+    <SolidColorBrush
+        Color="#1C1F23"
+        Opacity="0.35"
+        x:Key="HyperlinkButtonDisabledForeground" />
+
+    <SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
+</ResourceDictionary>

src/Semi.Avalonia/Themes/Light/RefreshContainer.axaml

@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RefreshContainerIconForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="RefreshContainerIconBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="RefreshVisualizerIconBackground" Color="Transparent" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Light/_index.axaml

@@ -2,7 +2,6 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Palette.axaml" />
         <!--  Controls  -->
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Border.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Button.axaml" />
@@ -21,6 +20,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Flyout.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/GridSplitter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/HyperlinkButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Label.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ListBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ManagedFileChooser.axaml" />

src/Semi.Avalonia/Themes/LightTheme.axaml

@@ -8,7 +8,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{StaticResource {x:Type UserControl}}" />
-    </Style>
 </Styles>

src/Semi.Avalonia/Themes/SemiTheme.axaml

@@ -13,7 +13,4 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-    <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
-    </Style>
 </Styles>

src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml

@@ -1,4 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Thickness x:Key="AdornerLayerMargin">1</Thickness>
-    <x:Double x:Key="AdornerLayerThickness">1</x:Double>
-</ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml

@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="HyperlinkButtonFontSize">14</x:Double>
+    <x:Double x:Key="HyperlinkButtonIconWidth">12</x:Double>
+    <x:Double x:Key="HyperlinkButtonIconHeight">12</x:Double>
+    <x:Double x:Key="HyperlinkButtonLinkGlyphWidth">12</x:Double>
+    <x:Double x:Key="HyperlinkButtonLinkGlyphHeight">12</x:Double>
+
+    <StreamGeometry x:Key="HyperlinkButtonLinkGlyph">M 12.9393 2.9393 C 15.182 0.69666 18.818 0.696668 21.0606 2.93931 C 23.3033 5.18195 23.3033 8.81799 21.0606 11.0606 L 18.3925 13.7288 C 18.4631 13.3298 18.5 12.9192 18.5 12.5 C 18.5 11.5751 18.3206 10.6921 17.9947 9.88386 L 18.9393 8.93931 C 20.0104 7.86824 20.0104 6.13169 18.9393 5.06063 C 17.8682 3.98956 16.1317 3.98956 15.0606 5.06062 L 11.0606 9.06063 C 9.98956 10.1317 9.98956 11.8682 11.0606 12.9393 C 11.3265 13.2052 11.6335 13.4051 11.961 13.539 L 9.75848 15.7415 C 9.47 15.5439 9.19556 15.3169 8.9393 15.0606 C 6.69666 12.818 6.69666 9.18195 8.9393 6.93931 L 12.9393 2.9393 Z M 2.9393 12.9393 L 5.60751 10.2711 C 5.53685 10.6701 5.49999 11.0808 5.49999 11.5001 C 5.49999 12.4249 5.67935 13.3079 6.00519 14.1161 L 5.06062 15.0607 C 3.98956 16.1317 3.98956 17.8683 5.06063 18.9393 C 6.13169 20.0104 7.86824 20.0104 8.9393 18.9393 L 12.9393 14.9393 C 14.0104 13.8683 14.0104 12.1317 12.9393 11.0607 C 12.7664 10.8878 12.5762 10.7428 12.3743 10.6258 L 14.5302 8.46985 C 14.7141 8.61357 14.8914 8.77007 15.0606 8.93934 C 17.3033 11.182 17.3033 14.818 15.0606 17.0607 L 11.0606 21.0607 C 8.81798 23.3033 5.18194 23.3033 2.9393 21.0607 C 0.696665 18.818 0.696663 15.182 2.9393 12.9393 Z</StreamGeometry>
+</ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/RefreshContainer.axaml

@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <PathGeometry x:Key="RefreshContainerIconGlyph">M14.2 3.78966C9.66551 2.57466 5.00465 5.26561 3.78964 9.80007C3.12066 12.2967 3.63433 14.8301 4.99177 16.8102C5.46019 17.4935 5.28601 18.4271 4.60273 18.8955C3.91945 19.364 2.98581 19.1898 2.51739 18.5065C0.685557 15.8344 -0.0134454 12.4023 0.891867 9.02361C2.5357 2.88875 8.84157 -0.751945 14.9764 0.891885C21.1113 2.53572 24.752 8.84159 23.1082 14.9765C22.8937 15.7767 22.0712 16.2515 21.271 16.0371C20.4708 15.8227 19.996 15.0002 20.2104 14.2C21.4254 9.66553 18.7344 5.00467 14.2 3.78966Z</PathGeometry>
+    <x:Double x:Key="RefreshVisualizerIconSize">24</x:Double>
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/TextBox.axaml

@@ -10,9 +10,6 @@
     <Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
     <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
     <Thickness x:Key="TextBoxBorderThickness">1</Thickness>
-    
-    <Thickness x:Key="TextBoxTextAreaContentPadding">12 5</Thickness>
-    <x:Double x:Key="TextBoxTextAreaHeight">90</x:Double>
 
     <StreamGeometry x:Key="PasswordBoxRevealButtonData">M12 4C5 4 1 10 1 12C1 14 5 20 12 20C19 20 23 14 23 12C23 10 19 4 12 4ZM17 12C17 14.7614 14.7614 17 12 17C9.23858 17 7 14.7614 7 12C7 9.23858 9.23858 7 12 7C14.7614 7 17 9.23858 17 12ZM12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z</StreamGeometry>
     <StreamGeometry x:Key="PasswordBoxHideButtonData">M2.02949 4.67856C2.7593 4.28654 3.66871 4.56038 4.06073 5.29018C6.21313 9.29726 8.83179 11.5 12.0001 11.5C15.1685 11.5 17.7871 9.29726 19.9395 5.29018C20.3315 4.56038 21.241 4.28655 21.9708 4.67856C22.7006 5.07058 22.9744 5.97999 22.5824 6.7098C21.9049 7.97104 21.1385 9.15419 20.2743 10.199L23.2001 14.1C23.6971 14.7627 23.5628 15.7029 22.9001 16.2C22.2373 16.697 21.2971 16.5627 20.8001 15.9L18.1186 12.3246C17.448 12.8501 16.7322 13.2957 15.9687 13.6441L17.4046 17.4733C17.6955 18.249 17.3025 19.1136 16.5268 19.4045C15.7511 19.6954 14.8865 19.3024 14.5956 18.5267L13.0956 14.5267C13.0852 14.4988 13.0756 14.4709 13.0669 14.4428C12.7193 14.4806 12.3638 14.5 12.0001 14.5C11.6365 14.5 11.281 14.4806 10.9333 14.4428C10.9246 14.4709 10.9151 14.4988 10.9046 14.5267L9.40463 18.5267C9.11375 19.3024 8.24913 19.6954 7.47345 19.4045C6.69777 19.1136 6.30476 18.249 6.59564 17.4733L8.03159 13.6441C7.26806 13.2957 6.55223 12.8501 5.88163 12.3246L3.20009 15.9C2.70303 16.5627 1.76283 16.697 1.10009 16.2C0.437347 15.7029 0.303032 14.7627 0.800088 14.1L3.72589 10.1989C2.86177 9.15415 2.09533 7.97101 1.41787 6.70979C1.02585 5.97999 1.29969 5.07057 2.02949 4.67856Z</StreamGeometry>

src/Semi.Avalonia/Themes/Shared/_index.axaml

@@ -2,7 +2,6 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Palette.axaml" />
         <!--  Controls  -->
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Border.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Button.axaml" />
@@ -21,6 +20,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Flyout.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/GridSplitter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/HeaderedContentControl.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Label.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ListBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/ManagedFileChooser.axaml" />