impl #1334

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

@@ -18,7 +18,7 @@ body:
       options:
         - label: 我已阅读 Snap Hutao 文档中的[常见问题](https://hut.ao/advanced/FAQ.html)和[常见程序异常](https://hut.ao/advanced/exceptions.html)，我的问题没有在文档中得到解答
           required: true
-
+          
         - label: 我知道文档站的导航栏中有**搜索功能**，且已经搜索过相关关键词
           required: true
 
@@ -29,17 +29,17 @@ body:
     id: winver
     attributes:
       label: Windows 版本
-      description: |
+      description: | 
         `Win+R` 输入 `winver` 回车后在打开的窗口第二行可以找到
       placeholder: 例：22000.556
     validations:
       required: true
-
+   
   - type: input
     id: shver
     attributes:
       label: Snap Hutao 版本
-      description: 在应用标题，应用程序的反馈中心界面中可以找到
+      description: 在应用标题，应用程序的设置界面中靠下的位置可以找到
       placeholder: 例：1.4.15.0
     validations:
       required: true
@@ -48,10 +48,10 @@ body:
     id: deviceid
     attributes:
       label: 设备 ID
-      description: |
-        在胡桃工具箱的反馈中心界面，你可以找到并复制你的设备 ID
+      description: | 
+        在胡桃工具箱的设置界面，你可以找到并复制你的设备 ID
         如果你的问题涉及程序崩溃，请填写该项，这将有助于我们定位问题
-        如果你的程序已经无法启动，请下载并运行[诊断工具](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.Diagnostic.Tooling.exe)，它将显示你的设备 ID
+        如果你的程序已经无法启动，请下载并运行[诊断工具](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.DiagTools.exe)，它将显示你的设备 ID
     validations:
       required: false
 
@@ -79,7 +79,7 @@ body:
         - 公告
         - 其它
     validations:
-      required: true
+      required: true   
 
   - type: textarea
     id: what-happened
@@ -107,3 +107,4 @@ body:
       options:
         - label: 我认为上述的描述已经足以详细，以允许开发人员能复现该问题
           required: true
+      

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

@@ -18,7 +18,7 @@ body:
       options:
         - label: I have read [FAQ page](https://hut.ao/advanced/FAQ.html) and [Exception page](https://hut.ao/advanced/exceptions.html) in Snap Hutao document, and my issue is not answered
           required: true
-
+          
         - label: I and tried **search feature** in Snap Hutao document site, and no associated article
           required: true
 
@@ -29,12 +29,12 @@ body:
     id: winver
     attributes:
       label: Windows Version
-      description: |
+      description: | 
         Use `Win+R` and input `winver`, Windows build version is usually at the second line
       placeholder: e.g. 22000.556
     validations:
       required: true
-
+   
   - type: input
     id: shver
     attributes:
@@ -48,10 +48,10 @@ body:
     id: deviceid
     attributes:
       label: Device ID
-      description: |
-        In Snap Hutao's Feedback Center, you can find and copy your device ID
+      description: | 
+        In Snap Hutao's settings page, you can find and copy your device ID
         If your issue is about program crash, please fill this so we can dump the log and locate the source easier
-        If your program cannot startup, please download and run [Diagnostic Tooling](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.Diagnostic.Tooling.exe), it will shows your device ID.
+        If your program cannot startup, please download and run [Diagnosis Tool](https://github.com/DGP-Automation/ISSUE_TEMPLATES/releases/download/diagnosis_tools/Snap.Hutao.DiagTools.exe), it will shows your device ID.
     validations:
       required: false
 
@@ -74,12 +74,12 @@ body:
         - User Interface
         - Snap Hutao Cloud
         - Snap Hutao Account
-        - Checkin
+        - Checkin        
         - Wiki
         - Announcement
         - Other
     validations:
-      required: true
+      required: true   
 
   - type: textarea
     id: what-happened
@@ -107,3 +107,4 @@ body:
       options:
         - label: I believe the description above is detail enough to allow developers to reproduce the issue
           required: true
+      

.github/dependabot.yml

@@ -13,8 +13,4 @@ updates:
     groups:
       packages:
         patterns:
-          - "*"
-  - package-ecosystem: "github-actions"
-    directory: "/.github/workflows" # GitHub Workflows
-    schedule:
-      interval: "weekly"
+          - "*"

.github/workflows/alpha.yml

@@ -13,28 +13,16 @@ on:
       - '**.md'
       - 'LICENSE'
       - '**.yml'
-  pull_request:
-    branches:
-      - develop
-    paths-ignore:
-      - '.gitattributes'
-      - '.github/**'
-      - '.gitignore'
-      - '.gitmodules'
-      - '**.md'
-      - 'LICENSE'
-      - '**.yml'
-      - '**.resx'
 
 jobs:
   build:
     runs-on: self-hosted
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.1.1
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 8.0
 
@@ -46,21 +34,20 @@ jobs:
           VERSION_API_TOKEN: ${{ secrets.VERSION_API_TOKEN }}
 
       - name: Sign Msix
-        if: success() && github.event_name != 'pull_request'
         shell: pwsh
         run: |
           [System.Convert]::FromBase64String("${{ secrets.CERTIFICATE }}") | Set-Content -AsByteStream temp.pfx
           signtool.exe sign /debug /v /a /fd SHA256 /f temp.pfx /p ${{ secrets.PW }} ${{ github.workspace }}\src\output\Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}.msix
 
       - name: Upload signed msix
-        if: success() && github.event_name != 'pull_request'
-        uses: actions/upload-artifact@v4
+        if: success()
+        uses: actions/upload-artifact@v3
         with:
           name: Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}
           path: ${{ github.workspace }}/src/output/Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}.msix
 
       - name: Add summary
-        if: success() && github.event_name != 'pull_request'
+        if: success()
         shell: pwsh
         run: |
           $summary = "

.github/workflows/close_stale.yml

@@ -1,16 +0,0 @@
-name: 'Close stale issues and PRs'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v9
-        with:
-          any-of-labels: 'needs-more-info,需要更多信息'
-          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 3 days.'
-          days-before-stale: 7
-          days-before-close: 3
-          close-issue-reason: not_planned

.github/workflows/issue_similarity.yml

@@ -1,20 +0,0 @@
-name: Issues Similarity Analysis
-
-on:
-  issues:
-    types: [opened, edited]
-
-jobs:
-  similarity-analysis:
-    runs-on: ubuntu-latest
-    steps:
-      - name: analysis
-        uses: actions-cool/issues-similarity-analysis@v1
-        with:
-          filter-threshold: 0.5
-          comment-title: '### Probable Similar Topics'
-          title-excludes: '[Publish]:,[Bug]:,[Feat]:,[Network]:,[ENG]'
-          comment-body: '${index}. ${similarity} #${number}'
-          show-footer: false
-          show-mentioned: true
-          since-days: 365

.github/workflows/lock_closed_issues.yml

@@ -1,26 +0,0 @@
-name: 'Lock Threads'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-  pull-requests: write
-  discussions: write
-
-concurrency:
-  group: lock-threads
-
-jobs:
-  action:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v5
-        with:
-          issue-inactive-days: '30'
-          issue-comment: 'This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related topic.'
-          issue-lock-reason: 'resolved'
-          process-only: 'issues'
-          log-output: false

.gitlab-ci.yml

@@ -74,4 +74,3 @@ Refresh:
   script:
     - apt-get install -y curl
     - curl -X PATCH "$PURGE_URL"
-    - curl -X POST -o /dev/null "$UPLOAD_OSS_URL"

README.md

