*更新版本号至 0.0.2.129

Author: Maklith

Core/ViewModel/Main/MainWindowViewModel.cs

@@ -18,21 +18,16 @@ namespace Core.ViewModel.Main;
 /// </summary>
 public partial class MainWindowViewModel : ObservableRecipient
 {
-    public MainWindowViewModel()
-    {
-        WeakReferenceMessenger.Default.Register<MainWindowViewModel, PageChangeEventArgs>(this, OnNavigation);
-    }
+    [ObservableProperty] private object? _content;
 
     [ObservableProperty] private bool _settingPage = false;
-    [ObservableProperty] private string _version = "0.0.2.128";
-    private void OnNavigation(MainWindowViewModel recipient, PageChangeEventArgs message)
+    [ObservableProperty] private string _version = "0.0.2.129";
+
+    public MainWindowViewModel()
     {
-        Content = message.Key;
-        SettingPage = message.Key == "Setting";
+        WeakReferenceMessenger.Default.Register<MainWindowViewModel, PageChangeEventArgs>(this, OnNavigation);
     }
 
-    [ObservableProperty] private object? _content;
-
     public ObservableCollection<MenuItemViewModel> MenuItems { get; } = new()
     {
         new MenuItemViewModel
@@ -79,6 +74,12 @@ private void OnNavigation(MainWindowViewModel recipient, PageChangeEventArgs mes
         }
     };
 
+    private void OnNavigation(MainWindowViewModel recipient, PageChangeEventArgs message)
+    {
+        Content = message.Key;
+        SettingPage = message.Key == "Setting";
+    }
+
     [RelayCommand]
     public void ActivateSettingPage()
     {
@@ -112,6 +113,15 @@ public PageChangeEventArgs(string key)
 
 public partial class MenuItemViewModel : ObservableObject
 {
+    [ObservableProperty] private bool _isSelected = false;
+
+    public MenuItemViewModel()
+    {
+        WeakReferenceMessenger.Default.Register<PageChangeEventArgs>(this,
+            (recipient, message) => { IsSelected = message.Key == Key; });
+        ActivateCommand = new RelayCommand(OnActivate);
+    }
+
     public string MenuHeader { get; set; }
     public string MenuIconGlyph { get; set; }
     public string MenuIconFilledGlyph { get; set; }
@@ -122,15 +132,6 @@ public partial class MenuItemViewModel : ObservableObject
     public ObservableCollection<MenuItemViewModel> Children { get; set; } = new();
     public ICommand ActivateCommand { get; set; }
 
-    [ObservableProperty] private bool _isSelected = false;
-
-    public MenuItemViewModel()
-    {
-        WeakReferenceMessenger.Default.Register<PageChangeEventArgs>(this,
-            (recipient, message) => { IsSelected = message.Key == Key; });
-        ActivateCommand = new RelayCommand(OnActivate);
-    }
-
     private void OnActivate()
     {
         if (IsSeparator) return;

KitopiaAvalonia/KitopiaAvalonia.csproj

@@ -31,7 +31,7 @@
         <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
         <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
         <DebugType Condition="'$(Configuration)' == 'Release'">none</DebugType>
-        <Version>0.0.2.128</Version>
+        <Version>0.0.2.129</Version>
         <AvaloniaVersion>11.3.2</AvaloniaVersion>
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU;x64</Platforms>

build/InstallerAssets/info.json

@@ -1,7 +1,7 @@
 {
   "DisplayIcon": "",
   "DisplayName": "Kitopia",
-  "DisplayVersion": "0.0.2.102",
+  "DisplayVersion": "0.0.2.129",
   "Publisher": "MakesYT",
   "CanExecutePath": "KitopiaAvalonia.exe",
   "Is64": true