launch game

fix #1571

.github/ISSUE_TEMPLATE/CHS-bug-report.yml

@@ -40,7 +40,7 @@ body:
     attributes:
       label: Snap Hutao 版本
       description: 在应用标题，应用程序的反馈中心界面中可以找到
-      placeholder: 例：1.4.15.0
+      placeholder: 例：1.9.9.0
     validations:
       required: true
 
@@ -62,20 +62,19 @@ body:
       description: 请设置一个你认为合适的分类，这将帮助我们快速定位问题
       options:
         - 安装和环境
-        - 成就管理
-        - 角色信息面板
         - 游戏启动器
+        - 祈愿记录
+        - 成就管理
+        - 我的角色
         - 实时便笺
         - 养成计算
-        - 文件缓存
-        - 祈愿记录
-        - 玩家查询
-        - 胡桃数据库
-        - 用户界面
-        - 胡桃云
-        - 胡桃帐号
-        - 签到
+        - 深境螺旋/胡桃数据库
         - Wiki
+        - 米游社账号面板
+        - 每日签到奖励
+        - 胡桃通行证/胡桃云
+        - 用户界面
+        - 文件缓存
         - 公告
         - 其它
     validations:

.github/ISSUE_TEMPLATE/ENG-bug-report.yml

@@ -40,7 +40,7 @@ body:
     attributes:
       label: Snap Hutao Version
       description: You can find the version in application's title bar
-      placeholder: e.g. 1.4.15.0
+      placeholder: e.g. 1.9.9.0
     validations:
       required: true
 
@@ -62,20 +62,19 @@ body:
       description: Please select the most associated category of your issue
       options:
         - Installation and Environment
+        - Game Launcher
+        - Wish Export
         - Achievement
         - My Character
-        - Game Launcher
         - Realtime Note
         - Develop Plan
-        - File Cache
-        - Wish Export
-        - Game Record
-        - Hutao Database
-        - User Interface
-        - Snap Hutao Cloud
-        - Snap Hutao Account
-        - Checkin
+        - Spiral Abyss
         - Wiki
+        - MiHoYo Account Panel
+        - Daily Checkin Reward
+        - Hutao Passport/Hutao Cloud
+        - User Interface
+        - File Cache
         - Announcement
         - Other
     validations:

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+<!--- Hi, thanks for considering make a PR contribution to Snap Hutao, we appreciate your work. -->
+<!--- Before you create this PR, please fill the following form and checklist -->
+
+## Description
+
+<!--- Describe your changes -->
+
+## Related Issue
+
+<!--- If there's an associated issue, please use [GitHub Keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests) to link it -->
+<!-- e.g. fix #999, resolve #999, close #999 -->
+
+## Checklist
+
+- [ ] The target PR branch is `develop` branch

README.md