@@ -35,8 +35,7 @@ Install with Snap Hutao MSIX package, can be installed with Windows built-in App
 
 * [向我们提交 PR / Make Pull Requests](https://github.com/DGP-Studio/Snap.Hutao/pulls)
 * [在 Crowdin 上进行本地化 / Translate Project on Crowdin](https://translate.hut.ao/)
-* [为我们更新文档 / Enhance our Document](https://github.com/DGP-Studio/Snap.Hutao.Docs)
-* [帮助我们测试程序 / Test Binary Package](https://hut.ao/development/contribute.html)
+* [为我们更新文档 / Enhance our Document ](https://github.com/DGP-Studio/Snap.Hutao.Docs)
 
 ## 特别感谢 / Special Thanks
 

azure-pipelines.yml

@@ -0,0 +1,119 @@
+# CI process script for Snap.Hutao
+# Usage:
+# 1. Append the script in Pipelines
+# 2. Upload the pfx and cer certificates to Pipelines Library secrets
+# 3. Permit the pfx usage
+# 4. Add a `pw` variable in the script variables, which is pfx password
+# 5. Connect the GitHub in project settings
+# 6. Run
+
+trigger: none
+pr: none
+# trigger:
+#   branches:
+#     include:
+#     - main
+#     - develop
+#   paths:
+#     exclude:
+#     - README.md
+#     - azure-pipelines.yml
+#     - .github/ISSUE_TEMPLATE/*.yml
+#     - .github/workflows/*.yml
+#     - src/Snap.Hutao/Snap.Hutao/Resource/Localization/*.resx
+# pr:
+#   branches:
+#    include:
+#    - main
+#   paths:
+#    exclude:
+#      - README.md
+#      - azure-pipelines.yml
+#      - .github/ISSUE_TEMPLATE/*.yml
+#      - .github/workflows/*.yml
+#      - src/Snap.Hutao/Snap.Hutao/Resource/Localization/*.resx
+
+
+pool:
+  name: Default
+  demands: agent.name -equals Hutao-Server
+
+variables:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  solution: '$(Build.SourcesDirectory)/src/Snap.Hutao/Snap.Hutao.sln'
+  project: $(Build.SourcesDirectory)/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj'
+  buildPlatform: 'x64'
+  buildConfiguration: 'Release'
+
+
+steps:
+- task: UseDotNet@2
+  displayName: Install dotNet
+  inputs:
+    packageType: 'sdk'
+    version: '8.x'
+    includePreviewVersions: true
+
+- task: CmdLine@2
+  displayName: dotnet cake
+  inputs:
+    script: dotnet tool restore && dotnet cake
+
+- task: MsixSigning@1
+  name: signMsix
+  displayName: Sign MSIX package
+  inputs:
+    package: '$(Build.ArtifactStagingDirectory)/Snap.Hutao.Alpha-$(version).msix'
+    certificate: 'DGP_Studio_CI.pfx'
+    passwordVariable: 'pw'
+  condition: succeeded()
+
+- task: DownloadSecureFile@1
+  name: cerFile
+  displayName: Download Root CA
+  inputs:
+    secureFile: 'Snap.Hutao.CI.cer'
+
+- task: PublishPipelineArtifact@1
+  inputs:
+    targetPath: '$(Build.ArtifactStagingDirectory)'
+    artifact: 'Snap.Hutao.Alpha-$(version).msix'
+    publishLocation: 'pipeline'
+
+#- task: GitHubRelease@1
+#  inputs:
+#    gitHubConnection: 'github.com_Masterain'
+#    repositoryName: 'DGP-Automation/Hutao-Auto-Release'
+#    action: 'create'
+#    target: '$(Build.SourceVersion)'
+#    tagSource: 'userSpecifiedTag'
+#    tag: '$(version)'
+#    title: '$(version)'
+#    releaseNotesSource: 'inline'
+#    releaseNotesInline: |
+#      ## 普通用户请勿下载
+#      该版本是由 CI 程序自动打包生成的 `Alpha` 测试版本，**仅供开发者测试使用**
+#
+#      普通用户请[点击这里](https://github.com/DGP-Studio/Snap.Hutao/releases/latest/)下载最新的稳定版本
+#
+#    assets: |
+#      $(Build.ArtifactStagingDirectory)/*
+#      $(cerFile.secureFilePath)
+#    isPreRelease: true
+#    changeLogCompareToRelease: 'lastFullRelease'
+#    changeLogType: 'commitBased'
+
+
+- task: rclone@1
+  displayName: Upload CI via Rclone
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+  inputs:
+    arguments: 'copy $(Build.ArtifactStagingDirectory)/Snap.Hutao.Alpha-$(version).msix downloadDGPCN:/releases/Alpha/'
+    configPath: 'C:\agent\_work\_tasks\rclone.conf'
+
+- task: rclone@1
+  displayName: Upload PR CI via Rclone
+  condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
+  inputs:
+    arguments: 'copy $(Build.ArtifactStagingDirectory)/Snap.Hutao.Alpha-$(version).msix downloadDGPCN:/releases/PR/'
+    configPath: 'C:\agent\_work\_tasks\rclone.conf'

build.cake

@@ -1,5 +1,5 @@
-#tool "nuget:?package=nuget.commandline&version=6.9.1"
-#addin nuget:?package=Cake.Http&version=4.0.0
+#tool "nuget:?package=nuget.commandline&version=6.5.0"
+#addin nuget:?package=Cake.Http&version=3.0.2
 
 var target = Argument("target", "Build");
 var configuration = Argument("configuration", "Release");
@@ -28,33 +28,43 @@ string manifest
     get => System.IO.Path.Combine(repoDir, "src", "Snap.Hutao", "Snap.Hutao", "Package.appxmanifest");
 }
 
-if (GitHubActions.IsRunningOnGitHubActions)
+if (AzurePipelines.IsRunningOnAzurePipelines)
+{
+    repoDir = AzurePipelines.Environment.Build.SourcesDirectory.FullPath;
+    outputPath = AzurePipelines.Environment.Build.ArtifactStagingDirectory.FullPath;
+
+    var versionAuth = HasEnvironmentVariable("VERSION_API_TOKEN") ? EnvironmentVariable("VERSION_API_TOKEN") : throw new Exception("Cannot find VERSION_API_TOKEN");
+    version = HttpGet(
+        "https://internal.snapgenshin.cn/BuildIntergration/RequestNewVersion",
+        new HttpSettings
+        {
+            Headers = new Dictionary<string, string>
+                {
+                    { "Authorization", versionAuth }
+                }
+        }
+    );
+    Information($"Version: {version}");
+
+    AzurePipelines.Commands.SetVariable("version", version);
+}
+else if (GitHubActions.IsRunningOnGitHubActions)
 {
     repoDir = GitHubActions.Environment.Workflow.Workspace.FullPath;
     outputPath = System.IO.Path.Combine(repoDir, "src", "output");
 
-    if (GitHubActions.Environment.PullRequest.IsPullRequest)
-    {
-        version = System.DateTime.Now.ToString("yyyy.M.d.0");
-
-        Information("Is Pull Request. Skip version.");
-    }
-    else
-    {
-        var versionAuth = HasEnvironmentVariable("VERSION_API_TOKEN") ? EnvironmentVariable("VERSION_API_TOKEN") : throw new Exception("Cannot find VERSION_API_TOKEN");
-        version = HttpGet(
-            "https://internal.snapgenshin.cn/BuildIntergration/RequestNewVersion",
-            new HttpSettings
-            {
-                Headers = new Dictionary<string, string>
-                    {
+    var versionAuth = HasEnvironmentVariable("VERSION_API_TOKEN") ? EnvironmentVariable("VERSION_API_TOKEN") : throw new Exception("Cannot find VERSION_API_TOKEN");
+    version = HttpGet(
+        "https://internal.snapgenshin.cn/BuildIntergration/RequestNewVersion",
+        new HttpSettings
+        {
+            Headers = new Dictionary<string, string>
+                {
                     { "Authorization", versionAuth }
-                    }
-            }
-        );
-
-        Information($"Version: {version}");
-    }
+                }
+        }
+    );
+    Information($"Version: {version}");
 
     GitHubActions.Commands.SetOutputParameter("version", version);
 }
@@ -69,15 +79,6 @@ else if (AppVeyor.IsRunningOnAppVeyor)
     })[..^2];
     Information($"Version: {version}");
 }
-else // Local
-{
-    repoDir = System.Environment.CurrentDirectory;
-    outputPath = System.IO.Path.Combine(repoDir, "src", "output");
-
-    version = System.DateTime.Now.ToString("yyyy.M.d.") + ((int)((System.DateTime.Now - System.DateTime.Today).TotalSeconds / 86400 * 65535)).ToString();
-
-    Information($"Version: {version}");
-}
 
 Task("Build")
     .IsDependentOn("Build binary package")
@@ -105,7 +106,7 @@ Task("Generate AppxManifest")
 
     var content = System.IO.File.ReadAllText(manifest);
 
-    if (GitHubActions.IsRunningOnGitHubActions)
+    if (AzurePipelines.IsRunningOnAzurePipelines || GitHubActions.IsRunningOnGitHubActions)
     {
         Information("Using CI configuraion");
         content = content
@@ -121,17 +122,6 @@ Task("Generate AppxManifest")
         Information("Using Release configuration");
         content = System.Text.RegularExpressions.Regex.Replace(content, "  Publisher=\"([^\"]*)\"", "  Publisher=\"CN=SignPath Foundation, O=SignPath Foundation, L=Lewes, S=Delaware, C=US\"");
     }
-    else
-    {
-        Information("Using Local configuration.");
-        content = content
-            .Replace("Snap Hutao", "Snap Hutao Local")
-            .Replace("胡桃", "胡桃 Local")
-            .Replace("DGP Studio", "DGP Studio CI");
-        content = System.Text.RegularExpressions.Regex.Replace(content, "  Name=\"([^\"]*)\"", "  Name=\"E8B6E2B3-D2A0-4435-A81D-2A16AAF405C7\"");
-        content = System.Text.RegularExpressions.Regex.Replace(content, "  Publisher=\"([^\"]*)\"", "  Publisher=\"E=admin@dgp-studio.cn, CN=DGP Studio CI, OU=CI, O=DGP-Studio, L=San Jose, S=CA, C=US\"");
-        content = System.Text.RegularExpressions.Regex.Replace(content, "  Version=\"([0-9\\.]+)\"", $"  Version=\"{version}\"");
-    }
 
     System.IO.File.WriteAllText(manifest, content);
 
@@ -185,7 +175,7 @@ Task("Build MSIX")
     .Does(() =>
 {
     var arguments = "arguments";
-    if (GitHubActions.IsRunningOnGitHubActions)
+    if (AzurePipelines.IsRunningOnAzurePipelines || GitHubActions.IsRunningOnGitHubActions)
     {
         arguments = "pack /d " + binPath + " /p " + System.IO.Path.Combine(outputPath, $"Snap.Hutao.Alpha-{version}.msix");
     }
@@ -193,10 +183,6 @@ Task("Build MSIX")
     {
         arguments = "pack /d " + binPath + " /p " + System.IO.Path.Combine(outputPath, $"Snap.Hutao-{version}.msix");
     }
-    else
-    {
-        arguments = "pack /d " + binPath + " /p " + System.IO.Path.Combine(outputPath, $"Snap.Hutao.Local-{version}.msix");
-    }
     var p = StartProcess(
         "makeappx.exe",
         new ProcessSettings

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
@@ -12,10 +12,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

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

@@ -6,7 +6,6 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources/>
-                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenizingTextBox/TokenizingTextBox.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Loading.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Image/CachedImage.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Card.xaml"/>
@@ -23,13 +22,10 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/PageOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/PivotOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/ScrollViewer.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/SegmentedOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/SettingsStyle.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Theme/Thickness.xaml"/>
                 <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/Control/Animation/ControlAnimationConstants.cs

@@ -23,12 +23,10 @@ internal static class ControlAnimationConstants
     /// <summary>
     /// 图像淡入
     /// </summary>
-    public static readonly TimeSpan ImageScaleFadeIn = TimeSpan.FromSeconds(0.3);
+    public static readonly TimeSpan ImageFadeIn = TimeSpan.FromSeconds(0.3);
 
     /// <summary>
     /// 图像淡出
     /// </summary>
-    public static readonly TimeSpan ImageScaleFadeOut = TimeSpan.FromSeconds(0.2);
-
-    public static readonly TimeSpan ImageOpacityFadeInOut = TimeSpan.FromSeconds(1);
+    public static readonly TimeSpan ImageFadeOut = TimeSpan.FromSeconds(0.2);
 }

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

@@ -1,79 +0,0 @@
-// 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;
-
-namespace Snap.Hutao.Control.AutoSuggestBox;
-
-[DependencyProperty("FilterCommand", typeof(ICommand))]
-[DependencyProperty("FilterCommandParameter", typeof(object))]
-[DependencyProperty("AvailableTokens", typeof(IReadOnlyDictionary<string, SearchToken>))]
-internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
-{
-    public AutoSuggestTokenBox()
-    {
-        DefaultStyleKey = typeof(TokenizingTextBox);
-        TextChanged += OnFilterSuggestionRequested;
-        QuerySubmitted += OnQuerySubmitted;
-        TokenItemAdding += OnTokenItemAdding;
-        TokenItemAdded += OnTokenItemModified;
-        TokenItemRemoved += OnTokenItemModified;
-        Loaded += OnLoaded;
-    }
-
-    private void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        if (this.FindDescendant("SuggestionsPopup") is Popup { Child: Border { Child: ListView listView } border })
-        {
-            IAppResourceProvider appResourceProvider = Ioc.Default.GetRequiredService<IAppResourceProvider>();
-            listView.Background = null;
-            listView.Margin = appResourceProvider.GetResource<Thickness>("AutoSuggestListPadding");
-
-            border.Background = appResourceProvider.GetResource<Microsoft.UI.Xaml.Media.Brush>("AutoSuggestBoxSuggestionsListBackground");
-            border.CornerRadius = new(0, 0, 8, 8);
-        }
-    }
-
-    private void OnFilterSuggestionRequested(Microsoft.UI.Xaml.Controls.AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
-    {
-        if (string.IsNullOrWhiteSpace(Text))
-        {
-            return;
-        }
-
-        if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
-        {
-            sender.ItemsSource = AvailableTokens.Values.Where(q => q.Value.Contains(Text, StringComparison.OrdinalIgnoreCase));
-        }
-    }
-
-    private void OnQuerySubmitted(Microsoft.UI.Xaml.Controls.AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
-    {
-        if (args.ChosenSuggestion is not null)
-        {
-            return;
-        }
-
-        CommandInvocation.TryExecute(FilterCommand, FilterCommandParameter);
-    }
-
-    private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
-    {
-        if (string.IsNullOrWhiteSpace(args.TokenText))
-        {
-            return;
-        }
-
-        args.Item = AvailableTokens.GetValueOrDefault(args.TokenText) ?? new SearchToken(SearchTokenKind.None, args.TokenText);
-    }
-
-    private void OnTokenItemModified(TokenizingTextBox sender, object args)
-    {
-        CommandInvocation.TryExecute(FilterCommand, FilterCommandParameter);
-    }
-}

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

@@ -1,33 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Windows.UI;
-
-namespace Snap.Hutao.Control.AutoSuggestBox;
-
-internal sealed class SearchToken
-{
-    public SearchToken(SearchTokenKind kind, string value, Uri? iconUri = null, Uri? sideIconUri = null, Color? quality = null)
-    {
-        Value = value;
-        Kind = kind;
-        IconUri = iconUri;
-        SideIconUri = sideIconUri;
-        Quality = quality;
-    }
-
-    public SearchTokenKind Kind { get; }
-
-    public string Value { get; set; } = default!;
-
-    public Uri? IconUri { get; }
-
-    public Uri? SideIconUri { get; }
-
-    public Color? Quality { get; }
-
-    public override string ToString()
-    {
-        return Value;
-    }
-}

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

@@ -1,17 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.AutoSuggestBox;
-
-internal enum SearchTokenKind
-{
-    None,
-    AssociationType,
-    Avatar,
-    BodyType,
-    ElementName,
-    FightProperty,
-    ItemQuality,
-    Weapon,
-    WeaponType,
-}

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

@@ -3,7 +3,6 @@
 
 using CommunityToolkit.WinUI.Behaviors;
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.Control.Behavior;
 
@@ -46,6 +45,10 @@ internal sealed partial class InvokeCommandOnLoadedBehavior : BehaviorBase<UIEle
             return;
         }
 
-        executed = Command.TryExecute(CommandParameter);
+        if (Command is not null && Command.CanExecute(CommandParameter))
+        {
+            Command.Execute(CommandParameter);
+            executed = true;
+        }
     }
 }

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

@@ -1,87 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using CommunityToolkit.WinUI.Behaviors;
-using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
-
-namespace Snap.Hutao.Control.Behavior;
-
-[DependencyProperty("Period", typeof(TimeSpan))]
-[DependencyProperty("Command", typeof(ICommand))]
-[DependencyProperty("CommandParameter", typeof(object))]
-internal sealed partial class PeriodicInvokeCommandOrOnActualThemeChangedBehavior : BehaviorBase<FrameworkElement>, IDisposable
-{
-    private TaskCompletionSource acutalThemeChangedTaskCompletionSource = new();
-    private CancellationTokenSource periodicTimerCancellationTokenSource = new();
-
-    public void Dispose()
-    {
-        periodicTimerCancellationTokenSource.Dispose();
-    }
-
-    protected override bool Initialize()
-    {
-        AssociatedObject.ActualThemeChanged += OnActualThemeChanged;
-        return true;
-    }
-
-    protected override void OnAssociatedObjectLoaded()
-    {
-        RunCoreAsync().SafeForget();
-    }
-
-    protected override bool Uninitialize()
-    {
-        AssociatedObject.ActualThemeChanged -= OnActualThemeChanged;
-        return true;
-    }
-
-    private void OnActualThemeChanged(FrameworkElement sender, object args)
-    {
-        acutalThemeChangedTaskCompletionSource.TrySetResult();
-        periodicTimerCancellationTokenSource.Cancel();
-    }
-
-    private void TryExecuteCommand()
-    {
-        if (AssociatedObject is null)
-        {
-            return;
-        }
-
-        Command.TryExecute(CommandParameter);
-    }
-
-    private async ValueTask RunCoreAsync()
-    {
-        using (PeriodicTimer timer = new(Period))
-        {
-            do
-            {
-                if (!IsAttached)
-                {
-                    break;
-                }
-
-                ITaskContext taskContext = Ioc.Default.GetRequiredService<ITaskContext>();
-                await taskContext.SwitchToMainThreadAsync();
-                TryExecuteCommand();
-
-                await taskContext.SwitchToBackgroundAsync();
-                try
-                {
-                    Task nextTickTask = timer.WaitForNextTickAsync(periodicTimerCancellationTokenSource.Token).AsTask();
-                    await Task.WhenAny(nextTickTask, acutalThemeChangedTaskCompletionSource.Task).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                }
-
-                acutalThemeChangedTaskCompletionSource = new();
-                periodicTimerCancellationTokenSource = new();
-            }
-            while (true);
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Brush/ColorSegmentCollection.cs

@@ -1,8 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Brush;
-
-internal sealed class ColorSegmentCollection : List<IColorSegment>
-{
-}

src/Snap.Hutao/Snap.Hutao/Control/Brush/IColorSegment.cs

@@ -9,5 +9,5 @@ internal interface IColorSegment
 {
     Color Color { get; }
 
-    double Value { get; set; }
+    double Value { get; }
 }

src/Snap.Hutao/Snap.Hutao/Control/Brush/SegmentedBar.cs

@@ -9,48 +9,36 @@ using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Control.Brush;
 
-[DependencyProperty("Source", typeof(ColorSegmentCollection), default!, nameof(OnSourceChanged))]
+[DependencyProperty("Source", typeof(List<IColorSegment>), default!, nameof(OnSourceChanged))]
 internal sealed partial class SegmentedBar : ContentControl
 {
     private readonly LinearGradientBrush brush = new() { StartPoint = new(0, 0), EndPoint = new(1, 0), };
 
     public SegmentedBar()
     {
-        HorizontalContentAlignment = HorizontalAlignment.Stretch;
-        VerticalContentAlignment = VerticalAlignment.Stretch;
-
         Content = new Rectangle()
         {
             Fill = brush,
-            HorizontalAlignment = HorizontalAlignment.Stretch,
-            VerticalAlignment = VerticalAlignment.Stretch,
         };
     }
 
     private static void OnSourceChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
     {
-        UpdateLinearGradientBrush((SegmentedBar)obj);
-    }
+        SegmentedBar segmentedBar = (SegmentedBar)obj;
 
-    private static void UpdateLinearGradientBrush(SegmentedBar segmentedBar)
-    {
         GradientStopCollection collection = segmentedBar.brush.GradientStops;
         collection.Clear();
 
-        ColorSegmentCollection segmentCollection = segmentedBar.Source;
-
-        double total = segmentCollection.Sum(seg => seg.Value);
-        if (total is 0D)
+        if (args.NewValue as List<IColorSegment> is [_, ..] list)
         {
-            return;
-        }
-
-        double offset = 0;
-        foreach (ref readonly IColorSegment segment in CollectionsMarshal.AsSpan(segmentCollection))
-        {
-            collection.Add(new() { Color = segment.Color, Offset = offset, });
-            offset += segment.Value / total;
-            collection.Add(new() { Color = segment.Color, Offset = offset, });
+            double total = list.Sum(seg => seg.Value);
+            double offset = 0;
+            foreach (ref readonly IColorSegment segment in CollectionsMarshal.AsSpan(list))
+            {
+                collection.Add(new() { Color = segment.Color, Offset = offset, });
+                offset += segment.Value / total;
+                collection.Add(new() { Color = segment.Color, Offset = offset, });
+            }
         }
     }
 }

src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs

@@ -1,763 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using CommunityToolkit.WinUI.Collections;
-using CommunityToolkit.WinUI.Helpers;
-using Microsoft.UI.Xaml.Data;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using NotifyCollectionChangedAction = System.Collections.Specialized.NotifyCollectionChangedAction;
-
-namespace Snap.Hutao.Control.Collection.AdvancedCollectionView;
-
-internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, INotifyPropertyChanged, ISupportIncrementalLoading, IComparer<object>
-    where T : class
-{
-    private readonly List<T> view;
-    private readonly ObservableCollection<SortDescription> sortDescriptions;
-    private readonly Dictionary<string, PropertyInfo?> sortProperties;
-    private readonly bool liveShapingEnabled;
-    private readonly HashSet<string?> observedFilterProperties = [];
-
-    private IList<T> source;
-    private Predicate<T>? filter;
-    private int deferCounter;
-    private WeakEventListener<AdvancedCollectionView<T>, object?, NotifyCollectionChangedEventArgs>? sourceWeakEventListener;
-
-    public AdvancedCollectionView()
-        : this(new List<T>(0))
-    {
-    }
-
-    public AdvancedCollectionView(IList<T> source, bool isLiveShaping = false)
-    {
-        liveShapingEnabled = isLiveShaping;
-        view = [];
-        sortDescriptions = [];
-        sortDescriptions.CollectionChanged += SortDescriptionsCollectionChanged;
-        sortProperties = [];
-        Source = source;
-    }
-
-    public event EventHandler<object>? CurrentChanged;
-
-    public event CurrentChangingEventHandler? CurrentChanging;
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    public event VectorChangedEventHandler<object>? VectorChanged;
-
-    public IList<T> Source
-    {
-        get => source;
-
-        [MemberNotNull(nameof(source))]
-        set
-        {
-            if (ReferenceEquals(source, value))
-            {
-                return;
-            }
-
-            if (source is not null)
-            {
-                DetachPropertyChangedHandler(source);
-            }
-
-            source = value;
-            AttachPropertyChangedHandler(source);
-
-            sourceWeakEventListener?.Detach();
-
-            if (source is INotifyCollectionChanged sourceNotifyCollectionChanged)
-            {
-                sourceWeakEventListener = new WeakEventListener<AdvancedCollectionView<T>, object?, NotifyCollectionChangedEventArgs>(this)
-                {
-                    // Call the actual collection changed event
-                    OnEventAction = (source, changed, arg3) => SourceNotifyCollectionChangedCollectionChanged(source, arg3),
-
-                    // The source doesn't exist anymore
-                    OnDetachAction = (listener) =>
-                    {
-                        ArgumentNullException.ThrowIfNull(sourceWeakEventListener);
-                        sourceNotifyCollectionChanged.CollectionChanged -= sourceWeakEventListener.OnEvent;
-                    },
-                };
-                sourceNotifyCollectionChanged.CollectionChanged += sourceWeakEventListener.OnEvent;
-            }
-
-            HandleSourceChanged();
-            OnPropertyChanged();
-        }
-    }
-
-    public int Count
-    {
-        get => view.Count;
-    }
-
-    public bool IsReadOnly
-    {
-        get => source is null || source.IsReadOnly;
-    }
-
-    public IObservableVector<object> CollectionGroups
-    {
-        get => default!;
-    }
-
-    public T? CurrentItem
-    {
-        get => CurrentPosition > -1 && CurrentPosition < view.Count ? view[CurrentPosition] : default;
-        set => MoveCurrentTo(value);
-    }
-
-    public int CurrentPosition { get; private set; }
-
-    public bool HasMoreItems
-    {
-        get => source is ISupportIncrementalLoading { HasMoreItems: true };
-    }
-
-    public bool IsCurrentAfterLast
-    {
-        get => CurrentPosition >= view.Count;
-    }
-
-    public bool IsCurrentBeforeFirst
-    {
-        get => CurrentPosition < 0;
-    }
-
-    public bool CanFilter
-    {
-        get => true;
-    }
-
-    public Predicate<T>? Filter
-    {
-        get => filter;
-        set
-        {
-            if (filter == value)
-            {
-                return;
-            }
-
-            filter = value;
-            HandleFilterChanged();
-        }
-    }
-
-    public bool CanSort
-    {
-        get => true;
-    }
-
-    public IList<SortDescription> SortDescriptions
-    {
-        get => sortDescriptions;
-    }
-
-    public IEnumerable<T> SourceCollection
-    {
-        get => source;
-    }
-
-    public IReadOnlyList<T> View
-    {
-        get => view;
-    }
-
-    public T this[int index]
-    {
-        get => view[index];
-        set => view[index] = value;
-    }
-
-    public void Refresh()
-    {
-        HandleSourceChanged();
-    }
-
-    public void RefreshFilter()
-    {
-        HandleFilterChanged();
-    }
-
-    public void RefreshSorting()
-    {
-        HandleSortChanged();
-    }
-
-    public IEnumerator<T> GetEnumerator()
-    {
-        return view.GetEnumerator();
-    }
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-        return view.GetEnumerator();
-    }
-
-    public void Add(T item)
-    {
-        source.Add(item);
-    }
-
-    public void Clear()
-    {
-        source.Clear();
-    }
-
-    public bool Contains(T item)
-    {
-        return view.Contains(item);
-    }
-
-    public void CopyTo(T[] array, int arrayIndex)
-    {
-        view.CopyTo(array, arrayIndex);
-    }
-
-    public bool Remove(T item)
-    {
-        source.Remove(item);
-        return true;
-    }
-
-    [SuppressMessage("", "SH007")]
-    public int IndexOf(T? item)
-    {
-        return view.IndexOf(item!);
-    }
-
-    public void Insert(int index, T item)
-    {
-        source.Insert(index, item);
-    }
-
-    public void RemoveAt(int index)
-    {
-        Remove(view[index]);
-    }
-
-    public bool MoveCurrentTo(T? item)
-    {
-        return (item is not null && item.Equals(CurrentItem)) || MoveCurrentToIndex(IndexOf(item));
-    }
-
-    public bool MoveCurrentToPosition(int index)
-    {
-        return MoveCurrentToIndex(index);
-    }
-
-    public bool MoveCurrentToFirst()
-    {
-        return MoveCurrentToIndex(0);
-    }
-
-    public bool MoveCurrentToLast()
-    {
-        return MoveCurrentToIndex(view.Count - 1);
-    }
-
-    public bool MoveCurrentToNext()
-    {
-        return MoveCurrentToIndex(CurrentPosition + 1);
-    }
-
-    public bool MoveCurrentToPrevious()
-    {
-        return MoveCurrentToIndex(CurrentPosition - 1);
-    }
-
-    public IAsyncOperation<LoadMoreItemsResult>? LoadMoreItemsAsync(uint count)
-    {
-        return (source as ISupportIncrementalLoading)?.LoadMoreItemsAsync(count);
-    }
-
-    public void ObserveFilterProperty(string propertyName)
-    {
-        observedFilterProperties.Add(propertyName);
-    }
-
-    public void ClearObservedFilterProperties()
-    {
-        observedFilterProperties.Clear();
-    }
-
-    public IDisposable DeferRefresh()
-    {
-        return new NotificationDeferrer(this);
-    }
-
-    int IComparer<object>.Compare(object? x, object? y)
-    {
-        if (sortProperties.Count <= 0)
-        {
-            Type listType = source.GetType();
-            Type? type;
-
-            if (listType.IsGenericType)
-            {
-                type = listType.GetGenericArguments()[0];
-            }
-            else
-            {
-                type = x?.GetType();
-            }
-
-            foreach (SortDescription sd in sortDescriptions)
-            {
-                if (!string.IsNullOrEmpty(sd.PropertyName))
-                {
-                    sortProperties[sd.PropertyName] = type?.GetProperty(sd.PropertyName);
-                }
-            }
-        }
-
-        foreach (SortDescription sd in sortDescriptions)
-        {
-            object? cx, cy;
-
-            if (string.IsNullOrEmpty(sd.PropertyName))
-            {
-                cx = x;
-                cy = y;
-            }
-            else
-            {
-                PropertyInfo? pi = sortProperties[sd.PropertyName];
-
-                cx = pi?.GetValue(x);
-                cy = pi?.GetValue(y);
-            }
-
-            int cmp = sd.Comparer.Compare(cx, cy);
-
-            if (cmp is not 0)
-            {
-                return sd.Direction is SortDirection.Ascending ? +cmp : -cmp;
-            }
-        }
-
-        return 0;
-    }
-
-    internal void OnPropertyChanged([CallerMemberName] string propertyName = default!)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
-
-    private void ItemOnPropertyChanged(object? item, PropertyChangedEventArgs e)
-    {
-        if (!liveShapingEnabled)
-        {
-            return;
-        }
-
-        ArgumentNullException.ThrowIfNull(item);
-        T typedItem = (T)item;
-
-        bool? filterResult = filter?.Invoke(typedItem);
-
-        if (filterResult.HasValue && observedFilterProperties.Contains(e.PropertyName))
-        {
-            int viewIndex = view.IndexOf(typedItem);
-            if (viewIndex != -1 && !filterResult.Value)
-            {
-                RemoveFromView(viewIndex, typedItem);
-            }
-            else if (viewIndex == -1 && filterResult.Value)
-            {
-                int index = source.IndexOf(typedItem);
-                HandleItemAdded(index, typedItem);
-            }
-        }
-
-        if ((filterResult ?? true) && SortDescriptions.Any(sd => sd.PropertyName == e.PropertyName))
-        {
-            int oldIndex = view.IndexOf(typedItem);
-
-            // Check if item is in view:
-            if (oldIndex < 0)
-            {
-                return;
-            }
-
-            view.RemoveAt(oldIndex);
-            int targetIndex = view.BinarySearch(typedItem, this);
-            if (targetIndex < 0)
-            {
-                targetIndex = ~targetIndex;
-            }
-
-            // Only trigger expensive UI updates if the index really changed:
-            if (targetIndex != oldIndex)
-            {
-                OnVectorChanged(new VectorChangedEventArgs(CollectionChange.ItemRemoved, oldIndex, typedItem));
-
-                view.Insert(targetIndex, typedItem);
-
-                OnVectorChanged(new VectorChangedEventArgs(CollectionChange.ItemInserted, targetIndex, typedItem));
-            }
-            else
-            {
-                view.Insert(targetIndex, typedItem);
-            }
-        }
-        else if (string.IsNullOrEmpty(e.PropertyName))
-        {
-            HandleSourceChanged();
-        }
-    }
-
-    private void AttachPropertyChangedHandler(IEnumerable items)
-    {
-        if (!liveShapingEnabled || items is null)
-        {
-            return;
-        }
-
-        foreach (object item in items)
-        {
-            if (item is INotifyPropertyChanged notifyPropertyChanged)
-            {
-                notifyPropertyChanged.PropertyChanged += ItemOnPropertyChanged;
-            }
-        }
-    }
-
-    private void DetachPropertyChangedHandler(IEnumerable items)
-    {
-        if (!liveShapingEnabled || items is null)
-        {
-            return;
-        }
-
-        foreach (object item in items)
-        {
-            if (item is INotifyPropertyChanged notifyPropertyChanged)
-            {
-                notifyPropertyChanged.PropertyChanged -= ItemOnPropertyChanged;
-            }
-        }
-    }
-
-    private void HandleSortChanged()
-    {
-        sortProperties.Clear();
-        view.Sort(this);
-        sortProperties.Clear();
-        OnVectorChanged(new VectorChangedEventArgs(CollectionChange.Reset));
-    }
-
-    private void HandleFilterChanged()
-    {
-        if (filter is not null)
-        {
-            for (int index = 0; index < view.Count; index++)
-            {
-                T item = view[index];
-                if (filter(item))
-                {
-                    continue;
-                }
-
-                RemoveFromView(index, item);
-                index--;
-            }
-        }
-
-        HashSet<T> viewHash = new(view);
-        int viewIndex = 0;
-        for (int index = 0; index < source.Count; index++)
-        {
-            T item = source[index];
-            if (viewHash.Contains(item))
-            {
-                viewIndex++;
-                continue;
-            }
-
-            if (HandleItemAdded(index, item, viewIndex))
-            {
-                viewIndex++;
-            }
-        }
-    }
-
-    private void HandleSourceChanged()
-    {
-        sortProperties.Clear();
-        T? currentItem = CurrentItem;
-        view.Clear();
-        foreach (T item in Source)
-        {
-            if (filter is not null && !filter(item))
-            {
-                continue;
-            }
-
-            if (sortDescriptions.Count > 0)
-            {
-                int targetIndex = view.BinarySearch(item, this);
-                if (targetIndex < 0)
-                {
-                    targetIndex = ~targetIndex;
-                }
-
-                view.Insert(targetIndex, item);
-            }
-            else
-            {
-                view.Add(item);
-            }
-        }
-
-        sortProperties.Clear();
-        OnVectorChanged(new VectorChangedEventArgs(CollectionChange.Reset));
-        MoveCurrentTo(currentItem);
-    }
-
-    private void SourceNotifyCollectionChangedCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-    {
-        switch (e.Action)
-        {
-            case NotifyCollectionChangedAction.Add:
-                ArgumentNullException.ThrowIfNull(e.NewItems);
-                AttachPropertyChangedHandler(e.NewItems);
-                if (deferCounter <= 0)
-                {
-                    if (e.NewItems?.Count == 1)
-                    {
-                        object? newItem = e.NewItems[0];
-                        ArgumentNullException.ThrowIfNull(newItem);
-                        HandleItemAdded(e.NewStartingIndex, (T)newItem);
-                    }
-                    else
-                    {
-                        HandleSourceChanged();
-                    }
-                }
-
-                break;
-            case NotifyCollectionChangedAction.Remove:
-                ArgumentNullException.ThrowIfNull(e.OldItems);
-                DetachPropertyChangedHandler(e.OldItems);
-                if (deferCounter <= 0)
-                {
-                    if (e.OldItems?.Count == 1)
-                    {
-                        object? oldItem = e.OldItems[0];
-                        ArgumentNullException.ThrowIfNull(oldItem);
-                        HandleItemRemoved(e.OldStartingIndex, (T)oldItem);
-                    }
-                    else
-                    {
-                        HandleSourceChanged();
-                    }
-                }
-
-                break;
-            case NotifyCollectionChangedAction.Move:
-            case NotifyCollectionChangedAction.Replace:
-            case NotifyCollectionChangedAction.Reset:
-                if (deferCounter <= 0)
-                {
-                    HandleSourceChanged();
-                }
-
-                break;
-        }
-    }
-
-    private bool HandleItemAdded(int newStartingIndex, T newItem, int? viewIndex = null)
-    {
-        if (filter is not null && !filter(newItem))
-        {
-            return false;
-        }
-
-        int newViewIndex = view.Count;
-
-        if (sortDescriptions.Count > 0)
-        {
-            sortProperties.Clear();
-            newViewIndex = view.BinarySearch(newItem, this);
-            if (newViewIndex < 0)
-            {
-                newViewIndex = ~newViewIndex;
-            }
-        }
-        else if (filter is not null)
-        {
-            if (source is null)
-            {
-                HandleSourceChanged();
-                return false;
-            }
-
-            if (newStartingIndex == 0 || view.Count == 0)
-            {
-                newViewIndex = 0;
-            }
-            else if (newStartingIndex == source.Count - 1)
-            {
-                newViewIndex = view.Count;
-            }
-            else if (viewIndex.HasValue)
-            {
-                newViewIndex = viewIndex.Value;
-            }
-            else
-            {
-                for (int i = 0, j = 0; i < source.Count; i++)
-                {
-                    if (i == newStartingIndex)
-                    {
-                        newViewIndex = j;
-                        break;
-                    }
-
-                    if (Equals(view[j], source[i]))
-                    {
-                        j++;
-                    }
-                }
-            }
-        }
-
-        view.Insert(newViewIndex, newItem);
-        if (newViewIndex <= CurrentPosition)
-        {
-            CurrentPosition++;
-        }
-
-        OnVectorChanged(new VectorChangedEventArgs(CollectionChange.ItemInserted, newViewIndex, newItem));
-        return true;
-    }
-
-    private void HandleItemRemoved(int oldStartingIndex, T oldItem)
-    {
-        if (filter is not null && !filter(oldItem))
-        {
-            return;
-        }
-
-        if (oldStartingIndex < 0 || oldStartingIndex >= view.Count || !Equals(view[oldStartingIndex], oldItem))
-        {
-            oldStartingIndex = view.IndexOf(oldItem);
-        }
-
-        if (oldStartingIndex < 0)
-        {
-            return;
-        }
-
-        RemoveFromView(oldStartingIndex, oldItem);
-    }
-
-    private void RemoveFromView(int itemIndex, T item)
-    {
-        view.RemoveAt(itemIndex);
-        if (itemIndex <= CurrentPosition)
-        {
-            CurrentPosition--;
-        }
-
-        OnVectorChanged(new VectorChangedEventArgs(CollectionChange.ItemRemoved, itemIndex, item));
-    }
-
-    private void SortDescriptionsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-    {
-        if (deferCounter > 0)
-        {
-            return;
-        }
-
-        HandleSortChanged();
-    }
-
-    private bool MoveCurrentToIndex(int i)
-    {
-        if (i < -1 || i >= view.Count)
-        {
-            return false;
-        }
-
-        if (i == CurrentPosition)
-        {
-            return false;
-        }
-
-        CurrentChangingEventArgs e = new();
-        OnCurrentChanging(e);
-        if (e.Cancel)
-        {
-            return false;
-        }
-
-        CurrentPosition = i;
-        OnCurrentChanged(default!);
-        return true;
-    }
-
-    private void OnCurrentChanging(CurrentChangingEventArgs e)
-    {
-        if (deferCounter > 0)
-        {
-            return;
-        }
-
-        CurrentChanging?.Invoke(this, e);
-    }
-
-    private void OnCurrentChanged(object e)
-    {
-        if (deferCounter > 0)
-        {
-            return;
-        }
-
-        CurrentChanged?.Invoke(this, e);
-        OnPropertyChanged(nameof(CurrentItem));
-    }
-
-    private void OnVectorChanged(IVectorChangedEventArgs e)
-    {
-        if (deferCounter > 0)
-        {
-            return;
-        }
-
-        VectorChanged?.Invoke(this, e);
-        OnPropertyChanged(nameof(Count));
-    }
-
-    internal sealed class NotificationDeferrer : IDisposable
-    {
-        private readonly AdvancedCollectionView<T> advancedCollectionView;
-        private readonly T? currentItem;
-
-        public NotificationDeferrer(AdvancedCollectionView<T> acvs)
-        {
-            advancedCollectionView = acvs;
-            currentItem = advancedCollectionView.CurrentItem;
-            advancedCollectionView.deferCounter++;
-        }
-
-        public void Dispose()
-        {
-            advancedCollectionView.MoveCurrentTo(currentItem);
-            advancedCollectionView.deferCounter--;
-            advancedCollectionView.Refresh();
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/IAdvancedCollectionView.cs

@@ -1,105 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using CommunityToolkit.WinUI.Collections;
-using Microsoft.UI.Xaml.Data;
-using System.Collections;
-
-namespace Snap.Hutao.Control.Collection.AdvancedCollectionView;
-
-internal interface IAdvancedCollectionView<T> : ICollectionView, IEnumerable
-    where T : class
-{
-    bool CanFilter { get; }
-
-    bool CanSort { get; }
-
-    object? ICollectionView.CurrentItem
-    {
-        get => CurrentItem;
-    }
-
-    new T? CurrentItem { get; }
-
-    Predicate<T>? Filter { get; set; }
-
-    IList<SortDescription> SortDescriptions { get; }
-
-    IEnumerable<T> SourceCollection { get; }
-
-    object IList<object>.this[int index]
-    {
-        get => this[index];
-        set => this[index] = (T)value;
-    }
-
-    new T this[int index] { get; set; }
-
-    void ICollection<object>.Add(object item)
-    {
-        Add((T)item);
-    }
-
-    void Add(T item);
-
-    void ClearObservedFilterProperties();
-
-    bool ICollection<object>.Contains(object item)
-    {
-        return Contains((T)item);
-    }
-
-    bool Contains(T item);
-
-    void ICollection<object>.CopyTo(object[] array, int arrayIndex)
-    {
-        CopyTo((T[])array, arrayIndex);
-    }
-
-    void CopyTo(T[] array, int arrayIndex);
-
-    IDisposable DeferRefresh();
-
-    IEnumerator<object> IEnumerable<object>.GetEnumerator()
-    {
-        return GetEnumerator();
-    }
-
-    new IEnumerator<T> GetEnumerator();
-
-    int IList<object>.IndexOf(object item)
-    {
-        return IndexOf((T)item);
-    }
-
-    int IndexOf(T item);
-
-    void IList<object>.Insert(int index, object item)
-    {
-        Insert(index, (T)item);
-    }
-
-    void Insert(int index, T item);
-
-    bool ICollectionView.MoveCurrentTo(object item)
-    {
-        return MoveCurrentTo((T)item);
-    }
-
-    bool MoveCurrentTo(T item);
-
-    void ObserveFilterProperty(string propertyName);
-
-    void Refresh();
-
-    void RefreshFilter();
-
-    void RefreshSorting();
-
-    bool ICollection<object>.Remove(object item)
-    {
-        return Remove((T)item);
-    }
-
-    bool Remove(T item);
-}

src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/VectorChangedEventArgs.cs

@@ -1,19 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Windows.Foundation.Collections;
-
-namespace Snap.Hutao.Control.Collection.AdvancedCollectionView;
-
-internal sealed class VectorChangedEventArgs : IVectorChangedEventArgs
-{
-    public VectorChangedEventArgs(CollectionChange cc, int index = -1, object item = null!)
-    {
-        CollectionChange = cc;
-        Index = (uint)index;
-    }
-
-    public CollectionChange CollectionChange { get; }
-
-    public uint Index { get; }
-}

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

@@ -1,18 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Extension;
-
-internal static class CommandInvocation
-{
-    public static bool TryExecute(this ICommand? command, object? parameter = null)
-    {
-        if (command is not null && command.CanExecute(parameter))
-        {
-            command.Execute(parameter);
-            return true;
-        }
-
-        return false;
-    }
-}

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

@@ -2,13 +2,11 @@
 // 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/Helper/UIElementHelper.cs

@@ -1,24 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-
-namespace Snap.Hutao.Control.Helper;
-
-[SuppressMessage("", "SH001")]
-[DependencyProperty("VisibilityObject", typeof(object), null, nameof(OnVisibilityObjectChanged), IsAttached = true, AttachedType = typeof(UIElement))]
-[DependencyProperty("OpacityObject", typeof(object), null, nameof(OnOpacityObjectChanged), IsAttached = true, AttachedType = typeof(UIElement))]
-public sealed partial class UIElementHelper
-{
-    private static void OnVisibilityObjectChanged(DependencyObject dp, DependencyPropertyChangedEventArgs e)
-    {
-        UIElement element = (UIElement)dp;
-        element.Visibility = e.NewValue is null ? Visibility.Collapsed : Visibility.Visible;
-    }
-
-    private static void OnOpacityObjectChanged(DependencyObject dp, DependencyPropertyChangedEventArgs e)
-    {
-        UIElement element = (UIElement)dp;
-        element.Opacity = e.NewValue is null ? 0D : 1D;
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/IXamlElementAccessor.cs

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

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

@@ -3,9 +3,7 @@
 
 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;
@@ -28,11 +26,12 @@ internal sealed class CachedImage : Implementation.ImageEx
     /// <inheritdoc/>
     protected override async Task<ImageSource?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
-        IImageCache imageCache = this.ServiceProvider().GetRequiredService<IImageCache>();
+        // We can only use Ioc to retrieve IImageCache, no IServiceProvider is available.
+        IImageCache imageCache = Ioc.Default.GetRequiredService<IImageCache>();
 
         try
         {
-            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
+            Verify.Operation(!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/CompositionImage.cs

@@ -168,7 +168,6 @@ internal abstract partial class CompositionImage : Microsoft.UI.Xaml.Controls.Co
             if (surface.DecodedPhysicalSize.Size() <= 0D)
             {
                 await Task.WhenAny(surfaceLoadTaskCompletionSource.Task, Task.Delay(5000, token)).ConfigureAwait(true);
-                await Task.Delay(50, token).ConfigureAwait(true);
             }
 
             LoadImageSurfaceCompleted(surface);
@@ -193,7 +192,7 @@ internal abstract partial class CompositionImage : Microsoft.UI.Xaml.Controls.Co
             {
                 await AnimationBuilder
                     .Create()
-                    .Opacity(from: 0D, to: 1D, duration: ControlAnimationConstants.ImageScaleFadeIn)
+                    .Opacity(from: 0D, to: 1D, duration: ControlAnimationConstants.ImageFadeIn)
                     .StartAsync(this, token)
                     .ConfigureAwait(true);
             }
@@ -214,7 +213,7 @@ internal abstract partial class CompositionImage : Microsoft.UI.Xaml.Controls.Co
             {
                 await AnimationBuilder
                     .Create()
-                    .Opacity(from: 1D, to: 0D, duration: ControlAnimationConstants.ImageScaleFadeOut)
+                    .Opacity(from: 1D, to: 0D, duration: ControlAnimationConstants.ImageFadeOut)
                     .StartAsync(this, token)
                     .ConfigureAwait(true);
             }

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

@@ -7,14 +7,21 @@ using Windows.Media.Casting;
 
 namespace Snap.Hutao.Control.Image.Implementation;
 
-[DependencyProperty("NineGrid", typeof(Thickness))]
-internal partial class ImageEx : ImageExBase
+internal 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,7 +6,6 @@ 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;
 
@@ -159,6 +158,7 @@ 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 { EnableLazyLoading: true } control)
+        if (d is ImageExBase control && control.EnableLazyLoading)
         {
             control.InvalidateLazyLoading();
         }
@@ -229,6 +229,9 @@ 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;
@@ -237,15 +240,6 @@ 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)
@@ -317,7 +311,8 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
         }
 
         tokenSource?.Cancel();
-        tokenSource = new();
+
+        tokenSource = new CancellationTokenSource();
 
         AttachPlaceholderSource(null);
 
@@ -448,10 +443,9 @@ internal abstract partial class ImageExBase : Microsoft.UI.Xaml.Controls.Control
             return;
         }
 
-        Rect controlRect = TransformToVisual(hostElement).TransformBounds(StructMarshal.Rect(ActualSize));
+        Rect controlRect = TransformToVisual(hostElement)
+            .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

@@ -0,0 +1,151 @@
+// 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

@@ -4,7 +4,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections.Specialized;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Windows.Foundation;
 
@@ -19,12 +18,14 @@ 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/>
@@ -81,10 +82,16 @@ 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;
 
-        double totalWidth = ((state.ColumnWidth + MinColumnSpacing) * numberOfColumns) - MinColumnSpacing;
-
+        // adjust for column spacing on all columns expect the first
+        double totalWidth = state.ColumnWidth + ((numberOfColumns - 1) * (state.ColumnWidth + MinColumnSpacing));
         if (totalWidth > availableWidth)
         {
             numberOfColumns--;
@@ -96,6 +103,7 @@ 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();
         }
 
@@ -162,7 +170,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 item
+                    // this item changed size; we need to recalculate layout for everything after this
                     state.RemoveFromIndex(i + 1);
                     item.Height = item.Element.DesiredSize.Height;
                     columnHeights[columnIndex] = item.Top + item.Height;
@@ -193,16 +201,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++)
         {
-            foreach (ref readonly UniformStaggeredItem item in CollectionsMarshal.AsSpan(state.GetColumnLayout(columnIndex)))
+            UniformStaggeredColumnLayout layout = 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);
@@ -221,22 +229,21 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
         return finalSize;
     }
 
-    private static (int NumberOfColumns, double ColumnWidth) GetNumberOfColumnsAndWidth(double availableWidth, double minItemWidth, double columnSpacing)
+    private static (int NumberOfColumns, double ColumnWidth) GetNumberOfColumnsAndWidth(double availableWidth, double minItemWidth, double minColumnSpacing)
     {
         // test if the width can fit in 2 items
-        if ((2 * minItemWidth) + columnSpacing > availableWidth)
+        if ((2 * minItemWidth) + minColumnSpacing > availableWidth)
         {
             return (1, availableWidth);
         }
 
-        int columnCount = Math.Max(1, (int)((availableWidth + columnSpacing) / (minItemWidth + columnSpacing)));
-        double columnWidthWithSpacing = (availableWidth + columnSpacing) / columnCount;
-        return (columnCount, columnWidthWithSpacing - columnSpacing);
+        int columnCount = Math.Max(1, (int)((availableWidth + minColumnSpacing) / (minItemWidth + minColumnSpacing)));
+        double columnWidthAddSpacing = (availableWidth + minColumnSpacing) / columnCount;
+        return (columnCount, columnWidthAddSpacing - minColumnSpacing);
     }
 
     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++)
@@ -253,11 +260,13 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
 
     private static void OnMinItemWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        ((UniformStaggeredLayout)d).InvalidateMeasure();
+        UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
+        panel.InvalidateMeasure();
     }
 
     private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        ((UniformStaggeredLayout)d).InvalidateMeasure();
+        UniformStaggeredLayout panel = (UniformStaggeredLayout)d;
+        panel.InvalidateMeasure();
     }
 }

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

