修复侧栏展开状态保存问题、更新部分 nuget 包

Xcube-Studio · Nov 19, 2024 · 2b54b03 · 2b54b03
1 parent 0802992
commit 2b54b03
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/Natsurainko.FluentCore b/Natsurainko.FluentCore
diff --git a/Natsurainko.FluentLauncher/Natsurainko.FluentLauncher.csproj b/Natsurainko.FluentLauncher/Natsurainko.FluentLauncher.csproj
@@ -57,7 +57,7 @@
   <ItemGroup>
     <!-- NuGet Packages -->
     <PackageReference Include="ColorCode.WinUI" Version="2.0.15" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
     <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.1.240821" />
     <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.1.240821" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.ColorPicker" Version="8.1.240821" />
@@ -78,7 +78,7 @@
     <PackageReference Include="ReverseMarkdown" Version="4.6.0" />
     <PackageReference Include="System.Management" Version="8.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="WindowsAPICodePack.Shell.CommonFileDialogs" Version="1.1.5" />
     <PackageReference Include="WinUIEx" Version="2.3.4" />

diff --git a/Natsurainko.FluentLauncher/Views/Home/HomePage.xaml.cs b/Natsurainko.FluentLauncher/Views/Home/HomePage.xaml.cs
@@ -28,6 +28,10 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
                     ? new SolidColorBrush(Color.FromArgb(128, 255, 255, 255))
                     : new SolidColorBrush(Color.FromArgb(76, 58, 58, 58));
 
+            Brush foregroundBrush = this.ActualTheme == ElementTheme.Light
+                ? new SolidColorBrush(Color.FromArgb(255, 26, 26, 26))
+                : new SolidColorBrush(Color.FromArgb(255, 255, 255, 255));
+
             DropDownButton.Shadow = _themeShadow;
             DropDownButton.Translation += new System.Numerics.Vector3(0, 0, 32);
             DropDownButtonArea.Background = new CommunityToolkit.WinUI.Media.BackdropBlurBrush() { Amount = 16 };
@@ -37,15 +41,21 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
             HyperlinkButton.Translation += new System.Numerics.Vector3(0, 0, 32);
             HyperlinkButtonArea.Background = new CommunityToolkit.WinUI.Media.BackdropBlurBrush() { Amount = 16 };
             HyperlinkButton.Background = maskColorBrush;
+            HyperlinkButton.Foreground = foregroundBrush;
 
             this.ActualThemeChanged += (_, e) =>
             {
                 Brush maskColorBrush = this.ActualTheme == ElementTheme.Light
                     ? new SolidColorBrush(Color.FromArgb(128, 255, 255, 255))
                     : new SolidColorBrush(Color.FromArgb(76, 58, 58, 58));
 
+                Brush foregroundBrush = this.ActualTheme == ElementTheme.Light
+                    ? new SolidColorBrush(Color.FromArgb(255, 26, 26, 26))
+                    : new SolidColorBrush(Color.FromArgb(255, 255, 255, 255));
+
                 DropDownButton.Background = maskColorBrush;
                 HyperlinkButton.Background = maskColorBrush;
+                HyperlinkButton.Foreground = foregroundBrush;
             };
         }
 

diff --git a/Natsurainko.FluentLauncher/Views/ShellPage.xaml.cs b/Natsurainko.FluentLauncher/Views/ShellPage.xaml.cs
@@ -214,13 +214,13 @@ private async void BackgroundReloaded(object? sender, EventArgs e)
     void ConfigurePage()
     {
         ContentFrame = contentFrame;
+        NavigationViewControl.IsPaneOpen = _settings.NavigationViewIsPaneOpen;
+
         App.GetService<AppearanceService>().BackgroundReloaded += BackgroundReloaded;
     }
 
     void ConfigureNavigationView()
     {
-        NavigationViewControl.IsPaneOpen = _settings.NavigationViewIsPaneOpen;
-
         if (_settings.UseBackgroundMask)
         {
             var RootSplitView = FindControl<SplitView>(NavigationViewControl, typeof(SplitView), "RootSplitView");

diff --git a/...her.Infra.Settings.SourceGenerators/FluentLauncher.Infra.Settings.SourceGenerators.csproj b/...her.Infra.Settings.SourceGenerators/FluentLauncher.Infra.Settings.SourceGenerators.csproj
@@ -19,6 +19,7 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
       <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+      <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/infra/FluentLauncher.Infra.Settings/FluentLauncher.Infra.Settings.csproj b/infra/FluentLauncher.Infra.Settings/FluentLauncher.Infra.Settings.csproj
@@ -6,4 +6,8 @@
     <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+  </ItemGroup>
+
 </Project>
diff --git a/infra/FluentLauncher.Infra.UI/FluentLauncher.Infra.UI.csproj b/infra/FluentLauncher.Infra.UI/FluentLauncher.Infra.UI.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/infra/FluentLauncher.Infra.WinUI/FluentLauncher.Infra.WinUI.csproj b/infra/FluentLauncher.Infra.WinUI/FluentLauncher.Infra.WinUI.csproj
@@ -15,7 +15,7 @@
       <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
       <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-      <PackageReference Include="System.Text.Json" Version="8.0.4" />
+      <PackageReference Include="System.Text.Json" Version="8.0.5" />
       <PackageReference Include="WinUIEx" Version="2.3.4" />
   </ItemGroup>