add alpha build constant

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
+        - Spiral Abyss
-        - Wish Export
-        - Game Record
-        - Hutao Database
-        - User Interface
-        - Snap Hutao Cloud
-        - Snap Hutao Account
-        - Checkin
         - 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 做出贡献的社区成员，并且欢迎更多的朋友能参与到这个项目中。
 

build.cake

@@ -11,6 +11,15 @@ var version = "version";
 var repoDir = "repoDir";
 var outputPath = "outputPath";
 
+// Extension
+
+static ProcessArgumentBuilder AppendIf(this ProcessArgumentBuilder builder, string text, bool condition)
+{
+    return condition ? builder.Append(text) : builder;
+}
+
+// Properties
+
 string solution
 {
     get => System.IO.Path.Combine(repoDir, "src", "Snap.Hutao", "Snap.Hutao.sln");
@@ -157,6 +166,7 @@ Task("Build binary package")
                                             .Append("/p:AppxPackageSigningEnabled=false")
                                             .Append("/p:AppxBundle=Never")
                                             .Append("/p:AppxPackageOutput=" + outputPath)
+                                            .AppendIf("/p:AlphaConstants=IS_ALPHA_BUILD", !AppVeyor.IsRunningOnAppVeyor)
     };
 
     DotNetBuild(project, settings);

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,10 +12,11 @@
 
   <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.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

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

@@ -29,6 +29,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/TransitionCollection.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Uri.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/WindowOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///View/Card/Primitive/CardProgressBar.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style

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

@@ -7,6 +7,7 @@ using Snap.Hutao.Core;
 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 System.Diagnostics;
 
@@ -21,17 +22,17 @@ namespace Snap.Hutao;
 [SuppressMessage("", "SH001")]
 public sealed partial class App : Application
 {
-    private const string ConsoleBanner = """
+    private const string ConsoleBanner = $"""
         ----------------------------------------------------------------
-          _____                         _    _         _                
+          _____                         _    _         _ 
-         / ____|                       | |  | |       | |               
+         / ____|                       | |  | |       | |
-        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___  
+        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___
-         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \ 
+         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \
          ____) || | | || (_| || |_) |_ | |  | || |_| || |_| (_| || (_) |
-        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/ 
+        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/
-                              | |                                       
+                              | |
-                              |_| 
+                              |_|
-                              
+        
         Snap.Hutao is a open source software developed by DGP Studio.
         Copyright (C) 2022 - 2024 DGP Studio, All Rights Reserved.
         ----------------------------------------------------------------
@@ -47,6 +48,8 @@ public sealed partial class App : Application
     /// <param name="serviceProvider">服务提供器</param>
     public App(IServiceProvider serviceProvider)
     {
+        // DispatcherShutdownMode = DispatcherShutdownMode.OnExplicitShutdown;
+
         // Load app resource
         InitializeComponent();
         activation = serviceProvider.GetRequiredService<IActivation>();
@@ -69,7 +72,7 @@ public sealed partial class App : Application
                 return;
             }
 
-            logger.LogInformation(ConsoleBanner);
+            logger.LogColorizedInformation((ConsoleBanner, ConsoleColor.DarkYellow));
             LogDiagnosticInformation();
 
             // manually invoke
@@ -89,8 +92,8 @@ public sealed partial class App : Application
     {
         RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
 
-        logger.LogInformation("FamilyName: {name}", runtimeOptions.FamilyName);
+        logger.LogColorizedInformation(("FamilyName: {Name}", ConsoleColor.Blue), (runtimeOptions.FamilyName, ConsoleColor.Cyan));
-        logger.LogInformation("Version: {version}", runtimeOptions.Version);
+        logger.LogColorizedInformation(("Version: {Version}", ConsoleColor.Blue), (runtimeOptions.Version, ConsoleColor.Cyan));
-        logger.LogInformation("LocalCache: {folder}", runtimeOptions.LocalCache);
+        logger.LogColorizedInformation(("LocalCache: {Path}", ConsoleColor.Blue), (runtimeOptions.LocalCache, ConsoleColor.Cyan));
     }
 }

src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/AutoSuggestTokenBox.cs

@@ -1,9 +1,13 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Snap.Hutao.Control.Extension;
+using System.Collections;
 
 namespace Snap.Hutao.Control.AutoSuggestBox;
 
@@ -18,23 +22,44 @@ internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
         TextChanged += OnFilterSuggestionRequested;
         QuerySubmitted += OnQuerySubmitted;
         TokenItemAdding += OnTokenItemAdding;
-        TokenItemAdded += OnTokenItemModified;
+        TokenItemAdded += OnTokenItemCollectionChanged;
-        TokenItemRemoved += OnTokenItemModified;
+        TokenItemRemoved += OnTokenItemCollectionChanged;
+        Loaded += OnLoaded;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        if (this.FindDescendant("SuggestionsPopup") is Popup { Child: Border { Child: ListView listView } border })
+        {
+            IAppResourceProvider appResourceProvider = this.ServiceProvider().GetRequiredService<IAppResourceProvider>();
+
+            listView.Background = null;
+            listView.Margin = appResourceProvider.GetResource<Thickness>("AutoSuggestListPadding");
+
+            border.Background = appResourceProvider.GetResource<Microsoft.UI.Xaml.Media.Brush>("AutoSuggestBoxSuggestionsListBackground");
+            CornerRadius overlayCornerRadius = appResourceProvider.GetResource<CornerRadius>("OverlayCornerRadius");
+            CornerRadiusFilterConverter cornerRadiusFilterConverter = new() { Filter = CornerRadiusFilterKind.Bottom };
+            border.CornerRadius = (CornerRadius)cornerRadiusFilterConverter.Convert(overlayCornerRadius, typeof(CornerRadius), default, default);
+        }
     }
 
     private void OnFilterSuggestionRequested(Microsoft.UI.Xaml.Controls.AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
     {
         if (string.IsNullOrWhiteSpace(Text))
         {
-            return;
+            sender.ItemsSource = AvailableTokens
+                .OrderBy(kvp => kvp.Value.Kind)
+                .Select(kvp => kvp.Value);
         }
 
         if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
         {
-            sender.ItemsSource = AvailableTokens.Values.Where(q => q.Value.Contains(Text, StringComparison.OrdinalIgnoreCase));
+            sender.ItemsSource = AvailableTokens
-
+                .Where(kvp => kvp.Value.Value.Contains(Text, StringComparison.OrdinalIgnoreCase))
-            // TODO: CornerRadius
+                .OrderBy(kvp => kvp.Value.Kind)
-            // Popup? popup = this.FindDescendant("SuggestionsPopup") as Popup;
+                .ThenBy(kvp => kvp.Value.Order)
+                .Select(kvp => kvp.Value)
+                .DefaultIfEmpty(SearchToken.NotFound);
         }
     }
 
@@ -45,7 +70,7 @@ internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
             return;
         }
 
-        CommandExtension.TryExecute(FilterCommand, FilterCommandParameter);
+        CommandInvocation.TryExecute(FilterCommand, FilterCommandParameter);
     }
 
     private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
@@ -55,11 +80,23 @@ internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
             return;
         }
 
-        args.Item = AvailableTokens.GetValueOrDefault(args.TokenText) ?? new SearchToken(SearchTokenKind.None, args.TokenText);
+        if (AvailableTokens.GetValueOrDefault(args.TokenText) is { } token)
+        {
+            args.Item = token;
+        }
+        else
+        {
+            args.Cancel = true;
+        }
     }
 
-    private void OnTokenItemModified(TokenizingTextBox sender, object args)
+    private void OnTokenItemCollectionChanged(TokenizingTextBox sender, object args)
     {
-        CommandExtension.TryExecute(FilterCommand, FilterCommandParameter);
+        if (args is SearchToken { Kind: SearchTokenKind.None } token)
+        {
+            ((IList)sender.ItemsSource).Remove(token);
+        }
+
+        FilterCommand.TryExecute(FilterCommandParameter);
     }
 }

src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchToken.cs