@@ -1,6 +1,7 @@
 // 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;
 
@@ -66,6 +67,46 @@ 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);
@@ -98,37 +139,10 @@ 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)
     {
-        context.RecycleElement(context.GetOrCreateElementAt(index));
+        UIElement element = context.GetOrCreateElementAt(index);
+        context.RecycleElement(element);
     }
 
     internal void RemoveFromIndex(int index)
@@ -161,7 +175,7 @@ internal sealed class UniformStaggeredLayoutState
     {
         for (int i = startIndex; i <= endIndex; i++)
         {
-            if (i >= items.Count)
+            if (i > items.Count)
             {
                 break;
             }
@@ -170,7 +184,7 @@ internal sealed class UniformStaggeredLayoutState
             item.Height = 0;
             item.Top = 0;
 
-            // We must recycle all removed elements to ensure that it gets the correct context
+            // We must recycle all elements to ensure that it gets the correct context
             RecycleElementAt(i);
         }
 

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

@@ -33,16 +33,6 @@ internal struct Bgra32
     /// </summary>
     public byte A;
 
-    public Bgra32(byte b, byte g, byte r, byte a)
-    {
-        B = b;
-        G = g;
-        R = r;
-        A = a;
-    }
-
-    public readonly double Luminance { get => ((0.299 * R) + (0.587 * G) + (0.114 * B)) / 255; }
-
     /// <summary>
     /// 从 Color 转换
     /// </summary>
@@ -54,11 +44,4 @@ internal struct Bgra32
         *(uint*)&bgra8 = BinaryPrimitives.ReverseEndianness(*(uint*)&color);
         return bgra8;
     }
