From f84a482394012edab1172be6100e5f9ac9d70262 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 23 Jun 2023 03:32:50 +0800
Subject: [PATCH] feat: update resources.

---
 demo/Ursa.Demo/Pages/NavigationMenuDemo.axaml | 31 ++-----
 .../Controls/Navigation.axaml                 | 86 ++++++++++++++-----
 .../Themes/Dark/NavigationMenu.axaml          |  9 ++
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml |  1 +
 .../Themes/Light/NavigationMenu.axaml         |  9 ++
 .../Themes/Light/_index.axaml                 |  1 +
 .../Controls/Navigation/NavigationMenuItem.cs |  2 +
 7 files changed, 92 insertions(+), 47 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml

diff --git a/demo/Ursa.Demo/Pages/NavigationMenuDemo.axaml b/demo/Ursa.Demo/Pages/NavigationMenuDemo.axaml
index 126b08f..dad4c0b 100644
--- a/demo/Ursa.Demo/Pages/NavigationMenuDemo.axaml
+++ b/demo/Ursa.Demo/Pages/NavigationMenuDemo.axaml
@@ -24,9 +24,14 @@
         <u:NavigationMenu
             Name="menu"
             HorizontalAlignment="Left"
-            Header="Semi Avalonia"
             ItemsSource="{Binding MenuItems}"
             ShowCollapseButton="True">
+            <u:NavigationMenu.Header>
+                <TextBlock
+                    Classes="H5"
+                    Text="Semi Avalonia"
+                    Theme="{DynamicResource TitleTextBlock}" />
+            </u:NavigationMenu.Header>
             <u:NavigationMenu.Icon>
                 <PathIcon
                     Width="32"
@@ -46,29 +51,5 @@
                 </TreeDataTemplate>
             </u:NavigationMenu.ItemTemplate>
         </u:NavigationMenu>
-
-        <TreeView ItemsSource="{Binding MenuItems}">
-            <TreeView.ItemTemplate>
-                <TreeDataTemplate ItemsSource="{Binding Children}">
-                    <ContentControl Content="{Binding MenuHeader}" />
-                </TreeDataTemplate>
-            </TreeView.ItemTemplate>
-        </TreeView>
-
-        <TextBlock Text="{ReflectionBinding #menu.SelectedItem.MenuHeader}" />
-
-        <u:NavigationMenu>
-            <u:NavigationMenuItem Header="111" />
-            <u:NavigationMenuItem Header="222" />
-            <u:NavigationMenuItem Header="333" />
-        </u:NavigationMenu>
-
-        <u:NavigationMenu ItemsSource="{Binding MenuItems}">
-            <u:NavigationMenu.ItemTemplate>
-                <DataTemplate>
-                    <u:NavigationMenuItem Header="{Binding MenuHeader}" />
-                </DataTemplate>
-            </u:NavigationMenu.ItemTemplate>
-        </u:NavigationMenu>
     </StackPanel>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Controls/Navigation.axaml b/src/Ursa.Themes.Semi/Controls/Navigation.axaml
index 329fabb..b0950d3 100644
--- a/src/Ursa.Themes.Semi/Controls/Navigation.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Navigation.axaml
@@ -30,20 +30,19 @@
                         Background="{TemplateBinding Background}"
                         RowDefinitions="Auto, *, Auto, Auto">
                         <StackPanel
-                            Margin="18"
+                            Margin="12"
                             HorizontalAlignment="Center"
                             Orientation="Horizontal">
                             <ContentPresenter
                                 Name="PART_IconPresenter"
-                                Margin="0,8"
+                                Margin="0,0,8,0"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Icon}" />
                             <ContentPresenter
                                 Name="PART_HeaderPresenter"
                                 VerticalAlignment="Center"
                                 Content="{TemplateBinding Header}"
-                                ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                FontSize="18" />
+                                ContentTemplate="{TemplateBinding HeaderTemplate}" />
 
                         </StackPanel>
                         <ItemsPresenter Grid.Row="1" ItemsPanel="{TemplateBinding ItemsPanel}" />
