From 263c65dd18090eb258ca6e37568d6a98e491d165 Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Fri, 3 Jan 2025 15:51:51 +0800
Subject: [PATCH] feat: simplify menu.

---
 demo/Semi.Avalonia.Demo/Views/MainView.axaml  |  15 --
 .../Views/MainView.axaml.cs                   | 131 ++++++++++--------
 2 files changed, 70 insertions(+), 76 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
index e0e0f91..0b958ac 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -46,21 +46,6 @@
                             <Setter Property="Theme" Value="{DynamicResource InnerPathIcon}" />
                         </Style>
                     </StackPanel.Styles>
-                    
-                    <Button>
-                        <PathIcon Data="{StaticResource SemiIconLanguage}" />
-                        <Button.Flyout>
-                            <MenuFlyout Placement="Bottom" ItemsSource="{Binding LocaleItems}" />
-                        </Button.Flyout>
-                        <Button.Styles>
-                            <Style Selector="MenuItem" x:DataType="views:MenuItemViewModel">
-                                <Setter Property="Header" Value="{Binding Header}" />
-                                <Setter Property="ItemsSource" Value="{Binding Items}" />
-                                <Setter Property="Command" Value="{Binding Command}" />
-                                <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
-                            </Style>
-                        </Button.Styles>
-                    </Button>
 
                     <Button Command="{Binding OpenUrlCommand}" CommandParameter="{Binding DocumentationUrl}">
                         <PathIcon Data="{StaticResource SemiIconGlobe}" />
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
index 5316df1..876ace2 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml.cs
@@ -25,8 +25,6 @@ public partial class MainViewModel : ObservableObject
     public string DocumentationUrl => "https://docs.irihi.tech/semi";
     public string RepoUrl => "https://github.com/irihitech/Semi.Avalonia";
     public IReadOnlyList<MenuItemViewModel> MenuItems { get; }
-    
-    public IReadOnlyList<MenuItemViewModel> LocaleItems { get; }
 
     public MainViewModel()
     {
@@ -34,67 +32,78 @@ public partial class MainViewModel : ObservableObject
         [
             new MenuItemViewModel
             {
-                Header = "Aquatic",
-                Command = SelectThemeCommand,
-                CommandParameter = SemiTheme.Aquatic
+                Header = "High Contrast Theme",
+                Items =
+                [
+                    new MenuItemViewModel
+                    {
+                        Header = "Aquatic",
+                        Command = SelectThemeCommand,
+                        CommandParameter = SemiTheme.Aquatic
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "Desert",
+                        Command = SelectThemeCommand,
+                        CommandParameter = SemiTheme.Desert
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "Dusk",
+                        Command = SelectThemeCommand,
+                        CommandParameter = SemiTheme.Dusk
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "NightSky",
+                        Command = SelectThemeCommand,
+                        CommandParameter = SemiTheme.NightSky
+                    },
+                ]
             },
-            new MenuItemViewModel
+            new MenuItemViewModel()
             {
-                Header = "Desert",
-                Command = SelectThemeCommand,
-                CommandParameter = SemiTheme.Desert
-            },
-            new MenuItemViewModel
-            {
-                Header = "Dusk",
-                Command = SelectThemeCommand,
-                CommandParameter = SemiTheme.Dusk
-            },
-            new MenuItemViewModel
-            {
-                Header = "NightSky",
-                Command = SelectThemeCommand,
-                CommandParameter = SemiTheme.NightSky
-            },
-        ];
-        LocaleItems =
-        [
-            new MenuItemViewModel
-            {
-                Header = "简体中文",
-                Command = SelectLocaleCommand,
-                CommandParameter = new System.Globalization.CultureInfo("zh-cn")
-            },
-            new MenuItemViewModel
-            {
-                Header = "English",
-                Command = SelectLocaleCommand,
-                CommandParameter = new System.Globalization.CultureInfo("en-us")
-            },
-            new MenuItemViewModel
-            {
-                Header = "日本語",
-                Command = SelectLocaleCommand,
-                CommandParameter = new System.Globalization.CultureInfo("ja-jp")
-            },
-            new MenuItemViewModel
-            {
-                Header = "Українська",
-                Command = SelectLocaleCommand,
-                CommandParameter = new System.Globalization.CultureInfo("uk-ua")
-            },
-            new MenuItemViewModel
-            {
-                Header = "Русский",
-                Command = SelectLocaleCommand,
-                CommandParameter = new System.Globalization.CultureInfo("ru-ru")
-            },
-            new MenuItemViewModel
-            {
-                Header = "繁體中文",
-                Command = SelectLocaleCommand,
-                CommandParameter = new System.Globalization.CultureInfo("zh-tw")
-            },
+                Header = "Locale",
+                Items=
+                [
+                    new MenuItemViewModel
+                    {
+                        Header = "简体中文",
+                        Command = SelectLocaleCommand,
+                        CommandParameter = new System.Globalization.CultureInfo("zh-cn")
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "English",
+                        Command = SelectLocaleCommand,
+                        CommandParameter = new System.Globalization.CultureInfo("en-us")
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "日本語",
+                        Command = SelectLocaleCommand,
+                        CommandParameter = new System.Globalization.CultureInfo("ja-jp")
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "Українська",
+                        Command = SelectLocaleCommand,
+                        CommandParameter = new System.Globalization.CultureInfo("uk-ua")
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "Русский",
+                        Command = SelectLocaleCommand,
+                        CommandParameter = new System.Globalization.CultureInfo("ru-ru")
+                    },
+                    new MenuItemViewModel
+                    {
+                        Header = "繁體中文",
+                        Command = SelectLocaleCommand,
+                        CommandParameter = new System.Globalization.CultureInfo("zh-tw")
+                    },
+                ]
+            }
         ];
     }