-
-    public static unsafe implicit operator Color(Bgra32 bgra8)
-    {
-        Unsafe.SkipInit(out Color color);
-        *(uint*)&color = BinaryPrimitives.ReverseEndianness(*(uint*)&bgra8);
-        return color;
-    }
 }

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

@@ -8,7 +8,7 @@ namespace Snap.Hutao.Control.Media;
 /// <summary>
 /// Defines a color in Hue/Saturation/Lightness (HSL) space.
 /// </summary>
-internal struct Hsla32
+internal struct Hsl32
 {
     /// <summary>
     /// The Hue in 0..360 range.

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

@@ -46,14 +46,14 @@ internal struct Rgba32
     /// <summary>
     /// 使用 RGBA 代码初始化新的结构
     /// </summary>
-    /// <param name="xrgbaCode">RGBA 代码</param>
-    public unsafe Rgba32(uint xrgbaCode)
+    /// <param name="code">RGBA 代码</param>
+    public unsafe Rgba32(uint code)
     {
-        // uint layout: 0xRRGGBBAA is AABBGGRR
+        // uint layout: 0xRRGGBBAA -> AABBGGRR
         // AABBGGRR -> RRGGBBAA
         fixed (Rgba32* pSelf = &this)
         {
-            *(uint*)pSelf = BinaryPrimitives.ReverseEndianness(xrgbaCode);
+            *(uint*)pSelf = BinaryPrimitives.ReverseEndianness(code);
         }
     }
 
@@ -67,14 +67,14 @@ internal struct Rgba32
 
     public static unsafe implicit operator Color(Rgba32 hexColor)
     {
-        // Goal : Rgba32:RRGGBBAA(0xAABBGGRR) -> Color: AARRGGBB(0xBBGGRRAA)
-        // Step1: Rgba32:RRGGBBAA(0xAABBGGRR) -> UInt32:AA000000(0x000000AA)
-        uint a = ((*(uint*)&hexColor) >> 24) & 0x000000FF;
+        // AABBGGRR -> BBGGRRAA
+        // AABBGGRR -> 000000AA
+        uint a = (*(uint*)&hexColor) >> 24;
 
-        // Step2: Rgba32:RRGGBBAA(0xAABBGGRR) -> UInt32:00RRGGBB(0xRRGGBB00)
-        uint rgb = ((*(uint*)&hexColor) << 8) & 0xFFFFFF00;
+        // AABBGGRR -> BBGGRR00
+        uint rgb = (*(uint*)&hexColor) << 8;
 
-        // Step2: UInt32:00RRGGBB(0xRRGGBB00) + UInt32:AA000000(0x000000AA) -> UInt32:AARRGGBB(0xRRGGBBAA)
+        // BBGGRR00 + 000000AA
         uint rgba = rgb + a;
 
         return *(Color*)&rgba;
@@ -85,7 +85,7 @@ internal struct Rgba32
     /// </summary>
     /// <param name="hsl">HSL 颜色</param>
     /// <returns>RGBA8颜色</returns>
-    public static Rgba32 FromHsl(Hsla32 hsl)
+    public static Rgba32 FromHsl(Hsl32 hsl)
     {
         double chroma = (1 - Math.Abs((2 * hsl.L) - 1)) * hsl.S;
         double h1 = hsl.H / 60;
@@ -142,7 +142,7 @@ internal struct Rgba32
     /// 转换到 HSL 颜色
     /// </summary>
     /// <returns>HSL 颜色</returns>
-    public readonly Hsla32 ToHsl()
+    public readonly Hsl32 ToHsl()
     {
         const double toDouble = 1.0 / 255;
         double r = toDouble * R;
@@ -175,7 +175,7 @@ internal struct Rgba32
         double lightness = 0.5 * (max + min);
         double saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs((2 * lightness) - 1));
 
-        Hsla32 ret;
+        Hsl32 ret;
         ret.H = 60 * h1;
         ret.S = saturation;
         ret.L = lightness;

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

@@ -25,7 +25,8 @@ internal static class SoftwareBitmapExtension
         {
             using (IMemoryBufferReference reference = buffer.CreateReference())
             {
-                reference.As<IMemoryBufferByteAccess>().GetBuffer(out Span<Bgra32> bytes);
+                reference.As<IMemoryBufferByteAccess>().GetBuffer(out byte* data, out uint length);
+                Span<Bgra32> bytes = new(data, unchecked((int)length / sizeof(Bgra32)));
                 foreach (ref Bgra32 pixel in bytes)
                 {
                     byte baseAlpha = pixel.A;
@@ -38,43 +39,4 @@ 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))
-        {
-            using (IMemoryBufferReference reference = buffer.CreateReference())
-            {
-                reference.As<IMemoryBufferByteAccess>().GetBuffer(out Span<Bgra32> bytes);
-                double b = 0, g = 0, r = 0, a = 0;
-                foreach (ref readonly Bgra32 pixel in bytes)
-                {
-                    b += pixel.B;
-                    g += pixel.G;
-                    r += pixel.R;
-                    a += pixel.A;
-                }
-
-                return new((byte)(b / bytes.Length), (byte)(g / bytes.Length), (byte)(r / bytes.Length), (byte)(a / bytes.Length));
-            }
-        }
-    }
 }

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

@@ -1,89 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using System.Data;
-using System.Runtime.InteropServices;
-using Windows.Foundation;
-
-namespace Snap.Hutao.Control.Panel;
-
-[DependencyProperty("Spacing", typeof(double), default(double), nameof(OnSpacingChanged))]
-internal partial class EqualPanel : Microsoft.UI.Xaml.Controls.Panel
-{
-    private double maxItemWidth;
-    private double maxItemHeight;
-    private int visibleItemsCount;
-
-    public EqualPanel()
-    {
-        RegisterPropertyChangedCallback(HorizontalAlignmentProperty, OnHorizontalAlignmentChanged);
-    }
-
-    protected override Size MeasureOverride(Size availableSize)
-    {
-        maxItemWidth = 0;
-        maxItemHeight = 0;
-
-        List<UIElement> elements = [.. Children.Where(element => element.Visibility == Visibility.Visible)];
-        visibleItemsCount = elements.Count;
-
-        foreach (ref readonly UIElement child in CollectionsMarshal.AsSpan(elements))
-        {
-            child.Measure(availableSize);
-            maxItemWidth = Math.Max(maxItemWidth, child.DesiredSize.Width);
-            maxItemHeight = Math.Max(maxItemHeight, child.DesiredSize.Height);
-        }
-
-        if (visibleItemsCount > 0)
-        {
-            // Return equal widths based on the widest item
-            // In very specific edge cases the AvailableWidth might be infinite resulting in a crash.
-            if (HorizontalAlignment is not HorizontalAlignment.Stretch || double.IsInfinity(availableSize.Width))
-            {
-                return new Size((maxItemWidth * visibleItemsCount) + (Spacing * (visibleItemsCount - 1)), maxItemHeight);
-            }
-            else
-            {
-                // Equal columns based on the available width, adjust for spacing
-                double totalWidth = availableSize.Width - (Spacing * (visibleItemsCount - 1));
-                maxItemWidth = totalWidth / visibleItemsCount;
-                return new Size(availableSize.Width, maxItemHeight);
-            }
-        }
-        else
-        {
-            return new Size(0, 0);
-        }
-    }
-
-    protected override Size ArrangeOverride(Size finalSize)
-    {
-        double x = 0;
-
-        // Check if there's more (little) width available - if so, set max item width to the maximum possible as we have an almost perfect height.
-        if (finalSize.Width > (visibleItemsCount * maxItemWidth) + (Spacing * (visibleItemsCount - 1)))
-        {
-            maxItemWidth = (finalSize.Width - (Spacing * (visibleItemsCount - 1))) / visibleItemsCount;
-        }
-
-        IEnumerable<UIElement> elements = Children.Where(static e => e.Visibility == Visibility.Visible);
-        foreach (UIElement child in elements)
-        {
-            child.Arrange(new Rect(x, 0, maxItemWidth, maxItemHeight));
-            x += maxItemWidth + Spacing;
-        }
-
-        return finalSize;
-    }
-
-    private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        (d as EqualPanel)?.InvalidateMeasure();
-    }
-
-    private void OnHorizontalAlignmentChanged(DependencyObject sender, DependencyProperty dp)
-    {
-        InvalidateMeasure();
-    }
-}

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

@@ -1,58 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Windows.Foundation;
-
-namespace Snap.Hutao.Control.Panel;
-
-[DependencyProperty("MinItemWidth", typeof(double))]
-[DependencyProperty("Spacing", typeof(double))]
-internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
-{
-    public HorizontalEqualPanel()
-    {
-        Loaded += OnLoaded;
-        SizeChanged += OnSizeChanged;
-    }
-
-    protected override Size MeasureOverride(Size availableSize)
-    {
-        foreach (UIElement child in Children)
-        {
-            // 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 childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
-            child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
-        }
-
-        return base.MeasureOverride(availableSize);
-    }
-
-    protected override Size ArrangeOverride(Size finalSize)
-    {
-        int itemCount = Children.Count;
-        double availableWidthPerItem = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
-        double actualItemWidth = Math.Max(MinItemWidth, availableWidthPerItem);
-
-        double offset = 0;
-        foreach (UIElement child in Children)
-        {
-            child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
-            offset += actualItemWidth + Spacing;
-        }
-
-        return finalSize;
-    }
-
-    private void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        MinWidth = (MinItemWidth * Children.Count) + (Spacing * (Children.Count - 1));
-    }
-
-    private void OnSizeChanged(object sender, SizeChangedEventArgs e)
-    {
-        InvalidateMeasure();
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Panel/PanelSelector.xaml

@@ -6,7 +6,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    Style="{StaticResource DefaultSegmentedStyle}"
     mc:Ignorable="d">
 
     <cwc:SegmentedItem

src/Snap.Hutao/Snap.Hutao/Control/Panel/PanelSelector.xaml.cs

@@ -4,7 +4,6 @@
 using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 using Snap.Hutao.Core.Setting;
-using System.Collections.Frozen;
 
 namespace Snap.Hutao.Control.Panel;
 
@@ -20,11 +19,11 @@ internal sealed partial class PanelSelector : Segmented
     public const string List = nameof(List);
     public const string Grid = nameof(Grid);
 
-    private static readonly FrozenDictionary<int, string> IndexTypeMap = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(0, List),
-        KeyValuePair.Create(1, Grid),
-    ]);
+    private static readonly Dictionary<int, string> IndexTypeMap = new()
+    {
+        [0] = List,
+        [1] = Grid,
+    };
 
     private readonly RoutedEventHandler loadedEventHandler;
     private readonly RoutedEventHandler unloadedEventHandler;

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

@@ -72,11 +72,7 @@ internal class ScopedPage : Page
             DisposeViewModel();
         }
 
-        if (this.IsDisposed())
-        {
-            return;
-        }
-
+        DataContext = null;
         Unloaded -= unloadEventHandler;
     }
 

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

@@ -7,7 +7,6 @@ using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
 using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Control.Media;
-using Snap.Hutao.Control.Text.Syntax.MiHoYo;
 using Snap.Hutao.Control.Theme;
 using Snap.Hutao.Metadata;
 using Windows.Foundation;
@@ -17,12 +16,23 @@ namespace Snap.Hutao.Control.Text;
 
 /// <summary>
 /// 专用于呈现描述文本的文本块
+/// Some part of this file came from:
+/// https://github.com/xunkong/desktop/tree/main/src/Desktop/Desktop/Pages/CharacterInfoPage.xaml.cs
 /// </summary>
 [HighQuality]
 [DependencyProperty("Description", typeof(string), "", nameof(OnDescriptionChanged))]
 [DependencyProperty("TextStyle", typeof(Style), default(Style), nameof(OnTextStyleChanged))]
 internal sealed partial class DescriptionTextBlock : ContentControl
 {
+    private static readonly int RgbaColorTagFullLength = "<color=#FFFFFFFF></color>".Length;
+    private static readonly int RgbaColorTagLeftLength = "<color=#FFFFFFFF>".Length;
+
+    private static readonly int RgbColorTagFullLength = "<color=#FFFFFF></color>".Length;
+    private static readonly int RgbColorTagLeftLength = "<color=#FFFFFF>".Length;
+
+    private static readonly int ItalicTagFullLength = "<i></i>".Length;
+    private static readonly int ItalicTagLeftLength = "<i>".Length;
+
     private readonly TypedEventHandler<FrameworkElement, object> actualThemeChangedEventHandler;
 
     /// <summary>
@@ -45,10 +55,11 @@ internal sealed partial class DescriptionTextBlock : ContentControl
     private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         TextBlock textBlock = (TextBlock)((DescriptionTextBlock)d).Content;
+        ReadOnlySpan<char> description = SpecialNameHandler.Handle((string)e.NewValue);
 
         try
         {
-            UpdateDescription(textBlock, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle((string)e.NewValue)));
+            UpdateDescription(textBlock, description);
         }
         catch (Exception ex)
         {
@@ -62,106 +73,120 @@ internal sealed partial class DescriptionTextBlock : ContentControl
         textBlock.Style = (Style)e.NewValue;
     }
 
-    private static void UpdateDescription(TextBlock textBlock, MiHoYoSyntaxTree syntaxTree)
+    private static void UpdateDescription(TextBlock textBlock, in ReadOnlySpan<char> description)
     {
         textBlock.Inlines.Clear();
-        AppendNode(textBlock, textBlock.Inlines, syntaxTree.Root);
-    }
 