@@ -17,7 +17,7 @@ You can follow the instructions in the [Quick Start](https://hut.ao/en/quick-sta
 
 ## 本地化翻译 / Localization
 
-![zh-TW translation](https://img.shields.io/badge/dynamic/json?color=blue&label=zh-TW&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27zh-TW%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![en translation](https://img.shields.io/badge/dynamic/json?color=blue&label=en&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27en%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![id translation](https://img.shields.io/badge/dynamic/json?color=blue&label=id&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27id%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![ja translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ja&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ja%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json) ![ko translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ko&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ko%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)![pt-PT translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pt-PT&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27pt-PT%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)  ![ru translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ru&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ru%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)
+[![zh-TW translation](https://img.shields.io/badge/dynamic/json?color=blue&label=zh-TW&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27zh-TW%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![en translation](https://img.shields.io/badge/dynamic/json?color=blue&label=en&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27en%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![id translation](https://img.shields.io/badge/dynamic/json?color=blue&label=id&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27id%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![ja translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ja&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ja%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![ko translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ko&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ko%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![pt-PT translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pt-PT&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27pt-PT%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![ru translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ru&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ru%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
 
 Snap Hutao 使用 [Crowdin](https://translate.hut.ao/) 作为客户端文本翻译平台，在该平台上你可以为你熟悉的语言提交翻译文本。我们感谢每一个为 Snap Hutao 做出贡献的社区成员，并且欢迎更多的朋友能参与到这个项目中。
 

src/Snap.Hutao/.editorconfig

@@ -110,7 +110,6 @@ dotnet_diagnostic.SA1642.severity = none
 
 dotnet_diagnostic.IDE0005.severity = warning
 dotnet_diagnostic.IDE0060.severity = none
-dotnet_diagnostic.IDE0290.severity = none
 
 # SA1208: System using directives should be placed before other using directives
 dotnet_diagnostic.SA1208.severity = none
@@ -321,7 +320,8 @@ dotnet_diagnostic.CA2227.severity = suggestion
 
 # CA2251: 使用 “string.Equals”
 dotnet_diagnostic.CA2251.severity = suggestion
-csharp_style_prefer_primary_constructors = true:suggestion
+
+csharp_style_prefer_primary_constructors = false:none
 
 [*.vb]
 #### 命名样式 ####

src/Snap.Hutao/Snap.Hutao.Test/PlatformExtensions/DependencyInjectionTest.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using System;
 
 namespace Snap.Hutao.Test.PlatformExtensions;
@@ -11,6 +12,7 @@ public sealed class DependencyInjectionTest
         .AddSingleton<IService, ServiceB>()
         .AddScoped<IScopedService, ServiceA>()
         .AddTransient(typeof(IGenericService<>), typeof(GenericService<>))
+        .AddLogging(builder => builder.AddConsole())
         .BuildServiceProvider();
 
     [TestMethod]
@@ -41,6 +43,13 @@ public sealed class DependencyInjectionTest
         }
     }
 
+    [TestMethod]
+    public void LoggerWithInterfaceTypeCanBeResolved()
+    {
+        Assert.IsNotNull(services.GetService<ILogger<IScopedService>>());
+        Assert.IsNotNull(services.GetRequiredService<ILoggerFactory>().CreateLogger(nameof(IScopedService)));
+    }
+
     private interface IService
     {
         Guid Id { get; }

src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj

@@ -12,9 +12,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Snap.Hutao/Snap.Hutao/App.xaml

@@ -6,6 +6,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources/>
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsCard/SettingsCard.xaml"/>
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenizingTextBox/TokenizingTextBox.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Loading.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Image/CachedImage.xaml"/>

src/Snap.Hutao/Snap.Hutao/App.xaml.cs

@@ -8,10 +8,10 @@ using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.LifeCycle;
 using Snap.Hutao.Core.LifeCycle.InterProcess;
 using Snap.Hutao.Core.Logging;
-using Snap.Hutao.Core.Shell;
+using Snap.Hutao.Core.Setting;
+using Snap.Hutao.Core.Windowing.HotKey;
+using Snap.Hutao.Core.Windowing.NotifyIcon;
 using System.Diagnostics;
-using System.Text;
-using static Snap.Hutao.Core.Logging.ConsoleVirtualTerminalSequences;
 
 namespace Snap.Hutao;
 
@@ -41,7 +41,7 @@ public sealed partial class App : Application
         """;
 
     private readonly IServiceProvider serviceProvider;
-    private readonly IActivation activation;
+    private readonly IAppActivation activation;
     private readonly ILogger<App> logger;
 
     /// <summary>
@@ -52,13 +52,21 @@ public sealed partial class App : Application
     {
         // Load app resource
         InitializeComponent();
-        activation = serviceProvider.GetRequiredService<IActivation>();
+        activation = serviceProvider.GetRequiredService<IAppActivation>();
         logger = serviceProvider.GetRequiredService<ILogger<App>>();
         serviceProvider.GetRequiredService<ExceptionRecorder>().Record(this);
 
         this.serviceProvider = serviceProvider;
     }
 
+    public bool IsExiting { get; private set; }
+
+    public new void Exit()
+    {
+        IsExiting = true;
+        base.Exit();
+    }
+
     /// <inheritdoc/>
     protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
@@ -75,11 +83,9 @@ public sealed partial class App : Application
             logger.LogColorizedInformation((ConsoleBanner, ConsoleColor.DarkYellow));
             LogDiagnosticInformation();
 
-            // manually invoke
+            // Manually invoke
             activation.Activate(HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs));
-            activation.Initialize();
-
-            serviceProvider.GetRequiredService<IJumpListInterop>().ConfigureAsync().SafeForget();
+            activation.PostInitialization();
         }
         catch
         {

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilder.cs

@@ -0,0 +1,10 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal class ButtonBaseBuilder<TButton> : IButtonBaseBuilder<TButton>
+    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase, new()
+{
+    public TButton Button { get; } = new();
+}

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilderExtension.cs

@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Abstraction.Extension;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal static class ButtonBaseBuilderExtension
+{
+    public static TBuilder SetContent<TBuilder, TButton>(this TBuilder builder, object? content)
+        where TBuilder : IButtonBaseBuilder<TButton>
+        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
+    {
+        builder.Configure(builder => builder.Button.Content = content);
+        return builder;
+    }
+
+    public static TBuilder SetCommand<TBuilder, TButton>(this TBuilder builder, ICommand command)
+        where TBuilder : IButtonBaseBuilder<TButton>
+        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
+    {
+        builder.Configure(builder => builder.Button.Command = command);
+        return builder;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilder.cs

@@ -0,0 +1,8 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal sealed class ButtonBuilder : ButtonBaseBuilder<Button>;

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilderExtension.cs

@@ -0,0 +1,19 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal static class ButtonBuilderExtension
+{
+    public static ButtonBuilder SetContent(this ButtonBuilder builder, object? content)
+    {
+        return builder.SetContent<ButtonBuilder, Button>(content);
+    }
+
+    public static ButtonBuilder SetCommand(this ButtonBuilder builder, ICommand command)
+    {
+        return builder.SetCommand<ButtonBuilder, Button>(command);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/IButtonBaseBuilder.cs

@@ -0,0 +1,12 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Abstraction;
+
+namespace Snap.Hutao.Control.Builder.ButtonBase;
+
+internal interface IButtonBaseBuilder<TButton> : IBuilder
+    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
+{
+    TButton Button { get; }
+}

src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs

@@ -28,4 +28,21 @@ internal static class FrameworkElementExtension
         frameworkElement.IsRightTapEnabled = false;
         frameworkElement.IsTabStop = false;
     }
+
+    public static void InitializeDataContext<TDataContext>(this FrameworkElement frameworkElement, IServiceProvider? serviceProvider = default)
+        where TDataContext : class
+    {
+        IServiceProvider service = serviceProvider ?? Ioc.Default;
+        try
+        {
+            frameworkElement.DataContext = service.GetRequiredService<TDataContext>();
+        }
+        catch (Exception ex)
+        {
+
+            ILogger? logger = service.GetRequiredService(typeof(ILogger<>).MakeGenericType([frameworkElement.GetType()])) as ILogger;
+            logger?.LogError(ex, "Failed to initialize DataContext");
+            throw;
+        }
+    }
 }

src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs

@@ -35,7 +35,7 @@ internal sealed class CachedImage : Implementation.ImageEx
 
         try
         {
-            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
+            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
             string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
             token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
             return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.

src/Snap.Hutao/Snap.Hutao/Control/Layout/UniformStaggeredLayout.cs

@@ -4,7 +4,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections.Specialized;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Windows.Foundation;
 

src/Snap.Hutao/Snap.Hutao/Control/Panel/HorizontalEqualPanel.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using System.Runtime.InteropServices;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;
@@ -18,13 +19,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size MeasureOverride(Size availableSize)
     {
-        foreach (UIElement child in Children)
+        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
+        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
         {
             // ScrollViewer will always return an Infinity Size, we should use ActualWidth for this situation.
             double availableWidth = double.IsInfinity(availableSize.Width) ? ActualWidth : availableSize.Width;
-            double childAvailableWidth = (availableWidth + Spacing) / Children.Count;
+            double childAvailableWidth = (availableWidth + Spacing) / visibleChildren.Count;
             double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
-            child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
+            visibleChild.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
         }
 
         return base.MeasureOverride(availableSize);
@@ -32,14 +34,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        int itemCount = Children.Count;
-        double availableItemWidth = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
+        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
+        double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
         double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);
 
         double offset = 0;
-        foreach (UIElement child in Children)
+        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
         {
-            child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
+            visibleChild.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
             offset += actualItemWidth + Spacing;
         }
 
@@ -49,7 +51,8 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
     private static void OnLoaded(object sender, RoutedEventArgs e)
     {
         HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
-        panel.MinWidth = (panel.MinItemWidth * panel.Children.Count) + (panel.Spacing * (panel.Children.Count - 1));
+        int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
+        panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
     }
 
     private static void OnSizeChanged(object sender, SizeChangedEventArgs e)

src/Snap.Hutao/Snap.Hutao/Control/Panel/UniformPanel.cs

@@ -2,8 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;

src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs

@@ -15,7 +15,7 @@ internal class ScopedPage : Page
 {
     private readonly RoutedEventHandler unloadEventHandler;
     private readonly CancellationTokenSource viewCancellationTokenSource = new();
-    private readonly IServiceScope currentScope;
+    private readonly IServiceScope pageScope;
 
     private bool inFrame = true;
 
@@ -23,7 +23,7 @@ internal class ScopedPage : Page
     {
         unloadEventHandler = OnUnloaded;
         Unloaded += unloadEventHandler;
-        currentScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
+        pageScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
     }
 
     public async ValueTask NotifyRecipientAsync(INavigationData extra)
@@ -44,10 +44,18 @@ internal class ScopedPage : Page
     protected void InitializeWith<TViewModel>()
         where TViewModel : class, IViewModel
     {
-        IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
+        try
+        {
+            IViewModel viewModel = pageScope.ServiceProvider.GetRequiredService<TViewModel>();
             viewModel.CancellationToken = viewCancellationTokenSource.Token;
             DataContext = viewModel;
         }
+        catch (Exception ex)
+        {
+            pageScope.ServiceProvider.GetRequiredService<ILogger<ScopedPage>>().LogError(ex, "Failed to initialize view model.");
+            throw;
+        }
+    }
 
     /// <inheritdoc/>
     protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -95,7 +103,8 @@ internal class ScopedPage : Page
                 viewModel.IsViewDisposed = true;
 
                 // Dispose the scope
-                currentScope.Dispose();
+                pageScope.Dispose();
+                GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);
             }
         }
     }

src/Snap.Hutao/Snap.Hutao/Control/ScopedPageScopeReferenceTracker.cs

@@ -22,7 +22,6 @@ internal sealed partial class ScopedPageScopeReferenceTracker : IScopedPageScope
 
     public IServiceScope CreateScope()
     {
-        GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);
         IServiceScope currentScope = serviceProvider.CreateScope();
 
         // In case previous one is not disposed.

src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml

@@ -17,8 +17,13 @@
     <x:String x:Key="UI_Icon_Intee_Explore_1">https://api.snapgenshin.com/static/raw/Bg/UI_Icon_Intee_Explore_1.png</x:String>
     <x:String x:Key="UI_ImgSign_ItemIcon">https://api.snapgenshin.com/static/raw/Bg/UI_ImgSign_ItemIcon.png</x:String>
     <x:String x:Key="UI_ItemIcon_None">https://api.snapgenshin.com/static/raw/Bg/UI_ItemIcon_None.png</x:String>
-    <x:String x:Key="UI_MarkQuest_Events_Proce">https://api.snapgenshin.com/static/raw/Bg/UI_MarkQuest_Events_Proce.png</x:String>
-    <x:String x:Key="UI_MarkTower">https://api.snapgenshin.com/static/raw/Bg/UI_MarkTower.png</x:String>
+
+    <!--  Mark  -->
+    <x:String x:Key="UI_MarkQuest_Events_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Proce.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Events_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Start.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Main_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Proce.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Main_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Start.png</x:String>
+    <x:String x:Key="UI_MarkTower">https://api.snapgenshin.com/static/raw/Mark/UI_MarkTower.png</x:String>
 
     <!--  ItemIcon  -->
     <x:String x:Key="UI_ItemIcon_201">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_201.png</x:String>

src/Snap.Hutao/Snap.Hutao/Core/Abstraction/Extension/BuilderExtension.cs

@@ -1,10 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Web.Request.Builder.Abstraction;
 using System.Diagnostics;
 
-namespace Snap.Hutao.Web.Request.Builder;
+namespace Snap.Hutao.Core.Abstraction.Extension;
 
 internal static class BuilderExtension
 {

src/Snap.Hutao/Snap.Hutao/Core/Abstraction/IBuilder.cs

@@ -1,6 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Snap.Hutao.Web.Request.Builder.Abstraction;
+namespace Snap.Hutao.Core.Abstraction;
 
 internal interface IBuilder;

src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs

@@ -1,10 +1,14 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.Extensions.Caching.Memory;
 using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
 using Snap.Hutao.Core.IO;
 using Snap.Hutao.Core.IO.Hashing;
 using Snap.Hutao.Core.Logging;
+using Snap.Hutao.ViewModel.Guide;
+using Snap.Hutao.Web.Request.Builder;
+using Snap.Hutao.Web.Request.Builder.Abstraction;
 using System.Collections.Concurrent;
 using System.Collections.Frozen;
 using System.IO;
@@ -25,6 +29,7 @@ namespace Snap.Hutao.Core.Caching;
 internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOperation
 {
     private const string CacheFolderName = nameof(ImageCache);
+    private const string CacheFailedDownloadTasksName = $"{nameof(ImageCache)}.FailedDownloadTasks";
 
     private readonly FrozenDictionary<int, TimeSpan> retryCountToDelay = FrozenDictionary.ToFrozenDictionary(
     [
@@ -35,9 +40,11 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
 
     private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();
 
+    private readonly IHttpRequestMessageBuilderFactory httpRequestMessageBuilderFactory;
     private readonly IHttpClientFactory httpClientFactory;
     private readonly IServiceProvider serviceProvider;
     private readonly ILogger<ImageCache> logger;
+    private readonly IMemoryCache memoryCache;
 
     private string? baseFolder;
     private string? cacheFolder;
@@ -169,16 +176,36 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
         HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
         while (retryCount < 3)
         {
-            using (HttpResponseMessage message = await httpClient.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
+            HttpRequestMessageBuilder requestMessageBuilder = httpRequestMessageBuilderFactory
+                .Create()
+                .SetRequestUri(uri)
+
+                // These headers are only available for our own api
+                .SetStaticResourceControlHeadersIf(uri.Host.Contains("api.snapgenshin.com", StringComparison.OrdinalIgnoreCase))
+                .Get();
+
+            using (HttpRequestMessage requestMessage = requestMessageBuilder.HttpRequestMessage)
             {
-                if (message.RequestMessage is { RequestUri: { } target } && target != uri)
+                using (HttpResponseMessage responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
+                {
+                    if (responseMessage.RequestMessage is { RequestUri: { } target } && target != uri)
                     {
                         logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
                     }
 
-                if (message.IsSuccessStatusCode)
+                    if (responseMessage.IsSuccessStatusCode)
                     {
-                    using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                        if (responseMessage.Content.Headers.ContentType?.MediaType is "application/json")
+                        {
+#if DEBUG
+                            DebugTrack(uri);
+#endif
+                            string raw = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
+                            logger.LogColorizedCritical("Failed to download '{Uri}' with unexpected body '{Raw}'", (uri, ConsoleColor.Red), (raw, ConsoleColor.DarkYellow));
+                            return;
+                        }
+
+                        using (Stream httpStream = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false))
                         {
                             using (FileStream fileStream = File.Create(baseFile))
                             {
@@ -188,21 +215,37 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
                         }
                     }
 
-                switch (message.StatusCode)
+                    switch (responseMessage.StatusCode)
                     {
                         case HttpStatusCode.TooManyRequests:
                             {
                                 retryCount++;
-                            TimeSpan delay = message.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
+                                TimeSpan delay = responseMessage.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
                                 logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
                                 await Task.Delay(delay).ConfigureAwait(false);
                                 break;
                             }
 
                         default:
+#if DEBUG
+                            DebugTrack(uri);
+#endif
+                            logger.LogColorizedCritical("Failed to download '{Uri}' with status code '{StatusCode}'", (uri, ConsoleColor.Red), (responseMessage.StatusCode, ConsoleColor.DarkYellow));
                             return;
                     }
                 }
             }
         }
     }
+}
+
+#if DEBUG
+internal partial class ImageCache
+{
+    private void DebugTrack(Uri uri)
+    {
+        HashSet<string>? set = memoryCache.GetOrCreate(CacheFailedDownloadTasksName, entry => entry.Value ??= new HashSet<string>()) as HashSet<string>;
+        set?.Add(uri.ToString());
+    }
+}
+#endif

src/Snap.Hutao/Snap.Hutao/Core/Collection/TwoEnumerbleEnumerator.cs

@@ -0,0 +1,32 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Collection;
+
+internal sealed class TwoEnumerbleEnumerator<TFirst, TSecond> : IDisposable
+{
+    private readonly IEnumerator<TFirst> firstEnumerator;
+    private readonly IEnumerator<TSecond> secondEnumerator;
+
+    public TwoEnumerbleEnumerator(IEnumerable<TFirst> firstEnumerable, IEnumerable<TSecond> secondEnumerable)
+    {
+        firstEnumerator = firstEnumerable.GetEnumerator();
+        secondEnumerator = secondEnumerable.GetEnumerator();
+    }
+
+    public (TFirst First, TSecond Second) Current { get => (firstEnumerator.Current, secondEnumerator.Current); }
+
+    public bool MoveNext(ref bool moveFirst, ref bool moveSecond)
+    {
+        moveFirst = moveFirst && firstEnumerator.MoveNext();
+        moveSecond = moveSecond && secondEnumerator.MoveNext();
+
+        return moveFirst || moveSecond;
+    }
+
+    public void Dispose()
+    {
+        firstEnumerator.Dispose();
+        secondEnumerator.Dispose();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Convert.cs

@@ -1,25 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Snap.Hutao.Core;
-
-/// <summary>
-/// 支持Md5转换
-/// </summary>
-[HighQuality]
-internal static class Convert
-{
-    /// <summary>
-    /// 获取字符串的MD5计算结果
-    /// </summary>
-    /// <param name="source">源字符串</param>
-    /// <returns>计算的结果</returns>
-    public static string ToMd5HexString(string source)
-    {
-        byte[] hash = MD5.HashData(Encoding.UTF8.GetBytes(source));
-        return System.Convert.ToHexString(hash);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/Database/DbSetExtension.cs

@@ -13,13 +13,6 @@ namespace Snap.Hutao.Core.Database;
 [HighQuality]
 internal static class DbSetExtension
 {
-    /// <summary>
-    /// 添加并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
     public static int AddAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -27,27 +20,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步添加并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
+    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Add(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <summary>
-    /// 添加列表并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entities">实体</param>
-    /// <returns>影响条数</returns>
     public static int AddRangeAndSave<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
         where TEntity : class
     {
@@ -55,27 +34,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步添加列表并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entities">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
+    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.AddRange(entities);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <summary>
-    /// 移除并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
     public static int RemoveAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -83,27 +48,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步移除并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
+    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Remove(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <summary>
-    /// 更新并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
     public static int UpdateAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -111,18 +62,11 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <summary>
-    /// 异步更新并保存
-    /// </summary>
-    /// <typeparam name="TEntity">实体类型</typeparam>
-    /// <param name="dbSet">数据库集</param>
-    /// <param name="entity">实体</param>
-    /// <returns>影响条数</returns>
-    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
+    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Update(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -136,11 +80,11 @@ internal static class DbSetExtension
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet)
+    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet, CancellationToken token = default)
         where TEntity : class
     {
         DbContext dbContext = dbSet.Context();
-        int count = await dbContext.SaveChangesAsync().ConfigureAwait(false);
+        int count = await dbContext.SaveChangesAsync(token).ConfigureAwait(false);
         dbContext.ChangeTracker.Clear();
         return count;
     }

src/Snap.Hutao/Snap.Hutao/Core/Database/ScopedDbCurrent.cs

@@ -38,7 +38,7 @@ internal sealed partial class ScopedDbCurrent<TEntity, TMessage>
                 return;
             }
 
-            if (serviceProvider.IsDisposedSlow())
+            if (serviceProvider.IsDisposed())
             {
                 return;
             }
@@ -96,7 +96,7 @@ internal sealed partial class ScopedDbCurrent<TEntityOnly, TEntity, TMessage>
                 return;
             }
 
-            if (serviceProvider.IsDisposedSlow())
+            if (serviceProvider.IsDisposed())
             {
                 return;
             }

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/CastServiceExtension.cs

@@ -1,26 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.DependencyInjection.Abstraction;
-
-namespace Snap.Hutao.Core.DependencyInjection;
-
-/// <summary>
-/// 对象扩展
-/// </summary>
-[HighQuality]
-internal static class CastServiceExtension
-{
-    /// <summary>
-    /// <see langword="as"/> 的链式调用扩展
-    /// </summary>
-    /// <typeparam name="T">目标转换类型</typeparam>
-    /// <param name="service">对象</param>
-    /// <returns>转换类型后的对象</returns>
-    [Obsolete("Not useful anymore")]
-    public static T? As<T>(this ICastService service)
-        where T : class
-    {
-        return service as T;
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/DependencyInjection.cs

@@ -24,7 +24,13 @@ internal static class DependencyInjection
         ServiceProvider serviceProvider = new ServiceCollection()
 
             // Microsoft extension
-            .AddLogging(builder => builder.AddDebug().AddConsoleWindow())
+            .AddLogging(builder =>
+            {
+                builder
+                    .SetMinimumLevel(LogLevel.Trace)
+                    .AddDebug()
+                    .AddConsoleWindow();
+            })
             .AddMemoryCache()
 
             // Hutao extensions

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocConfiguration.cs

@@ -33,17 +33,17 @@ internal static class IocConfiguration
         return services
             .AddTransient(typeof(Database.ScopedDbCurrent<,>))
             .AddTransient(typeof(Database.ScopedDbCurrent<,,>))
-            .AddDbContext<AppDbContext>(AddDbContextCore);
+            .AddDbContextPool<AppDbContext>(AddDbContextCore);
     }
 
-    private static void AddDbContextCore(IServiceProvider provider, DbContextOptionsBuilder builder)
+    private static void AddDbContextCore(IServiceProvider serviceProvider, DbContextOptionsBuilder builder)
     {
-        RuntimeOptions runtimeOptions = provider.GetRequiredService<RuntimeOptions>();
+        RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
         string dbFile = System.IO.Path.Combine(runtimeOptions.DataFolder, "Userdata.db");
         string sqlConnectionString = $"Data Source={dbFile}";
 
         // Temporarily create a context
-        using (AppDbContext context = AppDbContext.Create(sqlConnectionString))
+        using (AppDbContext context = AppDbContext.Create(serviceProvider, sqlConnectionString))
         {
             if (context.Database.GetPendingMigrations().Any())
             {

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/ServiceProviderExtension.cs

@@ -18,13 +18,22 @@ internal static class ServiceProviderExtension
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsDisposedSlow(this IServiceProvider? serviceProvider)
+    public static bool IsDisposed(this IServiceProvider? serviceProvider)
     {
         if (serviceProvider is null)
         {
             return true;
         }
 
+        if (serviceProvider is ServiceProvider serviceProviderImpl)
+        {
+            return GetPrivateDisposed(serviceProviderImpl);
+        }
+
         return serviceProvider.GetType().GetField("_disposed")?.GetValue(serviceProvider) is true;
     }
+
+    // private bool _disposed;
+    [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_disposed")]
+    private static extern ref bool GetPrivateDisposed(ServiceProvider serviceProvider);
 }

src/Snap.Hutao/Snap.Hutao/Core/Diagnostics/MeasureExecutionToken.cs

@@ -1,5 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
+using Snap.Hutao.Core.Logging;
+
 namespace Snap.Hutao.Core.Diagnostics;
 
 internal readonly struct MeasureExecutionToken : IDisposable
@@ -17,6 +19,6 @@ internal readonly struct MeasureExecutionToken : IDisposable
 
     public void Dispose()
     {
-        logger.LogDebug("{Caller} toke {Time} ms", callerName, stopwatch.GetElapsedTime().TotalMilliseconds);
+        logger.LogColorizedDebug(("{Caller} toke {Time} ms", ConsoleColor.Gray), (callerName, ConsoleColor.Yellow), (stopwatch.GetElapsedTime().TotalMilliseconds, ConsoleColor.DarkGreen));
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoException.cs

@@ -5,50 +5,67 @@ namespace Snap.Hutao.Core.ExceptionService;
 
 internal sealed class HutaoException : Exception
 {
-    public HutaoException(HutaoExceptionKind kind, string message, Exception? innerException)
-        : this(message, innerException)
-    {
-        Kind = kind;
-    }
-
-    private HutaoException(string message, Exception? innerException)
+    public HutaoException(string message, Exception? innerException)
         : base($"{message}\n{innerException?.Message}", innerException)
     {
     }
 
-    public HutaoExceptionKind Kind { get; private set; }
-
     [DoesNotReturn]
-    public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
+    public static HutaoException Throw(string message, Exception? innerException = default)
     {
-        throw new HutaoException(kind, message, innerException);
+        throw new HutaoException(message, innerException);
     }
 
-    public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
+    public static void ThrowIf([DoesNotReturnIf(true)] bool condition, string message, Exception? innerException = default)
     {
         if (condition)
         {
-            throw new HutaoException(kind, message, innerException);
+            throw new HutaoException(message, innerException);
         }
     }
 
-    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
+    public static void ThrowIfNot([DoesNotReturnIf(false)] bool condition, string message, Exception? innerException = default)
     {
         if (!condition)
         {
-            throw new HutaoException(kind, message, innerException);
+            throw new HutaoException(message, innerException);
         }
     }
 
-    public static HutaoException ServiceTypeCastFailed<TFrom, TTo>(string name, Exception? innerException = default)
-    {
-        string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
-        throw new HutaoException(HutaoExceptionKind.ServiceTypeCastFailed, message, innerException);
-    }
-
+    [DoesNotReturn]
     public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
     {
-        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
-        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
+        throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
+    }
+
+    [DoesNotReturn]
+    public static HutaoException UserdataCorrupted(string message, Exception? innerException = default)
+    {
+        throw new HutaoException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    public static InvalidCastException InvalidCast<TFrom, TTo>(string name, Exception? innerException = default)
+    {
+        string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
+        throw new InvalidCastException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    public static InvalidOperationException InvalidOperation(string message, Exception? innerException = default)
+    {
+        throw new InvalidOperationException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    public static NotSupportedException NotSupported(string? message = default, Exception? innerException = default)
+    {
+        throw new NotSupportedException(message, innerException);
+    }
+
+    [DoesNotReturn]
+    public static OperationCanceledException OperationCanceled(string message, Exception? innerException = default)
+    {
+        throw new OperationCanceledException(message, innerException);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoExceptionKind.cs

@@ -1,21 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.ExceptionService;
-
-internal enum HutaoExceptionKind
-{
-    None,
-
-    // Foundation
-    ServiceTypeCastFailed,
-    ImageCacheInvalidUri,
-
-    // IO
-    FileSystemCreateFileInsufficientPermissions,
-    PrivateNamedPipeContentHashIncorrect,
-
-    // Service
-    GachaStatisticsInvalidItemId,
-    GameFpsUnlockingFailed,
-}

src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs

@@ -1,7 +1,12 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Win32.System.Com;
+using Snap.Hutao.Win32.UI.Shell;
 using System.IO;
+using static Snap.Hutao.Win32.Macros;
+using static Snap.Hutao.Win32.Ole32;
+using static Snap.Hutao.Win32.Shell32;
 
 namespace Snap.Hutao.Core.IO;
 
@@ -39,4 +44,57 @@ internal static class FileOperation
         File.Move(sourceFileName, destFileName, false);
         return true;
     }
+
+    public static unsafe bool UnsafeMove(string sourceFileName, string destFileName)
+    {
+        bool result = false;
+
+        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
+        {
+            if (SUCCEEDED(SHCreateItemFromParsingName(sourceFileName, default, in IShellItem.IID, out IShellItem* pSourceShellItem)))
+            {
+                if (SUCCEEDED(SHCreateItemFromParsingName(destFileName, default, in IShellItem.IID, out IShellItem* pDestShellItem)))
+                {
+                    pFileOperation->MoveItem(pSourceShellItem, pDestShellItem, default, default);
+
+                    if (SUCCEEDED(pFileOperation->PerformOperations()))
+                    {
+                        result = true;
+                    }
+
+                    IUnknownMarshal.Release(pDestShellItem);
+                }
+
+                IUnknownMarshal.Release(pSourceShellItem);
+            }
+
+            IUnknownMarshal.Release(pFileOperation);
+        }
+
+        return result;
+    }
+
+    public static unsafe bool UnsafeDelete(string path)
+    {
+        bool result = false;
+
+        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
+        {
+            if (SUCCEEDED(SHCreateItemFromParsingName(path, default, in IShellItem.IID, out IShellItem* pShellItem)))
+            {
+                pFileOperation->DeleteItem(pShellItem, default);
+
+                if (SUCCEEDED(pFileOperation->PerformOperations()))
+                {
+                    result = true;
+                }
+
+                IUnknownMarshal.Release(pShellItem);
+            }
+
+            IUnknownMarshal.Release(pFileOperation);
+        }
+
+        return result;
+    }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/Hash.cs

@@ -8,12 +8,17 @@ namespace Snap.Hutao.Core.IO.Hashing;
 
 internal static class Hash
 {
-    public static string SHA1HexString(string input)
+    public static unsafe string SHA1HexString(string input)
     {
-        return HashCore(BitConverter.ToString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
+        return HashCore(Convert.ToHexString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
     }
 
-    private static TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)
+    public static unsafe string MD5HexString(string input)
+    {
+        return HashCore(Convert.ToHexString, System.Security.Cryptography.MD5.HashData, Encoding.UTF8.GetBytes, input);
+    }
+
+    private static unsafe TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)
     {
         return resultConverter(hashMethod(bytesConverter(input)));
     }

src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/MD5.cs

@@ -34,6 +34,6 @@ internal static class MD5
     public static async ValueTask<string> HashAsync(Stream stream, CancellationToken token = default)
     {
         byte[] bytes = await System.Security.Cryptography.MD5.HashDataAsync(stream, token).ConfigureAwait(false);
-        return System.Convert.ToHexString(bytes);
+        return Convert.ToHexString(bytes);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/SHA256.cs

@@ -18,6 +18,6 @@ internal static class SHA256
     public static async ValueTask<string> HashAsync(Stream stream, CancellationToken token = default)
     {
         byte[] bytes = await System.Security.Cryptography.SHA256.HashDataAsync(stream, token).ConfigureAwait(false);
-        return System.Convert.ToHexString(bytes);
+        return Convert.ToHexString(bytes);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Sharding/HttpShardCopyWorker.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.Win32.SafeHandles;
 using Snap.Hutao.Core.Diagnostics;
+using System.Buffers;
 using System.IO;
 using System.Net.Http;
 
@@ -77,8 +78,9 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
                 using (HttpResponseMessage response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false))
                 {
                     response.EnsureSuccessStatusCode();
-
-                    Memory<byte> buffer = new byte[bufferSize];
+                    using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent())
+                    {
+                        Memory<byte> buffer = memoryOwner.Memory;
                         using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
                         {
                             int totalBytesRead = 0;
@@ -110,6 +112,7 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
                 }
             }
         }
+    }
 
     public void Dispose()
     {

src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Core.Diagnostics;
+using System.Buffers;
 using System.IO;
 
 namespace Snap.Hutao.Core.IO;
@@ -51,12 +52,15 @@ internal class StreamCopyWorker<TStatus>
 
         long totalBytesRead = 0;
         int bytesRead;
-        Memory<byte> buffer = new byte[bufferSize];
+
+        using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(bufferSize))
+        {
+            Memory<byte> buffer = memoryOwner.Memory;
 
             do
             {
                 bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
-            if (bytesRead == 0)
+                if (bytesRead is 0)
                 {
                     progress.Report(statusFactory(totalBytesRead));
                     break;
@@ -74,3 +78,4 @@ internal class StreamCopyWorker<TStatus>
             while (bytesRead > 0);
         }
     }
+}

src/Snap.Hutao/Snap.Hutao/Core/IO/StreamReaderWriter.cs

@@ -0,0 +1,40 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.IO;
+
+namespace Snap.Hutao.Core.IO;
+
+internal sealed class StreamReaderWriter : IDisposable
+{
+    private readonly StreamReader reader;
+    private readonly StreamWriter writer;
+
+    public StreamReaderWriter(StreamReader reader, StreamWriter writer)
+    {
+        this.reader = reader;
+        this.writer = writer;
+    }
+
+    public StreamReader Reader { get => reader; }
+
+    public StreamWriter Writer { get => writer; }
+
+    /// <inheritdoc cref="StreamReader.ReadLineAsync(CancellationToken)"/>
+    public ValueTask<string?> ReadLineAsync(CancellationToken token)
+    {
+        return reader.ReadLineAsync(token);
+    }
+
+    /// <inheritdoc cref="StreamWriter.WriteAsync(string?)"/>
+    public Task WriteAsync(string value)
+    {
+        return writer.WriteAsync(value);
+    }
+
+    public void Dispose()
+    {
+        writer.Dispose();
+        reader.Dispose();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs

@@ -29,7 +29,7 @@ internal readonly struct TempFile : IDisposable
         }
         catch (UnauthorizedAccessException ex)
         {
-            HutaoException.Throw(HutaoExceptionKind.FileSystemCreateFileInsufficientPermissions, SH.CoreIOTempFileCreateFail, ex);
+            HutaoException.Throw(SH.CoreIOTempFileCreateFail, ex);
         }
 
         if (delete)

src/Snap.Hutao/Snap.Hutao/Core/LazySlim.cs

@@ -0,0 +1,21 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core;
+
+internal sealed class LazySlim<T>
+{
+    private readonly Func<T> valueFactory;
+
+    [MaybeNull]
+    private T value;
+    private bool initialized;
+    private object? syncRoot;
+
+    public LazySlim(Func<T> valueFactory)
+    {
+        this.valueFactory = valueFactory;
+    }
+
+    public T Value { get => LazyInitializer.EnsureInitialized(ref value, ref initialized, ref syncRoot, valueFactory); }
+}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppActivation.cs

@@ -3,8 +3,11 @@
 
 using CommunityToolkit.WinUI.Notifications;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.UI.Xaml;
 using Snap.Hutao.Core.LifeCycle.InterProcess;
 using Snap.Hutao.Core.Setting;
+using Snap.Hutao.Core.Windowing.HotKey;
+using Snap.Hutao.Core.Windowing.NotifyIcon;
 using Snap.Hutao.Service.DailyNote;
 using Snap.Hutao.Service.Discord;
 using Snap.Hutao.Service.Hutao;
@@ -20,9 +23,9 @@ namespace Snap.Hutao.Core.LifeCycle;
 /// </summary>
 [HighQuality]
 [ConstructorGenerated]
-[Injection(InjectAs.Singleton, typeof(IActivation))]
+[Injection(InjectAs.Singleton, typeof(IAppActivation))]
 [SuppressMessage("", "CA1001")]
-internal sealed partial class Activation : IActivation
+internal sealed partial class AppActivation : IAppActivation, IAppActivationActionHandlersAccess, IDisposable
 {
     public const string Action = nameof(Action);
     public const string Uid = nameof(Uid);
@@ -35,13 +38,15 @@ internal sealed partial class Activation : IActivation
     private const string UrlActionRefresh = "/REFRESH";
 
     private readonly IServiceProvider serviceProvider;
-    private readonly ICurrentWindowReference currentWindowReference;
+    private readonly ICurrentXamlWindowReference currentWindowReference;
     private readonly ITaskContext taskContext;
     private readonly SemaphoreSlim activateSemaphore = new(1);
 
     /// <inheritdoc/>
     public void Activate(HutaoActivationArguments args)
     {
+        // Before activate, we try to redirect to the opened process in App,
+        // And we check if it's a toast activation.
         if (ToastNotificationManagerCompat.WasCurrentProcessToastActivated())
         {
             return;
@@ -51,10 +56,52 @@ internal sealed partial class Activation : IActivation
     }
 
     /// <inheritdoc/>
-    public void Initialize()
+    public void PostInitialization()
     {
         serviceProvider.GetRequiredService<PrivateNamedPipeServer>().RunAsync().SafeForget();
         ToastNotificationManagerCompat.OnActivated += NotificationActivate;
+
+        serviceProvider.GetRequiredService<HotKeyOptions>().RegisterAll();
+        if (LocalSetting.Get(SettingKeys.IsNotifyIconEnabled, true))
+        {
+            serviceProvider.GetRequiredService<App>().DispatcherShutdownMode = DispatcherShutdownMode.OnExplicitShutdown;
+            _ = serviceProvider.GetRequiredService<NotifyIconController>();
+        }
+    }
+
+    public void Dispose()
+    {
+        activateSemaphore.Dispose();
+    }
+
+    public async ValueTask HandleLaunchGameActionAsync(string? uid = null)
+    {
+        serviceProvider
+            .GetRequiredService<IMemoryCache>()
+            .Set(ViewModel.Game.LaunchGameViewModel.DesiredUid, uid);
+
+        await taskContext.SwitchToMainThreadAsync();
+
+        if (currentWindowReference.Window is null)
+        {
+            currentWindowReference.Window = serviceProvider.GetRequiredService<LaunchGameWindow>();
+            return;
+        }
+
+        if (currentWindowReference.Window is MainWindow)
+        {
+            await serviceProvider
+                .GetRequiredService<INavigationService>()
+                .NavigateAsync<View.Page.LaunchGamePage>(INavigationAwaiter.Default, true)
+                .ConfigureAwait(false);
+
+            return;
+        }
+        else
+        {
+            // We have a non-Main Window, just exit current process anyway
+            Process.GetCurrentProcess().Kill();
+        }
     }
 
     private void NotificationActivate(ToastNotificationActivatedEventArgsCompat args)
@@ -94,12 +141,6 @@ internal sealed partial class Activation : IActivation
             ArgumentNullException.ThrowIfNull(args.LaunchActivatedArguments);
             switch (args.LaunchActivatedArguments)
             {
-                case LaunchGame:
-                    {
-                        await HandleLaunchGameActionAsync().ConfigureAwait(false);
-                        break;
-                    }
-
                 default:
                     {
                         await HandleNormalLaunchActionAsync().ConfigureAwait(false);
@@ -112,22 +153,22 @@ internal sealed partial class Activation : IActivation
     private async ValueTask HandleNormalLaunchActionAsync()
     {
         // Increase launch times
-        LocalSetting.Update(SettingKeys.LaunchTimes, 0, x => x + 1);
+        LocalSetting.Update(SettingKeys.LaunchTimes, 0, x => unchecked(x + 1));
 
-        // If it's the first time launch, we show the guide window anyway.
-        // Otherwise, we check if there's any unfulfilled resource category present.
-        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
+        // If the guide is completed, we check if there's any unfulfilled resource category present.
+        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
         {
             if (StaticResource.IsAnyUnfulfilledCategoryPresent())
             {
-                UnsafeLocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, GuideState.StaticResourceBegin);
+                UnsafeLocalSetting.Set(SettingKeys.Major1Minor10Revision0GuideState, GuideState.StaticResourceBegin);
             }
         }
 
-        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) < GuideState.Completed)
+        // If it's the first time launch, show the guide window anyway.
+        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
         {
             await taskContext.SwitchToMainThreadAsync();
-            serviceProvider.GetRequiredService<GuideWindow>();
+            currentWindowReference.Window = serviceProvider.GetRequiredService<GuideWindow>();
         }
         else
         {
@@ -144,7 +185,7 @@ internal sealed partial class Activation : IActivation
 
         await taskContext.SwitchToMainThreadAsync();
 
-        serviceProvider.GetRequiredService<MainWindow>();
+        currentWindowReference.Window = serviceProvider.GetRequiredService<MainWindow>();
 
         await taskContext.SwitchToBackgroundAsync();
 
@@ -158,10 +199,7 @@ internal sealed partial class Activation : IActivation
             hutaoUserServiceInitialization.InitializeInternalAsync().SafeForget();
         }
 
-        serviceProvider
-            .GetRequiredService<IDiscordService>()
-            .SetNormalActivityAsync()
-            .SafeForget();
+        serviceProvider.GetRequiredService<IDiscordService>().SetNormalActivityAsync().SafeForget();
     }
 
     private async ValueTask HandleUrlActivationAsync(Uri uri, bool isRedirectTo)
@@ -244,34 +282,4 @@ internal sealed partial class Activation : IActivation
                 }
         }
     }
-
-    private async ValueTask HandleLaunchGameActionAsync(string? uid = null)
-    {
-        serviceProvider
-            .GetRequiredService<IMemoryCache>()
-            .Set(ViewModel.Game.LaunchGameViewModel.DesiredUid, uid);
-
-        await taskContext.SwitchToMainThreadAsync();
-
-        if (currentWindowReference.Window is null)
-        {
-            serviceProvider.GetRequiredService<LaunchGameWindow>();
-            return;
-        }
-
-        if (currentWindowReference.Window is MainWindow)
-        {
-            await serviceProvider
-                .GetRequiredService<INavigationService>()
-                .NavigateAsync<View.Page.LaunchGamePage>(INavigationAwaiter.Default, true)
-                .ConfigureAwait(false);
-
-            return;
-        }
-        else
-        {
-            // We have a non-Main Window, just exit current process anyway
-            Process.GetCurrentProcess().Kill();
-        }
-    }
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/CurrentWindowReferenceExtension.cs

@@ -1,24 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Snap.Hutao.Core.Windowing;
-using Snap.Hutao.Win32.Foundation;
-using WinRT.Interop;
-
-namespace Snap.Hutao.Core.LifeCycle;
-
-internal static class CurrentWindowReferenceExtension
-{
-    public static XamlRoot GetXamlRoot(this ICurrentWindowReference reference)
-    {
-        return reference.Window.Content.XamlRoot;
-    }
-
-    public static HWND GetWindowHandle(this ICurrentWindowReference reference)
-    {
-        return reference.Window is IWindowOptionsSource optionsSource
-            ? optionsSource.WindowOptions.Hwnd
-            : WindowNative.GetWindowHandle(reference.Window);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/CurrentXamlWindowReference.cs

@@ -5,19 +5,19 @@ using Microsoft.UI.Xaml;
 
 namespace Snap.Hutao.Core.LifeCycle;
 
-[Injection(InjectAs.Singleton, typeof(ICurrentWindowReference))]
-internal sealed class CurrentWindowReference : ICurrentWindowReference
+[Injection(InjectAs.Singleton, typeof(ICurrentXamlWindowReference))]
+internal sealed class CurrentXamlWindowReference : ICurrentXamlWindowReference
 {
     private readonly WeakReference<Window> reference = new(default!);
 
     [SuppressMessage("", "SH007")]
-    public Window Window
+    public Window? Window
     {
         get
         {
             reference.TryGetTarget(out Window? window);
             return window!;
         }
-        set => reference.SetTarget(value);
+        set => reference.SetTarget(value!);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/CurrentXamlWindowReferenceExtension.cs

@@ -0,0 +1,23 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+using Snap.Hutao.Core.Windowing;
+using Snap.Hutao.Win32.Foundation;
+using WinRT.Interop;
+
+namespace Snap.Hutao.Core.LifeCycle;
+
+internal static class CurrentXamlWindowReferenceExtension
+{
+    public static XamlRoot GetXamlRoot(this ICurrentXamlWindowReference reference)
+    {
+        ArgumentNullException.ThrowIfNull(reference.Window);
+        return reference.Window.Content.XamlRoot;
+    }
+
+    public static HWND GetWindowHandle(this ICurrentXamlWindowReference reference)
+    {
+        return WindowExtension.GetWindowHandle(reference.Window);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/IActivation.cs

@@ -1,14 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.LifeCycle;
-
-/// <summary>
-/// 激活
-/// </summary>
-internal interface IActivation
-{
-    void Activate(HutaoActivationArguments args);
-
-    void Initialize();
-}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/IAppActivation.cs

@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.LifeCycle;
+
+internal interface IAppActivation
+{
+    void Activate(HutaoActivationArguments args);
+
+    void PostInitialization();
+}
+
+internal interface IAppActivationActionHandlersAccess
+{
+    ValueTask HandleLaunchGameActionAsync(string? uid = null);
+}

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/ICurrentXamlWindowReference.cs

@@ -5,10 +5,10 @@ using Microsoft.UI.Xaml;
 
 namespace Snap.Hutao.Core.LifeCycle;
 
-internal interface ICurrentWindowReference
+internal interface ICurrentXamlWindowReference
 {
     /// <summary>
     /// Only set in WindowController
     /// </summary>
-    public Window Window { get; set; }
+    public Window? Window { get; set; }
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PrivateNamedPipeMessageDispatcher.cs

@@ -16,6 +16,6 @@ internal sealed partial class PrivateNamedPipeMessageDispatcher
             return;
         }
 
-        serviceProvider.GetRequiredService<IActivation>().Activate(args);
+        serviceProvider.GetRequiredService<IAppActivation>().Activate(args);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PrivateNamedPipeServer.cs

@@ -49,7 +49,7 @@ internal sealed partial class PrivateNamedPipeServer : IDisposable
     {
         byte[] content = new byte[header->ContentLength];
         serverStream.ReadAtLeast(content, header->ContentLength, false);
-        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, HutaoExceptionKind.PrivateNamedPipeContentHashIncorrect, "PipePacket Content Hash incorrect");
+        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
         return content;
     }
 

src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleWindowLifeTime.cs

@@ -10,11 +10,18 @@ namespace Snap.Hutao.Core.Logging;
 
 internal sealed class ConsoleWindowLifeTime : IDisposable
 {
+    public const bool DebugModeEnabled =
+#if IS_ALPHA_BUILD
+        true;
+#else
+        false;
+#endif
+
     private readonly bool consoleWindowAllocated;
 
     public ConsoleWindowLifeTime()
     {
-        if (LocalSetting.Get(SettingKeys.IsAllocConsoleDebugModeEnabled, false))
+        if (LocalSetting.Get(SettingKeys.IsAllocConsoleDebugModeEnabled, DebugModeEnabled))
         {
             consoleWindowAllocated = AllocConsole();
             if (consoleWindowAllocated)

src/Snap.Hutao/Snap.Hutao/Core/Logging/LogArgument.cs

@@ -21,6 +21,11 @@ internal readonly struct LogArgument
         return new(argument);
     }
 
+    public static implicit operator LogArgument(double argument)
+    {
+        return new(argument);
+    }
+
     public static implicit operator LogArgument((object? Argument, ConsoleColor Foreground) tuple)
     {
         return new(tuple.Argument, tuple.Foreground);

src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerExtension.cs

@@ -151,7 +151,7 @@ internal static class LoggerExtension
                     }
                     else
                     {
-                        resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.Default);
+                        resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.ForegroundWhite);
                     }
                 }
             }
@@ -164,7 +164,7 @@ internal static class LoggerExtension
         // Restore default colors
         if (message.ForegroundColor.HasValue || message.BackgroundColor.HasValue)
         {
-            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.Default);
+            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.ForegroundWhite);
         }
 
         return resultMessageBuilder.ToString();

src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerFactoryExtension.cs

@@ -9,7 +9,11 @@ internal static class LoggerFactoryExtension
     {
         builder.Services.AddSingleton<ConsoleWindowLifeTime>();
 
-        builder.AddSimpleConsole();
+        builder.AddSimpleConsole(options =>
+        {
+            options.TimestampFormat = "yyyy-MM-dd HH:mm:ss.fff ";
+        });
+
         return builder;
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/ReadOnlySpan2D.cs

@@ -0,0 +1,27 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Snap.Hutao.Core;
+
+internal readonly ref struct ReadOnlySpan2D<T>
+    where T : unmanaged
+{
+    private readonly ref T reference;
+    private readonly int length;
+    private readonly int columns;
+
+    public unsafe ReadOnlySpan2D(void* pointer, int length, int columns)
+    {
+        reference = ref *(T*)pointer;
+        this.length = length;
+        this.columns = columns;
+    }
+
+    public ReadOnlySpan<T> this[int row]
+    {
+        get => MemoryMarshal.CreateReadOnlySpan(ref Unsafe.Add(ref reference, row * columns), columns);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.Web.WebView2.Core;
 using Microsoft.Win32;
+using Snap.Hutao.Core.IO.Hashing;
 using Snap.Hutao.Core.Setting;
 using System.IO;
 using System.Security.Principal;
@@ -15,15 +16,13 @@ namespace Snap.Hutao.Core;
 [Injection(InjectAs.Singleton)]
 internal sealed class RuntimeOptions
 {
-    private readonly IServiceProvider serviceProvider;
-
-    private readonly Lazy<(Version Version, string UserAgent)> lazyVersionAndUserAgent = new(() =>
+    private readonly LazySlim<(Version Version, string UserAgent)> lazyVersionAndUserAgent = new(() =>
     {
         Version version = Package.Current.Id.Version.ToVersion();
         return (version, $"Snap Hutao/{version}");
     });
 
-    private readonly Lazy<string> lazyDataFolder = new(() =>
+    private readonly LazySlim<string> lazyDataFolder = new(() =>
     {
         string preferredPath = LocalSetting.Get(SettingKeys.DataFolderPath, string.Empty);
 
@@ -48,14 +47,14 @@ internal sealed class RuntimeOptions
         return path;
     });
 
-    private readonly Lazy<string> lazyDeviceId = new(() =>
+    private readonly LazySlim<string> lazyDeviceId = new(() =>
     {
         string userName = Environment.UserName;
         object? machineGuid = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Cryptography\", "MachineGuid", userName);
-        return Convert.ToMd5HexString($"{userName}{machineGuid}");
+        return Hash.MD5HexString($"{userName}{machineGuid}");
     });
 
-    private readonly Lazy<(string Version, bool Supported)> lazyWebViewEnvironment = new(() =>
+    private readonly LazySlim<(string Version, bool Supported)> lazyWebViewEnvironment = new(() =>
     {
         try
         {
@@ -68,7 +67,7 @@ internal sealed class RuntimeOptions
         }
     });
 
-    private readonly Lazy<bool> lazyElevated = new(() =>
+    private readonly LazySlim<bool> lazyElevated = new(() =>
     {
         if (LocalSetting.Get(SettingKeys.OverrideElevationRequirement, false))
         {
@@ -82,18 +81,18 @@ internal sealed class RuntimeOptions
         }
     });
 
-    private readonly Lazy<string> lazyLocalCache = new(() => ApplicationData.Current.LocalCacheFolder.Path);
-    private readonly Lazy<string> lazyInstalledLocation = new(() => Package.Current.InstalledLocation.Path);
-    private readonly Lazy<string> lazyFamilyName = new(() => Package.Current.Id.FamilyName);
+    private readonly LazySlim<string> lazyLocalCache = new(() => ApplicationData.Current.LocalCacheFolder.Path);
+    private readonly LazySlim<string> lazyInstalledLocation = new(() => Package.Current.InstalledLocation.Path);
+    private readonly LazySlim<string> lazyFamilyName = new(() => Package.Current.Id.FamilyName);
 
-    private bool isToastAvailable;
-    private bool isToastAvailableInitialized;
-    private object isToastAvailableLock = new();
-
-    public RuntimeOptions(IServiceProvider serviceProvider, ILogger<RuntimeOptions> logger)
+    private readonly LazySlim<bool> lazyToastAvailable = new(() =>
     {
-        this.serviceProvider = serviceProvider;
+        ITaskContext taskContext = Ioc.Default.GetRequiredService<ITaskContext>();
+        return taskContext.InvokeOnMainThread(() => ToastNotificationManager.CreateToastNotifier().Setting is NotificationSetting.Enabled);
+    });
 
+    public RuntimeOptions()
+    {
         AppLaunchTime = DateTimeOffset.UtcNow;
     }
 
@@ -117,19 +116,7 @@ internal sealed class RuntimeOptions
 
     public bool IsElevated { get => lazyElevated.Value; }
 
-    public bool IsToastAvailable
-    {
-        get
-        {
-            return LazyInitializer.EnsureInitialized(ref isToastAvailable, ref isToastAvailableInitialized, ref isToastAvailableLock, GetIsToastAvailable);
-
-            bool GetIsToastAvailable()
-            {
-                ITaskContext taskContext = serviceProvider.GetRequiredService<ITaskContext>();
-                return taskContext.InvokeOnMainThread(() => ToastNotificationManager.CreateToastNotifier().Setting is NotificationSetting.Enabled);
-            }
-        }
-    }
+    public bool IsToastAvailable { get => lazyToastAvailable.Value; }
 
     public DateTimeOffset AppLaunchTime { get; }
 }

src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptionsExtension.cs

@@ -16,11 +16,15 @@ internal static class RuntimeOptionsExtension
 
     public static string GetDataFolderServerCacheFolder(this RuntimeOptions options)
     {
-        return Path.Combine(options.DataFolder, "ServerCache");
+        string directory = Path.Combine(options.DataFolder, "ServerCache");
+        Directory.CreateDirectory(directory);
+        return directory;
     }
 
     public static string GetDataFolderBackgroundFolder(this RuntimeOptions options)
     {
-        return Path.Combine(options.DataFolder, "Background");
+        string directory = Path.Combine(options.DataFolder, "Background");
+        Directory.CreateDirectory(directory);
+        return directory;
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs

@@ -12,17 +12,25 @@ internal static class SettingKeys
 {
     #region MainWindow
     public const string WindowRect = "WindowRect";
+    public const string GuideWindowRect = "GuideWindowRect";
     public const string IsNavPaneOpen = "IsNavPaneOpen";
     public const string IsInfoBarToggleChecked = "IsInfoBarToggleChecked";
+
+    #endregion
+
+    #region Infrastructure
     public const string ExcludedAnnouncementIds = "ExcludedAnnouncementIds";
     #endregion
 
     #region Application
     public const string LaunchTimes = "LaunchTimes";
     public const string DataFolderPath = "DataFolderPath";
-    public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
+    public const string Major1Minor10Revision0GuideState = "Major1Minor10Revision0GuideState1";
+    public const string StaticResourceImageQuality = "StaticResourceImageQuality";
+    public const string StaticResourceImageArchive = "StaticResourceImageArchive";
     public const string HotKeyMouseClickRepeatForever = "HotKeyMouseClickRepeatForever";
     public const string IsAllocConsoleDebugModeEnabled = "IsAllocConsoleDebugModeEnabled2";
+    public const string IsNotifyIconEnabled = "IsNotifyIconEnabled";
     #endregion
 
     #region Passport
@@ -60,6 +68,10 @@ internal static class SettingKeys
     #endregion
 
     #region Obsolete
+
+    [Obsolete("重置新手引导状态")]
+    public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
+
     [Obsolete("重置调试控制台开关")]
     public const string IsAllocConsoleDebugModeEnabledLegacy1 = "IsAllocConsoleDebugModeEnabled";
     #endregion

src/Snap.Hutao/Snap.Hutao/Core/Shell/IJumpListInterop.cs

@@ -1,16 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Shell;
-
-/// <summary>
-/// 跳转列表交互
-/// </summary>
-internal interface IJumpListInterop
-{
-    /// <summary>
-    /// 异步配置跳转列表
-    /// </summary>
-    /// <returns>任务</returns>
-    ValueTask ConfigureAsync();
-}

src/Snap.Hutao/Snap.Hutao/Core/Shell/JumpListInterop.cs

@@ -1,36 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.LifeCycle;
-using Windows.UI.StartScreen;
-
-namespace Snap.Hutao.Core.Shell;
-
-/// <summary>
-/// 跳转列表交互
-/// </summary>
-[HighQuality]
-[Injection(InjectAs.Transient, typeof(IJumpListInterop))]
-internal sealed class JumpListInterop : IJumpListInterop
-{
-    /// <summary>
-    /// 异步配置跳转列表
-    /// </summary>
-    /// <returns>任务</returns>
-    public async ValueTask ConfigureAsync()
-    {
-        if (JumpList.IsSupported())
-        {
-            JumpList list = await JumpList.LoadCurrentAsync();
-
-            list.Items.Clear();
-
-            JumpListItem launchGameItem = JumpListItem.CreateWithArguments(Activation.LaunchGame, SH.CoreJumpListHelperLaunchGameItemDisplayName);
-            launchGameItem.Logo = "ms-appx:///Resource/Navigation/LaunchGame.png".ToUri();
-
-            list.Items.Add(launchGameItem);
-
-            await list.SaveAsync();
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/Shell/ShellLinkInterop.cs

@@ -21,22 +21,27 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
     public async ValueTask<bool> TryCreateDesktopShoutcutForElevatedLaunchAsync()
     {
         string targetLogoPath = Path.Combine(runtimeOptions.DataFolder, "ShellLinkLogo.ico");
+        string elevatedLauncherPath = Path.Combine(runtimeOptions.DataFolder, "Snap.Hutao.Elevated.Launcher.exe");
 
         try
         {
             Uri sourceLogoUri = "ms-appx:///Assets/Logo.ico".ToUri();
             StorageFile iconFile = await StorageFile.GetFileFromApplicationUriAsync(sourceLogoUri);
             await iconFile.OverwriteCopyAsync(targetLogoPath).ConfigureAwait(false);
+
+            Uri elevatedLauncherUri = "ms-appx:///Snap.Hutao.Elevated.Launcher.exe".ToUri();
+            StorageFile launcherFile = await StorageFile.GetFileFromApplicationUriAsync(elevatedLauncherUri);
+            await launcherFile.OverwriteCopyAsync(elevatedLauncherPath).ConfigureAwait(false);
         }
         catch
         {
             return false;
         }
 
-        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath);
+        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath, elevatedLauncherPath);
     }
 
-    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath)
+    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath, string elevatedLauncherPath)
     {
         bool result = false;
 
@@ -44,18 +49,12 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
         HRESULT hr = CoCreateInstance(in ShellLink.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IShellLinkW.IID, out IShellLinkW* pShellLink);
         if (SUCCEEDED(hr))
         {
-            pShellLink->SetPath($"shell:AppsFolder\\{runtimeOptions.FamilyName}!App");
+            pShellLink->SetPath(elevatedLauncherPath);
+            pShellLink->SetArguments(runtimeOptions.FamilyName);
             pShellLink->SetShowCmd(SHOW_WINDOW_CMD.SW_NORMAL);
             pShellLink->SetIconLocation(targetLogoPath, 0);
 
-            if (SUCCEEDED(pShellLink->QueryInterface(in IShellLinkDataList.IID, out IShellLinkDataList* pShellLinkDataList)))
-            {
-                pShellLinkDataList->GetFlags(out uint flags);
-                pShellLinkDataList->SetFlags(flags | (uint)SHELL_LINK_DATA_FLAGS.SLDF_RUNAS_USER);
-                pShellLinkDataList->Release();
-            }
-
-            if (SUCCEEDED(pShellLink->QueryInterface(in IPersistFile.IID, out IPersistFile* pPersistFile)))
+            if (SUCCEEDED(IUnknownMarshal.QueryInterface(pShellLink, in IPersistFile.IID, out IPersistFile* pPersistFile)))
             {
                 string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
                 string target = Path.Combine(desktop, $"{SH.FormatAppNameAndVersion(runtimeOptions.Version)}.lnk");
@@ -65,10 +64,10 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
                     result = true;
                 }
 
-                pPersistFile->Release();
+                IUnknownMarshal.Release(pPersistFile);
             }
 
-            pShellLink->Release();
+            uint value = IUnknownMarshal.Release(pShellLink);
         }
 
         return result;

src/Snap.Hutao/Snap.Hutao/Core/Threading/SpinWaitPolyfill.cs

@@ -1,6 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Diagnostics;
+
 namespace Snap.Hutao.Core.Threading;
 
 internal delegate bool SpinWaitPredicate<T>(ref readonly T state);
@@ -15,4 +17,23 @@ internal static class SpinWaitPolyfill
             spinner.SpinOnce();
         }
     }
+
+    [SuppressMessage("", "SH002")]
+    public static unsafe bool SpinUntil<T>(ref T state, delegate*<ref readonly T, bool> condition, TimeSpan timeout)
+    {
+        long startTime = Stopwatch.GetTimestamp();
+
+        SpinWait spinner = default;
+        while (!condition(ref state))
+        {
+            spinner.SpinOnce();
+
+            if (timeout < Stopwatch.GetElapsedTime(startTime))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

src/Snap.Hutao/Snap.Hutao/Core/Windowing/Backdrop/IWindowNeedEraseBackground.cs

@@ -0,0 +1,6 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Windowing.Backdrop;
+
+internal interface IWindowNeedEraseBackground;

src/Snap.Hutao/Snap.Hutao/Core/Windowing/Backdrop/InputActiveDesktopAcrylicBackdrop.cs

@@ -0,0 +1,41 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Composition;
+using Microsoft.UI.Composition.SystemBackdrops;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using System.Collections.Concurrent;
+
+namespace Snap.Hutao.Core.Windowing.Backdrop;
+
+// https://github.com/microsoft/microsoft-ui-xaml/blob/winui3/release/1.5-stable/controls/dev/Materials/DesktopAcrylicBackdrop/DesktopAcrylicBackdrop.cpp
+internal sealed class InputActiveDesktopAcrylicBackdrop : SystemBackdrop
+{
+    private readonly ConcurrentDictionary<ICompositionSupportsSystemBackdrop, DesktopAcrylicController> controllers = [];
+
+    protected override void OnTargetConnected(ICompositionSupportsSystemBackdrop target, XamlRoot xamlRoot)
+    {
+        base.OnTargetConnected(target, xamlRoot);
+
+        DesktopAcrylicController newController = new();
+        SystemBackdropConfiguration configuration = GetDefaultSystemBackdropConfiguration(target, xamlRoot);
+
+        configuration.IsInputActive = true;
+
+        newController.AddSystemBackdropTarget(target);
+        newController.SetSystemBackdropConfiguration(configuration);
+        controllers.TryAdd(target, newController);
+    }
+
+    protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop target)
+    {
+        base.OnTargetDisconnected(target);
+
+        if (controllers.TryRemove(target, out DesktopAcrylicController? controller))
+        {
+            controller.RemoveSystemBackdropTarget(target);
+            controller.Dispose();
+        }
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/Backdrop/SystemBackdropDesktopWindowXamlSourceAccess.cs

@@ -0,0 +1,50 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Media;
+using System.Runtime.CompilerServices;
+using WinRT;
+
+namespace Snap.Hutao.Core.Windowing.Backdrop;
+
+internal sealed class SystemBackdropDesktopWindowXamlSourceAccess : SystemBackdrop
+{
+    private readonly SystemBackdrop? innerBackdrop;
+
+    public SystemBackdropDesktopWindowXamlSourceAccess(SystemBackdrop? systemBackdrop)
+    {
+        innerBackdrop = systemBackdrop;
+    }
+
+    public DesktopWindowXamlSource? DesktopWindowXamlSource
+    {
+        get; private set;
+    }
+
+    protected override void OnTargetConnected(ICompositionSupportsSystemBackdrop target, XamlRoot xamlRoot)
+    {
+        DesktopWindowXamlSource = DesktopWindowXamlSource.FromAbi(target.As<IInspectable>().ThisPtr);
+        if (innerBackdrop is not null)
+        {
+            ProtectedOnTargetConnected(innerBackdrop, target, xamlRoot);
+        }
+    }
+
+    protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop target)
+    {
+        DesktopWindowXamlSource = null;
+        if (innerBackdrop is not null)
+        {
+            ProtectedOnTargetDisconnected(innerBackdrop, target);
+        }
+    }
+
+    [UnsafeAccessor(UnsafeAccessorKind.Method, Name = nameof(OnTargetConnected))]
+    private static extern void ProtectedOnTargetConnected(SystemBackdrop systemBackdrop, ICompositionSupportsSystemBackdrop target, XamlRoot xamlRoot);
+
+    [UnsafeAccessor(UnsafeAccessorKind.Method, Name = nameof(OnTargetDisconnected))]
+    private static extern void ProtectedOnTargetDisconnected(SystemBackdrop systemBackdrop, ICompositionSupportsSystemBackdrop target);
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/Backdrop/TransparentBackdrop.cs

@@ -9,9 +9,9 @@ using Windows.UI;
 
 namespace Snap.Hutao.Core.Windowing.Backdrop;
 
-internal sealed class TransparentBackdrop : SystemBackdrop, IDisposable, IBackdropNeedEraseBackground
+internal sealed class TransparentBackdrop : SystemBackdrop, IBackdropNeedEraseBackground
 {
-    private readonly object compositorLock = new();
+    private object? compositorLock;
 
     private Color tintColor;
     private Windows.UI.Composition.CompositionColorBrush? brush;
@@ -31,26 +31,13 @@ internal sealed class TransparentBackdrop : SystemBackdrop, IDisposable, IBackdr
     {
         get
         {
-            if (compositor is null)
-            {
-                lock (compositorLock)
-                {
-                    if (compositor is null)
+            return LazyInitializer.EnsureInitialized(ref compositor, ref compositorLock, () =>
             {
                 DispatcherQueue.EnsureSystemDispatcherQueue();
-                        compositor = new Windows.UI.Composition.Compositor();
+                return new Windows.UI.Composition.Compositor();
+            });
         }
     }
-            }
-
-            return compositor;
-        }
-    }
-
-    public void Dispose()
-    {
-        compositor?.Dispose();
-    }
 
     protected override void OnTargetConnected(ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
     {
@@ -61,5 +48,13 @@ internal sealed class TransparentBackdrop : SystemBackdrop, IDisposable, IBackdr
     protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop disconnectedTarget)
     {
         disconnectedTarget.SystemBackdrop = null;
+
+        if (compositorLock is not null)
+        {
+            lock (compositorLock)
+            {
+                compositor?.Dispose();
+            }
+        }
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyCombination.cs

@@ -17,10 +17,10 @@ namespace Snap.Hutao.Core.Windowing.HotKey;
 [SuppressMessage("", "SA1124")]
 internal sealed class HotKeyCombination : ObservableObject
 {
-    private readonly ICurrentWindowReference currentWindowReference;
     private readonly IInfoBarService infoBarService;
     private readonly RuntimeOptions runtimeOptions;
 
+    private readonly HWND hwnd;
     private readonly string settingKey;
     private readonly int hotKeyId;
     private readonly HotKeyParameter defaultHotKeyParameter;
@@ -36,12 +36,12 @@ internal sealed class HotKeyCombination : ObservableObject
     private VirtualKey key;
     private bool isEnabled;
 
-    public HotKeyCombination(IServiceProvider serviceProvider, string settingKey, int hotKeyId, HOT_KEY_MODIFIERS defaultModifiers, VirtualKey defaultKey)
+    public HotKeyCombination(IServiceProvider serviceProvider, HWND hwnd, string settingKey, int hotKeyId, HOT_KEY_MODIFIERS defaultModifiers, VirtualKey defaultKey)
     {
-        currentWindowReference = serviceProvider.GetRequiredService<ICurrentWindowReference>();
         infoBarService = serviceProvider.GetRequiredService<IInfoBarService>();
         runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
 
+        this.hwnd = hwnd;
         this.settingKey = settingKey;
         this.hotKeyId = hotKeyId;
         defaultHotKeyParameter = new(defaultModifiers, defaultKey);
@@ -53,7 +53,7 @@ internal sealed class HotKeyCombination : ObservableObject
 
             HotKeyParameter actual = LocalSettingGetHotKeyParameter();
             modifiers = actual.Modifiers;
-            InitializeModifiersComposeFields();
+            InitializeModifiersCompositionFields();
             key = actual.Key;
 
             keyNameValue = VirtualKeys.GetList().Single(v => v.Value == key);
@@ -164,8 +164,8 @@ internal sealed class HotKeyCombination : ObservableObject
 
                 _ = (value, registered) switch
                 {
-                    (true, false) => RegisterForCurrentWindow(),
-                    (false, true) => UnregisterForCurrentWindow(),
+                    (true, false) => Register(),
+                    (false, true) => Unregister(),
                     _ => false,
                 };
             }
@@ -174,7 +174,7 @@ internal sealed class HotKeyCombination : ObservableObject
 
     public string DisplayName { get => ToString(); }
 
-    public bool RegisterForCurrentWindow()
+    public bool Register()
     {
         if (!runtimeOptions.IsElevated || !IsEnabled)
         {
@@ -186,7 +186,6 @@ internal sealed class HotKeyCombination : ObservableObject
             return true;
         }
 
-        HWND hwnd = currentWindowReference.GetWindowHandle();
         BOOL result = RegisterHotKey(hwnd, hotKeyId, Modifiers, (uint)Key);
         registered = result;
 
@@ -198,7 +197,7 @@ internal sealed class HotKeyCombination : ObservableObject
         return result;
     }
 
-    public bool UnregisterForCurrentWindow()
+    public bool Unregister()
     {
         if (!runtimeOptions.IsElevated)
         {
@@ -210,7 +209,6 @@ internal sealed class HotKeyCombination : ObservableObject
             return true;
         }
 
-        HWND hwnd = currentWindowReference.GetWindowHandle();
         BOOL result = UnregisterHotKey(hwnd, hotKeyId);
         registered = !result;
         return result;
@@ -272,7 +270,7 @@ internal sealed class HotKeyCombination : ObservableObject
         Modifiers = modifiers;
     }
 
-    private void InitializeModifiersComposeFields()
+    private void InitializeModifiersCompositionFields()
     {
         if (Modifiers.HasFlag(HOT_KEY_MODIFIERS.MOD_WIN))
         {
@@ -309,7 +307,7 @@ internal sealed class HotKeyCombination : ObservableObject
         HotKeyParameter current = new(Modifiers, Key);
         LocalSetting.Set(settingKey, *(int*)&current);
 
-        UnregisterForCurrentWindow();
-        RegisterForCurrentWindow();
+        Unregister();
+        Register();
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyController.cs

@@ -1,97 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Win32.UI.Input.KeyboardAndMouse;
-using System.Runtime.InteropServices;
-using static Snap.Hutao.Win32.User32;
-
-namespace Snap.Hutao.Core.Windowing.HotKey;
-
-[SuppressMessage("", "CA1001")]
-[Injection(InjectAs.Singleton, typeof(IHotKeyController))]
-[ConstructorGenerated]
-internal sealed partial class HotKeyController : IHotKeyController
-{
-    private static readonly WaitCallback RunMouseClickRepeatForever = MouseClickRepeatForever;
-
-    private readonly object syncRoot = new();
-
-    private readonly HotKeyOptions hotKeyOptions;
-
-    private volatile CancellationTokenSource? cancellationTokenSource;
-
-    public void RegisterAll()
-    {
-        hotKeyOptions.MouseClickRepeatForeverKeyCombination.RegisterForCurrentWindow();
-    }
-
-    public void UnregisterAll()
-    {
-        hotKeyOptions.MouseClickRepeatForeverKeyCombination.UnregisterForCurrentWindow();
-    }
-
-    public void OnHotKeyPressed(in HotKeyParameter parameter)
-    {
-        if (parameter.Equals(hotKeyOptions.MouseClickRepeatForeverKeyCombination))
-        {
-            ToggleMouseClickRepeatForever();
-        }
-    }
-
-    private static unsafe INPUT CreateInputForMouseEvent(MOUSE_EVENT_FLAGS flags)
-    {
-        INPUT input = default;
-        input.type = INPUT_TYPE.INPUT_MOUSE;
-        input.Anonymous.mi.dwFlags = flags;
-        return input;
-    }
-
-    [SuppressMessage("", "SH007")]
-    private static unsafe void MouseClickRepeatForever(object? state)
-    {
-        CancellationToken token = (CancellationToken)state!;
-
-        // We want to use this thread for a long time
-        while (!token.IsCancellationRequested)
-        {
-            INPUT[] inputs =
-            [
-                CreateInputForMouseEvent(MOUSE_EVENT_FLAGS.MOUSEEVENTF_LEFTDOWN),
-                CreateInputForMouseEvent(MOUSE_EVENT_FLAGS.MOUSEEVENTF_LEFTUP),
-            ];
-
-            if (SendInput(inputs.AsSpan(), sizeof(INPUT)) is 0)
-            {
-                Marshal.ThrowExceptionForHR(Marshal.GetLastPInvokeError());
-            }
-
-            if (token.IsCancellationRequested)
-            {
-                return;
-            }
-
-            Thread.Sleep(System.Random.Shared.Next(100, 150));
-        }
-    }
-
-    private void ToggleMouseClickRepeatForever()
-    {
-        lock (syncRoot)
-        {
-            if (hotKeyOptions.IsMouseClickRepeatForeverOn)
-            {
-                // Turn off
-                cancellationTokenSource?.Cancel();
-                cancellationTokenSource = default;
-                hotKeyOptions.IsMouseClickRepeatForeverOn = false;
-            }
-            else
-            {
-                // Turn on
-                cancellationTokenSource = new();
-                ThreadPool.QueueUserWorkItem(RunMouseClickRepeatForever, cancellationTokenSource.Token);
-                hotKeyOptions.IsMouseClickRepeatForeverOn = true;
-            }
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyMessageWindow.cs

@@ -0,0 +1,92 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.UI.WindowsAndMessaging;
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using static Snap.Hutao.Win32.ConstValues;
+using static Snap.Hutao.Win32.User32;
+
+namespace Snap.Hutao.Core.Windowing.HotKey;
+
+internal sealed class HotKeyMessageWindow : IDisposable
+{
+    private const string WindowClassName = "SnapHutaoHotKeyMessageWindowClass";
+
+    private static readonly ConcurrentDictionary<HWND, HotKeyMessageWindow> WindowTable = [];
+
+    private bool isDisposed;
+
+    public unsafe HotKeyMessageWindow()
+    {
+        ushort atom;
+        fixed (char* className = WindowClassName)
+        {
+            WNDCLASSW wc = new()
+            {
+                lpfnWndProc = WNDPROC.Create(&OnWindowProcedure),
+                lpszClassName = className,
+            };
+
+            atom = RegisterClassW(&wc);
+        }
+
+        ArgumentOutOfRangeException.ThrowIfEqual<ushort>(atom, 0);
+
+        HWND = CreateWindowExW(0, WindowClassName, WindowClassName, 0, 0, 0, 0, 0, default, default, default, default);
+
+        if (HWND == default)
+        {
+            Marshal.ThrowExceptionForHR(Marshal.GetLastPInvokeError());
+        }
+
+        WindowTable.TryAdd(HWND, this);
+    }
+
+    ~HotKeyMessageWindow()
+    {
+        Dispose();
+    }
+
+    public Action<HotKeyParameter>? HotKeyPressed { get; set; }
+
+    public HWND HWND { get; }
+
+    public void Dispose()
+    {
+        if (isDisposed)
+        {
+            return;
+        }
+
+        isDisposed = true;
+
+        DestroyWindow(HWND);
+        WindowTable.TryRemove(HWND, out _);
+
+        GC.SuppressFinalize(this);
+    }
+
+    [SuppressMessage("", "SH002")]
+    [UnmanagedCallersOnly(CallConvs = [typeof(CallConvStdcall)])]
+    private static unsafe LRESULT OnWindowProcedure(HWND hwnd, uint uMsg, WPARAM wParam, LPARAM lParam)
+    {
+        if (!WindowTable.TryGetValue(hwnd, out HotKeyMessageWindow? window))
+        {
+            return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+        }
+
+        switch (uMsg)
+        {
+            case WM_HOTKEY:
+                window.HotKeyPressed?.Invoke(*(HotKeyParameter*)&lParam);
+                break;
+            default:
+                break;
+        }
+
+        return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/HotKeyOptions.cs

@@ -4,19 +4,35 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Model;
+using Snap.Hutao.Win32.UI.Input.KeyboardAndMouse;
+using System.Runtime.InteropServices;
 using Windows.System;
+using static Snap.Hutao.Win32.User32;
 
 namespace Snap.Hutao.Core.Windowing.HotKey;
 
 [Injection(InjectAs.Singleton)]
-internal sealed partial class HotKeyOptions : ObservableObject
+internal sealed partial class HotKeyOptions : ObservableObject, IDisposable
 {
+    private static readonly WaitCallback RunMouseClickRepeatForever = MouseClickRepeatForever;
+
+    private readonly object syncRoot = new();
+    private readonly HotKeyMessageWindow hotKeyMessageWindow;
+
+    private volatile CancellationTokenSource? cancellationTokenSource;
+
+    private bool isDisposed;
     private bool isMouseClickRepeatForeverOn;
     private HotKeyCombination mouseClickRepeatForeverKeyCombination;
 
     public HotKeyOptions(IServiceProvider serviceProvider)
     {
-        mouseClickRepeatForeverKeyCombination = new(serviceProvider, SettingKeys.HotKeyMouseClickRepeatForever, 100000, default, VirtualKey.F8);
+        hotKeyMessageWindow = new()
+        {
+            HotKeyPressed = OnHotKeyPressed,
+        };
+
+        mouseClickRepeatForeverKeyCombination = new(serviceProvider, hotKeyMessageWindow.HWND, SettingKeys.HotKeyMouseClickRepeatForever, 100000, default, VirtualKey.F8);
     }
 
     public List<NameValue<VirtualKey>> VirtualKeys { get; } = HotKey.VirtualKeys.GetList();
@@ -32,4 +48,96 @@ internal sealed partial class HotKeyOptions : ObservableObject
         get => mouseClickRepeatForeverKeyCombination;
         set => SetProperty(ref mouseClickRepeatForeverKeyCombination, value);
     }
+
+    public void Dispose()
+    {
+        if (isDisposed)
+        {
+            return;
+        }
+
+        isDisposed = true;
+
+        UnregisterAll();
+        hotKeyMessageWindow.Dispose();
+        cancellationTokenSource?.Dispose();
+
+        GC.SuppressFinalize(this);
+    }
+
+    public void RegisterAll()
+    {
+        MouseClickRepeatForeverKeyCombination.Register();
+    }
+
+    private static unsafe INPUT CreateInputForMouseEvent(MOUSE_EVENT_FLAGS flags)
+    {
+        INPUT input = default;
+        input.type = INPUT_TYPE.INPUT_MOUSE;
+        input.Anonymous.mi.dwFlags = flags;
+        return input;
+    }
+
+    [SuppressMessage("", "SH007")]
+    private static unsafe void MouseClickRepeatForever(object? state)
+    {
+        CancellationToken token = (CancellationToken)state!;
+
+        // We want to use this thread for a long time
+        while (!token.IsCancellationRequested)
+        {
+            INPUT[] inputs =
+            [
+                CreateInputForMouseEvent(MOUSE_EVENT_FLAGS.MOUSEEVENTF_LEFTDOWN),
+                CreateInputForMouseEvent(MOUSE_EVENT_FLAGS.MOUSEEVENTF_LEFTUP),
+            ];
+
+            if (SendInput(inputs.AsSpan(), sizeof(INPUT)) is 0)
+            {
+                Marshal.ThrowExceptionForHR(Marshal.GetLastPInvokeError());
+            }
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            Thread.Sleep(System.Random.Shared.Next(100, 150));
+        }
+    }
+
+    private void UnregisterAll()
+    {
+        MouseClickRepeatForeverKeyCombination.Unregister();
+    }
+
+    [SuppressMessage("", "SH002")]
+    private void OnHotKeyPressed(HotKeyParameter parameter)
+    {
+        if (parameter.Equals(MouseClickRepeatForeverKeyCombination))
+        {
+            ToggleMouseClickRepeatForever();
+        }
+    }
+
+    private void ToggleMouseClickRepeatForever()
+    {
+        lock (syncRoot)
+        {
+            if (IsMouseClickRepeatForeverOn)
+            {
+                // Turn off
+                cancellationTokenSource?.Cancel();
+                cancellationTokenSource = default;
+                IsMouseClickRepeatForeverOn = false;
+            }
+            else
+            {
+                // Turn on
+                cancellationTokenSource = new();
+                ThreadPool.QueueUserWorkItem(RunMouseClickRepeatForever, cancellationTokenSource.Token);
+                IsMouseClickRepeatForeverOn = true;
+            }
+        }
+    }
 }

src/Snap.Hutao/Snap.Hutao/Core/Windowing/HotKey/IHotKeyController.cs

@@ -1,13 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Windowing.HotKey;
-
-internal interface IHotKeyController
-{
-    void OnHotKeyPressed(in HotKeyParameter parameter);
-
-    void RegisterAll();
-
-    void UnregisterAll();
-}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/IXamlWindowOptionsSource.cs

@@ -6,10 +6,10 @@ namespace Snap.Hutao.Core.Windowing;
 /// <summary>
 /// 为扩展窗体提供必要的选项
 /// </summary>
-internal interface IWindowOptionsSource
+internal interface IXamlWindowOptionsSource
 {
     /// <summary>
     /// 窗体选项
     /// </summary>
-    WindowOptions WindowOptions { get; }
+    XamlWindowOptions WindowOptions { get; }
 }

src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconContextMenu.xaml

@@ -0,0 +1,67 @@
+<Flyout
+    x:Class="Snap.Hutao.Core.Windowing.NotifyIcon.NotifyIconContextMenu"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    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:shcm="using:Snap.Hutao.Control.Markup"
+    xmlns:shcwb="using:Snap.Hutao.Core.Windowing.Backdrop"
+    xmlns:shv="using:Snap.Hutao.ViewModel"
+    ShouldConstrainToRootBounds="False"
+    mc:Ignorable="d">
+
+    <Flyout.SystemBackdrop>
+        <shcwb:InputActiveDesktopAcrylicBackdrop/>
+    </Flyout.SystemBackdrop>
+
+    <Flyout.FlyoutPresenterStyle>
+        <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="Margin" Value="0"/>
+        </Style>
+    </Flyout.FlyoutPresenterStyle>
+
+    <Grid
+        x:Name="Root"
+        d:DataContext="{d:DesignInstance shv:NotifyIconViewModel}"
+        Background="Transparent">
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <TextBlock Margin="8" Text="{Binding Title}"/>
+        <Grid Grid.Row="1" Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
+            <StackPanel
+                Margin="4,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal"
+                Spacing="2">
+                <AppBarButton Command="{Binding ShowWindowCommand}" Label="{shcm:ResourceString Name=CoreWindowingNotifyIconViewLabel}">
+                    <AppBarButton.Icon>
+                        <FontIcon
+                            Width="20"
+                            Height="20"
+                            Glyph="&#xE80F;"/>
+                    </AppBarButton.Icon>
+                </AppBarButton>
+                <AppBarButton Command="{Binding LaunchGameCommand}" Label="{shcm:ResourceString Name=CoreWindowingNotifyIconLaunchGameLabel}">
+                    <AppBarButton.Icon>
+                        <FontIcon
+                            Width="20"
+                            Height="20"
+                            Glyph="&#xE7FC;"/>
+                    </AppBarButton.Icon>
+                </AppBarButton>
+                <AppBarButton Command="{Binding ExitCommand}" Label="{shcm:ResourceString Name=CoreWindowingNotifyIconExitLabel}">
+                    <AppBarButton.Icon>
+                        <FontIcon
+                            Width="20"
+                            Height="20"
+                            Glyph="&#xE7E8;"/>
+                    </AppBarButton.Icon>
+                </AppBarButton>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Flyout>

src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconContextMenu.xaml.cs

@@ -0,0 +1,17 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.ViewModel;
+
+namespace Snap.Hutao.Core.Windowing.NotifyIcon;
+
+internal sealed partial class NotifyIconContextMenu : Flyout
+{
+    public NotifyIconContextMenu(IServiceProvider serviceProvider)
+    {
+        AllowFocusOnInteraction = false;
+        InitializeComponent();
+        Root.DataContext = serviceProvider.GetRequiredService<NotifyIconViewModel>();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconController.cs

@@ -0,0 +1,92 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.ExceptionService;
+using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.UI.WindowsAndMessaging;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Windows.Storage;
+using static Snap.Hutao.Win32.ConstValues;
+
+namespace Snap.Hutao.Core.Windowing.NotifyIcon;
+
+[Injection(InjectAs.Singleton)]
+internal sealed class NotifyIconController : IDisposable
+{
+    private readonly LazySlim<NotifyIconContextMenu> lazyMenu;
+    private readonly NotifyIconXamlHostWindow xamlHostWindow;
+    private readonly NotifyIconMessageWindow messageWindow;
+    private readonly System.Drawing.Icon icon;
+
+    public NotifyIconController(IServiceProvider serviceProvider)
+    {
+        lazyMenu = new(() => new(serviceProvider));
+
+        StorageFile iconFile = StorageFile.GetFileFromApplicationUriAsync("ms-appx:///Assets/Logo.ico".ToUri()).AsTask().GetAwaiter().GetResult();
+        icon = new(iconFile.Path);
+
+        xamlHostWindow = new();
+
+        messageWindow = new()
+        {
+            TaskbarCreated = OnRecreateNotifyIconRequested,
+            ContextMenuRequested = OnContextMenuRequested,
+        };
+
+        CreateNotifyIcon();
+    }
+
+    private static ref readonly Guid Id
+    {
+        get
+        {
+            // MD5 for "Snap.Hutao"
+            ReadOnlySpan<byte> data = [0xEE, 0x01, 0x5C, 0xCB, 0xF3, 0x97, 0xC6, 0x93, 0xE8, 0x77, 0xCE, 0x09, 0x54, 0x90, 0xEE, 0xAC];
+            return ref Unsafe.As<byte, Guid>(ref MemoryMarshal.GetReference(data));
+        }
+    }
+
+    public void Dispose()
+    {
+        messageWindow.Dispose();
+        NotifyIconMethods.Delete(Id);
+        icon.Dispose();
+
+        xamlHostWindow.Dispose();
+    }
+
+    private void OnRecreateNotifyIconRequested(NotifyIconMessageWindow window)
+    {
+        NotifyIconMethods.Delete(Id);
+        if (!NotifyIconMethods.Add(Id, window.HWND, "Snap Hutao", NotifyIconMessageWindow.WM_NOTIFYICON_CALLBACK, (HICON)icon.Handle))
+        {
+            HutaoException.InvalidOperation("Failed to recreate NotifyIcon");
+        }
+
+        if (!NotifyIconMethods.SetVersion(Id, NOTIFYICON_VERSION_4))
+        {
+            HutaoException.InvalidOperation("Failed to set NotifyIcon version");
+        }
+    }
+
+    private void CreateNotifyIcon()
+    {
+        NotifyIconMethods.Delete(Id);
+        if (!NotifyIconMethods.Add(Id, messageWindow.HWND, "Snap Hutao", NotifyIconMessageWindow.WM_NOTIFYICON_CALLBACK, (HICON)icon.Handle))
+        {
+            HutaoException.InvalidOperation("Failed to create NotifyIcon");
+        }
+
+        if (!NotifyIconMethods.SetVersion(Id, NOTIFYICON_VERSION_4))
+        {
+            HutaoException.InvalidOperation("Failed to set NotifyIcon version");
+        }
+    }
+
+    private void OnContextMenuRequested(NotifyIconMessageWindow window, PointUInt16 point)
+    {
+        RECT iconRect = NotifyIconMethods.GetRect(Id, window.HWND);
+        xamlHostWindow.ShowFlyoutAt(lazyMenu.Value, new Windows.Foundation.Point(point.X, point.Y), iconRect);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconMessageWindow.cs

@@ -0,0 +1,151 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.UI.WindowsAndMessaging;
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using static Snap.Hutao.Win32.ConstValues;
+using static Snap.Hutao.Win32.User32;
+
+namespace Snap.Hutao.Core.Windowing.NotifyIcon;
+
+[SuppressMessage("", "SA1310")]
+internal sealed class NotifyIconMessageWindow : IDisposable
+{
+    public const uint WM_NOTIFYICON_CALLBACK = 0x444U;
+    private const string WindowClassName = "SnapHutaoNotifyIconMessageWindowClass";
+
+    private static readonly ConcurrentDictionary<HWND, NotifyIconMessageWindow> WindowTable = [];
+
+    [SuppressMessage("", "SA1306")]
+    private readonly uint WM_TASKBARCREATED;
+
+    private bool isDisposed;
+
+    public unsafe NotifyIconMessageWindow()
+    {
+        ushort atom;
+        fixed (char* className = WindowClassName)
+        {
+            WNDCLASSW wc = new()
+            {
+                lpfnWndProc = WNDPROC.Create(&OnWindowProcedure),
+                lpszClassName = className,
+            };
+
+            atom = RegisterClassW(&wc);
+        }
+
+        ArgumentOutOfRangeException.ThrowIfEqual<ushort>(atom, 0);
+
+        // https://learn.microsoft.com/zh,cn/windows/win32/shell/taskbar#taskbar,creation,notification
+        WM_TASKBARCREATED = RegisterWindowMessageW("TaskbarCreated");
+
+        HWND = CreateWindowExW(0, WindowClassName, WindowClassName, 0, 0, 0, 0, 0, default, default, default, default);
+
+        if (HWND == default)
+        {
+            Marshal.ThrowExceptionForHR(Marshal.GetLastPInvokeError());
+        }
+
+        WindowTable.TryAdd(HWND, this);
+    }
+
+    ~NotifyIconMessageWindow()
+    {
+        Dispose();
+    }
+
+    public Action<NotifyIconMessageWindow>? TaskbarCreated { get; set; }
+
+    public Action<NotifyIconMessageWindow, PointUInt16>? ContextMenuRequested { get; set; }
+
+    public HWND HWND { get; }
+
+    public void Dispose()
+    {
+        if (isDisposed)
+        {
+            return;
+        }
+
+        isDisposed = true;
+
+        DestroyWindow(HWND);
+        WindowTable.TryRemove(HWND, out _);
+
+        GC.SuppressFinalize(this);
+    }
+
+    [SuppressMessage("", "SH002")]
+    [UnmanagedCallersOnly(CallConvs = [typeof(CallConvStdcall)])]
+    private static unsafe LRESULT OnWindowProcedure(HWND hwnd, uint uMsg, WPARAM wParam, LPARAM lParam)
+    {
+        if (!WindowTable.TryGetValue(hwnd, out NotifyIconMessageWindow? window))
+        {
+            return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+        }
+
+        if (uMsg == window.WM_TASKBARCREATED)
+        {
+            // TODO: Re-add the notify icon.
+            window.TaskbarCreated?.Invoke(window);
+        }
+
+        // https://learn.microsoft.com/zh-cn/windows/win32/api/shellapi/ns-shellapi-notifyicondataw
+        if (uMsg is WM_NOTIFYICON_CALLBACK)
+        {
+            LPARAM2 lParam2 = *(LPARAM2*)&lParam;
+            PointUInt16 wParam2 = *(PointUInt16*)&wParam;
+
+            switch (lParam2.Low)
+            {
+                case WM_CONTEXTMENU:
+                    window.ContextMenuRequested?.Invoke(window, wParam2);
+                    break;
+                case WM_MOUSEMOVE:
+                    // X: wParam2.X Y: wParam2.Y Low: WM_MOUSEMOVE
+                    break;
+                case WM_LBUTTONDOWN:
+                case WM_LBUTTONUP:
+                    break;
+                case WM_RBUTTONDOWN:
+                case WM_RBUTTONUP:
+                    break;
+                case NIN_SELECT:
+                    // X: wParam2.X Y: wParam2.Y Low: NIN_SELECT
+                    break;
+                case NIN_POPUPOPEN:
+                    // X: wParam2.X Y: 0? Low: NIN_POPUPOPEN
+                    break;
+                case NIN_POPUPCLOSE:
+                    // X: wParam2.X Y: 0? Low: NIN_POPUPCLOSE
+                    break;
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            switch (uMsg)
+            {
+                case WM_ACTIVATEAPP:
+                    break;
+                case WM_DWMNCRENDERINGCHANGED:
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return DefWindowProcW(hwnd, uMsg, wParam, lParam);
+    }
+
+    private readonly struct LPARAM2
+    {
+        public readonly uint Low;
+        public readonly uint High;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconMethods.cs

@@ -0,0 +1,90 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.UI.Shell;
+using Snap.Hutao.Win32.UI.WindowsAndMessaging;
+using System.Runtime.InteropServices;
+using static Snap.Hutao.Win32.Shell32;
+
+namespace Snap.Hutao.Core.Windowing.NotifyIcon;
+
+internal sealed class NotifyIconMethods
+{
+    public static BOOL Add(ref readonly NOTIFYICONDATAW data)
+    {
+        return Shell_NotifyIconW(NOTIFY_ICON_MESSAGE.NIM_ADD, in data);
+    }
+
+    [SuppressMessage("", "SH002")]
+    public static unsafe BOOL Add(Guid id, HWND hWnd, string tip, uint uCallbackMessage, HICON hIcon)
+    {
+        NOTIFYICONDATAW data = default;
+        data.cbSize = (uint)sizeof(NOTIFYICONDATAW);
+        data.uFlags = NOTIFY_ICON_DATA_FLAGS.NIF_MESSAGE | NOTIFY_ICON_DATA_FLAGS.NIF_ICON | NOTIFY_ICON_DATA_FLAGS.NIF_TIP | NOTIFY_ICON_DATA_FLAGS.NIF_GUID;
+        data.guidItem = id;
+        data.hWnd = hWnd;
+        tip.AsSpan().CopyTo(new(data.szTip, 128));
+        data.uCallbackMessage = uCallbackMessage;
+        data.hIcon = hIcon;
+        data.dwState = NOTIFY_ICON_STATE.NIS_HIDDEN;
+        data.dwStateMask = NOTIFY_ICON_STATE.NIS_HIDDEN;
+
+        return Add(in data);
+    }
+
+    public static BOOL Modify(ref readonly NOTIFYICONDATAW data)
+    {
+        return Shell_NotifyIconW(NOTIFY_ICON_MESSAGE.NIM_MODIFY, in data);
+    }
+
+    public static BOOL Delete(ref readonly NOTIFYICONDATAW data)
+    {
+        return Shell_NotifyIconW(NOTIFY_ICON_MESSAGE.NIM_DELETE, in data);
+    }
+
+    public static unsafe BOOL Delete(Guid id)
+    {
+        NOTIFYICONDATAW data = default;
+        data.cbSize = (uint)sizeof(NOTIFYICONDATAW);
+        data.uFlags = NOTIFY_ICON_DATA_FLAGS.NIF_GUID;
+        data.guidItem = id;
+
+        return Delete(in data);
+    }
+
+    [SuppressMessage("", "SH002")]
+    public static unsafe RECT GetRect(Guid id, HWND hWND)
+    {
+        NOTIFYICONIDENTIFIER identifier = new()
+        {
+            cbSize = (uint)sizeof(NOTIFYICONIDENTIFIER),
+            hWnd = hWND,
+            guidItem = id,
+        };
+
+        Marshal.ThrowExceptionForHR(Shell_NotifyIconGetRect(ref identifier, out RECT rect));
+        return rect;
+    }
+
+    public static BOOL SetFocus(ref readonly NOTIFYICONDATAW data)
+    {
+        return Shell_NotifyIconW(NOTIFY_ICON_MESSAGE.NIM_SETFOCUS, in data);
+    }
+
+    public static BOOL SetVersion(ref readonly NOTIFYICONDATAW data)
+    {
+        return Shell_NotifyIconW(NOTIFY_ICON_MESSAGE.NIM_SETVERSION, in data);
+    }
+
+    public static unsafe BOOL SetVersion(Guid id, uint version)
+    {
+        NOTIFYICONDATAW data = default;
+        data.cbSize = (uint)sizeof(NOTIFYICONDATAW);
+        data.uFlags = NOTIFY_ICON_DATA_FLAGS.NIF_GUID;
+        data.guidItem = id;
+        data.Anonymous.uVersion = version;
+
+        return SetVersion(in data);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/NotifyIconXamlHostWindow.cs

@@ -0,0 +1,69 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Snap.Hutao.Core.Windowing.Backdrop;
+using Snap.Hutao.Win32;
+using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.UI.WindowsAndMessaging;
+using Windows.Foundation;
+using WinRT.Interop;
+using static Snap.Hutao.Win32.User32;
+
+namespace Snap.Hutao.Core.Windowing.NotifyIcon;
+
+internal sealed class NotifyIconXamlHostWindow : Window, IDisposable, IWindowNeedEraseBackground
+{
+    private readonly XamlWindowSubclass subclass;
+
+    public NotifyIconXamlHostWindow()
+    {
+        Content = new Border();
+
+        this.SetLayeredWindow();
+
+        AppWindow.Title = "SnapHutaoNotifyIconXamlHost";
+        AppWindow.IsShownInSwitchers = false;
+        if (AppWindow.Presenter is OverlappedPresenter presenter)
+        {
+            presenter.IsMaximizable = false;
+            presenter.IsMinimizable = false;
+            presenter.IsResizable = false;
+            presenter.IsAlwaysOnTop = true;
+            presenter.SetBorderAndTitleBar(false, false);
+        }
+
+        XamlWindowOptions options = new(this, default!, default);
+        subclass = new(this, options);
+        subclass.Initialize();
+
+        Activate();
+    }
+
+    public void ShowFlyoutAt(FlyoutBase flyout, Point point, RECT icon)
+    {
+        icon.left -= 8;
+        icon.top -= 8;
+        icon.right += 8;
+        icon.bottom += 8;
+
+        HWND hwnd = WindowNative.GetWindowHandle(this);
+        ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_NORMAL);
+        SetForegroundWindow(hwnd);
+
+        AppWindow.MoveAndResize(StructMarshal.RectInt32(icon));
+        flyout.ShowAt(Content, new()
+        {
+            Placement = FlyoutPlacementMode.Auto,
+            ShowMode = FlyoutShowMode.Transient,
+        });
+    }
+
+    public void Dispose()
+    {
+        subclass.Dispose();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/NotifyIcon/PointUInt16.cs

@@ -0,0 +1,10 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Windowing.NotifyIcon;
+
+internal readonly struct PointUInt16
+{
+    public readonly ushort X;
+    public readonly ushort Y;
+}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowExtension.cs

@@ -2,30 +2,67 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
+using Snap.Hutao.Core.Windowing.Backdrop;
 using Snap.Hutao.Win32.Foundation;
 using Snap.Hutao.Win32.UI.WindowsAndMessaging;
 using System.Runtime.CompilerServices;
 using WinRT.Interop;
+using static Snap.Hutao.Win32.Macros;
 using static Snap.Hutao.Win32.User32;
 
 namespace Snap.Hutao.Core.Windowing;
 
 internal static class WindowExtension
 {
-    private static readonly ConditionalWeakTable<Window, WindowController> WindowControllers = [];
+    private static readonly ConditionalWeakTable<Window, XamlWindowController> WindowControllers = [];
 
     public static void InitializeController<TWindow>(this TWindow window, IServiceProvider serviceProvider)
-        where TWindow : Window, IWindowOptionsSource
+        where TWindow : Window, IXamlWindowOptionsSource
     {
-        WindowController windowController = new(window, window.WindowOptions, serviceProvider);
+        XamlWindowController windowController = new(window, window.WindowOptions, serviceProvider);
         WindowControllers.Add(window, windowController);
     }
 
+    public static bool IsControllerInitialized<TWindow>(this TWindow window)
+        where TWindow : Window
+    {
+        return WindowControllers.TryGetValue(window, out _);
+    }
+
     public static void SetLayeredWindow(this Window window)
     {
         HWND hwnd = (HWND)WindowNative.GetWindowHandle(window);
         nint style = GetWindowLongPtrW(hwnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE);
         style |= (nint)WINDOW_EX_STYLE.WS_EX_LAYERED;
         SetWindowLongPtrW(hwnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, style);
+        SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), 0, LAYERED_WINDOW_ATTRIBUTES_FLAGS.LWA_COLORKEY | LAYERED_WINDOW_ATTRIBUTES_FLAGS.LWA_ALPHA);
+    }
+
+    public static void Show(this Window window)
+    {
+        ShowWindow(GetWindowHandle(window), SHOW_WINDOW_CMD.SW_NORMAL);
+    }
+
+    public static void Hide(this Window window)
+    {
+        ShowWindow(GetWindowHandle(window), SHOW_WINDOW_CMD.SW_HIDE);
+    }
+
+    public static DesktopWindowXamlSource? GetDesktopWindowXamlSource(this Window window)
+    {
+        if (window.SystemBackdrop is SystemBackdropDesktopWindowXamlSourceAccess access)
+        {
+            return access.DesktopWindowXamlSource;
+        }
+
+        return default;
+    }
+
+    public static HWND GetWindowHandle(this Window? window)
+    {
+        return window is IXamlWindowOptionsSource optionsSource
+            ? optionsSource.WindowOptions.Hwnd
+            : WindowNative.GetWindowHandle(window);
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs

@@ -1,145 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Snap.Hutao.Core.Windowing.Backdrop;
-using Snap.Hutao.Core.Windowing.HotKey;
-using Snap.Hutao.Win32.Foundation;
-using Snap.Hutao.Win32.UI.Shell;
-using Snap.Hutao.Win32.UI.WindowsAndMessaging;
-using static Snap.Hutao.Win32.ComCtl32;
-using static Snap.Hutao.Win32.ConstValues;
-using static Snap.Hutao.Win32.User32;
-
-namespace Snap.Hutao.Core.Windowing;
-
-/// <summary>
-/// 窗体子类管理器
-/// </summary>
-[HighQuality]
-internal sealed class WindowSubclass : IDisposable
-{
-    private const int WindowSubclassId = 101;
-    private const int DragBarSubclassId = 102;
-
-    private readonly Window window;
-    private readonly WindowOptions options;
-    private readonly IServiceProvider serviceProvider;
-    private readonly IHotKeyController hotKeyController;
-
-    // We have to explicitly hold a reference to SUBCLASSPROC
-    private SUBCLASSPROC windowProc = default!;
-    private SUBCLASSPROC legacyDragBarProc = default!;
-
-    public WindowSubclass(Window window, in WindowOptions options, IServiceProvider serviceProvider)
-    {
-        this.window = window;
-        this.options = options;
-        this.serviceProvider = serviceProvider;
-
-        hotKeyController = serviceProvider.GetRequiredService<IHotKeyController>();
-    }
-
-    /// <summary>
-    /// 尝试设置窗体子类
-    /// </summary>
-    /// <returns>是否设置成功</returns>
-    public bool Initialize()
-    {
-        windowProc = OnSubclassProcedure;
-        bool windowHooked = SetWindowSubclass(options.Hwnd, windowProc, WindowSubclassId, 0);
-        hotKeyController.RegisterAll();
-
-        bool titleBarHooked = true;
-
-        // only hook up drag bar proc when use legacy Window.ExtendsContentIntoTitleBar
-        if (!options.UseLegacyDragBarImplementation)
-        {
-            return windowHooked && titleBarHooked;
-        }
-
-        titleBarHooked = false;
-        HWND hwndDragBar = FindWindowExW(options.Hwnd, default, "DRAG_BAR_WINDOW_CLASS", default);
-
-        if (hwndDragBar.IsNull)
-        {
-            return windowHooked && titleBarHooked;
-        }
-
-        legacyDragBarProc = OnLegacyDragBarProcedure;
-        titleBarHooked = SetWindowSubclass(hwndDragBar, legacyDragBarProc, DragBarSubclassId, 0);
-
-        return windowHooked && titleBarHooked;
-    }
-
-    /// <inheritdoc/>
-    public void Dispose()
-    {
-        hotKeyController.UnregisterAll();
-
-        RemoveWindowSubclass(options.Hwnd, windowProc, WindowSubclassId);
-        windowProc = default!;
-
-        if (options.UseLegacyDragBarImplementation)
-        {
-            RemoveWindowSubclass(options.Hwnd, legacyDragBarProc, DragBarSubclassId);
-            legacyDragBarProc = default!;
-        }
-    }
-
-    [SuppressMessage("", "SH002")]
-    private unsafe LRESULT OnSubclassProcedure(HWND hwnd, uint uMsg, WPARAM wParam, LPARAM lParam, nuint uIdSubclass, nuint dwRefData)
-    {
-        switch (uMsg)
-        {
-            case WM_GETMINMAXINFO:
-                {
-                    if (window is IMinMaxInfoHandler handler)
-                    {
-                        handler.HandleMinMaxInfo(ref *(MINMAXINFO*)lParam, options.GetRasterizationScale());
-                    }
-
-                    break;
-                }
-
-            case WM_NCRBUTTONDOWN:
-            case WM_NCRBUTTONUP:
-                {
-                    return default;
-                }
-
-            case WM_HOTKEY:
-                {
-                    hotKeyController.OnHotKeyPressed(*(HotKeyParameter*)&lParam);
-                    break;
-                }
-
-            case WM_ERASEBKGND:
-                {
-                    if (window.SystemBackdrop is IBackdropNeedEraseBackground)
-                    {
-                        return (LRESULT)(int)BOOL.TRUE;
-                    }
-
-                    break;
-                }
-        }
-
-        return DefSubclassProc(hwnd, uMsg, wParam, lParam);
-    }
-
-    [SuppressMessage("", "SH002")]
-    private LRESULT OnLegacyDragBarProcedure(HWND hwnd, uint uMsg, WPARAM wParam, LPARAM lParam, nuint uIdSubclass, nuint dwRefData)
-    {
-        switch (uMsg)
-        {
-            case WM_NCRBUTTONDOWN:
-            case WM_NCRBUTTONUP:
-                {
-                    return (LRESULT)(nint)WM_NULL;
-                }
-        }
-
-        return DefSubclassProc(hwnd, uMsg, wParam, lParam);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Core/Windowing/XamlWindowController.cs

@@ -13,7 +13,6 @@ using Snap.Hutao.Win32;
 using Snap.Hutao.Win32.Foundation;
 using Snap.Hutao.Win32.Graphics.Dwm;
 using Snap.Hutao.Win32.UI.WindowsAndMessaging;
-using System.Collections.Frozen;
 using System.IO;
 using Windows.Graphics;
 using Windows.UI;
@@ -23,22 +22,23 @@ using static Snap.Hutao.Win32.User32;
 namespace Snap.Hutao.Core.Windowing;
 
 [SuppressMessage("", "CA1001")]
-internal sealed class WindowController
+internal sealed class XamlWindowController
 {
     private readonly Window window;
-    private readonly WindowOptions options;
+    private readonly XamlWindowOptions options;
     private readonly IServiceProvider serviceProvider;
-    private readonly WindowSubclass subclass;
+    private readonly XamlWindowSubclass subclass;
+    private readonly XamlWindowNonRudeHWND windowNonRudeHWND;
 
-    public WindowController(Window window, in WindowOptions options, IServiceProvider serviceProvider)
+    public XamlWindowController(Window window, in XamlWindowOptions options, IServiceProvider serviceProvider)
     {
         this.window = window;
         this.options = options;
         this.serviceProvider = serviceProvider;
 
-        // Window reference must be set before Window Subclass created
-        serviceProvider.GetRequiredService<ICurrentWindowReference>().Window = window;
-        subclass = new(window, options, serviceProvider);
+        subclass = new(window, options);
+        windowNonRudeHWND = new(options.Hwnd);
+
         InitializeCore();
     }
 
@@ -87,9 +87,9 @@ internal sealed class WindowController
         SizeInt32 scaledSize = options.InitSize.Scale(scale);
         RectInt32 rect = StructMarshal.RectInt32(scaledSize);
 
-        if (options.PersistSize)
+        if (!string.IsNullOrEmpty(options.PersistRectKey))
         {
-            RectInt32 persistedRect = (CompactRect)LocalSetting.Get(SettingKeys.WindowRect, (CompactRect)rect);
+            RectInt32 persistedRect = (CompactRect)LocalSetting.Get(options.PersistRectKey, (CompactRect)rect);
             if (persistedRect.Size() >= options.InitSize.Size())
             {
                 rect = persistedRect.Scale(scale);
@@ -102,7 +102,7 @@ internal sealed class WindowController
 
     private void SaveOrSkipWindowSize()
     {
-        if (!options.PersistSize)
+        if (string.IsNullOrEmpty(options.PersistRectKey))
         {
             return;
         }
@@ -114,7 +114,7 @@ internal sealed class WindowController
         if (!windowPlacement.ShowCmd.HasFlag(SHOW_WINDOW_CMD.SW_SHOWMAXIMIZED))
         {
             double scale = 1.0 / options.GetRasterizationScale();
-            LocalSetting.Set(SettingKeys.WindowRect, (CompactRect)window.AppWindow.GetRect().Scale(scale));
+            LocalSetting.Set(options.PersistRectKey, (CompactRect)window.AppWindow.GetRect().Scale(scale));
         }
     }
 
@@ -134,20 +134,29 @@ internal sealed class WindowController
     }
 
     private void OnWindowClosed(object sender, WindowEventArgs args)
+    {
+        if (LocalSetting.Get(SettingKeys.IsNotifyIconEnabled, true) && !serviceProvider.GetRequiredService<App>().IsExiting)
+        {
+            args.Handled = true;
+            window.Hide();
+
+            ICurrentXamlWindowReference currentXamlWindowReference = serviceProvider.GetRequiredService<ICurrentXamlWindowReference>();
+            if (currentXamlWindowReference.Window == window)
+            {
+                currentXamlWindowReference.Window = default!;
+            }
+
+            GC.Collect(GC.MaxGeneration);
+        }
+        else
         {
             SaveOrSkipWindowSize();
             subclass?.Dispose();
+            windowNonRudeHWND?.Dispose();
+        }
     }
 
     private void ExtendsContentIntoTitleBar()
-    {
-        if (options.UseLegacyDragBarImplementation)
-        {
-            // use normal Window method to extend.
-            window.ExtendsContentIntoTitleBar = true;
-            window.SetTitleBar(options.TitleBar);
-        }
-        else
     {
         AppWindowTitleBar appTitleBar = window.AppWindow.TitleBar;
         appTitleBar.IconShowOptions = IconShowOptions.HideIconAndSystemMenu;
@@ -158,11 +167,10 @@ internal sealed class WindowController
         options.TitleBar.ActualThemeChanged += (_, _) => UpdateTitleButtonColor();
         options.TitleBar.SizeChanged += (_, _) => UpdateDragRectangles();
     }
-    }
 
     private bool UpdateSystemBackdrop(BackdropType backdropType)
     {
-        window.SystemBackdrop = backdropType switch
+        SystemBackdrop? actualBackdop = backdropType switch
         {
             BackdropType.Transparent => new Backdrop.TransparentBackdrop(),
             BackdropType.MicaAlt => new MicaBackdrop() { Kind = MicaKind.BaseAlt },
@@ -171,6 +179,8 @@ internal sealed class WindowController
             _ => null,
         };
 
+        window.SystemBackdrop = new Backdrop.SystemBackdropDesktopWindowXamlSourceAccess(actualBackdop);
+
         return true;
     }