@@ -7,13 +7,16 @@ namespace Snap.Hutao.Control.AutoSuggestBox;
 
 internal sealed class SearchToken
 {
-    public SearchToken(SearchTokenKind kind, string value, Uri? iconUri = null, Uri? sideIconUri = null, Color? quality = null)
+    public static readonly SearchToken NotFound = new(SearchTokenKind.None, SH.ControlAutoSuggestBoxNotFoundValue, 0);
+
+    public SearchToken(SearchTokenKind kind, string value, int order, Uri? iconUri = null, Uri? sideIconUri = null, Color? quality = null)
     {
         Value = value;
         Kind = kind;
         IconUri = iconUri;
         SideIconUri = sideIconUri;
         Quality = quality;
+        Order = order;
     }
 
     public SearchTokenKind Kind { get; }
@@ -26,6 +29,8 @@ internal sealed class SearchToken
 
     public Color? Quality { get; }
 
+    public int Order { get; }
+
     public override string ToString()
     {
         return Value;

src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchTokenKind.cs

@@ -6,12 +6,12 @@ namespace Snap.Hutao.Control.AutoSuggestBox;
 internal enum SearchTokenKind
 {
     None,
-    AssociationType,
-    Avatar,
-    BodyType,
-    ElementName,
-    FightProperty,
     ItemQuality,
-    Weapon,
     WeaponType,
+    FightProperty,
+    ElementName,
+    AssociationType,
+    BodyType,
+    Avatar,
+    Weapon,
 }

src/Snap.Hutao/Snap.Hutao/Control/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs

@@ -33,6 +33,7 @@ internal sealed partial class PeriodicInvokeCommandOrOnActualThemeChangedBehavio
 
     protected override bool Uninitialize()
     {
+        periodicTimerCancellationTokenSource.Cancel();
         AssociatedObject.ActualThemeChanged -= OnActualThemeChanged;
         return true;
     }

src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs

@@ -13,6 +13,4 @@ namespace Snap.Hutao.Control;
 /// </summary>
 [HighQuality]
 [DependencyProperty("DataContext", typeof(object))]
-internal sealed partial class BindingProxy : DependencyObject
+internal sealed partial class BindingProxy : DependencyObject;
-{
-}

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/Collection/AdvancedCollectionView/AdvancedCollectionView.cs

@@ -30,7 +30,7 @@ internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, IN
     private WeakEventListener<AdvancedCollectionView<T>, object?, NotifyCollectionChangedEventArgs>? sourceWeakEventListener;
 
     public AdvancedCollectionView()
-        : this(new List<T>(0))
+        : this([])
     {
     }
 

src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/AlternatingItemsControl.cs

@@ -6,6 +6,7 @@ using Windows.Foundation.Collections;
 
 namespace Snap.Hutao.Control.Collection.Alternating;
 
+[Obsolete("Use SettingsCard instead")]
 [DependencyProperty("ItemAlternateBackground", typeof(Microsoft.UI.Xaml.Media.Brush))]
 internal sealed partial class AlternatingItemsControl : ItemsControl
 {

src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/IAlternatingItem.cs

@@ -3,6 +3,7 @@
 
 namespace Snap.Hutao.Control.Collection.Alternating;
 
+[Obsolete("Use SettingsCard instead")]
 internal interface IAlternatingItem
 {
     public Microsoft.UI.Xaml.Media.Brush? Background { get; set; }

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

@@ -3,7 +3,7 @@
 
 namespace Snap.Hutao.Control.Extension;
 
-internal static class CommandExtension
+internal static class CommandInvocation
 {
     public static bool TryExecute(this ICommand? command, object? parameter = null)
     {

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

@@ -2,11 +2,13 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using System.Runtime.CompilerServices;
 
 namespace Snap.Hutao.Control.Extension;
 
 internal static class DependencyObjectExtension
 {
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IServiceProvider ServiceProvider(this DependencyObject obj)
     {
         return Ioc.Default;

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

@@ -3,7 +3,9 @@
 
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
+using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Caching;
+using Snap.Hutao.Core.ExceptionService;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Control.Image;
@@ -19,6 +21,9 @@ internal sealed class CachedImage : Implementation.ImageEx
     /// </summary>
     public CachedImage()
     {
+        DefaultStyleKey = typeof(CachedImage);
+        DefaultStyleResourceUri = "ms-appx:///Control/Image/CachedImage.xaml".ToUri();
+
         IsCacheEnabled = true;
         EnableLazyLoading = false;
     }
@@ -26,12 +31,11 @@ internal sealed class CachedImage : Implementation.ImageEx
     /// <inheritdoc/>
     protected override async Task<ImageSource?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
-        // We can only use Ioc to retrieve IImageCache, no IServiceProvider is available.
+        IImageCache imageCache = this.ServiceProvider().GetRequiredService<IImageCache>();
-        IImageCache imageCache = Ioc.Default.GetRequiredService<IImageCache>();
 
         try
         {
-            Verify.Operation(!string.IsNullOrEmpty(imageUri.Host), 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/Image/Implementation/ImageEx.cs

@@ -7,21 +7,14 @@ using Windows.Media.Casting;
 
 namespace Snap.Hutao.Control.Image.Implementation;
 
-internal class ImageEx : ImageExBase
+[DependencyProperty("NineGrid", typeof(Thickness))]
+internal partial class ImageEx : ImageExBase
 {
-    private static readonly DependencyProperty NineGridProperty = DependencyProperty.Register(nameof(NineGrid), typeof(Thickness), typeof(ImageEx), new PropertyMetadata(default(Thickness)));
-
     public ImageEx()
         : base()
     {
     }
 
-    public Thickness NineGrid
-    {
-        get => (Thickness)GetValue(NineGridProperty);
-        set => SetValue(NineGridProperty, value);
-    }
-
     public override CompositionBrush GetAlphaMask()
     {
         if (IsInitialized && Image is Microsoft.UI.Xaml.Controls.Image image)

src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageExBase.cs

@@ -6,6 +6,7 @@ using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
+using Snap.Hutao.Win32;
 using System.IO;
 using Windows.Foundation;
 
@@ -158,7 +159,6 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         if (value)
         {
             control.LayoutUpdated += control.OnImageExBaseLayoutUpdated;
-
             control.InvalidateLazyLoading();
         }
         else
@@ -169,7 +169,7 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
 
     private static void LazyLoadingThresholdChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        if (d is ImageExBase control && control.EnableLazyLoading)
+        if (d is ImageExBase { EnableLazyLoading: true } control)
         {
             control.InvalidateLazyLoading();
         }
@@ -229,9 +229,6 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
 
     private void AttachPlaceholderSource(ImageSource? source)
     {
-        // Setting the source at this point should call ImageExOpened/VisualStateManager.GoToState
-        // as we register to both the ImageOpened/ImageFailed events of the underlying control.
-        // We only need to call those methods if we fail in other cases before we get here.
         if (PlaceholderImage is Microsoft.UI.Xaml.Controls.Image image)
         {
             image.Source = source;
@@ -240,6 +237,15 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         {
             brush.ImageSource = source;
         }
+
+        if (source is null)
+        {
+            VisualStateManager.GoToState(this, UnloadedState, true);
+        }
+        else if (source is BitmapSource { PixelHeight: > 0, PixelWidth: > 0 })
+        {
+            VisualStateManager.GoToState(this, LoadedState, true);
+        }
     }
 
     private async void SetSource(object? source)
@@ -311,8 +317,7 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         }
 
         tokenSource?.Cancel();
-
+        tokenSource = new();
-        tokenSource = new CancellationTokenSource();
 
         AttachPlaceholderSource(null);
 
@@ -443,9 +448,10 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
             return;
         }
 
-        Rect controlRect = TransformToVisual(hostElement)
+        Rect controlRect = TransformToVisual(hostElement).TransformBounds(StructMarshal.Rect(ActualSize));
-            .TransformBounds(new Rect(0, 0, ActualWidth, ActualHeight));
         double lazyLoadingThreshold = LazyLoadingThreshold;
+
+        // Left/Top 1 Threshold, Right/Bottom 2 Threshold
         Rect hostRect = new(
             0 - lazyLoadingThreshold,
             0 - lazyLoadingThreshold,

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

@@ -1,151 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Composition;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Hosting;
-using System.Numerics;
-using Windows.Foundation;
-
-namespace Snap.Hutao.Control.Layout;
-
-internal sealed class DefaultItemCollectionTransitionProvider : ItemCollectionTransitionProvider
-{
-    private const double DefaultAnimationDurationInMs = 300.0;
-
-    static DefaultItemCollectionTransitionProvider()
-    {
-        AnimationSlowdownFactor = 1.0;
-    }
-
-    public static double AnimationSlowdownFactor { get; set; }
-
-    protected override bool ShouldAnimateCore(ItemCollectionTransition transition)
-    {
-        return true;
-    }
-
-    protected override void StartTransitions(IList<ItemCollectionTransition> transitions)
-    {
-        List<ItemCollectionTransition> addTransitions = [];
-        List<ItemCollectionTransition> removeTransitions = [];
-        List<ItemCollectionTransition> moveTransitions = [];
-
-        foreach (ItemCollectionTransition transition in addTransitions)
-        {
-            switch (transition.Operation)
-            {
-                case ItemCollectionTransitionOperation.Add:
-                    addTransitions.Add(transition);
-                    break;
-                case ItemCollectionTransitionOperation.Remove:
-                    removeTransitions.Add(transition);
-                    break;
-                case ItemCollectionTransitionOperation.Move:
-                    moveTransitions.Add(transition);
-                    break;
-            }
-        }
-
-        StartAddTransitions(addTransitions, removeTransitions.Count > 0, moveTransitions.Count > 0);
-        StartRemoveTransitions(removeTransitions);
-        StartMoveTransitions(moveTransitions, removeTransitions.Count > 0);
-    }
-
-    private static void StartAddTransitions(IList<ItemCollectionTransition> transitions, bool hasRemoveTransitions, bool hasMoveTransitions)
-    {
-        foreach (ItemCollectionTransition transition in transitions)
-        {
-            ItemCollectionTransitionProgress progress = transition.Start();
-            Visual visual = ElementCompositionPreview.GetElementVisual(progress.Element);
-            Compositor compositor = visual.Compositor;
-
-            ScalarKeyFrameAnimation fadeInAnimation = compositor.CreateScalarKeyFrameAnimation();
-            fadeInAnimation.InsertKeyFrame(0.0f, 0.0f);
-
-            if (hasMoveTransitions && hasRemoveTransitions)
-            {
-                fadeInAnimation.InsertKeyFrame(0.66f, 0.0f);
-            }
-            else if (hasMoveTransitions || hasRemoveTransitions)
-            {
-                fadeInAnimation.InsertKeyFrame(0.5f, 0.0f);
-            }
-
-            fadeInAnimation.InsertKeyFrame(1.0f, 1.0f);
-            fadeInAnimation.Duration = TimeSpan.FromMilliseconds(
-                DefaultAnimationDurationInMs * ((hasRemoveTransitions ? 1 : 0) + (hasMoveTransitions ? 1 : 0) + 1) * AnimationSlowdownFactor);
-
-            CompositionScopedBatch batch = compositor.CreateScopedBatch(CompositionBatchTypes.Animation);
-            visual.StartAnimation("Opacity", fadeInAnimation);
-            batch.End();
-            batch.Completed += (_, _) => progress.Complete();
-        }
-    }
-
-    private static void StartRemoveTransitions(IList<ItemCollectionTransition> transitions)
-    {
-        foreach (ItemCollectionTransition transition in transitions)
-        {
-            ItemCollectionTransitionProgress progress = transition.Start();
-            Visual visual = ElementCompositionPreview.GetElementVisual(progress.Element);
-            Compositor compositor = visual.Compositor;
-
-            ScalarKeyFrameAnimation fadeOutAnimation = compositor.CreateScalarKeyFrameAnimation();
-            fadeOutAnimation.InsertExpressionKeyFrame(0.0f, "this.CurrentValue");
-            fadeOutAnimation.InsertKeyFrame(1.0f, 0.0f);
-            fadeOutAnimation.Duration = TimeSpan.FromMilliseconds(DefaultAnimationDurationInMs * AnimationSlowdownFactor);
-
-            CompositionScopedBatch batch = compositor.CreateScopedBatch(CompositionBatchTypes.Animation);
-            visual.StartAnimation(nameof(Visual.Opacity), fadeOutAnimation);
-            batch.End();
-            batch.Completed += (_, _) =>
-            {
-                visual.Opacity = 1.0f;
-                progress.Complete();
-            };
-        }
-    }
-
-    private static void StartMoveTransitions(IList<ItemCollectionTransition> transitions, bool hasRemoveAnimations)
-    {
-        foreach (ItemCollectionTransition transition in transitions)
-        {
-            ItemCollectionTransitionProgress progress = transition.Start();
-            Visual visual = ElementCompositionPreview.GetElementVisual(progress.Element);
-            Compositor compositor = visual.Compositor;
-            CompositionScopedBatch batch = compositor.CreateScopedBatch(CompositionBatchTypes.Animation);
-
-            // Animate offset.
-            if (transition.OldBounds.X != transition.NewBounds.X ||
-                transition.OldBounds.Y != transition.NewBounds.Y)
-            {
-                AnimateOffset(visual, compositor, transition.OldBounds, transition.NewBounds, hasRemoveAnimations);
-            }
-
-            batch.End();
-            batch.Completed += (_, _) => progress.Complete();
-        }
-    }
-
-    private static void AnimateOffset(Visual visual, Compositor compositor, Rect oldBounds, Rect newBounds, bool hasRemoveAnimations)
-    {
-        Vector2KeyFrameAnimation offsetAnimation = compositor.CreateVector2KeyFrameAnimation();
-
-        offsetAnimation.SetVector2Parameter("delta", new Vector2(
-            (float)(oldBounds.X - newBounds.X),
-            (float)(oldBounds.Y - newBounds.Y)));
-        offsetAnimation.SetVector2Parameter("final", default);
-        offsetAnimation.InsertExpressionKeyFrame(0.0f, "this.CurrentValue + delta");
-        if (hasRemoveAnimations)
-        {
-            offsetAnimation.InsertExpressionKeyFrame(0.5f, "delta");
-        }
-
-        offsetAnimation.InsertExpressionKeyFrame(1.0f, "final");
-        offsetAnimation.Duration = TimeSpan.FromMilliseconds(
-            DefaultAnimationDurationInMs * ((hasRemoveAnimations ? 1 : 0) + 1) * AnimationSlowdownFactor);
-
-        visual.StartAnimation("TransformMatrix._41_42", offsetAnimation);
-    }
-}

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

@@ -18,14 +18,12 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
     protected override void InitializeForContextCore(VirtualizingLayoutContext context)
     {
         context.LayoutState = new UniformStaggeredLayoutState(context);
-        base.InitializeForContextCore(context);
     }
 
     /// <inheritdoc/>
     protected override void UninitializeForContextCore(VirtualizingLayoutContext context)
     {
         context.LayoutState = null;
-        base.UninitializeForContextCore(context);
     }
 
     /// <inheritdoc/>
@@ -82,16 +80,10 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
 
         (int numberOfColumns, double columnWidth) = GetNumberOfColumnsAndWidth(availableWidth, MinItemWidth, MinColumnSpacing);
 
-        if (columnWidth != state.ColumnWidth)
-        {
-            // The items will need to be remeasured
-            state.Clear();
-        }
-
         state.ColumnWidth = columnWidth;
 
-        // adjust for column spacing on all columns expect the first
+        double totalWidth = ((state.ColumnWidth + MinColumnSpacing) * numberOfColumns) - MinColumnSpacing;
-        double totalWidth = state.ColumnWidth + ((numberOfColumns - 1) * (state.ColumnWidth + MinColumnSpacing));
+
         if (totalWidth > availableWidth)
         {
             numberOfColumns--;
@@ -103,7 +95,6 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
 
         if (numberOfColumns != state.NumberOfColumns)
         {
-            // The items will not need to be remeasured, but they will need to go into new columns
             state.ClearColumns();
         }
 
@@ -170,7 +161,7 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
                 item.Element.Measure(new Size(state.ColumnWidth, availableHeight));
                 if (item.Height != item.Element.DesiredSize.Height)
                 {
-                    // this item changed size; we need to recalculate layout for everything after this
+                    // this item changed size; we need to recalculate layout for everything after this item
                     state.RemoveFromIndex(i + 1);
                     item.Height = item.Element.DesiredSize.Height;
                     columnHeights[columnIndex] = item.Top + item.Height;
@@ -201,16 +192,16 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
         // Cycle through each column and arrange the items that are within the realization bounds
         for (int columnIndex = 0; columnIndex < state.NumberOfColumns; columnIndex++)
         {
-            UniformStaggeredColumnLayout layout = state.GetColumnLayout(columnIndex);
+            foreach (ref readonly UniformStaggeredItem item in CollectionsMarshal.AsSpan(state.GetColumnLayout(columnIndex)))
-            foreach (ref readonly UniformStaggeredItem item in CollectionsMarshal.AsSpan(layout))
             {
                 double bottom = item.Top + item.Height;
                 if (bottom < context.RealizationRect.Top)
                 {
-                    // element is above the realization bounds
+                    // Element is above the realization bounds
                     continue;
                 }
 
+                // Partial or fully in the view
                 if (item.Top <= context.RealizationRect.Bottom)
                 {
                     double itemHorizontalOffset = (state.ColumnWidth * columnIndex) + (MinColumnSpacing * columnIndex);
@@ -229,21 +220,22 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
         return finalSize;
     }
 
-    private static (int NumberOfColumns, double ColumnWidth) GetNumberOfColumnsAndWidth(double availableWidth, double minItemWidth, double minColumnSpacing)
+    private static (int NumberOfColumns, double ColumnWidth) GetNumberOfColumnsAndWidth(double availableWidth, double minItemWidth, double columnSpacing)
     {
         // test if the width can fit in 2 items
-        if ((2 * minItemWidth) + minColumnSpacing > availableWidth)
+        if ((2 * minItemWidth) + columnSpacing > availableWidth)
         {
             return (1, availableWidth);
         }
 
-        int columnCount = Math.Max(1, (int)((availableWidth + minColumnSpacing) / (minItemWidth + minColumnSpacing)));
+        int columnCount = Math.Max(1, (int)((availableWidth + columnSpacing) / (minItemWidth + columnSpacing)));
-        double columnWidthAddSpacing = (availableWidth + minColumnSpacing) / columnCount;
+        double columnWidthWithSpacing = (availableWidth + columnSpacing) / columnCount;
-        return (columnCount, columnWidthAddSpacing - minColumnSpacing);
+        return (columnCount, columnWidthWithSpacing - columnSpacing);
     }
 
     private static int GetLowestColumnIndex(in ReadOnlySpan<double> columnHeights)
     {
+        // We want to find the leftest column with the lowest height
         int columnIndex = 0;
         double height = columnHeights[0];
         for (int j = 1; j < columnHeights.Length; j++)
@@ -260,13 +252,11 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
 
     private static void OnMinItemWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
+        ((UniformStaggeredLayout)d).InvalidateMeasure();
-        panel.InvalidateMeasure();
     }
 
     private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
+        ((UniformStaggeredLayout)d).InvalidateMeasure();
-        panel.InvalidateMeasure();
     }
 }

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

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Runtime.InteropServices;
 
@@ -67,46 +66,6 @@ internal sealed class UniformStaggeredLayoutState
         return columnLayout[columnIndex];
     }
 
-    /// <summary>
-    /// Clear everything that has been calculated.
-    /// </summary>
-    internal void Clear()
-    {
-        // https://github.com/DGP-Studio/Snap.Hutao/issues/1079
-        // The first element must be force refreshed otherwise
-        // it will use the old one realized
-        // https://github.com/DGP-Studio/Snap.Hutao/issues/1099
-        // Now we need to refresh the first element of each column
-        // https://github.com/DGP-Studio/Snap.Hutao/issues/1099
-        // Finally we need to refresh the whole layout when we reset
-        if (context.ItemCount > 0)
-        {
-            for (int i = 0; i < context.ItemCount; i++)
-            {
-                RecycleElementAt(i);
-            }
-        }
-
-        columnLayout.Clear();
-        items.Clear();
-    }
-
-    /// <summary>
-    /// Clear the layout columns so they will be recalculated.
-    /// </summary>
-    internal void ClearColumns()
-    {
-        columnLayout.Clear();
-    }
-
-    /// <summary>
-    /// Gets the estimated height of the layout.
-    /// </summary>
-    /// <returns>The estimated height of the layout.</returns>
-    /// <remarks>
-    /// If all of the items have been calculated then the actual height will be returned.
-    /// If all of the items have not been calculated then an estimated height will be calculated based on the average height of the items.
-    /// </remarks>
     internal double GetHeight()
     {
         double desiredHeight = columnLayout.Values.Max(c => c.Height);
@@ -139,10 +98,37 @@ internal sealed class UniformStaggeredLayoutState
         return desiredHeight;
     }
 
+    internal void Clear()
+    {
+        RecycleElements();
+        ClearColumns();
+        ClearItems();
+    }
+
+    internal void ClearColumns()
+    {
+        columnLayout.Clear();
+    }
+
+    internal void ClearItems()
+    {
+        items.Clear();
+    }
+
+    internal void RecycleElements()
+    {
+        if (context.ItemCount > 0)
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                RecycleElementAt(i);
+            }
+        }
+    }
+
     internal void RecycleElementAt(int index)
     {
-        UIElement element = context.GetOrCreateElementAt(index);
+        context.RecycleElement(context.GetOrCreateElementAt(index));
-        context.RecycleElement(element);
     }
 
     internal void RemoveFromIndex(int index)
@@ -175,7 +161,7 @@ internal sealed class UniformStaggeredLayoutState
     {
         for (int i = startIndex; i <= endIndex; i++)
         {
-            if (i > items.Count)
+            if (i >= items.Count)
             {
                 break;
             }
@@ -184,7 +170,7 @@ internal sealed class UniformStaggeredLayoutState
             item.Height = 0;
             item.Top = 0;
 
-            // We must recycle all elements to ensure that it gets the correct context
+            // We must recycle all removed elements to ensure that it gets the correct context
             RecycleElementAt(i);
         }
 

src/Snap.Hutao/Snap.Hutao/Control/Loading.cs

@@ -17,7 +17,7 @@ internal class Loading : Microsoft.UI.Xaml.Controls.ContentControl
     public Loading()
     {
         DefaultStyleKey = typeof(Loading);
-        DefaultStyleResourceUri = new("ms-appx:///Control/Loading.xaml");
+        DefaultStyleResourceUri = "ms-appx:///Control/Loading.xaml".ToUri();
     }
 
     public bool IsLoading

src/Snap.Hutao/Snap.Hutao/Control/Markup/UInt32Extension.cs

@@ -12,7 +12,6 @@ internal sealed class UInt32Extension : MarkupExtension
 
     protected override object ProvideValue()
     {
-        _ = uint.TryParse(Value, out uint result);
+        return XamlBindingHelper.ConvertValue(typeof(uint), Value);
-        return result;
     }
 }

src/Snap.Hutao/Snap.Hutao/Control/Media/SoftwareBitmapExtension.cs

@@ -39,24 +39,6 @@ internal static class SoftwareBitmapExtension
         }
     }
 
-    public static unsafe double Luminance(this SoftwareBitmap softwareBitmap)
-    {
-        using (BitmapBuffer buffer = softwareBitmap.LockBuffer(BitmapBufferAccessMode.Read))
-        {
-            using (IMemoryBufferReference reference = buffer.CreateReference())
-            {
-                reference.As<IMemoryBufferByteAccess>().GetBuffer(out Span<Bgra32> bytes);
-                double sum = 0;
-                foreach (ref readonly Bgra32 pixel in bytes)
-                {
-                    sum += pixel.Luminance;
-                }
-
-                return sum / bytes.Length;
-            }
-        }
-    }
-
     public static unsafe Bgra32 GetAccentColor(this SoftwareBitmap softwareBitmap)
     {
         using (BitmapBuffer buffer = softwareBitmap.LockBuffer(BitmapBufferAccessMode.Read))

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

@@ -82,8 +82,8 @@ internal partial class EqualPanel : Microsoft.UI.Xaml.Controls.Panel
         (d as EqualPanel)?.InvalidateMeasure();
     }
 
-    private void OnHorizontalAlignmentChanged(DependencyObject sender, DependencyProperty dp)
+    private static void OnHorizontalAlignmentChanged(DependencyObject d, DependencyProperty dp)
     {
-        InvalidateMeasure();
+        (d as EqualPanel)?.InvalidateMeasure();
     }
 }

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,27 +34,29 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        int itemCount = Children.Count;
+        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
-        double availableWidthPerItem = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
+        double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
-        double actualItemWidth = Math.Max(MinItemWidth, availableWidthPerItem);
+        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;
         }
 
         return finalSize;
     }
 
-    private void OnLoaded(object sender, RoutedEventArgs e)
+    private static void OnLoaded(object sender, RoutedEventArgs e)
     {
-        MinWidth = (MinItemWidth * Children.Count) + (Spacing * (Children.Count - 1));
+        HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
+        int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
+        panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
     }
 
-    private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+    private static void OnSizeChanged(object sender, SizeChangedEventArgs e)
     {
-        InvalidateMeasure();
+        ((HorizontalEqualPanel)sender).InvalidateMeasure();
     }
 }

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

@@ -1,21 +1,53 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml;
+using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;
 
 [DependencyProperty("MinItemWidth", typeof(double))]
-internal sealed partial class UniformPanel : UniformGrid
+[DependencyProperty("ColumnSpacing", typeof(double))]
+[DependencyProperty("RowSpacing", typeof(double))]
+internal sealed partial class UniformPanel : Microsoft.UI.Xaml.Controls.Panel
 {
-    public UniformPanel()
+    private int columns;
+
+    protected override Size MeasureOverride(Size availableSize)
     {
-        Columns = 1;
+        columns = (int)((availableSize.Width + ColumnSpacing) / (MinItemWidth + ColumnSpacing));
-        SizeChanged += OnSizeChanged;
+        double availableItemWidth = ((availableSize.Width + ColumnSpacing) / columns) - ColumnSpacing;
+
+        double maxDesiredHeight = 0;
+        foreach (UIElement child in Children)
+        {
+            child.Measure(new Size(availableItemWidth, availableSize.Height));
+            maxDesiredHeight = Math.Max(maxDesiredHeight, child.DesiredSize.Height);
+        }
+
+        int desiredRows = (int)Math.Ceiling(Children.Count / (double)columns);
+        double desiredHeight = ((maxDesiredHeight + RowSpacing) * desiredRows) - RowSpacing;
+
+        return new Size(availableSize.Width, desiredHeight);
     }
 
-    private void OnSizeChanged(object sender, Microsoft.UI.Xaml.SizeChangedEventArgs e)
+    protected override Size ArrangeOverride(Size finalSize)
     {
-        Columns = (int)((e.NewSize.Width + ColumnSpacing) / (MinItemWidth + ColumnSpacing));
+        double itemWidth = ((finalSize.Width + ColumnSpacing) / columns) - ColumnSpacing;
+
+        for (int index = 0; index < Children.Count; index++)
+        {
+            UIElement child = Children[index];
+
+            int row = index / columns;
+            int column = index % columns;
+
+            double x = column * (itemWidth + ColumnSpacing);
+            double y = row * (child.DesiredSize.Height + RowSpacing);
+
+            child.Arrange(new Rect(x, y, itemWidth, child.DesiredSize.Height));
+        }
+
+        return finalSize;
     }
 }

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,9 +44,17 @@ internal class ScopedPage : Page
     protected void InitializeWith<TViewModel>()
         where TViewModel : class, IViewModel
     {
-        IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
+        try
-        viewModel.CancellationToken = viewCancellationTokenSource.Token;
+        {
-        DataContext = viewModel;
+            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/>
@@ -72,7 +80,11 @@ internal class ScopedPage : Page
             DisposeViewModel();
         }
 
-        DataContext = null;
+        if (this.IsDisposed())
+        {
+            return;
+        }
+
         Unloaded -= unloadEventHandler;
     }
 
@@ -91,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/Text/DescriptionTextBlock.cs

@@ -45,15 +45,7 @@ internal sealed partial class DescriptionTextBlock : ContentControl
     private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         TextBlock textBlock = (TextBlock)((DescriptionTextBlock)d).Content;
-
+        UpdateDescription(textBlock, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle((string)e.NewValue)));
-        try
-        {
-            UpdateDescription(textBlock, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle((string)e.NewValue)));
-        }
-        catch (Exception ex)
-        {
-            _ = ex;
-        }
     }
 
     private static void OnTextStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs

@@ -14,6 +14,7 @@ using Windows.UI;
 
 namespace Snap.Hutao.Control.Text;
 
+// TODO: change the parsing to syntax tree
 [DependencyProperty("Description", typeof(string), "", nameof(OnDescriptionChanged))]
 [DependencyProperty("TextStyle", typeof(Style), default(Style), nameof(OnTextStyleChanged))]
 internal sealed partial class HtmlDescriptionTextBlock : ContentControl

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>
@@ -30,6 +35,7 @@
     <x:String x:Key="UI_EmotionIcon25">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon25.png</x:String>
     <x:String x:Key="UI_EmotionIcon52">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon52.png</x:String>
     <x:String x:Key="UI_EmotionIcon71">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon71.png</x:String>
+    <x:String x:Key="UI_EmotionIcon89">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon89.png</x:String>
     <x:String x:Key="UI_EmotionIcon250">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon250.png</x:String>
     <x:String x:Key="UI_EmotionIcon271">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon271.png</x:String>
     <x:String x:Key="UI_EmotionIcon272">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon272.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/Abstraction/ICloneable.cs

@@ -1,18 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Abstraction;
-
-/// <summary>
-/// 可克隆
-/// </summary>
-/// <typeparam name="TSelf">自身类型</typeparam>
-[HighQuality]
-internal interface ICloneable<out TSelf>
-{
-    /// <summary>
-    /// 克隆
-    /// </summary>
-    /// <returns>新的克隆</returns>
-    TSelf Clone();
-}

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

@@ -1,15 +1,19 @@
 // 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;
 using System.Net;
 using System.Net.Http;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace Snap.Hutao.Core.Caching;
 
@@ -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;
@@ -104,12 +111,12 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
         {
             if (concurrentTasks.TryAdd(fileName, taskCompletionSource.Task))
             {
-                logger.LogDebug("Begin downloading image file from '{Uri}' to '{File}'", uri, filePath);
+                logger.LogColorizedInformation("Begin to download file from '{Uri}' to '{File}'", (uri, ConsoleColor.Cyan), (filePath, ConsoleColor.Cyan));
                 await DownloadFileAsync(uri, filePath).ConfigureAwait(false);
             }
             else if (concurrentTasks.TryGetValue(fileName, out Task? task))
             {
-                logger.LogDebug("Waiting for a queued image download task to complete for '{Uri}'", uri);
+                logger.LogDebug("Waiting for a queued image download task to complete for '{Uri}'", (uri, ConsoleColor.Cyan));
                 await task.ConfigureAwait(false);
             }
 
@@ -132,10 +139,7 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
 
     private static string GetCacheFileName(Uri uri)
     {
-        string url = uri.ToString();
+        return Hash.SHA1HexString(uri.ToString());
-        byte[] chars = Encoding.UTF8.GetBytes(url);
-        byte[] hash = SHA1.HashData(chars);
-        return System.Convert.ToHexString(hash);
     }
 
     private static bool IsFileInvalid(string file, bool treatNullFileAsInvalid = true)
@@ -172,40 +176,76 @@ 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()
-                if (message.RequestMessage is { RequestUri: { } target } && target != uri)
+                .SetRequestUri(uri)
-                {
-                    logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
-                }
 
-                if (message.IsSuccessStatusCode)
+                // These headers are only available for our own api
+                .SetStaticResourceControlHeadersIf(uri.Host.Contains("api.snapgenshin.com", StringComparison.OrdinalIgnoreCase))
+                .Get();
+
+            using (HttpRequestMessage requestMessage = requestMessageBuilder.HttpRequestMessage)
+            {
+                using (HttpResponseMessage responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
                 {
-                    using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                    if (responseMessage.RequestMessage is { RequestUri: { } target } && target != uri)
                     {
-                        using (FileStream fileStream = File.Create(baseFile))
+                        logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
+                    }
+
+                    if (responseMessage.IsSuccessStatusCode)
+                    {
+                        if (responseMessage.Content.Headers.ContentType?.MediaType is "application/json")
                         {
-                            await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
+#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;
                         }
-                    }
-                }
 
-                switch (message.StatusCode)
+                        using (Stream httpStream = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                {
-                    case HttpStatusCode.TooManyRequests:
                         {
-                            retryCount++;
+                            using (FileStream fileStream = File.Create(baseFile))
-                            TimeSpan delay = message.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
+                            {
-                            logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
+                                await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
-                            await Task.Delay(delay).ConfigureAwait(false);
+                                return;
-                            break;
+                            }
                         }
+                    }
 
-                    default:
+                    switch (responseMessage.StatusCode)
-                        return;
+                    {
+                        case HttpStatusCode.TooManyRequests:
+                            {
+                                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>
+    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
-    /// 异步添加并保存
-    /// </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)
         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>
+    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities, CancellationToken token = default)
-    /// 异步添加列表并保存
-    /// </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)
         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>
+    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
-    /// 异步移除并保存
-    /// </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)
         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>
+    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
-    /// 异步更新并保存
-    /// </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)
         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/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)
+    public HutaoException(string message, Exception? innerException)
-        : this(message, innerException)
-    {
-        Kind = kind;
-    }
-
-    private 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)
+    [DoesNotReturn]
-    {
-        string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
-        throw new HutaoException(HutaoExceptionKind.ServiceTypeCastFailed, message, innerException);
-    }
-
     public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
     {
-        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
+        throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
-        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, 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,20 +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,
-
-    // 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

@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Snap.Hutao.Core.IO.Hashing;
+
+internal static class Hash
+{
+    public static unsafe string SHA1HexString(string input)
+    {
+        return HashCore(Convert.ToHexString, SHA1.HashData, Encoding.UTF8.GetBytes, 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,34 +78,36 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
                 using (HttpResponseMessage response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false))
                 {
                     response.EnsureSuccessStatusCode();
-
+                    using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent())
-                    Memory<byte> buffer = new byte[bufferSize];
-                    using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
                     {
-                        int totalBytesRead = 0;
+                        Memory<byte> buffer = memoryOwner.Memory;
-                        int bytesReadAfterPreviousReport = 0;
+                        using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
-                        do
                         {
-                            int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
+                            int totalBytesRead = 0;
-                            if (bytesRead <= 0)
+                            int bytesReadAfterPreviousReport = 0;
+                            do
                             {
-                                progress.Report(new(bytesReadAfterPreviousReport));
+                                int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
-                                bytesReadAfterPreviousReport = 0;
+                                if (bytesRead <= 0)
-                                break;
+                                {
-                            }
+                                    progress.Report(new(bytesReadAfterPreviousReport));
+                                    bytesReadAfterPreviousReport = 0;
+                                    break;
+                                }
 
-                            await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
+                                await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
 
-                            totalBytesRead += bytesRead;
+                                totalBytesRead += bytesRead;
-                            bytesReadAfterPreviousReport += bytesRead;
+                                bytesReadAfterPreviousReport += bytesRead;
-                            if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
+                                if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
-                            {
+                                {
-                                progress.Report(new(bytesReadAfterPreviousReport));
+                                    progress.Report(new(bytesReadAfterPreviousReport));
-                                bytesReadAfterPreviousReport = 0;
+                                    bytesReadAfterPreviousReport = 0;
-                                stopwatch = ValueStopwatch.StartNew();
+                                    stopwatch = ValueStopwatch.StartNew();
+                                }
                             }
+                            while (true);
                         }
-                        while (true);
                     }
                 }
             }

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,26 +52,30 @@ internal class StreamCopyWorker<TStatus>
 
         long totalBytesRead = 0;
         int bytesRead;
-        Memory<byte> buffer = new byte[bufferSize];
 
-        do
+        using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(bufferSize))
         {
-            bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
+            Memory<byte> buffer = memoryOwner.Memory;
-            if (bytesRead == 0)
-            {
-                progress.Report(statusFactory(totalBytesRead));
-                break;
-            }
 
-            await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
+            do
-
-            totalBytesRead += bytesRead;
-            if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
             {
-                progress.Report(statusFactory(totalBytesRead));
+                bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
-                stopwatch = ValueStopwatch.StartNew();
+                if (bytesRead is 0)
+                {
+                    progress.Report(statusFactory(totalBytesRead));
+                    break;
+                }
+
+                await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
+
+                totalBytesRead += bytesRead;
+                if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
+                {
+                    progress.Report(statusFactory(totalBytesRead));
+                    stopwatch = ValueStopwatch.StartNew();
+                }
             }
+            while (bytesRead > 0);
         }
-        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/Activation.cs

@@ -116,15 +116,15 @@ internal sealed partial class Activation : IActivation
 
         // 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 (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 (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
         {
             await taskContext.SwitchToMainThreadAsync();
             serviceProvider.GetRequiredService<GuideWindow>();

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/ConsoleVirtualTerminalSequences.cs

@@ -0,0 +1,114 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Logging;
+
+internal static class ConsoleVirtualTerminalSequences
+{
+    public const string Default = "\u001b[0m";
+    public const string Bold = "\u001b[1m";
+
+    public const string Underline = "\u001b[4m";
+
+    public const string Negative = "\u001b[7m";
+
+    public const string NoBold = "\u001b[22m";
+
+    public const string NoUnderline = "\u001b[24m";
+
+    public const string Positive = "\u001b[27m";
+
+    public const string ForegroundBlack = "\u001b[30m";
+    public const string ForegroundRed = "\u001b[31m";
+    public const string ForegroundGreen = "\u001b[32m";
+    public const string ForegroundYellow = "\u001b[33m";
+    public const string ForegroundBlue = "\u001b[34m";
+    public const string ForegroundMagenta = "\u001b[35m";
+    public const string ForegroundCyan = "\u001b[36m";
+    public const string ForegroundWhite = "\u001b[37m";
+    public const string ForegroundExtended = "\u001b[38m";
+    public const string ForegroundDefault = "\u001b[39m";
+    public const string BackgroundBlack = "\u001b[40m";
+    public const string BackgroundRed = "\u001b[41m";
+    public const string BackgroundGreen = "\u001b[42m";
+    public const string BackgroundYellow = "\u001b[43m";
+    public const string BackgroundBlue = "\u001b[44m";
+    public const string BackgroundMagenta = "\u001b[45m";
+    public const string BackgroundCyan = "\u001b[46m";
+    public const string BackgroundWhite = "\u001b[47m";
+    public const string BackgroundExtended = "\u001b[48m";
+    public const string BackgroundDefault = "\u001b[49m";
+
+    public const string BrightForegroundBlack = "\u001b[1m\u001b[30m";
+    public const string BrightForegroundRed = "\u001b[1m\u001b[31m";
+    public const string BrightForegroundGreen = "\u001b[1m\u001b[32m";
+    public const string BrightForegroundYellow = "\u001b[1m\u001b[33m";
+    public const string BrightForegroundBlue = "\u001b[1m\u001b[34m";
+    public const string BrightForegroundMagenta = "\u001b[1m\u001b[35m";
+    public const string BrightForegroundCyan = "\u001b[1m\u001b[36m";
+    public const string BrightForegroundWhite = "\u001b[1m\u001b[37m";
+    public const string BrightBackgroundBlack = "\u001b[1m\u001b[40m";
+    public const string BrightBackgroundRed = "\u001b[1m\u001b[41m";
+    public const string BrightBackgroundGreen = "\u001b[1m\u001b[42m";
+    public const string BrightBackgroundYellow = "\u001b[1m\u001b[43m";
+    public const string BrightBackgroundBlue = "\u001b[1m\u001b[44m";
+    public const string BrightBackgroundMagenta = "\u001b[1m\u001b[45m";
+    public const string BrightBackgroundCyan = "\u001b[1m\u001b[46m";
+    public const string BrightBackgroundWhite = "\u001b[1m\u001b[47m";
+
+    public const string Dim = "\u001b[2m";
+    public const string Italic = "\u001b[3m";
+
+    public const string Blink = "\u001b[5m";
+
+    public const string Hidden = "\u001b[8m";
+    public const string StrikeThrough = "\u001b[9m";
+    public const string DoubleUnderline = "\u001b[21m";
+
+    public const string NoItalic = "\u001b[23m";
+
+    public const string NoBlink = "\u001b[25m";
+
+    public const string NoHidden = "\u001b[28m";
+    public const string NoStrikeThrough = "\u001b[29m";
+
+    public static string FromConsoleColor(ConsoleColor color, bool foreground)
+    {
+        return (foreground, color) switch
+        {
+            (true, ConsoleColor.Black) => ForegroundBlack,
+            (true, ConsoleColor.DarkBlue) => ForegroundBlue,
+            (true, ConsoleColor.DarkGreen) => ForegroundGreen,
+            (true, ConsoleColor.DarkCyan) => ForegroundCyan,
+            (true, ConsoleColor.DarkRed) => ForegroundRed,
+            (true, ConsoleColor.DarkMagenta) => ForegroundMagenta,
+            (true, ConsoleColor.DarkYellow) => ForegroundYellow,
+            (true, ConsoleColor.DarkGray) => BrightForegroundBlack,
+            (true, ConsoleColor.Gray) => ForegroundWhite,
+            (true, ConsoleColor.Blue) => BrightForegroundBlue,
+            (true, ConsoleColor.Green) => BrightForegroundGreen,
+            (true, ConsoleColor.Cyan) => BrightForegroundCyan,
+            (true, ConsoleColor.Red) => BrightForegroundRed,
+            (true, ConsoleColor.Magenta) => BrightForegroundMagenta,
+            (true, ConsoleColor.Yellow) => BrightForegroundYellow,
+            (true, ConsoleColor.White) => BrightForegroundWhite,
+            (false, ConsoleColor.Black) => BackgroundBlack,
+            (false, ConsoleColor.DarkBlue) => BackgroundBlue,
+            (false, ConsoleColor.DarkGreen) => BackgroundGreen,
+            (false, ConsoleColor.DarkCyan) => BackgroundCyan,
+            (false, ConsoleColor.DarkRed) => BackgroundRed,
+            (false, ConsoleColor.DarkMagenta) => BackgroundMagenta,
+            (false, ConsoleColor.DarkYellow) => BackgroundYellow,
+            (false, ConsoleColor.DarkGray) => BrightBackgroundBlack,
+            (false, ConsoleColor.Gray) => BackgroundWhite,
+            (false, ConsoleColor.Blue) => BrightBackgroundBlue,
+            (false, ConsoleColor.Green) => BrightBackgroundGreen,
+            (false, ConsoleColor.Cyan) => BrightBackgroundCyan,
+            (false, ConsoleColor.Red) => BrightBackgroundRed,
+            (false, ConsoleColor.Magenta) => BrightBackgroundMagenta,
+            (false, ConsoleColor.Yellow) => BrightBackgroundYellow,
+            (false, ConsoleColor.White) => BrightBackgroundWhite,
+            _ => string.Empty,
+        };
+    }
+}

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

@@ -22,7 +22,7 @@ internal sealed class ConsoleWindowLifeTime : IDisposable
                 HANDLE inputHandle = GetStdHandle(STD_HANDLE.STD_INPUT_HANDLE);
                 if (GetConsoleMode(inputHandle, out CONSOLE_MODE mode))
                 {
-                    mode &= ~CONSOLE_MODE.ENABLE_QUICK_EDIT_MODE;
+                    mode &= ~CONSOLE_MODE.ENABLE_VIRTUAL_TERMINAL_PROCESSING;
                     SetConsoleMode(inputHandle, mode);
                 }
 
@@ -38,4 +38,4 @@ internal sealed class ConsoleWindowLifeTime : IDisposable
             FreeConsole();
         }
     }
-}
+}

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

@@ -0,0 +1,33 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Logging;
+
+internal readonly struct LogArgument
+{
+    public readonly object? Argument;
+    public readonly ConsoleColor? ForegroundColor;
+    public readonly ConsoleColor? BackgroundColor;
+
+    public LogArgument(object? argument, ConsoleColor? foreground = default, ConsoleColor? background = default)
+    {
+        Argument = argument;
+        ForegroundColor = foreground;
+        BackgroundColor = background;
+    }
+
+    public static implicit operator LogArgument(string argument)
+    {
+        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/LogMessage.cs

@@ -0,0 +1,28 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Logging;
+
+internal readonly struct LogMessage
+{
+    public readonly string Message;
+    public readonly ConsoleColor? ForegroundColor;
+    public readonly ConsoleColor? BackgroundColor;
+
+    public LogMessage(string message, ConsoleColor? foreground = default, ConsoleColor? background = default)
+    {
+        Message = message;
+        ForegroundColor = foreground;
+        BackgroundColor = background;
+    }
+
+    public static implicit operator LogMessage(string value)
+    {
+        return new(value);
+    }
+
+    public static implicit operator LogMessage((string Value, ConsoleColor? Foreground) tuple)
+    {
+        return new(tuple.Value, tuple.Foreground);
+    }
+}

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

@@ -0,0 +1,172 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text;
+
+namespace Snap.Hutao.Core.Logging;
+
+[SuppressMessage("", "SH002")]
+internal static class LoggerExtension
+{
+    public static void LogColorizedDebug(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Debug, exception, message, args);
+    }
+
+    public static void LogColorizedDebug(this ILogger logger, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Debug, message, args);
+    }
+
+    public static void LogColorizedTrace(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Trace, exception, message, args);
+    }
+
+    public static void LogColorizedTrace(this ILogger logger, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Trace, message, args);
+    }
+
+    public static void LogColorizedInformation(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Information, exception, message, args);
+    }
+
+    public static void LogColorizedInformation(this ILogger logger, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Information, message, args);
+    }
+
+    public static void LogColorizedWarning(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Warning, exception, message, args);
+    }
+
+    public static void LogColorizedWarning(this ILogger logger, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Warning, message, args);
+    }
+
+    public static void LogColorizedError(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Error, exception, message, args);
+    }
+
+    public static void LogColorizedError(this ILogger logger, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Error, message, args);
+    }
+
+    public static void LogColorizedCritical(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Critical, exception, message, args);
+    }
+
+    public static void LogColorizedCritical(this ILogger logger, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(LogLevel.Critical, message, args);
+    }
+
+    public static void LogColorized(this ILogger logger, LogLevel logLevel, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(logLevel, 0, null, message, args);
+    }
+
+    public static void LogColorized(this ILogger logger, LogLevel logLevel, EventId eventId, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(logLevel, eventId, null, message, args);
+    }
+
+    public static void LogColorized(this ILogger logger, LogLevel logLevel, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        logger.LogColorized(logLevel, 0, exception, message, args);
+    }
+
+    public static void LogColorized(this ILogger logger, LogLevel logLevel, EventId eventId, Exception? exception, LogMessage message, params LogArgument[] args)
+    {
+        string colorizedMessage = Colorize(message, args, out object?[] outArgs)!;
+        logger.Log(logLevel, eventId, exception, colorizedMessage, outArgs);
+    }
+
+    private static string? Colorize(LogMessage message, LogArgument[] args, out object?[] outArgs)
+    {
+        StringBuilder resultMessageBuilder = new(message.Message.Length);
+        ReadOnlySpan<char> messageSpan = message.Message.AsSpan();
+
+        // Message base colors
+        ConsoleColor? messageForeground = message.ForegroundColor;
+        ConsoleColor? messageBackground = message.BackgroundColor;
+
+        if (messageForeground.HasValue)
+        {
+            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageForeground.Value, true));
+        }
+
+        if (messageBackground.HasValue)
+        {
+            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageBackground.Value, false));
+        }
+
+        ReadOnlySpan<LogArgument> argSpan = args.AsSpan();
+        outArgs = new object?[args.Length];
+
+        int argIndex = 0;
+        for (int index = 0; index < messageSpan.Length; index++)
+        {
+            if (messageSpan[index] == '{')
+            {
+                ref readonly LogArgument arg = ref argSpan[argIndex];
+                outArgs[argIndex] = arg.Argument;
+                argIndex++;
+                if (arg.ForegroundColor.HasValue)
+                {
+                    resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(arg.ForegroundColor.Value, true));
+                }
+
+                if (arg.BackgroundColor.HasValue)
+                {
+                    resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(arg.BackgroundColor.Value, false));
+                }
+
+                int closingIndex = messageSpan[index..].IndexOf('}');
+                resultMessageBuilder.Append(messageSpan.Slice(index, closingIndex + 1));
+
+                index += closingIndex;
+
+                if (arg.ForegroundColor.HasValue || arg.BackgroundColor.HasValue)
+                {
+                    // Restore message colors
+                    if (messageForeground.HasValue || messageBackground.HasValue)
+                    {
+                        if (messageForeground.HasValue)
+                        {
+                            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageForeground.Value, true));
+                        }
+
+                        if (messageBackground.HasValue)
+                        {
+                            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageBackground.Value, false));
+                        }
+                    }
+                    else
+                    {
+                        resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.ForegroundWhite);
+                    }
+                }
+            }
+            else
+            {
+                resultMessageBuilder.Append(messageSpan[index]);
+            }
+        }
+
+        // Restore default colors
+        if (message.ForegroundColor.HasValue || message.BackgroundColor.HasValue)
+        {
+            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.ForegroundWhite);
+        }
+
+        return resultMessageBuilder.ToString();
+    }
+}

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