-    private static void AppendNode(TextBlock textBlock, InlineCollection inlines, MiHoYoSyntaxNode node)
-    {
-        switch (node.Kind)
+        int last = 0;
+        for (int i = 0; i < description.Length;)
         {
-            case MiHoYoSyntaxKind.Root:
-                foreach (MiHoYoSyntaxNode child in ((MiHoYoRootSyntax)node).Children)
-                {
-                    AppendNode(textBlock, inlines, child);
-                }
+            // newline
+            if (description[i..].StartsWith(@"\n"))
+            {
+                AppendText(textBlock, description[last..i]);
+                AppendLineBreak(textBlock);
+                i += 2;
+                last = i;
+            }
 
-                break;
-            case MiHoYoSyntaxKind.PlainText:
-                AppendPlainText(textBlock, inlines, (MiHoYoPlainTextSyntax)node);
-                break;
-            case MiHoYoSyntaxKind.ColorText:
-                AppendColorText(textBlock, inlines, (MiHoYoColorTextSyntax)node);
-                break;
-            case MiHoYoSyntaxKind.ItalicText:
-                AppendItalicText(textBlock, inlines, (MiHoYoItalicTextSyntax)node);
-                break;
+            // color tag
+            else if (description[i..].StartsWith("<c"))
+            {
+                switch (description[i..].IndexOf('>'))
+                {
+                    case 16: // RgbaColorTag
+                        {
+                            AppendText(textBlock, description[last..i]);
+                            Rgba32 color = new(description.Slice(i + 8, 8).ToString());
+                            int length = description[(i + RgbaColorTagLeftLength)..].IndexOf('<');
+                            AppendColorText(textBlock, description.Slice(i + RgbaColorTagLeftLength, length), color);
+
+                            i += length + RgbaColorTagFullLength;
+                            last = i;
+                            break;
+                        }
+
+                    case 14: // RgbColorTag
+                        {
+                            AppendText(textBlock, description[last..i]);
+                            Rgba32 color = new(description.Slice(i + 8, 6).ToString());
+                            int length = description[(i + RgbColorTagLeftLength)..].IndexOf('<');
+                            AppendColorText(textBlock, description.Slice(i + RgbColorTagLeftLength, length), color);
+
+                            i += length + RgbColorTagFullLength;
+                            last = i;
+                            break;
+                        }
+                }
+            }
+
+            // italic
+            else if (description[i..].StartsWith("<i"))
+            {
+                AppendText(textBlock, description[last..i]);
+
+                int length = description[(i + ItalicTagLeftLength)..].IndexOf('<');
+                AppendItalicText(textBlock, description.Slice(i + ItalicTagLeftLength, length));
+
+                i += length + ItalicTagFullLength;
+                last = i;
+            }
+            else
+            {
+                i += 1;
+            }
+
+            if (i == description.Length - 1)
+            {
+                AppendText(textBlock, description[last..(i + 1)]);
+            }
         }
     }
 
-    private static void AppendPlainText(TextBlock textBlock, InlineCollection inlines, MiHoYoPlainTextSyntax plainText)
+    private static void AppendText(TextBlock text, in ReadOnlySpan<char> slice)
     {
-        // PlainText doesn't have children
-        inlines.Add(new Run { Text = plainText.Span.ToString() });
+        text.Inlines.Add(new Run { Text = slice.ToString() });
     }
 
-    private static void AppendColorText(TextBlock textBlock, InlineCollection inlines, MiHoYoColorTextSyntax colorText)
+    private static void AppendColorText(TextBlock text, in ReadOnlySpan<char> slice, Rgba32 color)
     {
-        Rgba32 color = new(colorText.ColorSpan.ToString());
         Color targetColor;
-        if (ThemeHelper.IsDarkMode(textBlock.ActualTheme))
+        if (ThemeHelper.IsDarkMode(text.ActualTheme))
         {
             targetColor = color;
         }
         else
         {
             // Make lighter in light mode
-            Hsla32 hsl = color.ToHsl();
+            Hsl32 hsl = color.ToHsl();
             hsl.L *= 0.3;
             targetColor = Rgba32.FromHsl(hsl);
         }
 
-        if (colorText.Children.Count > 1)
+        text.Inlines.Add(new Run
         {
-            Span span = new()
-            {
-                Foreground = new SolidColorBrush(targetColor),
-            };
-
-            foreach (MiHoYoSyntaxNode child in colorText.Children)
-            {
-                AppendNode(textBlock, span.Inlines, child);
-            }
-        }
-        else
-        {
-            inlines.Add(new Run
-            {
-                Text = colorText.ContentSpan.ToString(),
-                Foreground = new SolidColorBrush(targetColor),
-            });
-        }
+            Text = slice.ToString(),
+            Foreground = new SolidColorBrush(targetColor),
+        });
     }
 
-    private static void AppendItalicText(TextBlock textBlock, InlineCollection inlines, MiHoYoItalicTextSyntax italicText)
+    private static void AppendItalicText(TextBlock text, in ReadOnlySpan<char> slice)
     {
-        if (italicText.Children.Count > 1)
+        text.Inlines.Add(new Run
         {
-            Span span = new()
-            {
-                FontStyle = Windows.UI.Text.FontStyle.Italic,
-            };
+            Text = slice.ToString(),
+            FontStyle = Windows.UI.Text.FontStyle.Italic,
+        });
+    }
 
-            foreach (MiHoYoSyntaxNode child in italicText.Children)
-            {
-                AppendNode(textBlock, span.Inlines, child);
-            }
-        }
-        else
-        {
-            inlines.Add(new Run
-            {
-                Text = italicText.ContentSpan.ToString(),
-                FontStyle = Windows.UI.Text.FontStyle.Italic,
-            });
-        }
+    private static void AppendLineBreak(TextBlock text)
+    {
+        text.Inlines.Add(new LineBreak());
     }
 
     private void OnActualThemeChanged(FrameworkElement sender, object args)
     {
         // Simply re-apply texts
-        UpdateDescription((TextBlock)Content, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle(Description)));
+        UpdateDescription((TextBlock)Content, Description);
     }
 }

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

@@ -139,7 +139,7 @@ internal sealed partial class HtmlDescriptionTextBlock : ContentControl
         else
         {
             // Make lighter in light mode
-            Hsla32 hsl = color.ToHsl();
+            Hsl32 hsl = color.ToHsl();
             hsl.L *= 0.3;
             targetColor = Rgba32.FromHsl(hsl);
         }

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoColorKind.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal enum MiHoYoColorKind
-{
-    None,
-    Rgba,
-    Rgb,
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoColorTextSyntax.cs

@@ -1,49 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal sealed class MiHoYoColorTextSyntax : MiHoYoXmlElementSyntax
-{
-    public MiHoYoColorTextSyntax(MiHoYoColorKind colorKind, string text, int start, int end)
-        : base(MiHoYoSyntaxKind.ColorText, text, start, end)
-    {
-        ColorKind = colorKind;
-    }
-
-    public MiHoYoColorTextSyntax(MiHoYoColorKind colorKind, string text, in TextPosition position)
-        : base(MiHoYoSyntaxKind.ColorText, text, position)
-    {
-        ColorKind = colorKind;
-    }
-
-    public MiHoYoColorKind ColorKind { get; }
-
-    public override TextPosition ContentPosition
-    {
-        get
-        {
-            return ColorKind switch
-            {
-                MiHoYoColorKind.Rgba => new(Position.Start + 17, Position.End - 8),
-                MiHoYoColorKind.Rgb => new(Position.Start + 15, Position.End - 8),
-                _ => throw Must.NeverHappen(),
-            };
-        }
-    }
-
-    public TextPosition ColorPosition
-    {
-        get
-        {
-            return ColorKind switch
-            {
-                MiHoYoColorKind.Rgba => new(Position.Start + 8, Position.Start + 16),
-                MiHoYoColorKind.Rgb => new(Position.Start + 8, Position.Start + 14),
-                _ => throw Must.NeverHappen(),
-            };
-        }
-    }
-
-    public ReadOnlySpan<char> ColorSpan { get => Text.AsSpan()[ColorPosition.Start..ColorPosition.End]; }
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoItalicTextSyntax.cs

@@ -1,19 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal sealed class MiHoYoItalicTextSyntax : MiHoYoXmlElementSyntax
-{
-    public MiHoYoItalicTextSyntax(string text, int start, int end)
-        : base(MiHoYoSyntaxKind.ItalicText, text, start, end)
-    {
-    }
-
-    public MiHoYoItalicTextSyntax(string text, in TextPosition position)
-        : base(MiHoYoSyntaxKind.ItalicText, text, position)
-    {
-    }
-
-    public override TextPosition ContentPosition { get => new(Position.Start + 3, Position.End - 4); }
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoPlainTextSyntax.cs

@@ -1,17 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal sealed class MiHoYoPlainTextSyntax : MiHoYoSyntaxNode
-{
-    public MiHoYoPlainTextSyntax(string text, int start, int end)
-        : base(MiHoYoSyntaxKind.PlainText, text, start, end)
-    {
-    }
-
-    public MiHoYoPlainTextSyntax(string text, in TextPosition position)
-        : base(MiHoYoSyntaxKind.PlainText, text, position)
-    {
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoRootSyntax.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal sealed class MiHoYoRootSyntax : MiHoYoSyntaxNode
-{
-    public MiHoYoRootSyntax(string text, int start, int end)
-        : base(MiHoYoSyntaxKind.Root, text, start, end)
-    {
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoSyntaxKind.cs

@@ -1,13 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal enum MiHoYoSyntaxKind
-{
-    None,
-    Root,
-    PlainText,
-    ColorText,
-    ItalicText,
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoSyntaxNode.cs

@@ -1,17 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal abstract class MiHoYoSyntaxNode : SyntaxNode<MiHoYoSyntaxNode, MiHoYoSyntaxKind>
-{
-    public MiHoYoSyntaxNode(MiHoYoSyntaxKind kind, string text, int start, int end)
-        : base(kind, text, start, end)
-    {
-    }
-
-    public MiHoYoSyntaxNode(MiHoYoSyntaxKind kind, string text, in TextPosition position)
-        : base(kind, text, position)
-    {
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoSyntaxTree.cs

@@ -1,146 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal sealed class MiHoYoSyntaxTree
-{
-    public MiHoYoSyntaxNode Root { get; set; } = default!;
-
-    public string Text { get; set; } = default!;
-
-    public static MiHoYoSyntaxTree Parse(string text)
-    {
-        MiHoYoRootSyntax root = new(text, 0, text.Length);
-        ParseComponents(text, root);
-
-        MiHoYoSyntaxTree tree = new()
-        {
-            Text = text,
-            Root = root,
-        };
-
-        return tree;
-    }
-
-    private static void ParseComponents(string text, MiHoYoSyntaxNode syntax)
-    {
-        TextPosition contentPosition = syntax switch
-        {
-            MiHoYoXmlElementSyntax xmlSyntax => xmlSyntax.ContentPosition,
-            _ => syntax.Position,
-        };
-        ReadOnlySpan<char> contentSpan = text.AsSpan().Slice(contentPosition.Start, contentPosition.Length);
-
-        int endOfProcessedAtContent = 0;
-        while (true)
-        {
-            if (endOfProcessedAtContent >= contentSpan.Length)
-            {
-                break;
-            }
-
-            int indexOfXmlLeftOpeningAtUnprocessedContent = contentSpan[endOfProcessedAtContent..].IndexOf('<');
-
-            // End of content
-            if (indexOfXmlLeftOpeningAtUnprocessedContent < 0)
-            {
-                TextPosition position = new(contentPosition.Start + endOfProcessedAtContent, contentPosition.End);
-                MiHoYoPlainTextSyntax plainText = new(text, position);
-                syntax.Children.Add(plainText);
-                break;
-            }
-
-            // We have plain text between xml elements
-            if (indexOfXmlLeftOpeningAtUnprocessedContent > 0)
-            {
-                TextPosition position = new(0, indexOfXmlLeftOpeningAtUnprocessedContent);
-                TextPosition positionAtContent = position.RightShift(endOfProcessedAtContent);
-                TextPosition positionAtText = positionAtContent.RightShift(contentPosition.Start);
-                MiHoYoPlainTextSyntax plainText = new(text, positionAtText);
-                syntax.Children.Add(plainText);
-                endOfProcessedAtContent = positionAtContent.End;
-                continue;
-            }
-
-            // Peek the next character after '<'
-            int indexOfXmlLeftOpeningAtContent = endOfProcessedAtContent + indexOfXmlLeftOpeningAtUnprocessedContent;
-            switch (contentSpan[indexOfXmlLeftOpeningAtContent + 1])
-            {
-                case 'c':
-                    {
-                        int endOfXmlColorRightClosingAtUnprocessedContent = EndOfXmlClosing(contentSpan[indexOfXmlLeftOpeningAtContent..], out int endOfXmlColorLeftClosingAtUnprocessedContent);
-
-                        MiHoYoColorKind colorKind = endOfXmlColorLeftClosingAtUnprocessedContent switch
-                        {
-                            17 => MiHoYoColorKind.Rgba,
-                            15 => MiHoYoColorKind.Rgb,
-                            _ => throw Must.NeverHappen(),
-                        };
-
-                        TextPosition position = new(0, endOfXmlColorRightClosingAtUnprocessedContent);
-                        TextPosition positionAtContent = position.RightShift(endOfProcessedAtContent);
-                        TextPosition positionAtText = positionAtContent.RightShift(contentPosition.Start);
-
-                        MiHoYoColorTextSyntax colorText = new(colorKind, text, positionAtText);
-                        ParseComponents(text, colorText);
-                        syntax.Children.Add(colorText);
-                        endOfProcessedAtContent = positionAtContent.End;
-                        break;
-                    }
-
-                case 'i':
-                    {
-                        int endOfXmlItalicRightClosingAtUnprocessedContent = EndOfXmlClosing(contentSpan[indexOfXmlLeftOpeningAtContent..], out _);
-
-                        TextPosition position = new(0, endOfXmlItalicRightClosingAtUnprocessedContent);
-                        TextPosition positionAtContent = position.RightShift(endOfProcessedAtContent);
-                        TextPosition positionAtText = positionAtContent.RightShift(contentPosition.Start);
-
-                        MiHoYoItalicTextSyntax italicText = new(text, positionAtText);
-                        ParseComponents(text, italicText);
-                        syntax.Children.Add(italicText);
-                        endOfProcessedAtContent = positionAtContent.End;
-                        break;
-                    }
-            }
-        }
-    }
-
-    private static int EndOfXmlClosing(in ReadOnlySpan<char> span, out int endOfLeftClosing)
-    {
-        endOfLeftClosing = 0;
-
-        int openingCount = 0;
-        int closingCount = 0;
-
-        int current = 0;
-
-        // Considering <i>text1</i>text2<i>text3</i>
-        // Considering <i>text1<span>text2</span>text3</i>
-        while (true)
-        {
-            int leftMarkIndex = span[current..].IndexOf('<');
-            if (span[current..][leftMarkIndex + 1] is '/')
-            {
-                closingCount++;
-            }
-            else
-            {
-                openingCount++;
-            }
-
-            current += span[current..].IndexOf('>') + 1;
-
-            if (openingCount is 1 && closingCount is 0)
-            {
-                endOfLeftClosing = current;
-            }
-
-            if (openingCount == closingCount)
-            {
-                return current;
-            }
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/MiHoYo/MiHoYoXmlElementSyntax.cs

@@ -1,21 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax.MiHoYo;
-
-internal abstract class MiHoYoXmlElementSyntax : MiHoYoSyntaxNode
-{
-    public MiHoYoXmlElementSyntax(MiHoYoSyntaxKind kind, string text, int start, int end)
-        : base(kind, text, start, end)
-    {
-    }
-
-    public MiHoYoXmlElementSyntax(MiHoYoSyntaxKind kind, string text, in TextPosition position)
-        : base(kind, text, position)
-    {
-    }
-
-    public abstract TextPosition ContentPosition { get; }
-
-    public ReadOnlySpan<char> ContentSpan { get => Text.AsSpan(ContentPosition.Start, ContentPosition.Length); }
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/SyntaxNode.cs

@@ -1,33 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Text.Syntax;
-
-internal abstract class SyntaxNode<TSelf, TKind>
-    where TSelf : SyntaxNode<TSelf, TKind>
-    where TKind : struct, Enum
-{
-    public SyntaxNode(TKind kind, string text, int start, int end)
-    {
-        Kind = kind;
-        Text = text;
-        Position = new(start, end);
-    }
-
-    public SyntaxNode(TKind kind, string text, in TextPosition position)
-    {
-        Kind = kind;
-        Text = text;
-        Position = position;
-    }
-
-    public TKind Kind { get; protected set; }
-
-    public List<TSelf> Children { get; } = [];
-
-    public TextPosition Position { get; protected set; }
-
-    public ReadOnlySpan<char> Span { get => Text.AsSpan().Slice(Position.Start, Position.Length); }
-
-    protected string Text { get; set; } = default!;
-}

src/Snap.Hutao/Snap.Hutao/Control/Text/Syntax/TextPosition.cs

@@ -1,34 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using System.Diagnostics;
-
-namespace Snap.Hutao.Control.Text.Syntax;
-
-[DebuggerDisplay("[{Start}..{End}]")]
-internal readonly struct TextPosition
-{
-    public readonly int Start;
-    public readonly int End;
-
-    public TextPosition(int start, int end)
-    {
-        Start = start;
-        End = end;
-    }
-
-    public readonly int Length
-    {
-        get => End - Start;
-    }
-
-    public TextPosition LeftShift(int offset)
-    {
-        return new(Start - offset, End - offset);
-    }
-
-    public TextPosition RightShift(int offset)
-    {
-        return new(Start + offset, End + offset);
-    }
-}

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

@@ -4,19 +4,20 @@
     xmlns:cwm="using:CommunityToolkit.WinUI.Media">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
-            <x:Double x:Key="CompatShadowThemeOpacity">0.14</x:Double>
+            <cwm:AttachedCardShadow
+                x:Key="CompatCardShadow"
+                BlurRadius="8"
+                Opacity="0.14"
+                Offset="0,4,0"/>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
-            <x:Double x:Key="CompatShadowThemeOpacity">0.28</x:Double>
+            <cwm:AttachedCardShadow
+                x:Key="CompatCardShadow"
+                BlurRadius="8"
+                Opacity="0.28"
+                Offset="0,4,0"/>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
-
-    <cwm:AttachedCardShadow
-        x:Key="CompatCardShadow"
-        BlurRadius="8"
-        Opacity="{ThemeResource CompatShadowThemeOpacity}"
-        Offset="0,4,0"/>
-
     <Style x:Key="BorderCardStyle" TargetType="Border">
         <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
@@ -24,20 +25,20 @@
         <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
     </Style>
 
+    <Style
+        x:Key="AcrylicBaseHighBorderCardStyle"
+        BasedOn="{StaticResource BorderCardStyle}"
+        TargetType="Border">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Background" Value="{ThemeResource SystemControlBaseHighAcrylicElementBrush}"/>
+    </Style>
+
     <Style
         x:Key="AcrylicBorderCardStyle"
         BasedOn="{StaticResource BorderCardStyle}"
         TargetType="Border">
         <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Background" Value="{ThemeResource SystemControlAcrylicElementBrush}"/>
-    </Style>
-
-    <Style
-        x:Key="AcrylicSecondaryBorderCardStyle"
-        BasedOn="{StaticResource BorderCardStyle}"
-        TargetType="Border">
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumAcrylicElementMediumBrush}"/>
+        <Setter Property="Background" Value="{ThemeResource SystemControlAcrylicElementMediumHighBrush}"/>
     </Style>
 
     <Style x:Key="GridCardStyle" TargetType="Grid">
@@ -52,14 +53,14 @@
         BasedOn="{StaticResource GridCardStyle}"
         TargetType="Grid">
         <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Background" Value="{ThemeResource SystemControlAcrylicElementBrush}"/>
+        <Setter Property="Background" Value="{ThemeResource SystemControlAcrylicElementMediumHighBrush}"/>
     </Style>
 
     <Style
-        x:Key="AcrylicSecondaryGridCardStyle"
+        x:Key="AcrylicBaseHighGridCardStyle"
         BasedOn="{StaticResource GridCardStyle}"
         TargetType="Grid">
         <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Background" Value="{ThemeResource SystemControlChromeMediumAcrylicElementMediumBrush}"/>
+        <Setter Property="Background" Value="{ThemeResource SystemControlBaseHighAcrylicElementBrush}"/>
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

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

@@ -8,9 +8,6 @@
     <ItemsPanelTemplate x:Key="WrapPanelSpacing0Template">
         <cwcont:WrapPanel/>
     </ItemsPanelTemplate>
-    <ItemsPanelTemplate x:Key="WrapPanelSpacing2Template">
-        <cwcont:WrapPanel HorizontalSpacing="2" VerticalSpacing="2"/>
-    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="WrapPanelSpacing4Template">
         <cwcont:WrapPanel HorizontalSpacing="4" VerticalSpacing="4"/>
     </ItemsPanelTemplate>
@@ -20,9 +17,6 @@
     <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing2Template">
         <StackPanel Orientation="Horizontal" Spacing="2"/>
     </ItemsPanelTemplate>
-    <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing4Template">
-        <StackPanel Orientation="Horizontal" Spacing="4"/>
-    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="StackPanelSpacing4Template">
         <StackPanel Spacing="4"/>
     </ItemsPanelTemplate>

src/Snap.Hutao/Snap.Hutao/Control/Theme/KnownColors.cs

@@ -1,16 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Win32;
-using Windows.UI;
-
-namespace Snap.Hutao.Control.Theme;
-
-internal static class KnownColors
-{
-    public static readonly Color Orange = StructMarshal.Color(0xFFBC6932);
-    public static readonly Color Purple = StructMarshal.Color(0xFFA156E0);
-    public static readonly Color Blue = StructMarshal.Color(0xFF5180CB);
-    public static readonly Color Green = StructMarshal.Color(0xFF2A8F72);
-    public static readonly Color White = StructMarshal.Color(0xFF72778B);
-}

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

@@ -193,379 +193,6 @@
                                             <CompositeTransform x:Name="PivotLayoutElementTranslateTransform"/>
                                         </Grid.RenderTransform>
 
-                                        <ItemsPresenter x:Name="PivotItemPresenter" Grid.Row="1">
-                                            <ItemsPresenter.RenderTransform>
-                                                <TransformGroup>
-                                                    <TranslateTransform x:Name="ItemsPresenterTranslateTransform"/>
-                                                    <CompositeTransform x:Name="ItemsPresenterCompositeTransform"/>
-                                                </TransformGroup>
-                                            </ItemsPresenter.RenderTransform>
-                                        </ItemsPresenter>
-
-                                        <Border
-                                            Grid.Row="0"
-                                            Margin="16,16,16,0"
-                                            cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                            <Grid Style="{ThemeResource AcrylicSecondaryGridCardStyle}">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                </Grid.ColumnDefinitions>
-
-                                                <ContentPresenter
-                                                    x:Name="LeftHeaderPresenter"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Stretch"
-                                                    Content="{TemplateBinding LeftHeader}"
-                                                    ContentTemplate="{TemplateBinding LeftHeaderTemplate}"/>
-                                                <ContentControl
-                                                    x:Name="HeaderClipper"
-                                                    Grid.Column="1"
-                                                    HorizontalContentAlignment="Stretch"
-                                                    UseSystemFocusVisuals="{StaticResource UseSystemFocusVisuals}">
-                                                    <ContentControl.Clip>
-                                                        <RectangleGeometry x:Name="HeaderClipperGeometry"/>
-                                                    </ContentControl.Clip>
-                                                    <Grid>
-                                                        <Grid.RenderTransform>
-                                                            <CompositeTransform x:Name="HeaderOffsetTranslateTransform"/>
-                                                        </Grid.RenderTransform>
-                                                        <PivotHeaderPanel x:Name="StaticHeader" Visibility="Collapsed">
-                                                            <PivotHeaderPanel.RenderTransform>
-                                                                <CompositeTransform x:Name="StaticHeaderTranslateTransform"/>
-                                                            </PivotHeaderPanel.RenderTransform>
-                                                        </PivotHeaderPanel>
-                                                        <PivotHeaderPanel x:Name="Header">
-                                                            <PivotHeaderPanel.RenderTransform>
-                                                                <CompositeTransform x:Name="HeaderTranslateTransform"/>
-                                                            </PivotHeaderPanel.RenderTransform>
-                                                        </PivotHeaderPanel>
-                                                        <Rectangle
-                                                            x:Name="FocusFollower"
-                                                            HorizontalAlignment="Stretch"
-                                                            VerticalAlignment="Stretch"
-                                                            Control.IsTemplateFocusTarget="True"
-                                                            Fill="Transparent"
-                                                            IsHitTestVisible="False"/>
-                                                    </Grid>
-                                                </ContentControl>
-                                                <Button
-                                                    x:Name="PreviousButton"
-                                                    Grid.Column="1"
-                                                    Width="20"
-                                                    Height="36"
-                                                    Margin="{ThemeResource PivotNavButtonMargin}"
-                                                    HorizontalAlignment="Left"
-                                                    VerticalAlignment="Top"
-                                                    Background="Transparent"
-                                                    IsEnabled="False"
-                                                    IsTabStop="False"
-                                                    Opacity="0"
-                                                    Template="{StaticResource PreviousTemplate}"
-                                                    UseSystemFocusVisuals="False"/>
-                                                <Button
-                                                    x:Name="NextButton"
-                                                    Grid.Column="1"
-                                                    Width="20"
-                                                    Height="36"
-                                                    Margin="{ThemeResource PivotNavButtonMargin}"
-                                                    HorizontalAlignment="Right"
-                                                    VerticalAlignment="Top"
-                                                    Background="Transparent"
-                                                    IsEnabled="False"
-                                                    IsTabStop="False"
-                                                    Opacity="0"
-                                                    Template="{StaticResource NextTemplate}"
-                                                    UseSystemFocusVisuals="False"/>
-                                                <ContentPresenter
-                                                    x:Name="RightHeaderPresenter"
-                                                    Grid.Column="2"
-                                                    HorizontalAlignment="Stretch"
-                                                    VerticalAlignment="Stretch"
-                                                    Content="{TemplateBinding RightHeader}"
-                                                    ContentTemplate="{TemplateBinding RightHeaderTemplate}"/>
-                                            </Grid>
-                                        </Border>
-
-                                    </Grid>
-                                </PivotPanel>
-                            </ScrollViewer>
-
-                        </Grid>
-
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="Orientation">
-                                <VisualState x:Name="Portrait">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPortraitThemePadding}"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Landscape">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TitleContentControl" Storyboard.TargetProperty="Margin">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotLandscapeThemePadding}"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="NavigationButtonsVisibility">
-                                <VisualState x:Name="NavigationButtonsHidden"/>
-                                <VisualState x:Name="NavigationButtonsVisible">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="PreviousButtonVisible">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PreviousButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="NextButtonVisible">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="Opacity">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NextButton" Storyboard.TargetProperty="IsEnabled">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="True"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="HeaderStates">
-                                <VisualState x:Name="HeaderDynamic"/>
-                                <VisualState x:Name="HeaderStatic">
-
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Header" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="StaticHeader" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-
-                            </VisualStateGroup>
-
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style x:Key="CardPivotStyle2" TargetType="Pivot">
-        <Setter Property="Margin" Value="0"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Background" Value="{ThemeResource PivotBackground}"/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <Grid/>
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Pivot">
-                    <Grid
-                        x:Name="RootElement"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        Background="{TemplateBinding Background}">
-                        <Grid.Resources>
-                            <Style x:Key="BaseContentControlStyle" TargetType="ContentControl">
-                                <Setter Property="FontFamily" Value="XamlAutoFontFamily"/>
-                                <Setter Property="FontWeight" Value="SemiBold"/>
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="ContentControl">
-                                            <ContentPresenter
-                                                Margin="{TemplateBinding Padding}"
-                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                Content="{TemplateBinding Content}"
-                                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                ContentTransitions="{TemplateBinding ContentTransitions}"
-                                                OpticalMarginAlignment="TrimSideBearings"/>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                            <Style
-                                x:Key="TitleContentControlStyle"
-                                BasedOn="{StaticResource BaseContentControlStyle}"
-                                TargetType="ContentControl">
-                                <Setter Property="FontFamily" Value="{ThemeResource PivotTitleFontFamily}"/>
-                                <Setter Property="FontWeight" Value="{ThemeResource PivotTitleThemeFontWeight}"/>
-                                <Setter Property="FontSize" Value="{ThemeResource PivotTitleFontSize}"/>
-                            </Style>
-                        </Grid.Resources>
-
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <ContentControl
-                            x:Name="TitleContentControl"
-                            Grid.Row="0"
-                            Margin="{StaticResource PivotPortraitThemePadding}"
-                            Content="{TemplateBinding Title}"
-                            ContentTemplate="{TemplateBinding TitleTemplate}"
-                            IsTabStop="False"
-                            Style="{StaticResource TitleContentControlStyle}"
-                            Visibility="Collapsed"/>
-
-                        <Grid Grid.Row="1">
-                            <Grid.Resources>
-                                <ControlTemplate x:Key="NextTemplate" TargetType="Button">
-                                    <Border
-                                        x:Name="Root"
-                                        Background="{ThemeResource PivotNextButtonBackground}"
-                                        BorderBrush="{ThemeResource PivotNextButtonBorderBrush}"
-                                        BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}">
-                                        <FontIcon
-                                            x:Name="Arrow"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                            FontSize="12"
-                                            Foreground="{ThemeResource PivotNextButtonForeground}"
-                                            Glyph="&#xE76C;"
-                                            MirroredWhenRightToLeft="True"
-                                            UseLayoutRounding="False"/>
-                                        <VisualStateManager.VisualStateGroups>
-                                            <VisualStateGroup x:Name="CommonStates">
-                                                <VisualState x:Name="Normal"/>
-                                                <VisualState x:Name="PointerOver">
-                                                    <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBackgroundPointerOver}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBorderBrushPointerOver}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonForegroundPointerOver}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </VisualState>
-                                                <VisualState x:Name="Pressed">
-                                                    <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBackgroundPressed}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonBorderBrushPressed}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotNextButtonForegroundPressed}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </VisualState>
-                                            </VisualStateGroup>
-                                        </VisualStateManager.VisualStateGroups>
-                                    </Border>
-                                </ControlTemplate>
-                                <ControlTemplate x:Key="PreviousTemplate" TargetType="Button">
-                                    <Border
-                                        x:Name="Root"
-                                        Background="{ThemeResource PivotPreviousButtonBackground}"
-                                        BorderBrush="{ThemeResource PivotPreviousButtonBorderBrush}"
-                                        BorderThickness="{ThemeResource PivotNavButtonBorderThemeThickness}">
-                                        <FontIcon
-                                            x:Name="Arrow"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                            FontSize="12"
-                                            Foreground="{ThemeResource PivotPreviousButtonForeground}"
-                                            Glyph="&#xE76B;"
-                                            MirroredWhenRightToLeft="True"
-                                            UseLayoutRounding="False"/>
-                                        <VisualStateManager.VisualStateGroups>
-                                            <VisualStateGroup x:Name="CommonStates">
-                                                <VisualState x:Name="Normal"/>
-                                                <VisualState x:Name="PointerOver">
-                                                    <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBackgroundPointerOver}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBorderBrushPointerOver}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonForegroundPointerOver}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </VisualState>
-                                                <VisualState x:Name="Pressed">
-                                                    <Storyboard>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="Background">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBackgroundPressed}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Root" Storyboard.TargetProperty="BorderBrush">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonBorderBrushPressed}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="Foreground">
-                                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotPreviousButtonForegroundPressed}"/>
-                                                        </ObjectAnimationUsingKeyFrames>
-                                                    </Storyboard>
-                                                </VisualState>
-                                            </VisualStateGroup>
-                                        </VisualStateManager.VisualStateGroups>
-                                    </Border>
-                                </ControlTemplate>
-                            </Grid.Resources>
-                            <ScrollViewer
-                                x:Name="ScrollViewer"
-                                Margin="{TemplateBinding Padding}"
-                                VerticalContentAlignment="Stretch"
-                                BringIntoViewOnFocusChange="False"
-                                HorizontalScrollBarVisibility="Hidden"
-                                HorizontalSnapPointsAlignment="Center"
-                                HorizontalSnapPointsType="MandatorySingle"
-                                Template="{StaticResource ScrollViewerScrollBarlessTemplate}"
-                                VerticalScrollBarVisibility="Disabled"
-                                VerticalScrollMode="Disabled"
-                                VerticalSnapPointsType="None"
-                                ZoomMode="Disabled">
-                                <PivotPanel x:Name="Panel" VerticalAlignment="Stretch">
-                                    <Grid x:Name="PivotLayoutElement">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                        </Grid.RowDefinitions>
-                                        <Grid.RenderTransform>
-                                            <CompositeTransform x:Name="PivotLayoutElementTranslateTransform"/>
-                                        </Grid.RenderTransform>
-
 
 
                                         <ItemsPresenter x:Name="PivotItemPresenter" Grid.Row="1">
