feat: enhance navigation and UI structure in MainView and Application. (#811)

* feat: enhance navigation and UI structure in MainView and Application.

* feat: implement singleton pattern for PaletteDemoViewModel and add initialization check

* feat: set FontWeight to Normal for navigation button in MainView

---------

Co-authored-by: Dong Bin <popmessiah@hotmail.com>

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

@@ -12,14 +12,16 @@ public partial class PaletteDemo : UserControl
     public PaletteDemo()
     {
         InitializeComponent();
-        this.DataContext = new PaletteDemoViewModel();
+        this.DataContext = PaletteDemoViewModel.Instance.Value;
     }
 
     protected override async void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        PaletteDemoViewModel? vm = this.DataContext as PaletteDemoViewModel;
+        if (this.DataContext is PaletteDemoViewModel vm && !vm.IsInitialized)
-        await Dispatcher.UIThread.InvokeAsync(() => { vm?.InitializeResources(); });
+        {
+            await Dispatcher.UIThread.InvokeAsync(() => { vm?.InitializeResources(); });
+        }
     }
 
     public async Task Copy(object? o)

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

@@ -0,0 +1,353 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Layout;
+using Avalonia.Styling;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Semi.Avalonia.Demo.Pages;
+
+namespace Semi.Avalonia.Demo.ViewModels;
+
+public partial class MainViewModel : ObservableObject
+{
+    private readonly Dictionary<string, NavigationItemViewModel> _itemsByTitle = new(StringComparer.Ordinal);
+    private readonly IReadOnlyList<NavigationSectionViewModel> _allSections;
+
+    [ObservableProperty] public partial string? SearchText { get; set; }
+
+    public string DocumentationUrl => "https://docs.irihi.tech/semi";
+    public string RepoUrl => "https://github.com/irihitech/Semi.Avalonia";
+    public IReadOnlyList<MenuItemViewModel> MenuItems { get; }
+    public IReadOnlyList<NavigationSectionViewModel> Sections { get; }
+    public ObservableCollection<NavigationSectionViewModel> FilteredSections { get; } = [];
+    public bool ShowEmptySearchState => FilteredSections.Count == 0 && !string.IsNullOrWhiteSpace(SearchText);
+    public ContentPage? CurrentPage => SelectedItem?.Page;
+    public string SelectedPageTitle => SelectedItem?.Title ?? "Overview";
+
+    public NavigationItemViewModel? SelectedItem
+    {
+        get;
+        private set
+        {
+            if (ReferenceEquals(field, value))
+            {
+                return;
+            }
+
+            var previous = field;
+            if (SetProperty(ref field, value))
+            {
+                previous?.IsSelected = false;
+                value?.IsSelected = true;
+                OnPropertyChanged(nameof(CurrentPage));
+                OnPropertyChanged(nameof(SelectedPageTitle));
+            }
+        }
+    }
+
+    public MainViewModel()
+    {
+        MenuItems =
+        [
+            new MenuItemViewModel
+            {
+                Header = "Theme",
+                Items =
+                [
+                    new MenuItemViewModel { Header = "Auto", Command = FollowSystemThemeCommand },
+                    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
+            {
+                Header = "Locale",
+                Items =
+                [
+                    new MenuItemViewModel { Header = "简体中文", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("zh-CN") },
+                    new MenuItemViewModel { Header = "English", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("en-US") },
+                    new MenuItemViewModel { Header = "日本語", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("ja-JP") },
+                    new MenuItemViewModel { Header = "한국어", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("ko-KR") },
+                    new MenuItemViewModel { Header = "English (UK)", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("en-GB") },
+                    new MenuItemViewModel { Header = "Italiano", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("it-IT") },
+                    new MenuItemViewModel { Header = "Italiano (Switzerland)", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("it-CH") },
+                    new MenuItemViewModel { Header = "Nederlands", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("nl-NL") },
+                    new MenuItemViewModel { Header = "Nederlands (Belgium)", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("nl-BE") },
+                    new MenuItemViewModel { Header = "Українська", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("uk-UA") },
+                    new MenuItemViewModel { Header = "Русский", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("ru-RU") },
+                    new MenuItemViewModel { Header = "繁體中文", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("zh-TW") },
+                    new MenuItemViewModel { Header = "Deutsch", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("de-DE") },
+                    new MenuItemViewModel { Header = "Español", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("es-ES") },
+                    new MenuItemViewModel { Header = "Polski", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("pl-PL") },
+                    new MenuItemViewModel { Header = "Français", Command = SelectLocaleCommand, CommandParameter = new CultureInfo("fr-FR") },
+                ]
+            }
+        ];
+
+        Sections = _allSections =
+        [
+            new NavigationSectionViewModel("Overview",
+            [
+                CreateItem("Overview", static () => new Overview()),
+                CreateItem("About Us", static () => new AboutUs()),
+            ]),
+            new NavigationSectionViewModel("Resource Browser",
+            [
+                CreateItem("Palette", static () => new PaletteDemo()),
+                CreateItem("HighContrastTheme", static () => new HighContrastDemo()),
+                CreateItem("Variables", static () => new VariablesDemo()),
+                CreateItem("Icon", static () => new IconDemo()),
+            ]),
+            new NavigationSectionViewModel("Separate Pack",
+            [
+                CreateItem("ColorPicker", static () => new ColorPickerDemo()),
+                CreateItem("DataGrid", static () => new DataGridDemo()),
+            ]),
+            new NavigationSectionViewModel("Basic",
+            [
+                CreateItem("TextBlock", static () => new TextBlockDemo()),
+                CreateItem("SelectableTextBlock", static () => new SelectableTextBlockDemo()),
+                CreateItem("Border", static () => new BorderDemo()),
+                CreateItem("PathIcon", static () => new PathIconDemo()),
+            ]),
+            new NavigationSectionViewModel("Button",
+            [
+                CreateItem("Button", static () => new ButtonDemo()),
+                CreateItem("HyperlinkButton", static () => new HyperlinkButtonDemo()),
+                CreateItem("CheckBox", static () => new CheckBoxDemo()),
+                CreateItem("RadioButton", static () => new RadioButtonDemo()),
+                CreateItem("ToggleSwitch", static () => new ToggleSwitchDemo()),
+            ]),
+            new NavigationSectionViewModel("Input",
+            [
+                CreateItem("TextBox", static () => new TextBoxDemo()),
+                CreateItem("AutoCompleteBox", static () => new AutoCompleteBoxDemo()),
+                CreateItem("ComboBox", static () => new ComboBoxDemo()),
+                CreateItem("ButtonSpinner", static () => new ButtonSpinnerDemo()),
+                CreateItem("NumericUpDown", static () => new NumericUpDownDemo()),
+                CreateItem("Slider", static () => new SliderDemo()),
+                CreateItem("ManagedFileChooser", static () => new ManagedFileChooserDemo()),
+            ]),
+            new NavigationSectionViewModel("Date/Time",
+            [
+                CreateItem("Calendar", static () => new CalendarDemo()),
+                CreateItem("CalendarDatePicker", static () => new CalendarDatePickerDemo()),
+                CreateItem("DatePicker", static () => new DatePickerDemo()),
+                CreateItem("TimePicker", static () => new TimePickerDemo()),
+            ]),
+            new NavigationSectionViewModel("Navigation",
+            [
+                CreateItem("ContentPage", static () => new ContentPageDemo()),
+                CreateItem("CarouselPage", static () => new CarouselPageDemo()),
+                CreateItem("DrawerPage", static () => new DrawerPageDemo()),
+                CreateItem("NavigationPage", static () => new NavigationPageDemo()),
+                CreateItem("TabbedPage", static () => new TabbedPageDemo()),
+                CreateItem("TabControl", static () => new TabControlDemo()),
+                CreateItem("TabStrip", static () => new TabStripDemo()),
+                CreateItem("TreeView", static () => new TreeViewDemo()),
+            ]),
+            new NavigationSectionViewModel("Show",
+            [
+                CreateItem("Carousel", static () => new CarouselDemo()),
+                CreateItem("PipsPager", static () => new PipsPagerDemo()),
+                CreateItem("Expander", static () => new ExpanderDemo()),
+                CreateItem("Flyout", static () => new FlyoutDemo()),
+                CreateItem("HeaderedContentControl", static () => new HeaderedContentControlDemo()),
+                CreateItem("Label", static () => new LabelDemo()),
+                CreateItem("ListBox", static () => new ListBoxDemo()),
+                CreateItem("SplitView", static () => new SplitViewDemo()),
+                CreateItem("ToolTip", static () => new ToolTipDemo()),
+            ]),
+            new NavigationSectionViewModel("Feedback",
+            [
+                CreateItem("DataValidationErrors", static () => new DataValidationErrorsDemo()),
+                CreateItem("Notification", static () => new NotificationDemo()),
+                CreateItem("ProgressBar", static () => new ProgressBarDemo()),
+                CreateItem("RefreshContainer", static () => new RefreshContainerDemo()),
+            ]),
+            new NavigationSectionViewModel("Other",
+            [
+                CreateItem("CommandBar", static () => new CommandBarDemo()),
+                CreateItem("GridSplitter", static () => new GridSplitterDemo()),
+                CreateItem("Menu", static () => new MenuDemo()),
+                CreateItem("ScrollViewer", static () => new ScrollViewerDemo()),
+                CreateItem("ThemeVariantScope", static () => new ThemeVariantDemo()),
+                CreateItem("WindowCustomizationsPage", static () => new WindowCustomizationsPage()),
+            ]),
+        ];
+
+        SelectedItem = Sections[0].Items[0];
+        RefreshFilteredSections();
+    }
+
+    public bool TryNavigateTo(string title)
+    {
+        if (_itemsByTitle.TryGetValue(title, out var item))
+        {
+            SelectedItem = item;
+            return true;
+        }
+
+        return false;
+    }
+
+    partial void OnSearchTextChanged(string? value)
+    {
+        RefreshFilteredSections();
+    }
+
+    [RelayCommand]
+    private void NavigateTo(object? parameter)
+    {
+        if (parameter is NavigationItemViewModel item)
+        {
+            SelectedItem = item;
+        }
+    }
+
+    [RelayCommand]
+    private void FollowSystemTheme()
+    {
+        Application.Current?.RegisterFollowSystemTheme();
+    }
+
+    [RelayCommand]
+    private void ToggleTheme()
+    {
+        var app = Application.Current;
+        if (app is null) return;
+        var theme = app.ActualThemeVariant;
+        app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
+        app.UnregisterFollowSystemTheme();
+    }
+
+    [RelayCommand]
+    private void SelectTheme(object? obj)
+    {
+        var app = Application.Current;
+        if (app is null) return;
+        app.RequestedThemeVariant = obj as ThemeVariant;
+        app.UnregisterFollowSystemTheme();
+    }
+
+    [RelayCommand]
+    private void SelectLocale(object? obj)
+    {
+        var app = Application.Current;
+        if (app is null) return;
+        SemiTheme.OverrideLocaleResources(app, obj as CultureInfo);
+    }
+
+    [RelayCommand]
+    private static async Task OpenUrl(string url)
+    {
+        var launcher = ResolveDefaultTopLevel()?.Launcher;
+        if (launcher is not null)
+        {
+            await launcher.LaunchUriAsync(new Uri(url));
+        }
+    }
+
+    private NavigationItemViewModel CreateItem(string title, Func<Control> contentFactory)
+    {
+        var item = new NavigationItemViewModel(title, NavigateToCommand, contentFactory);
+        _itemsByTitle.Add(title, item);
+        return item;
+    }
+
+    private void RefreshFilteredSections()
+    {
+        var search = string.IsNullOrWhiteSpace(SearchText) ? string.Empty : SearchText.Trim();
+
+        FilteredSections.Clear();
+
+        foreach (var section in _allSections)
+        {
+            if (search.Length == 0 ||
+                section.Header.Contains(search, StringComparison.InvariantCultureIgnoreCase))
+            {
+                FilteredSections.Add(section);
+                continue;
+            }
+
+            var matchedItems = section.Items
+                .Where(item => item.Title.Contains(search, StringComparison.InvariantCultureIgnoreCase))
+                .ToArray();
+
+            if (matchedItems.Length > 0)
+            {
+                FilteredSections.Add(new NavigationSectionViewModel(section.Header, matchedItems));
+            }
+        }
+
+        OnPropertyChanged(nameof(ShowEmptySearchState));
+    }
+
+    private static TopLevel? ResolveDefaultTopLevel()
+    {
+        return Application.Current?.ApplicationLifetime switch
+        {
+            IClassicDesktopStyleApplicationLifetime desktopLifetime => desktopLifetime.MainWindow,
+            ISingleViewApplicationLifetime singleView => TopLevel.GetTopLevel(singleView.MainView),
+            _ => null
+        };
+    }
+}
+
+public class NavigationSectionViewModel
+{
+    public NavigationSectionViewModel(string header, IReadOnlyList<NavigationItemViewModel> items)
+    {
+        Header = header;
+        Items = items;
+    }
+
+    public string Header { get; }
+
+    public IReadOnlyList<NavigationItemViewModel> Items { get; }
+}
+
+public partial class NavigationItemViewModel : ObservableObject
+{
+    private readonly Func<Control> _contentFactory;
+
+    public NavigationItemViewModel(string title, ICommand navigateCommand, Func<Control> contentFactory)
+    {
+        Title = title;
+        NavigateCommand = navigateCommand;
+        _contentFactory = contentFactory;
+    }
+
+    public string Title { get; }
+
+    public ICommand NavigateCommand { get; }
+
+    public ContentPage Page => field ??= new ContentPage
+    {
+        Header = Title,
+        Background = null,
+        HorizontalContentAlignment = HorizontalAlignment.Stretch,
+        VerticalContentAlignment = VerticalAlignment.Stretch,
+        Content = _contentFactory()
+    };
+
+    [ObservableProperty] public partial bool IsSelected { get; set; }
+}
+
+public class MenuItemViewModel
+{
+    public string? Header { get; set; }
+    public ICommand? Command { get; set; }
+    public object? CommandParameter { get; set; }
+    public IList<MenuItemViewModel>? Items { get; set; }
+}

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

@@ -14,6 +14,8 @@ namespace Semi.Avalonia.Demo.ViewModels;
 
 public partial class PaletteDemoViewModel : ObservableObject
 {
+    public static Lazy<PaletteDemoViewModel> Instance { get; } = new(() => new PaletteDemoViewModel());
+    public bool IsInitialized { get; private set; }
     private readonly string[] _predefinedColorNames =
     [
         "Red", "Pink", "Purple", "Violet", "Indigo",
@@ -44,6 +46,7 @@ public partial class PaletteDemoViewModel : ObservableObject
         InitializePalette();
         InitializeFunctionalColors();
         InitializeShadows();
+        IsInitialized = true;
     }
 
     private void InitializePalette()

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

@@ -4,283 +4,142 @@
     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"
+    xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
-    xmlns:views="clr-namespace:Semi.Avalonia.Demo.Views"
     d:DesignHeight="450"
     d:DesignWidth="800"
-    x:DataType="views:MainViewModel"
+    x:DataType="vm:MainViewModel"
     mc:Ignorable="d">
-    <UserControl.Resources>
+    <UserControl.Styles>
-        <ControlTheme x:Key="CategoryTabItem" TargetType="TabItem">
+        <Style Selector="TextBlock.NavSectionHeader">
-            <Setter Property="IsEnabled" Value="False" />
+            <Setter Property="Margin" Value="12,10,12,2" />
-            <Setter Property="Template">
+            <Setter Property="FontSize" Value="12" />
-                <ControlTemplate TargetType="TabItem">
+            <Setter Property="FontWeight" Value="Bold" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
+        </Style>
+
+        <Style Selector="Border.NavItemHost">
+            <Setter Property="Margin" Value="6,0" />
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <Style Selector="Border.NavItemHost.Selected">
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLight}" />
+        </Style>
+
+        <Style Selector="Button.NavItem">
+            <Setter Property="Theme" Value="{DynamicResource BorderlessButton}" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="Padding" Value="12,8" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
+        </Style>
+        <Style Selector="Button.NavItem.Selected">
+            <Setter Property="Foreground" Value="{DynamicResource SemiColorPrimary}" />
+        </Style>
+    </UserControl.Styles>
+
+    <DrawerPage
+        Name="MainDrawer"
+        Margin="8"
+        Background="Transparent"
+        Content="{Binding CurrentPage}"
+        DrawerLayoutBehavior="{OnFormFactor Split, Mobile=Overlay}"
+        DrawerLength="300"
+        IsOpen="True">
+        <DrawerPage.Header>
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <SelectableTextBlock
+                    VerticalAlignment="Center"
+                    Classes="H6"
+                    Text="Semi Avalonia"
+                    Theme="{DynamicResource TitleSelectableTextBlock}" />
+                <TextBlock VerticalAlignment="Center" Text="/" />
+                <SelectableTextBlock
+                    VerticalAlignment="Center"
+                    Classes="Secondary"
+                    Text="{Binding SelectedPageTitle}" />
+            </StackPanel>
+        </DrawerPage.Header>
+
+        <DrawerPage.DrawerHeader>
+            <TextBox
+                Margin="8"
+                Classes="ClearButton"
+                PlaceholderText="Search demos or sections"
+                Text="{Binding SearchText}" />
+        </DrawerPage.DrawerHeader>
+
+        <DrawerPage.Drawer>
+            <ScrollViewer HorizontalScrollBarVisibility="Disabled">
+                <StackPanel>
+                    <ItemsControl ItemsSource="{Binding FilteredSections}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate DataType="vm:NavigationSectionViewModel">
+                                <StackPanel Margin="0,0,0,10">
+                                    <TextBlock Classes="NavSectionHeader" Text="{Binding Header}" />
+                                    <ItemsControl ItemsSource="{Binding Items}">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate DataType="vm:NavigationItemViewModel">
+                                                <Border Classes="NavItemHost" Classes.Selected="{Binding IsSelected}">
+                                                    <Button
+                                                        Classes="NavItem"
+                                                        FontWeight="Normal"
+                                                        Classes.Selected="{Binding IsSelected}"
+                                                        Command="{Binding NavigateCommand}"
+                                                        CommandParameter="{Binding}"
+                                                        Content="{Binding Title}" />
+                                                </Border>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+
                     <TextBlock
-                        Margin="4"
+                        Margin="16,12,16,0"
-                        FontSize="12"
+                        Foreground="{DynamicResource SemiColorText1}"
-                        FontWeight="Bold"
+                        IsVisible="{Binding ShowEmptySearchState}"
-                        Text="{TemplateBinding Header}" />
+                        Text="No demo pages matched your search." />
-                </ControlTemplate>
-            </Setter>
-            <Style Selector="^:disabled /template/ TextBlock">
-                <Setter Property="Foreground" Value="{DynamicResource SemiColorText1}" />
-            </Style>
-        </ControlTheme>
-    </UserControl.Resources>
-    <Grid RowDefinitions="Auto, *">
-        <Border
-            Grid.Row="0"
-            Margin="8"
-            Padding="12,4"
-            Theme="{DynamicResource CardBorder}">
-            <Panel>
-                <StackPanel Orientation="Horizontal" Spacing="8">
-                    <ToggleSwitch
-                        Name="ExpandButton"
-                        Content="{StaticResource SemiIconSidebar}"
-                        Theme="{DynamicResource IconBorderlessToggleSwitch}" />
-                    <SelectableTextBlock
-                        VerticalAlignment="Center"
-                        Classes="H6"
-                        Text="Semi Avalonia"
-                        Theme="{DynamicResource TitleSelectableTextBlock}" />
-                    <SelectableTextBlock VerticalAlignment="Center" Text="/" />
-                    <SelectableTextBlock
-                        VerticalAlignment="Center"
-                        Classes="Secondary"
-                        Text="{ReflectionBinding #tab.SelectedItem.Header}" />
                 </StackPanel>
-                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            </ScrollViewer>
-                    <Button
+        </DrawerPage.Drawer>
-                        Command="{Binding OpenUrlCommand}"
-                        CommandParameter="{Binding DocumentationUrl}"
-                        Content="{StaticResource SemiIconGlobe}"
-                        Theme="{DynamicResource IconBorderlessButton}" />
 
-                    <Button
+        <DrawerPage.DrawerFooter>
-                        Command="{Binding OpenUrlCommand}"
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                        CommandParameter="{Binding RepoUrl}"
+                <Button
-                        Content="{StaticResource SemiIconGithubLogo}"
+                    Command="{Binding OpenUrlCommand}"
-                        Theme="{DynamicResource IconBorderlessButton}" />
+                    CommandParameter="{Binding DocumentationUrl}"
+                    Content="{StaticResource SemiIconGlobe}"
+                    Theme="{DynamicResource IconBorderlessButton}" />
 
-                    <ToggleSwitch
+                <Button
-                        Command="{Binding ToggleThemeCommand}"
+                    Command="{Binding OpenUrlCommand}"
-                        OffContent="{StaticResource SemiIconSun}"
+                    CommandParameter="{Binding RepoUrl}"
-                        OnContent="{StaticResource SemiIconMoon}"
+                    Content="{StaticResource SemiIconGithubLogo}"
-                        Theme="{DynamicResource IconBorderlessToggleSwitch}" />
+                    Theme="{DynamicResource IconBorderlessButton}" />
 
-                    <Button Content="{StaticResource SemiIconMenu}" Theme="{DynamicResource IconBorderlessButton}">
+                <ToggleSwitch
-                        <Button.Flyout>
+                    Command="{Binding ToggleThemeCommand}"
-                            <MenuFlyout ItemsSource="{Binding MenuItems}" Placement="Bottom" />
+                    OffContent="{StaticResource SemiIconSun}"
-                        </Button.Flyout>
+                    OnContent="{StaticResource SemiIconMoon}"
-                        <Button.Styles>
+                    Theme="{DynamicResource IconBorderlessToggleSwitch}" />
-                            <Style x:DataType="views:MenuItemViewModel" Selector="MenuItem">
+
-                                <Setter Property="Header" Value="{Binding Header}" />
+                <Button Content="{StaticResource SemiIconMenu}" Theme="{DynamicResource IconBorderlessButton}">
-                                <Setter Property="ItemsSource" Value="{Binding Items}" />
+                    <Button.Flyout>
-                                <Setter Property="Command" Value="{Binding Command}" />
+                        <MenuFlyout ItemsSource="{Binding MenuItems}" Placement="Bottom" />
-                                <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
+                    </Button.Flyout>
-                            </Style>
+                    <Button.Styles>
-                        </Button.Styles>
+                        <Style x:DataType="vm:MenuItemViewModel" Selector="MenuItem">
-                    </Button>
+                            <Setter Property="Header" Value="{Binding Header}" />
-                </StackPanel>
+                            <Setter Property="ItemsSource" Value="{Binding Items}" />
-            </Panel>
+                            <Setter Property="Command" Value="{Binding Command}" />
-        </Border>
+                            <Setter Property="CommandParameter" Value="{Binding CommandParameter}" />
-        <TabControl
+                        </Style>
-            Name="tab"
+                    </Button.Styles>
-            Grid.Row="1"
+                </Button>
-            Margin="8"
+            </StackPanel>
-            Padding="20,0,0,0"
+        </DrawerPage.DrawerFooter>
-            Classes.Dismiss="{Binding #ExpandButton.IsChecked}"
+    </DrawerPage>
-            TabStripPlacement="Left"
-            Theme="{DynamicResource ScrollLineTabControl}">
-            <TabControl.Styles>
-                <Style Selector=".Dismiss /template/ ScrollViewer#PART_ScrollViewer">
-                    <Setter Property="IsVisible" Value="False" />
-                </Style>
-            </TabControl.Styles>
-            <TabControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel />
-                </ItemsPanelTemplate>
-            </TabControl.ItemsPanel>
-            <TabItem Header="Overview">
-                <pages:Overview />
-            </TabItem>
-            <TabItem Header="About Us">
-                <pages:AboutUs />
-            </TabItem>
-            <TabItem Header="Resource Browser" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="Palette">
-                <pages:PaletteDemo />
-            </TabItem>
-            <TabItem Header="HighContrastTheme">
-                <pages:HighContrastDemo />
-            </TabItem>
-            <TabItem Header="Variables">
-                <pages:VariablesDemo />
-            </TabItem>
-            <TabItem Header="Icon">
-                <pages:IconDemo />
-            </TabItem>
-            <TabItem Header="Separate Pack" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="ColorPicker">
-                <pages:ColorPickerDemo />
-            </TabItem>
-            <TabItem Header="DataGrid">
-                <pages:DataGridDemo />
-            </TabItem>
-            <!-- <TabItem Header="TreeDataGrid"> -->
-            <!--     <pages:TreeDataGridDemo /> -->
-            <!-- </TabItem> -->
-            <TabItem Header="Basic" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="TextBlock">
-                <pages:TextBlockDemo />
-            </TabItem>
-            <TabItem Header="SelectableTextBlock">
-                <pages:SelectableTextBlockDemo />
-            </TabItem>
-            <TabItem Header="Border">
-                <pages:BorderDemo />
-            </TabItem>
-            <TabItem Header="PathIcon">
-                <pages:PathIconDemo />
-            </TabItem>
-            <TabItem Header="Button" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="Button">
-                <pages:ButtonDemo />
-            </TabItem>
-            <TabItem Header="HyperlinkButton">
-                <pages:HyperlinkButtonDemo />
-            </TabItem>
-            <TabItem Header="CheckBox">
-                <pages:CheckBoxDemo />
-            </TabItem>
-            <TabItem Header="RadioButton">
-                <pages:RadioButtonDemo />
-            </TabItem>
-            <TabItem Header="ToggleSwitch">
-                <pages:ToggleSwitchDemo />
-            </TabItem>
-            <TabItem Header="Input" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="TextBox">
-                <pages:TextBoxDemo />
-            </TabItem>
-            <TabItem Header="AutoCompleteBox">
-                <pages:AutoCompleteBoxDemo />
-            </TabItem>
-            <TabItem Header="ComboBox">
-                <pages:ComboBoxDemo />
-            </TabItem>
-            <TabItem Header="ButtonSpinner">
-                <pages:ButtonSpinnerDemo />
-            </TabItem>
-            <TabItem Header="NumericUpDown">
-                <pages:NumericUpDownDemo />
-            </TabItem>
-            <TabItem Header="Slider">
-                <pages:SliderDemo />
-            </TabItem>
-            <TabItem Header="ManagedFileChooser">
-                <pages:ManagedFileChooserDemo />
-            </TabItem>
-            <TabItem Header="Date/Time" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="Calendar">
-                <pages:CalendarDemo />
-            </TabItem>
-            <TabItem Header="CalendarDatePicker">
-                <pages:CalendarDatePickerDemo />
-            </TabItem>
-            <TabItem Header="DatePicker">
-                <pages:DatePickerDemo />
-            </TabItem>
-            <TabItem Header="TimePicker">
-                <pages:TimePickerDemo />
-            </TabItem>
-            <TabItem Header="Navigation" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="ContentPage">
-                <pages:ContentPageDemo />
-            </TabItem>
-            <TabItem Header="CarouselPage">
-                <pages:CarouselPageDemo />
-            </TabItem>
-            <TabItem Header="DrawerPage">
-                <pages:DrawerPageDemo />
-            </TabItem>
-            <TabItem Header="NavigationPage">
-                <pages:NavigationPageDemo />
-            </TabItem>
-            <TabItem Header="TabbedPage">
-                <pages:TabbedPageDemo />
-            </TabItem>
-            <TabItem Header="TabControl">
-                <pages:TabControlDemo />
-            </TabItem>
-            <TabItem Header="TabStrip">
-                <pages:TabStripDemo />
-            </TabItem>
-            <TabItem Header="TreeView">
-                <pages:TreeViewDemo />
-            </TabItem>
-            <TabItem Header="Show" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="Carousel">
-                <pages:CarouselDemo />
-            </TabItem>
-            <TabItem Header="PipsPager">
-                <pages:PipsPagerDemo />
-            </TabItem>
-            <TabItem Header="Expander">
-                <pages:ExpanderDemo />
-            </TabItem>
-            <TabItem Header="Flyout">
-                <pages:FlyoutDemo />
-            </TabItem>
-            <TabItem Header="HeaderedContentControl">
-                <pages:HeaderedContentControlDemo />
-            </TabItem>
-            <TabItem Header="Label">
-                <pages:LabelDemo />
-            </TabItem>
-            <TabItem Header="ListBox">
-                <pages:ListBoxDemo />
-            </TabItem>
-            <TabItem Header="SplitView">
-                <pages:SplitViewDemo />
-            </TabItem>
-            <TabItem Header="ToolTip">
-                <pages:ToolTipDemo />
-            </TabItem>
-            <TabItem Header="Feedback" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="DataValidationErrors">
-                <pages:DataValidationErrorsDemo />
-            </TabItem>
-            <TabItem Header="Notification">
-                <pages:NotificationDemo />
-            </TabItem>
-            <TabItem Header="ProgressBar">
-                <pages:ProgressBarDemo />
-            </TabItem>
-            <TabItem Header="RefreshContainer">
-                <pages:RefreshContainerDemo />
-            </TabItem>
-            <TabItem Header="Other" Theme="{DynamicResource CategoryTabItem}" />
-            <TabItem Header="CommandBar">
-                <pages:CommandBarDemo />
-            </TabItem>
-            <TabItem Header="GridSplitter">
-                <pages:GridSplitterDemo />
-            </TabItem>
-            <TabItem Header="Menu">
-                <pages:MenuDemo />
-            </TabItem>
-            <TabItem Header="ScrollViewer">
-                <pages:ScrollViewerDemo />
-            </TabItem>
-            <TabItem Header="ThemeVariantScope">
-                <pages:ThemeVariantDemo />
-            </TabItem>
-            <TabItem Header="WindowCustomizationsPage">
-                <pages:WindowCustomizationsPage />
-            </TabItem>
-        </TabControl>
-    </Grid>
 </UserControl>

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

@@ -1,250 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Styling;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Semi.Avalonia.Demo.ViewModels;
 
 namespace Semi.Avalonia.Demo.Views;
 
 public partial class MainView : UserControl
 {
+    private readonly MainViewModel _viewModel;
+
     public MainView()
     {
         InitializeComponent();
-        this.DataContext = new MainViewModel();
+        DataContext = _viewModel = new MainViewModel();
         WeakReferenceMessenger.Default.Register<string, string>(this, "JumpTo", MessageHandler);
     }
 
     private void MessageHandler(object _, string message)
     {
-        foreach (var item in tab.ItemsView)
+        _viewModel.TryNavigateTo(message);
-        {
-            if (item is TabItem tabItem && tabItem.Header is not null && tabItem.Header.Equals(message))
-            {
-                tab.SelectedItem = tabItem;
-                break;
-            }
-        }
     }
 }
-
-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 MainViewModel()
-    {
-        MenuItems =
-        [
-            new MenuItemViewModel
-            {
-                Header = "Theme",
-                Items =
-                [
-                    new MenuItemViewModel
-                    {
-                        Header = "Auto",
-                        Command = FollowSystemThemeCommand
-                    },
-                    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
-            {
-                Header = "Locale",
-                Items =
-                [
-                    new MenuItemViewModel
-                    {
-                        Header = "简体中文",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("zh-CN")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "English",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("en-US")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "日本語",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("ja-JP")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "한국어",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("ko-KR")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "English (UK)",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("en-GB")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Italiano",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("it-IT")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Italiano (Switzerland)",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("it-CH")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Nederlands",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("nl-NL")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Nederlands (Belgium)",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("nl-BE")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Українська",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("uk-UA")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Русский",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("ru-RU")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "繁體中文",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("zh-TW")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Deutsch",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("de-DE")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Español",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("es-ES")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Polski",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("pl-PL")
-                    },
-                    new MenuItemViewModel
-                    {
-                        Header = "Français",
-                        Command = SelectLocaleCommand,
-                        CommandParameter = new CultureInfo("fr-FR")
-                    },
-                ]
-            }
-        ];
-    }
-
-    [RelayCommand]
-    private void FollowSystemTheme()
-    {
-        Application.Current?.RegisterFollowSystemTheme();
-    }
-
-    [RelayCommand]
-    private void ToggleTheme()
-    {
-        var app = Application.Current;
-        if (app is null) return;
-        var theme = app.ActualThemeVariant;
-        app.RequestedThemeVariant = theme == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark;
-        app.UnregisterFollowSystemTheme();
-    }
-
-    [RelayCommand]
-    private void SelectTheme(object? obj)
-    {
-        var app = Application.Current;
-        if (app is null) return;
-        app.RequestedThemeVariant = obj as ThemeVariant;
-        app.UnregisterFollowSystemTheme();
-    }
-
-    [RelayCommand]
-    private void SelectLocale(object? obj)
-    {
-        var app = Application.Current;
-        if (app is null) return;
-        SemiTheme.OverrideLocaleResources(app, obj as CultureInfo);
-    }
-
-    [RelayCommand]
-    private static async Task OpenUrl(string url)
-    {
-        var launcher = ResolveDefaultTopLevel()?.Launcher;
-        if (launcher is not null)
-        {
-            await launcher.LaunchUriAsync(new Uri(url));
-        }
-    }
-
-    private static TopLevel? ResolveDefaultTopLevel()
-    {
-        return Application.Current?.ApplicationLifetime switch
-        {
-            IClassicDesktopStyleApplicationLifetime desktopLifetime => desktopLifetime.MainWindow,
-            ISingleViewApplicationLifetime singleView => TopLevel.GetTopLevel(singleView.MainView),
-            _ => null
-        };
-    }
-}
-
-public class MenuItemViewModel
-{
-    public string? Header { get; set; }
-    public ICommand? Command { get; set; }
-    public object? CommandParameter { get; set; }
-    public IList<MenuItemViewModel>? Items { get; set; }
-}