@@ -3,13 +3,17 @@
 
 namespace Snap.Hutao.Core.Logging;
 
-internal static class LoggerFactoryExtensions
+internal static class LoggerFactoryExtension
 {
     public static ILoggingBuilder AddConsoleWindow(this ILoggingBuilder builder)
     {
         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 LazySlim<(Version Version, string UserAgent)> lazyVersionAndUserAgent = new(() =>
-
-    private readonly Lazy<(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 LazySlim<string> lazyLocalCache = new(() => ApplicationData.Current.LocalCacheFolder.Path);
-    private readonly Lazy<string> lazyInstalledLocation = new(() => Package.Current.InstalledLocation.Path);
+    private readonly LazySlim<string> lazyInstalledLocation = new(() => Package.Current.InstalledLocation.Path);
-    private readonly Lazy<string> lazyFamilyName = new(() => Package.Current.Id.FamilyName);
+    private readonly LazySlim<string> lazyFamilyName = new(() => Package.Current.Id.FamilyName);
 
-    private bool isToastAvailable;
+    private readonly LazySlim<bool> lazyToastAvailable = new(() =>
-    private bool isToastAvailableInitialized;
-    private object isToastAvailableLock = new();
-
-    public RuntimeOptions(IServiceProvider serviceProvider, ILogger<RuntimeOptions> logger)
     {
-        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
+    public bool IsToastAvailable { get => lazyToastAvailable.Value; }
-    {
-        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 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

@@ -20,7 +20,9 @@ internal static class SettingKeys
     #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";
     #endregion
@@ -60,6 +62,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/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)))
+            if (SUCCEEDED(IUnknownMarshal.QueryInterface(pShellLink, in IPersistFile.IID, out IPersistFile* pPersistFile)))
-            {
-                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)))
             {
                 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/WindowController.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;
@@ -29,6 +28,7 @@ internal sealed class WindowController
     private readonly WindowOptions options;
     private readonly IServiceProvider serviceProvider;
     private readonly WindowSubclass subclass;
+    private readonly WindowNonRudeHWND windowNonRudeHWND;
 
     public WindowController(Window window, in WindowOptions options, IServiceProvider serviceProvider)
     {
@@ -39,6 +39,8 @@ internal sealed class WindowController
         // Window reference must be set before Window Subclass created
         serviceProvider.GetRequiredService<ICurrentWindowReference>().Window = window;
         subclass = new(window, options, serviceProvider);
+        windowNonRudeHWND = new(options.Hwnd);
+
         InitializeCore();
     }
 
@@ -137,27 +139,19 @@ internal sealed class WindowController
     {
         SaveOrSkipWindowSize();
         subclass?.Dispose();
+        windowNonRudeHWND?.Dispose();
     }
 
     private void ExtendsContentIntoTitleBar()
     {
-        if (options.UseLegacyDragBarImplementation)
+        AppWindowTitleBar appTitleBar = window.AppWindow.TitleBar;
-        {
+        appTitleBar.IconShowOptions = IconShowOptions.HideIconAndSystemMenu;
-            // use normal Window method to extend.
+        appTitleBar.ExtendsContentIntoTitleBar = true;
-            window.ExtendsContentIntoTitleBar = true;
-            window.SetTitleBar(options.TitleBar);
-        }
-        else
-        {
-            AppWindowTitleBar appTitleBar = window.AppWindow.TitleBar;
-            appTitleBar.IconShowOptions = IconShowOptions.HideIconAndSystemMenu;
-            appTitleBar.ExtendsContentIntoTitleBar = true;
 
-            UpdateTitleButtonColor();
+        UpdateTitleButtonColor();
-            UpdateDragRectangles();
+        UpdateDragRectangles();
-            options.TitleBar.ActualThemeChanged += (_, _) => UpdateTitleButtonColor();
+        options.TitleBar.ActualThemeChanged += (_, _) => UpdateTitleButtonColor();
-            options.TitleBar.SizeChanged += (_, _) => UpdateDragRectangles();
+        options.TitleBar.SizeChanged += (_, _) => UpdateDragRectangles();
-        }
     }
 
     private bool UpdateSystemBackdrop(BackdropType backdropType)

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

@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Win32.Foundation;
+using static Snap.Hutao.Win32.User32;
+
+namespace Snap.Hutao.Core.Windowing;
+
+internal sealed class WindowNonRudeHWND : IDisposable
+{
+    // https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/nf-shobjidl_core-itaskbarlist2-markfullscreenwindow#remarks
+    private const string NonRudeHWND = "NonRudeHWND";
+    private readonly HWND hwnd;
+
+    public WindowNonRudeHWND(HWND hwnd)
+    {
+        this.hwnd = hwnd;
+        SetPropW(hwnd, NonRudeHWND, BOOL.TRUE);
+    }
+
+    public void Dispose()
+    {
+        RemovePropW(hwnd, NonRudeHWND);
+    }
+}

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Input;
-using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Snap.Hutao.Win32.Foundation;
 using Windows.Graphics;
@@ -41,11 +40,6 @@ internal readonly struct WindowOptions
     /// </summary>
     public readonly bool PersistSize;
 
-    /// <summary>
-    /// 是否使用 Win UI 3 自带的拓展标题栏实现
-    /// </summary>
-    public readonly bool UseLegacyDragBarImplementation = !AppWindowTitleBar.IsCustomizationSupported();
-
     public WindowOptions(Window window, FrameworkElement titleBar, SizeInt32 initSize, bool persistSize = false)
     {
         Hwnd = WindowNative.GetWindowHandle(window);

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

@@ -9,7 +9,6 @@ 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;
 
@@ -20,7 +19,6 @@ namespace Snap.Hutao.Core.Windowing;
 internal sealed class WindowSubclass : IDisposable
 {
     private const int WindowSubclassId = 101;
-    private const int DragBarSubclassId = 102;
 
     private readonly Window window;
     private readonly WindowOptions options;
@@ -29,7 +27,6 @@ internal sealed class WindowSubclass : IDisposable
 
     // 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)
     {
@@ -50,26 +47,7 @@ internal sealed class WindowSubclass : IDisposable
         bool windowHooked = SetWindowSubclass(options.Hwnd, windowProc, WindowSubclassId, 0);
         hotKeyController.RegisterAll();
 
-        bool titleBarHooked = true;
+        return windowHooked;
-
-        // 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/>
@@ -79,12 +57,6 @@ internal sealed class WindowSubclass : IDisposable
 
         RemoveWindowSubclass(options.Hwnd, windowProc, WindowSubclassId);
         windowProc = default!;
-
-        if (options.UseLegacyDragBarImplementation)
-        {
-            RemoveWindowSubclass(options.Hwnd, legacyDragBarProc, DragBarSubclassId);
-            legacyDragBarProc = default!;
-        }
     }
 
     [SuppressMessage("", "SH002")]
@@ -127,19 +99,4 @@ internal sealed class WindowSubclass : IDisposable
 
         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/Extension/EnumerableExtension.List.cs

@@ -118,14 +118,6 @@ internal static partial class EnumerableExtension
         collection.RemoveAt(collection.Count - 1);
     }
 
-    /// <summary>
-    /// 转换到新类型的列表
-    /// </summary>
-    /// <typeparam name="TSource">原始类型</typeparam>
-    /// <typeparam name="TResult">新类型</typeparam>
-    /// <param name="list">列表</param>
-    /// <param name="selector">选择器</param>
-    /// <returns>新类型的列表</returns>
     [Pure]
     public static List<TResult> SelectList<TSource, TResult>(this List<TSource> list, Func<TSource, TResult> selector)
     {
@@ -200,6 +192,13 @@ internal static partial class EnumerableExtension
         return list;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
+    public static List<TSource> SortBy<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector, IComparer<TKey> comparer)
+    {
+        list.Sort((left, right) => comparer.Compare(keySelector(left), keySelector(right)));
+        return list;
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
     public static List<TSource> SortByDescending<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector)
         where TKey : IComparable
@@ -207,4 +206,11 @@ internal static partial class EnumerableExtension
         list.Sort((left, right) => keySelector(right).CompareTo(keySelector(left)));
         return list;
     }
+
+    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
+    public static List<TSource> SortByDescending<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector, IComparer<TKey> comparer)
+    {
+        list.Sort((left, right) => comparer.Compare(keySelector(right), keySelector(left)));
+        return list;
+    }
 }

src/Snap.Hutao/Snap.Hutao/Factory/ContentDialog/ContentDialogFactory.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.UI.Xaml.Controls;
 using Snap.Hutao.Core.LifeCycle;
+using Snap.Hutao.Service;
 
 namespace Snap.Hutao.Factory.ContentDialog;
 
@@ -15,6 +16,7 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory
     private readonly ICurrentWindowReference currentWindowReference;
     private readonly IServiceProvider serviceProvider;
     private readonly ITaskContext taskContext;
+    private readonly AppOptions appOptions;
 
     /// <inheritdoc/>
     public async ValueTask<ContentDialogResult> CreateForConfirmAsync(string title, string content)
@@ -27,6 +29,7 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory
             Content = content,
             DefaultButton = ContentDialogButton.Primary,
             PrimaryButtonText = SH.ContentDialogConfirmPrimaryButtonText,
+            RequestedTheme = appOptions.ElementTheme,
         };
 
         return await dialog.ShowAsync();