@@ -581,7 +208,7 @@
                                             Grid.Row="0"
                                             Margin="16,16,16,0"
                                             cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                            <Grid Style="{ThemeResource AcrylicSecondaryGridCardStyle}">
+                                            <Grid Style="{ThemeResource AcrylicBaseHighGridCardStyle}">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="Auto"/>
                                                     <ColumnDefinition Width="*"/>

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

@@ -1,115 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cw="using:CommunityToolkit.WinUI"
-    xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
-    xmlns:shcp="using:Snap.Hutao.Control.Panel"
-    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/SegmentedItem/SegmentedItem.xaml"/>
-    </ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <StaticResource x:Key="SegmentedBackground" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush"/>
-            <Thickness x:Key="SegmentedBorderThickness">1</Thickness>
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="SegmentedBackground" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush"/>
-            <Thickness x:Key="SegmentedBorderThickness">1</Thickness>
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="SegmentedBackground" ResourceKey="SystemColorButtonFaceColor"/>
-            <StaticResource x:Key="SegmentedBorderBrush" ResourceKey="SystemColorHighlightColorBrush"/>
-            <Thickness x:Key="SegmentedBorderThickness">1</Thickness>
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-
-    <x:Double x:Key="SegmentedItemSpacing">1</x:Double>
-    <x:Double x:Key="ButtonItemSpacing">2</x:Double>
-
-    <Style BasedOn="{StaticResource DefaultSegmentedStyle}" TargetType="cwc:Segmented"/>
-
-    <Style x:Key="DefaultSegmentedStyle" TargetType="cwc:Segmented">
-        <Style.Setters>
-            <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-            <Setter Property="Background" Value="{ThemeResource SegmentedBackground}"/>
-            <Setter Property="BorderBrush" Value="{ThemeResource SegmentedBorderBrush}"/>
-            <Setter Property="BorderThickness" Value="{ThemeResource SegmentedBorderThickness}"/>
-            <Setter Property="HorizontalAlignment" Value="Left"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="SelectionMode" Value="Single"/>
-            <Setter Property="IsItemClickEnabled" Value="False"/>
-            <win:Setter Property="SingleSelectionFollowsFocus" Value="False"/>
-            <Setter Property="IsTabStop" Value="False"/>
-            <Setter Property="TabNavigation" Value="Once"/>
-            <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <shcp:EqualPanel
-                            HorizontalAlignment="{Binding (cw:FrameworkElementExtensions.Ancestor).HorizontalAlignment, RelativeSource={RelativeSource Self}}"
-                            cw:FrameworkElementExtensions.AncestorType="cwc:Segmented"
-                            Spacing="{ThemeResource SegmentedItemSpacing}"/>
-                    </ItemsPanelTemplate>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="cwc:Segmented">
-                        <Grid>
-                            <Border
-                                VerticalAlignment="Stretch"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}"/>
-                            <ItemsPresenter Margin="{TemplateBinding Padding}"/>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <Style
-        x:Key="PivotSegmentedStyle"
-        BasedOn="{StaticResource DefaultSegmentedStyle}"
-        TargetType="cwc:Segmented">
-        <Style.Setters>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="ItemContainerStyle" Value="{StaticResource PivotSegmentedItemStyle}"/>
-            <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" Spacing="{ThemeResource SegmentedItemSpacing}"/>
-                    </ItemsPanelTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <Style
-        x:Key="ButtonSegmentedStyle"
-        BasedOn="{StaticResource DefaultSegmentedStyle}"
-        TargetType="cwc:Segmented">
-        <Style.Setters>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="0"/>
-            <Setter Property="ItemContainerStyle" Value="{StaticResource ButtonSegmentedItemStyle}"/>
-            <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" Spacing="{ThemeResource ButtonItemSpacing}"/>
-                    </ItemsPanelTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-</ResourceDictionary>

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

@@ -1,4 +1,7 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cwc="using:CommunityToolkit.WinUI.Controls">
     <!--  Settings  -->
     <x:Double x:Key="SettingsCardSpacing">3</x:Double>
     <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
@@ -21,14 +24,6 @@
             <Setter Property="Margin" Value="1,29,0,5"/>
         </Style.Setters>
     </Style>
-    <Style
-        x:Key="SettingsCardHeaderTextBlockStyle"
-        BasedOn="{StaticResource BodyStrongTextBlockStyle}"
-        TargetType="TextBlock">
-        <Style.Setters>
-            <Setter Property="Margin" Value="1,0,0,5"/>
-        </Style.Setters>
-    </Style>
     <Style
         x:Key="SettingsContentComboBoxStyle"
         BasedOn="{StaticResource DefaultComboBoxStyle}"

src/Snap.Hutao/Snap.Hutao/Control/Theme/SystemColors.cs

@@ -1,25 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Win32;
-using Windows.UI;
-
-namespace Snap.Hutao.Control.Theme;
-
-internal static class SystemColors
-{
-    public static Color BaseLowColor(bool isDarkMode)
-    {
-        return isDarkMode ? StructMarshal.Color(0x33FFFFFF) : StructMarshal.Color(0x33000000);
-    }
-
-    public static Color BaseMediumLowColor(bool isDarkMode)
-    {
-        return isDarkMode ? StructMarshal.Color(0x66FFFFFF) : StructMarshal.Color(0x66000000);
-    }
-
-    public static Color BaseHighColor(bool isDarkMode)
-    {
-        return isDarkMode ? StructMarshal.Color(0xFFFFFFFF) : StructMarshal.Color(0xFF000000);
-    }
-}

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