@@ -52,13 +51,29 @@
                             Grid.Row="2"
                             Content="{TemplateBinding Footer}"
                             ContentTemplate="{TemplateBinding FooterTemplate}" />
-                        <ToggleButton
+                        <ToggleSwitch
                             Name="{x:Static u:NavigationMenu.PART_CloseButton}"
                             Grid.Row="3"
                             Content="Open"
                             IsChecked="{TemplateBinding IsClosed,
                                                         Mode=TwoWay}"
-                            IsVisible="{TemplateBinding ShowCollapseButton}" />
+                            IsVisible="{TemplateBinding ShowCollapseButton}"
+                            Theme="{DynamicResource ButtonToggleSwitch}">
+                            <ToggleSwitch.OnContent>
+                                <PathIcon
+                                    Width="16"
+                                    Height="16"
+                                    Data="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"
+                                    Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                            </ToggleSwitch.OnContent>
+                            <ToggleSwitch.OffContent>
+                                <PathIcon
+                                    Width="16"
+                                    Height="16"
+                                    Data="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"
+                                    Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                            </ToggleSwitch.OffContent>
+                        </ToggleSwitch>
                     </Grid>
                 </Border>
             </ControlTemplate>
@@ -68,7 +83,7 @@
                 <Setter Property="ContentPresenter.IsVisible" Value="False" />
             </Style>
             <Style Selector="^ /template/ Border#PART_RootBorder">
-                <Setter Property="Border.Width" Value="60" />
+                <Setter Property="Border.Width" Value="80" />
             </Style>
             <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
                 <Setter Property="Grid.HorizontalAlignment" Value="Center" />
@@ -86,7 +101,7 @@
                             Name="PART_HeaderBorder"
                             Margin="0,2"
                             Padding="8"
-                            Background="Transparent"
+                            Background="{DynamicResource NavigationMenuItemDefaultBackground}"
                             CornerRadius="6">
                             <Grid
                                 Name="PART_RootStackPanel"
@@ -95,7 +110,7 @@
                                 <ContentPresenter
                                     Name="PART_IconPresenter"
                                     Grid.Column="1"
-                                    MinWidth="32"
+                                    MinWidth="24"
                                     Margin="{TemplateBinding Level,
                                                              Converter={StaticResource MarginConverter}}"
                                     Content="{TemplateBinding Icon}"
@@ -118,7 +133,8 @@
                                     Grid.Column="3"
                                     Width="8"
                                     Height="8"
-                                    Data="M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z">
+                                    Data="M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z"
+                                    Foreground="{DynamicResource NavigationMenuItemExpandIconForeground}">
                                     <PathIcon.Transitions>
                                         <Transitions>
                                             <TransformOperationsTransition Property="RenderTransform" Duration="0.1" />
@@ -130,7 +146,6 @@
                         <ItemsPresenter Name="PART_ItemsPresenter" ItemsPanel="{TemplateBinding ItemsPanel}">
                             <ItemsPresenter.Transitions>
                                 <Transitions>
-                                    <DoubleTransition Property="Height" Duration="0:0:0.15" />
                                     <DoubleTransition Property="Opacity" Duration="0:0:0.15" />
                                 </Transitions>
                             </ItemsPresenter.Transitions>
@@ -139,24 +154,51 @@
                 </Border>
             </ControlTemplate>
         </Setter>
+
         <Style Selector="^ /template/ Border#PART_HeaderBorder:pointerover">
-            <Setter Property="Border.Background" Value="LightGray" />
+            <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
         </Style>
+        <Style Selector="^ /template/ Border#PART_HeaderBorder:pressed">
+            <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPressedBackground}" />
+        </Style>
+
         <Style Selector="^:highlighted /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="u:NavigationMenuItem.Foreground" Value="Blue" />
+            <Setter Property="u:NavigationMenuItem.Foreground" Value="{DynamicResource NavigationMenuItemHighlightForeground}" />
         </Style>
+
         <Style Selector="^:selected /template/ Border#PART_HeaderBorder">