@@ -44,6 +47,7 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory
             DefaultButton = defaultButton,
             PrimaryButtonText = SH.ContentDialogConfirmPrimaryButtonText,
             CloseButtonText = SH.ContentDialogCancelCloseButtonText,
+            RequestedTheme = appOptions.ElementTheme,
         };
 
         return await dialog.ShowAsync();
@@ -58,6 +62,7 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory
             XamlRoot = currentWindowReference.GetXamlRoot(),
             Title = title,
             Content = new ProgressBar() { IsIndeterminate = true },
+            RequestedTheme = appOptions.ElementTheme,
         };
 
         return dialog;
@@ -69,6 +74,7 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory
         await taskContext.SwitchToMainThreadAsync();
         TContentDialog contentDialog = serviceProvider.CreateInstance<TContentDialog>(parameters);
         contentDialog.XamlRoot = currentWindowReference.GetXamlRoot();
+        contentDialog.RequestedTheme = appOptions.ElementTheme;
         return contentDialog;
     }
 
@@ -77,6 +83,7 @@ internal sealed partial class ContentDialogFactory : IContentDialogFactory
     {
         TContentDialog contentDialog = serviceProvider.CreateInstance<TContentDialog>(parameters);
         contentDialog.XamlRoot = currentWindowReference.GetXamlRoot();
+        contentDialog.RequestedTheme = appOptions.ElementTheme;
         return contentDialog;
     }
 }