@@ -1,5 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Thickness x:Key="ListViewInSplitPanePadding">0,2</Thickness>
-    <!--  https://github.com/microsoft/microsoft-ui-xaml/issues/4811  -->
-    <x:Int32 x:Key="__DiscardPageOverride">0</x:Int32>
-</ResourceDictionary>

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

@@ -34,6 +34,5 @@
     <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>
     <x:String x:Key="UI_EmotionIcon293">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon293.png</x:String>
-    <x:String x:Key="UI_EmotionIcon433">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon433.png</x:String>
     <x:String x:Key="UI_EmotionIcon445">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon445.png</x:String>
 </ResourceDictionary>

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

@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.DependencyInjection.Abstraction;
 using Snap.Hutao.Core.IO;
 
 namespace Snap.Hutao.Core.Caching;
@@ -9,7 +10,7 @@ namespace Snap.Hutao.Core.Caching;
 /// 为图像缓存提供抽象
 /// </summary>
 [HighQuality]
-internal interface IImageCache
+internal interface IImageCache : ICastService
 {
     /// <summary>
     /// Gets the file path containing cached item for given Uri

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

@@ -26,12 +26,12 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
 {
     private const string CacheFolderName = nameof(ImageCache);
 
-    private readonly FrozenDictionary<int, TimeSpan> retryCountToDelay = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(0, TimeSpan.FromSeconds(4)),
-        KeyValuePair.Create(1, TimeSpan.FromSeconds(16)),
-        KeyValuePair.Create(2, TimeSpan.FromSeconds(64)),
-    ]);
+    private readonly FrozenDictionary<int, TimeSpan> retryCountToDelay = new Dictionary<int, TimeSpan>()
+    {
+        [0] = TimeSpan.FromSeconds(4),
+        [1] = TimeSpan.FromSeconds(16),
+        [2] = TimeSpan.FromSeconds(64),
+    }.ToFrozenDictionary();
 
     private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();
 
@@ -42,20 +42,10 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
     private string? baseFolder;
     private string? cacheFolder;
 
-    private string CacheFolder
-    {
-        get => LazyInitializer.EnsureInitialized(ref cacheFolder, () =>
-        {
-            baseFolder ??= serviceProvider.GetRequiredService<RuntimeOptions>().LocalCache;
-            DirectoryInfo info = Directory.CreateDirectory(Path.Combine(baseFolder, CacheFolderName));
-            return info.FullName;
-        });
-    }
-
     /// <inheritdoc/>
     public void RemoveInvalid()
     {
-        RemoveCore(Directory.GetFiles(CacheFolder).Where(file => IsFileInvalid(file, false)));
+        RemoveInternal(Directory.GetFiles(GetCacheFolder()).Where(file => IsFileInvalid(file, false)));
     }
 
     /// <inheritdoc/>
@@ -72,7 +62,7 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
             return;
         }
 
-        string folder = CacheFolder;
+        string folder = GetCacheFolder();
         string[] files = Directory.GetFiles(folder);
 
         List<string> filesToDelete = [];
@@ -85,16 +75,16 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
             }
         }
 
-        RemoveCore(filesToDelete);
+        RemoveInternal(filesToDelete);
     }
 
     /// <inheritdoc/>
     public async ValueTask<ValueFile> GetFileFromCacheAsync(Uri uri)
     {
         string fileName = GetCacheFileName(uri);
-        string filePath = Path.Combine(CacheFolder, fileName);
+        string filePath = Path.Combine(GetCacheFolder(), fileName);
 
-        if (!IsFileInvalid(filePath))
+        if (File.Exists(filePath) && new FileInfo(filePath).Length != 0)
         {
             return filePath;
         }
@@ -104,12 +94,10 @@ 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);
                 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);
                 await task.ConfigureAwait(false);
             }
 
@@ -127,7 +115,7 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
     public ValueFile GetFileFromCategoryAndName(string category, string fileName)
     {
         Uri dummyUri = Web.HutaoEndpoints.StaticRaw(category, fileName).ToUri();
-        return Path.Combine(CacheFolder, GetCacheFileName(dummyUri));
+        return Path.Combine(GetCacheFolder(), GetCacheFileName(dummyUri));
     }
 
     private static string GetCacheFileName(Uri uri)
@@ -149,18 +137,17 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
         return fileInfo.Length == 0;
     }
 
-    private void RemoveCore(IEnumerable<string> filePaths)
+    private void RemoveInternal(IEnumerable<string> filePaths)
     {
         foreach (string filePath in filePaths)
         {
             try
             {
                 File.Delete(filePath);
-                logger.LogInformation("Remove cached image succeed:{File}", filePath);
             }
             catch (Exception ex)
             {
-                logger.LogWarning(ex, "Remove cached image failed:{File}", filePath);
+                logger.LogWarning(ex, "Remove Cache Image Failed:{File}", filePath);
             }
         }
     }
@@ -168,17 +155,14 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
     [SuppressMessage("", "SH003")]
     private async Task DownloadFileAsync(Uri uri, string baseFile)
     {
+        logger.LogInformation("Begin downloading for {Uri}", uri);
+
         int retryCount = 0;
         HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
         while (retryCount < 3)
         {
             using (HttpResponseMessage message = await httpClient.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
             {
-                if (message.RequestMessage is { RequestUri: { } target } && target != uri)
-                {
-                    logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
-                }
-
                 if (message.IsSuccessStatusCode)
                 {
                     using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
@@ -197,7 +181,7 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
                         {
                             retryCount++;
                             TimeSpan delay = message.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
-                            logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
+                            logger.LogInformation("Retry {Uri} after {Delay}.", uri, delay);
                             await Task.Delay(delay).ConfigureAwait(false);
                             break;
                         }
@@ -208,4 +192,18 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
             }
         }
     }
+
+    private string GetCacheFolder()
+    {
+        if (cacheFolder is not null)
+        {
+            return cacheFolder;
+        }
+
+        baseFolder ??= serviceProvider.GetRequiredService<RuntimeOptions>().LocalCache;
+        DirectoryInfo info = Directory.CreateDirectory(Path.Combine(baseFolder, CacheFolderName));
+        cacheFolder = info.FullName;
+
+        return cacheFolder;
+    }
 }

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

@@ -1,29 +1,25 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using CommunityToolkit.WinUI.Collections;
 using Microsoft.EntityFrameworkCore;
-using Snap.Hutao.Model;
-using Snap.Hutao.Model.Entity.Database;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Core.Database;
 
-internal sealed class ObservableReorderableDbCollection<TEntity> : ObservableCollection<TEntity>
-    where TEntity : class, IReorderable
+internal sealed class ObservableReorderableDbCollection<T> : ObservableCollection<T>
+    where T : class, IReorderable
 {
-    private readonly IServiceProvider serviceProvider;
+    private readonly DbContext dbContext;
+    private bool previousChangeIsRemoved;
 
-    public ObservableReorderableDbCollection(List<TEntity> items, IServiceProvider serviceProvider)
-        : base(AdjustIndex(items.SortBy(x => x.Index)))
+    public ObservableReorderableDbCollection(List<T> items, DbContext dbContext)
+        : base(AdjustIndex(items))
     {
-        this.serviceProvider = serviceProvider;
+        this.dbContext = dbContext;
     }
 
-    public IAdvancedCollectionView? View { get; set; }
-
     protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
     {
         base.OnCollectionChanged(e);
@@ -31,18 +27,26 @@ internal sealed class ObservableReorderableDbCollection<TEntity> : ObservableCol
         switch (e.Action)
         {
             case NotifyCollectionChangedAction.Remove:
+                previousChangeIsRemoved = true;
+                break;
             case NotifyCollectionChangedAction.Add:
+                if (!previousChangeIsRemoved)
+                {
+                    return;
+                }
+
                 OnReorder();
+                previousChangeIsRemoved = false;
                 break;
         }
     }
 
-    private static List<TEntity> AdjustIndex(List<TEntity> list)
+    private static List<T> AdjustIndex(List<T> list)
     {
-        Span<TEntity> span = CollectionsMarshal.AsSpan(list);
+        Span<T> span = CollectionsMarshal.AsSpan(list);
         for (int i = 0; i < list.Count; i++)
         {
-            ref readonly TEntity item = ref span[i];
+            ref readonly T item = ref span[i];
             item.Index = i;
         }
 
@@ -51,79 +55,12 @@ internal sealed class ObservableReorderableDbCollection<TEntity> : ObservableCol
 
     private void OnReorder()
     {
-        using (View?.DeferRefresh())
+        AdjustIndex((List<T>)Items);
+
+        DbSet<T> dbSet = dbContext.Set<T>();
+        foreach (ref readonly T item in CollectionsMarshal.AsSpan((List<T>)Items))
         {
-            AdjustIndex((List<TEntity>)Items);
-
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-                DbSet<TEntity> dbSet = appDbContext.Set<TEntity>();
-                foreach (ref readonly TEntity item in CollectionsMarshal.AsSpan((List<TEntity>)Items))
-                {
-                    dbSet.UpdateAndSave(item);
-                }
-            }
-        }
-    }
-}
-
-[SuppressMessage("", "SA1402")]
-internal sealed class ObservableReorderableDbCollection<TEntityOnly, TEntity> : ObservableCollection<TEntityOnly>
-    where TEntityOnly : class, IEntityOnly<TEntity>
-    where TEntity : class, IReorderable
-{
-    private readonly IServiceProvider serviceProvider;
-
-    public ObservableReorderableDbCollection(List<TEntityOnly> items, IServiceProvider serviceProvider)
-        : base(AdjustIndex(items.SortBy(x => x.Entity.Index)))
-    {
-        this.serviceProvider = serviceProvider;
-    }
-
-    public IAdvancedCollectionView? View { get; set; }
-
-    protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
-    {
-        base.OnCollectionChanged(e);
-
-        switch (e.Action)
-        {
-            case NotifyCollectionChangedAction.Remove:
-            case NotifyCollectionChangedAction.Add:
-                OnReorder();
-                break;
-        }
-    }
-
-    private static List<TEntityOnly> AdjustIndex(List<TEntityOnly> list)
-    {
-        Span<TEntityOnly> span = CollectionsMarshal.AsSpan(list);
-        for (int i = 0; i < list.Count; i++)
-        {
-            ref readonly TEntityOnly item = ref span[i];
-            item.Entity.Index = i;
-        }
-
-        return list;
-    }
-
-    private void OnReorder()
-    {
-        using (View?.DeferRefresh())
-        {
-            AdjustIndex((List<TEntityOnly>)Items);
-
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-
-                DbSet<TEntity> dbSet = appDbContext.Set<TEntity>();
-                foreach (ref readonly TEntityOnly item in CollectionsMarshal.AsSpan((List<TEntityOnly>)Items))
-                {
-                    dbSet.UpdateAndSave(item.Entity);
-                }
-            }
+            dbSet.UpdateAndSave(item);
         }
     }
 }

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

@@ -14,7 +14,7 @@ namespace Snap.Hutao.Core.Database;
 internal static class QueryableExtension
 {
     /// <summary>
-    /// <code>source.Where(predicate).ExecuteDelete()</code>
+    /// source.Where(predicate).ExecuteDelete()
     /// </summary>
     /// <typeparam name="TSource">源类型</typeparam>
     /// <param name="source">源</param>
@@ -27,7 +27,7 @@ internal static class QueryableExtension
     }
 
     /// <summary>
-    /// <code>source.Where(predicate).ExecuteDeleteAsync(token)</code>
+    /// source.Where(predicate).ExecuteDeleteAsync(token)
     /// </summary>
     /// <typeparam name="TSource">源类型</typeparam>
     /// <param name="source">源</param>

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

@@ -6,7 +6,6 @@ namespace Snap.Hutao.Core.DependencyInjection.Abstraction;
 /// <summary>
 /// 可转换类型服务
 /// </summary>
-[Obsolete("Not useful anymore")]
 internal interface ICastService
 {
 }

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

@@ -0,0 +1,18 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.DependencyInjection.Abstraction;
+
+/// <summary>
+/// 有名称的对象
+/// 指示该对象可通过名称区分
+/// </summary>
+[Obsolete("无意义的接口")]
+[HighQuality]
+internal interface INamedService
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    string Name { get; }
+}

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

@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.DependencyInjection.Abstraction;
+
+/// <summary>
+/// 海外服/HoYoLAB 可区分
+/// </summary>
+[Obsolete("Use IOverseaSupportFactory instead")]
+internal interface IOverseaSupport
+{
+    /// <summary>
+    /// 是否为 海外服/HoYoLAB
+    /// </summary>
+    public bool IsOversea { get; }
+}

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

@@ -17,7 +17,6 @@ internal static class CastServiceExtension
     /// <typeparam name="T">目标转换类型</typeparam>
     /// <param name="service">对象</param>
     /// <returns>转换类型后的对象</returns>
-    [Obsolete("Not useful anymore")]
     public static T? As<T>(this ICastService service)
         where T : class
     {

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

@@ -2,9 +2,12 @@
 // Licensed under the MIT license.
 
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.Http;
+using Snap.Hutao.Core.IO.Http.Proxy;
 using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Service;
 using System.Globalization;
+using System.Net.Http;
 using System.Runtime.CompilerServices;
 using Windows.Globalization;
 
@@ -51,13 +54,8 @@ internal static class DependencyInjection
         CultureOptions cultureOptions = serviceProvider.GetRequiredService<CultureOptions>();
         cultureOptions.SystemCulture = CultureInfo.CurrentCulture;
 
-        ILogger<CultureOptions> logger = serviceProvider.GetRequiredService<ILogger<CultureOptions>>();
-        logger.LogDebug("System Culture: {System}", cultureOptions.SystemCulture);
-
         CultureInfo cultureInfo = cultureOptions.CurrentCulture;
 
-        logger.LogDebug("Current Culture: {Current}", cultureInfo);
-
         CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
         CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
         CultureInfo.CurrentCulture = cultureInfo;
@@ -68,7 +66,6 @@ internal static class DependencyInjection
         SH.Culture = cultureInfo;
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static void InitializeConsoleWindow(this IServiceProvider serviceProvider)
     {
         _ = serviceProvider.GetRequiredService<ConsoleWindowLifeTime>();

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

@@ -47,13 +47,17 @@ internal static class IocConfiguration
         {
             if (context.Database.GetPendingMigrations().Any())
             {
+#if DEBUG
                 System.Diagnostics.Debug.WriteLine("[Database] Performing AppDbContext Migrations");
+#endif
                 context.Database.Migrate();
             }
         }
 
         builder
+#if DEBUG
             .EnableSensitiveDataLogging()
+#endif
             .UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking)
             .UseSqlite(sqlConnectionString);
     }

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

@@ -25,7 +25,6 @@ internal static partial class IocHttpClientConfiguration
                     .ConfigurePrimaryHttpMessageHandler((handler, provider) =>
                     {
                         HttpClientHandler clientHandler = (HttpClientHandler)handler;
-                        clientHandler.AllowAutoRedirect = true;
                         clientHandler.UseProxy = true;
                         clientHandler.Proxy = provider.GetRequiredService<DynamicHttpProxy>();
                     });

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

@@ -17,6 +17,6 @@ internal readonly struct MeasureExecutionToken : IDisposable
 
     public void Dispose()
     {
-        logger.LogDebug("{Caller} toke {Time} ms", callerName, stopwatch.GetElapsedTime().TotalMilliseconds);
+        logger.LogInformation("{Caller} toke {Time} ms", callerName, stopwatch.GetElapsedTime().TotalMilliseconds);
     }
 }

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

@@ -7,7 +7,6 @@ namespace Snap.Hutao.Core.ExceptionService;
 /// 数据库损坏异常
 /// </summary>
 [HighQuality]
-[Obsolete("Use HutaoException instead")]
 internal sealed class DatabaseCorruptedException : Exception
 {
     /// <summary>

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

@@ -23,16 +23,8 @@ internal sealed partial class ExceptionRecorder
     public void Record(Application app)
     {
         app.UnhandledException += OnAppUnhandledException;
-        app.DebugSettings.FailFastOnErrors = false;
-
-        app.DebugSettings.IsBindingTracingEnabled = true;
         app.DebugSettings.BindingFailed += OnXamlBindingFailed;
-
-        app.DebugSettings.IsXamlResourceReferenceTracingEnabled = true;
         app.DebugSettings.XamlResourceReferenceFailed += OnXamlResourceReferenceFailed;
-
-        app.DebugSettings.LayoutCycleTracingLevel = LayoutCycleTracingLevel.High;
-        app.DebugSettings.LayoutCycleDebugBreakLevel = LayoutCycleDebugBreakLevel.High;
     }
 
     [SuppressMessage("", "CA2012")]

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

@@ -18,12 +18,6 @@ internal sealed class HutaoException : Exception
 
     public HutaoExceptionKind Kind { get; private set; }
 
-    [DoesNotReturn]
-    public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
-    {
-        throw new HutaoException(kind, message, innerException);
-    }
-
     public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
     {
         if (condition)
@@ -31,24 +25,4 @@ internal sealed class HutaoException : Exception
             throw new HutaoException(kind, message, innerException);
         }
     }
-
-    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
-    {
-        if (!condition)
-        {
-            throw new HutaoException(kind, message, innerException);
-        }
-    }
-
-    public static HutaoException ServiceTypeCastFailed<TFrom, TTo>(string name, Exception? innerException = default)
-    {
-        string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
-        throw new HutaoException(HutaoExceptionKind.ServiceTypeCastFailed, message, innerException);
-    }
-
-    public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
-    {
-        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
-        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
-    }
 }

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

@@ -6,16 +6,4 @@ namespace Snap.Hutao.Core.ExceptionService;
 internal enum HutaoExceptionKind
 {
     None,
-
-    // Foundation
-    ServiceTypeCastFailed,
-    ImageCacheInvalidUri,
-
-    // IO
-    FileSystemCreateFileInsufficientPermissions,
-    PrivateNamedPipeContentHashIncorrect,
-
-    // Service
-    GachaStatisticsInvalidItemId,
-    GameFpsUnlockingFailed,
 }

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

@@ -8,7 +8,6 @@ namespace Snap.Hutao.Core.ExceptionService;
 /// 用户的计算机中的某些设置不符合要求
 /// </summary>
 [HighQuality]