-            <Setter Property="u:NavigationMenuItem.Background" Value="LightBlue" />
+            <Setter Property="u:NavigationMenuItem.Background" Value="{DynamicResource NavigationMenuItemSelectedBackground}" />
         </Style>
-        <Style Selector="^:closed /template/ ContentPresenter#PART_HeaderPresenter">
-            <Setter Property="ContentPresenter.Opacity" Value="0" />
-        </Style>
-        <Style Selector="^:closed /template/ StackPanel#PART_RootStackPanel">
-            <Setter Property="StackPanel.HorizontalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="^:closed /template/ ItemsPresenter#PART_ItemsPresenter">
-            <Setter Property="ItemsPresenter.IsVisible" Value="False" />
+
+        <Style Selector="^:closed:empty">
+            <Setter Property="Template">
+                <ControlTemplate TargetType="u:NavigationMenuItem">
+                    <Border
+                        Name="PART_HeaderBorder"
+                        Margin="0,2"
+                        Padding="8"
+                        HorizontalAlignment="Center"
+                        Background="{DynamicResource NavigationMenuItemDefaultBackground}"
+                        CornerRadius="6">
+                        <ContentPresenter
+                            Name="PART_IconPresenter"
+                            Grid.Column="1"
+                            MinWidth="24"
+                            Content="{TemplateBinding Icon}"
+                            ContentTemplate="{TemplateBinding IconTemplate}"
+                            ToolTip.ShowDelay="0"
+                            ToolTip.Tip="{TemplateBinding Header}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+            <Style Selector="^ /template/ Border#PART_HeaderBorder:pointerover">
+                <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPointeroverBackground}" />
+            </Style>
+            <Style Selector="^ /template/ Border#PART_HeaderBorder:pressed">
+                <Setter Property="Border.Background" Value="{DynamicResource NavigationMenuItemPressedBackground}" />
+            </Style>
         </Style>
+
         <Style Selector="^:collapsed /template/ ItemsPresenter#PART_ItemsPresenter">
             <Setter Property="ItemsPresenter.Height" Value="0" />
             <Setter Property="ItemsPresenter.Opacity" Value="0" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
new file mode 100644
index 0000000..01aeffc
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/NavigationMenu.axaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="NavigationMenuItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="NavigationMenuItemPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="NavigationMenuItemPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="NavigationMenuItemSelectedBackground" Opacity="0.2" Color="#54A9FF" />
+    <SolidColorBrush x:Key="NavigationMenuItemHighlightForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#F9F9F9" />
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index 69dc5ed..cc3a735 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -5,6 +5,7 @@
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
+        <MergeResourceInclude Source="NavigationMenu.axaml" />
         <MergeResourceInclude Source="Pagination.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml b/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
new file mode 100644
index 0000000..ef322d2
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/NavigationMenu.axaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="NavigationMenuItemDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="NavigationMenuItemPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="NavigationMenuItemPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="NavigationMenuItemSelectedBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="NavigationMenuItemHighlightForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="NavigationMenuItemExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index 69dc5ed..cc3a735 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -5,6 +5,7 @@
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
+        <MergeResourceInclude Source="NavigationMenu.axaml" />
         <MergeResourceInclude Source="Pagination.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa/Controls/Navigation/NavigationMenuItem.cs b/src/Ursa/Controls/Navigation/NavigationMenuItem.cs
index 84019d1..351c2c7 100644
--- a/src/Ursa/Controls/Navigation/NavigationMenuItem.cs
+++ b/src/Ursa/Controls/Navigation/NavigationMenuItem.cs
@@ -2,6 +2,7 @@ using System.Security.Cryptography.X509Certificates;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Mixins;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -68,6 +69,7 @@ public class NavigationMenuItem: HeaderedSelectingItemsControl
     static NavigationMenuItem()
     {
         IsClosedProperty.Changed.AddClassHandler<NavigationMenuItem>((o, e) => o.OnIsClosedChanged(e));
+        PressedMixin.Attach<NavigationMenuItem>();
     }
 
     private void OnIsClosedChanged(AvaloniaPropertyChangedEventArgs args)