-[Obsolete("Use HutaoException instead")]
 internal sealed class RuntimeEnvironmentException : Exception
 {
     /// <summary>

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

@@ -13,7 +13,6 @@ namespace Snap.Hutao.Core.ExceptionService;
 /// </summary>
 [HighQuality]
 [System.Diagnostics.StackTraceHidden]
-[Obsolete("Use HutaoException instead")]
 internal static class ThrowHelper
 {
     [DoesNotReturn]
@@ -74,15 +73,6 @@ internal static class ThrowHelper
         throw new NotSupportedException(message);
     }
 
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    public static void NotSupportedIf(bool condition, string message)
-    {
-        if (condition)
-        {
-            throw new NotSupportedException(message);
-        }
-    }
-
     [DoesNotReturn]
     [MethodImpl(MethodImplOptions.NoInlining)]
     public static OperationCanceledException OperationCanceled(string message, Exception? inner = default)

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

@@ -7,7 +7,6 @@ namespace Snap.Hutao.Core.ExceptionService;
 /// 用户数据损坏异常
 /// </summary>
 [HighQuality]
-[Obsolete("Use HutaoException instead")]
 internal sealed class UserdataCorruptedException : Exception
 {
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Loopback/LoopbackManager.cs

@@ -29,19 +29,17 @@ internal sealed unsafe class LoopbackManager : ObservableObject
         INET_FIREWALL_APP_CONTAINER* pContainers = default;
         try
         {
+            WIN32_ERROR error = NetworkIsolationEnumAppContainers(NETISO_FLAG.NETISO_FLAG_MAX, out uint acCount, out pContainers);
+            Marshal.ThrowExceptionForHR(HRESULT_FROM_WIN32(error));
+            for (uint i = 0; i < acCount; i++)
             {
-                WIN32_ERROR error = NetworkIsolationEnumAppContainers(NETISO_FLAG.NETISO_FLAG_MAX, out uint acCount, out pContainers);
-                Marshal.ThrowExceptionForHR(HRESULT_FROM_WIN32(error));
-                for (uint i = 0; i < acCount; i++)
+                INET_FIREWALL_APP_CONTAINER* pContainer = pContainers + i;
+                ReadOnlySpan<char> appContainerName = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(pContainer->appContainerName);
+                if (appContainerName.Equals(runtimeOptions.FamilyName, StringComparison.Ordinal))
                 {
-                    INET_FIREWALL_APP_CONTAINER* pContainer = pContainers + i;
-                    ReadOnlySpan<char> appContainerName = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(pContainer->appContainerName);
-                    if (appContainerName.Equals(runtimeOptions.FamilyName, StringComparison.Ordinal))
-                    {
-                        ConvertSidToStringSidW(pContainer->appContainerSid, out PWSTR stringSid);
-                        hutaoContainerStringSID = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(stringSid).ToString();
-                        break;
-                    }
+                    ConvertSidToStringSidW(pContainer->appContainerSid, out PWSTR stringSid);
+                    hutaoContainerStringSID = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(stringSid).ToString();
+                    break;
                 }
             }
         }
@@ -51,18 +49,16 @@ internal sealed unsafe class LoopbackManager : ObservableObject
             _ = NetworkIsolationFreeAppContainers(pContainers);
         }
 
+        WIN32_ERROR error2 = NetworkIsolationGetAppContainerConfig(out uint accCount, out SID_AND_ATTRIBUTES* pSids);
+        Marshal.ThrowExceptionForHR(HRESULT_FROM_WIN32(error2));
+        for (uint i = 0; i < accCount; i++)
         {
-            WIN32_ERROR error = NetworkIsolationGetAppContainerConfig(out uint accCount, out SID_AND_ATTRIBUTES* pSids);
-            Marshal.ThrowExceptionForHR(HRESULT_FROM_WIN32(error));
-            for (uint i = 0; i < accCount; i++)
+            ConvertSidToStringSidW((pSids + i)->Sid, out PWSTR stringSid);
+            ReadOnlySpan<char> stringSidSpan = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(stringSid);
+            if (stringSidSpan.Equals(hutaoContainerStringSID, StringComparison.Ordinal))
             {
-                ConvertSidToStringSidW((pSids + i)->Sid, out PWSTR stringSid);
-                ReadOnlySpan<char> stringSidSpan = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(stringSid);
-                if (stringSidSpan.Equals(hutaoContainerStringSID, StringComparison.Ordinal))
-                {
-                    IsLoopbackEnabled = true;
-                    break;
-                }
+                IsLoopbackEnabled = true;
+                break;
             }
         }
     }

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);
+            ThrowHelper.RuntimeEnvironment(SH.CoreIOTempFileCreateFail, ex);
         }
 
         if (delete)

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

@@ -148,15 +148,17 @@ internal sealed partial class Activation : IActivation
 
         await taskContext.SwitchToBackgroundAsync();
 
-        if (serviceProvider.GetRequiredService<IMetadataService>() is IMetadataServiceInitialization metadataServiceInitialization)
-        {
-            metadataServiceInitialization.InitializeInternalAsync().SafeForget();
-        }
+        serviceProvider
+            .GetRequiredService<IMetadataService>()
+            .As<IMetadataServiceInitialization>()?
+            .InitializeInternalAsync()
+            .SafeForget();
 
-        if (serviceProvider.GetRequiredService<IHutaoUserService>() is IHutaoUserServiceInitialization hutaoUserServiceInitialization)
-        {
-            hutaoUserServiceInitialization.InitializeInternalAsync().SafeForget();
-        }
+        serviceProvider
+            .GetRequiredService<IHutaoUserService>()
+            .As<IHutaoUserServiceInitialization>()?
+            .InitializeInternalAsync()
+            .SafeForget();
 
         serviceProvider
             .GetRequiredService<IDiscordService>()

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");
+        ThrowHelper.InvalidDataIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
         return content;
     }
 

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

@@ -8,15 +8,12 @@ using System.IO;
 using System.Security.Principal;
 using Windows.ApplicationModel;
 using Windows.Storage;
-using Windows.UI.Notifications;
 
 namespace Snap.Hutao.Core;
 
 [Injection(InjectAs.Singleton)]
 internal sealed class RuntimeOptions
 {
-    private readonly IServiceProvider serviceProvider;
-
     private readonly Lazy<(Version Version, string UserAgent)> lazyVersionAndUserAgent = new(() =>
     {
         Version version = Package.Current.Id.Version.ToVersion();
@@ -86,14 +83,8 @@ internal sealed class RuntimeOptions
     private readonly Lazy<string> lazyInstalledLocation = new(() => Package.Current.InstalledLocation.Path);
     private readonly Lazy<string> lazyFamilyName = new(() => Package.Current.Id.FamilyName);
 
-    private bool isToastAvailable;
-    private bool isToastAvailableInitialized;
-    private object isToastAvailableLock = new();
-
-    public RuntimeOptions(IServiceProvider serviceProvider, ILogger<RuntimeOptions> logger)
+    public RuntimeOptions(ILogger<RuntimeOptions> logger)
     {
-        this.serviceProvider = serviceProvider;
-
         AppLaunchTime = DateTimeOffset.UtcNow;
     }
 
@@ -117,19 +108,5 @@ internal sealed class RuntimeOptions
 
     public bool IsElevated { get => lazyElevated.Value; }
 
-    public bool IsToastAvailable
-    {
-        get
-        {
-            return LazyInitializer.EnsureInitialized(ref isToastAvailable, ref isToastAvailableInitialized, ref isToastAvailableLock, GetIsToastAvailable);
-
-            bool GetIsToastAvailable()
-            {
-                ITaskContext taskContext = serviceProvider.GetRequiredService<ITaskContext>();
-                return taskContext.InvokeOnMainThread(() => ToastNotificationManager.CreateToastNotifier().Setting is NotificationSetting.Enabled);
-            }
-        }
-    }
-
     public DateTimeOffset AppLaunchTime { get; }
 }

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

@@ -18,9 +18,4 @@ internal static class RuntimeOptionsExtension
     {
         return Path.Combine(options.DataFolder, "ServerCache");
     }
-
-    public static string GetDataFolderBackgroundFolder(this RuntimeOptions options)
-    {
-        return Path.Combine(options.DataFolder, "Background");
-    }
 }

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

@@ -48,45 +48,4 @@ internal static class DispatcherQueueExtension
             exceptionDispatchInfo?.Throw();
         }
     }
-
-    /// <summary>
-    /// 在调度器队列同步调用，直到执行结束，会持续阻塞当前线程
-    /// </summary>
-    /// <param name="dispatcherQueue">调度器队列</param>
-    /// <param name="action">执行的回调</param>
-    /// <typeparam name="T">返回类型</typeparam>
-    /// <returns>回调返回值</returns>
-    public static T Invoke<T>(this DispatcherQueue dispatcherQueue, Func<T> action)
-    {
-        T result = default!;
-
-        if (dispatcherQueue.HasThreadAccess)
-        {
-            return action();
-        }
-
-        ExceptionDispatchInfo? exceptionDispatchInfo = null;
-        using (ManualResetEventSlim blockEvent = new(false))
-        {
-            dispatcherQueue.TryEnqueue(() =>
-            {
-                try
-                {
-                    result = action();
-                }
-                catch (Exception ex)
-                {
-                    exceptionDispatchInfo = ExceptionDispatchInfo.Capture(ex);
-                }
-                finally
-                {
-                    blockEvent.Set();
-                }
-            });
-
-            blockEvent.Wait();
-            exceptionDispatchInfo?.Throw();
-            return result;
-        }
-    }
 }

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

@@ -12,8 +12,6 @@ internal interface ITaskContext
 
     void InvokeOnMainThread(Action action);
 
-    T InvokeOnMainThread<T>(Func<T> action);
-
     ThreadPoolSwitchOperation SwitchToBackgroundAsync();
 
     DispatcherQueueSwitchOperation SwitchToMainThreadAsync();

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

@@ -44,12 +44,6 @@ internal sealed class TaskContext : ITaskContext, ITaskContextUnsafe
         dispatcherQueue.Invoke(action);
     }
 
-    /// <inheritdoc/>
-    public T InvokeOnMainThread<T>(Func<T> action)
-    {
-        return dispatcherQueue.Invoke(action);
-    }
-
     public void BeginInvokeOnMainThread(Action action)
     {
         dispatcherQueue.TryEnqueue(() => action());

src/Snap.Hutao/Snap.Hutao/Core/TypeNameHelper.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Frozen;
 using System.Text;
 
 namespace Snap.Hutao.Core;
@@ -15,25 +14,25 @@ internal static class TypeNameHelper
 {
     private const char DefaultNestedTypeDelimiter = '+';
 
-    private static readonly FrozenDictionary<Type, string> BuiltInTypeNames = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(typeof(void), "void"),
-        KeyValuePair.Create(typeof(bool), "bool"),
-        KeyValuePair.Create(typeof(byte), "byte"),
-        KeyValuePair.Create(typeof(char), "char"),
-        KeyValuePair.Create(typeof(decimal), "decimal"),
-        KeyValuePair.Create(typeof(double), "double"),
-        KeyValuePair.Create(typeof(float), "float"),
-        KeyValuePair.Create(typeof(int), "int"),
-        KeyValuePair.Create(typeof(long), "long"),
-        KeyValuePair.Create(typeof(object), "object"),
-        KeyValuePair.Create(typeof(sbyte), "sbyte"),
-        KeyValuePair.Create(typeof(short), "short"),
-        KeyValuePair.Create(typeof(string), "string"),
-        KeyValuePair.Create(typeof(uint), "uint"),
-        KeyValuePair.Create(typeof(ulong), "ulong"),
-        KeyValuePair.Create(typeof(ushort), "ushort"),
-    ]);
+    private static readonly Dictionary<Type, string> BuiltInTypeNames = new()
+    {
+        { typeof(void), "void" },
+        { typeof(bool), "bool" },
+        { typeof(byte), "byte" },
+        { typeof(char), "char" },
+        { typeof(decimal), "decimal" },
+        { typeof(double), "double" },
+        { typeof(float), "float" },
+        { typeof(int), "int" },
+        { typeof(long), "long" },
+        { typeof(object), "object" },
+        { typeof(sbyte), "sbyte" },
+        { typeof(short), "short" },
+        { typeof(string), "string" },
+        { typeof(uint), "uint" },
+        { typeof(ulong), "ulong" },
+        { typeof(ushort), "ushort" },
+    };
 
     /// <summary>
     /// 获取对象类型的显示名称

src/Snap.Hutao/Snap.Hutao/Core/Validation/Must.cs

@@ -9,7 +9,6 @@ namespace Snap.Hutao.Core.Validation;
 /// 封装验证方法,简化微软验证
 /// </summary>
 [HighQuality]
-[Obsolete("Use HutaoException instead")]
 internal static class Must
 {
     /// <summary>

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

@@ -5,7 +5,6 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Snap.Hutao.Core.LifeCycle;
 using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Model;
-using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Win32.Foundation;
 using Snap.Hutao.Win32.UI.Input.KeyboardAndMouse;
 using System.Text;
@@ -18,7 +17,6 @@ namespace Snap.Hutao.Core.Windowing.HotKey;
 internal sealed class HotKeyCombination : ObservableObject
 {
     private readonly ICurrentWindowReference currentWindowReference;
-    private readonly IInfoBarService infoBarService;
     private readonly RuntimeOptions runtimeOptions;
 
     private readonly string settingKey;
@@ -39,7 +37,6 @@ internal sealed class HotKeyCombination : ObservableObject
     public HotKeyCombination(IServiceProvider serviceProvider, string settingKey, int hotKeyId, HOT_KEY_MODIFIERS defaultModifiers, VirtualKey defaultKey)
     {
         currentWindowReference = serviceProvider.GetRequiredService<ICurrentWindowReference>();
-        infoBarService = serviceProvider.GetRequiredService<IInfoBarService>();
         runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
 
         this.settingKey = settingKey;
@@ -189,12 +186,6 @@ internal sealed class HotKeyCombination : ObservableObject
         HWND hwnd = currentWindowReference.GetWindowHandle();
         BOOL result = RegisterHotKey(hwnd, hotKeyId, Modifiers, (uint)Key);
         registered = result;
-
-        if (!result)
-        {
-            infoBarService.Warning(SH.FormatCoreWindowHotkeyCombinationRegisterFailed(SH.ViewPageSettingKeyShortcutAutoClickingHeader, DisplayName));
-        }
-
         return result;
     }
 

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;
@@ -57,20 +56,20 @@ internal sealed class WindowController
     private void InitializeCore()
     {
         RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
-        AppOptions appOptions = serviceProvider.GetRequiredService<AppOptions>();
 
         window.AppWindow.Title = SH.FormatAppNameAndVersion(runtimeOptions.Version);
         window.AppWindow.SetIcon(Path.Combine(runtimeOptions.InstalledLocation, "Assets/Logo.ico"));
         ExtendsContentIntoTitleBar();
 
         RecoverOrInitWindowSize();
-        UpdateElementTheme(appOptions.ElementTheme);
         UpdateImmersiveDarkMode(options.TitleBar, default!);
 
         // appWindow.Show(true);
         // appWindow.Show can't bring window to top.
         window.Activate();
         options.BringToForeground();
+
+        AppOptions appOptions = serviceProvider.GetRequiredService<AppOptions>();
         UpdateSystemBackdrop(appOptions.BackdropType);
         appOptions.PropertyChanged += OnOptionsPropertyChanged;
 
@@ -120,17 +119,13 @@ internal sealed class WindowController
 
     private void OnOptionsPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
-        if (sender is not AppOptions options)
+        if (e.PropertyName is nameof(AppOptions.BackdropType))
         {
-            return;
+            if (sender is AppOptions options)
+            {
+                UpdateSystemBackdrop(options.BackdropType);
+            }
         }
-
-        _ = e.PropertyName switch
-        {
-            nameof(AppOptions.BackdropType) => UpdateSystemBackdrop(options.BackdropType),
-            nameof(AppOptions.ElementTheme) => UpdateElementTheme(options.ElementTheme),
-            _ => false,
-        };
     }
 
     private void OnWindowClosed(object sender, WindowEventArgs args)
@@ -160,7 +155,7 @@ internal sealed class WindowController
         }
     }
 
-    private bool UpdateSystemBackdrop(BackdropType backdropType)
+    private void UpdateSystemBackdrop(BackdropType backdropType)
     {
         window.SystemBackdrop = backdropType switch
         {
@@ -170,15 +165,6 @@ internal sealed class WindowController
             BackdropType.Acrylic => new DesktopAcrylicBackdrop(),
             _ => null,
         };
-
-        return true;
-    }
-
-    private bool UpdateElementTheme(ElementTheme theme)
-    {
-        ((FrameworkElement)window.Content).RequestedTheme = theme;
-
-        return true;
     }
 
     private void UpdateTitleButtonColor()
@@ -188,12 +174,12 @@ internal sealed class WindowController
         appTitleBar.ButtonBackgroundColor = Colors.Transparent;
         appTitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
 
-        bool isDarkMode = Control.Theme.ThemeHelper.IsDarkMode(options.TitleBar.ActualTheme);
+        IAppResourceProvider resourceProvider = serviceProvider.GetRequiredService<IAppResourceProvider>();
 
-        Color systemBaseLowColor = Control.Theme.SystemColors.BaseLowColor(isDarkMode);
+        Color systemBaseLowColor = resourceProvider.GetResource<Color>("SystemBaseLowColor");
         appTitleBar.ButtonHoverBackgroundColor = systemBaseLowColor;
 
-        Color systemBaseMediumLowColor = Control.Theme.SystemColors.BaseMediumLowColor(isDarkMode);
+        Color systemBaseMediumLowColor = resourceProvider.GetResource<Color>("SystemBaseMediumLowColor");
         appTitleBar.ButtonPressedBackgroundColor = systemBaseMediumLowColor;
 
         // The Foreground doesn't accept Alpha channel. So we translate it to gray.
@@ -201,7 +187,7 @@ internal sealed class WindowController
         byte result = (byte)((systemBaseMediumLowColor.A / 255.0) * light);
         appTitleBar.ButtonInactiveForegroundColor = Color.FromArgb(0xFF, result, result, result);
 
-        Color systemBaseHighColor = Control.Theme.SystemColors.BaseHighColor(isDarkMode);
+        Color systemBaseHighColor = resourceProvider.GetResource<Color>("SystemBaseHighColor");
         appTitleBar.ButtonForegroundColor = systemBaseHighColor;
         appTitleBar.ButtonHoverForegroundColor = systemBaseHighColor;
         appTitleBar.ButtonPressedForegroundColor = systemBaseHighColor;

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

@@ -46,6 +46,13 @@ internal readonly struct WindowOptions
     /// </summary>
     public readonly bool UseLegacyDragBarImplementation = !AppWindowTitleBar.IsCustomizationSupported();
 
+    /// <summary>
+    /// 构造一个新的窗体选项
+    /// </summary>
+    /// <param name="window">窗体</param>
+    /// <param name="titleBar">标题栏</param>
+    /// <param name="initSize">初始尺寸</param>
+    /// <param name="persistSize">持久化尺寸</param>
     public WindowOptions(Window window, FrameworkElement titleBar, SizeInt32 initSize, bool persistSize = false)
     {
         Hwnd = WindowNative.GetWindowHandle(window);