fix cn login

Update PWA assets

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -15,17 +15,15 @@ body:
       description: |-
         请确保你已完整执行检查清单，否则你的 Issue 可能会被忽略
       options:
-        - label: 我已完整阅读[胡桃工具箱文档](https://hut.ao/FAQ/)，并认为我的问题没有在文档中得到解答
-          required: true
+        - label: 我并未完整阅读[胡桃工具箱文档](https://hut.ao/advanced/FAQ.html)
+          
+        - label: 我不知道文档站的导航栏中有**搜索功能**，也没有搜索过相关关键词
 
-        - label: 我使用的操作系统是[受支持的版本](https://hut.ao/quick-start.html#%E6%9C%80%E4%BD%8E%E7%B3%BB%E7%BB%9F%E8%A6%81%E6%B1%82)
-          required: true
+        - label: 我使用的操作系统是不[受支持的版本](https://hut.ao/quick-start.html#%E6%9C%80%E4%BD%8E%E7%B3%BB%E7%BB%9F%E8%A6%81%E6%B1%82)
 
-        - label: 我确认没有其他人已经提出了相同或类似的问题
-          required: true
-
-        - label: 我会在下方的表单中附上充足的信息以帮助开发人员确定问题
-          required: true
+        - label: 我没有**通过搜索功能**确认其他人提出过相同或类似的问题
+         
+        - label: 我不明白上述的勾选项是**一个有助于快速排查问题的检查清单**，而是随手确认的选项
 
   - type: input
     id: winver
@@ -42,7 +40,7 @@ body:
     attributes:
       label: Snap Hutao 版本
       description: 在应用标题，应用程序的设置界面中靠下的位置可以找到
-      placeholder: 例：1.3.13.0
+      placeholder: 例：1.4.15.0
     validations:
       required: true
 
@@ -96,14 +94,4 @@ body:
       description: 详细的描述你期望发生的行为，突出与目前（可能不正确的）行为的不同
     validations:
       required: false
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: 相关的崩溃日志
-      description: |
-                   在资源管理器中直接输入`%userprofile%/Documents/Hutao`即可进入文件夹
-                   如果应用程序崩溃了，请将`log.db` 文件上传，文件包含了敏感信息，谨慎上传
-                   如果这个表单是关于导入祈愿记录的问题，请包含你导入的`Json`文件
-                   > **务必不要上传`user.db`文件，该文件包含你的帐号敏感信息**
-        
+      

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "nuget" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/PublishDistribution.yml

@@ -23,7 +23,7 @@ jobs:
         with: 
           repository: "DGP-Studio/Snap.Hutao"
           latest: true
-          fileName: "*.zip"
+          fileName: "*.msix"
           out-file-path: ./release-download
           
       # Upload to Drive

.gitignore

@@ -15,5 +15,5 @@ src/Snap.Hutao/Snap.Hutao.Installer/Properties/PublishProfiles/FolderProfile.pub
 src/Snap.Hutao/Snap.Hutao.SourceGeneration/bin/
 src/Snap.Hutao/Snap.Hutao.SourceGeneration/obj/
 
-src/Snap.Hutao/Snap.Hutao.Win32/bin/
-src/Snap.Hutao/Snap.Hutao.Win32/obj/
+src/Snap.Hutao/Snap.Hutao.Test/bin/
+src/Snap.Hutao/Snap.Hutao.Test/obj/

CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Code of Conduct
+
+>  Snap Hutao is adapting the following rules to keep the community safety.
+
+When participating in our open source community, we want all members to respect and support each other. To ensure the comfort and safety of our community members, we have established the following code of conduct:
+
+1. Respect diversity and inclusivity. We welcome people from different countries, regions, genders, sexual orientations, abilities, religions, and cultural backgrounds to participate in our community, and we encourage respect for all differences.
+2. Prohibit discrimination and harassment. We do not tolerate any form of discrimination, harassment, personal attacks, or insults. This includes but is not limited to race, gender, sexual orientation, age, religion, nationality, cultural background, physical and mental health status.
+3. Respect privacy and personal information. We protect the privacy and personal information of community members and prohibit the public disclosure of any private information. If you need to disclose certain information, please make sure you have obtained the relevant person's permission.
+4. Keep honesty and transparency. We expect community members to maintain honesty and transparency and not intentionally mislead or deceive others.
+5. Respect community rules and other members. We encourage community members to follow community rules and guidelines and maintain a polite and respectful attitude towards other members. If you find that other members are violating community rules, please report it to community administrators or organizers in a timely manner.
+
+The above is our community's code of conduct, and we expect all community members to abide by these rules. We will actively address behaviors that violate these rules. We believe that through mutual respect and support, we can build a friendly, inclusive, and beneficial open source community.

NuGet.Config

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="Microsoft CsWin32" value="https://pkgs.dev.azure.com/azure-public/winsdk/_packaging/CI/nuget/v3/index.json" />
+    <add key="CommunityToolkit Labs" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
+  </packageSources>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <bindingRedirects>
+    <add key="skip" value="False" />
+  </bindingRedirects>
+  <packageManagement>
+    <add key="format" value="1" />
+    <add key="disabled" value="False" />
+  </packageManagement>
+</configuration>

README.md

@@ -1,28 +1,34 @@
-![](https://repository-images.githubusercontent.com/482734649/5f8cf574-2ef0-43e9-aa8d-6cf094b54dd9)
+![](https://repository-images.githubusercontent.com/482734649/c47a0a8e-868d-4d07-a66f-6d4473abfe46)
 
-## 下载使用
+胡桃工具箱是一个 Windows 平台的开源的原神工具箱，旨在帮助玩家获得更好的游戏体验； 它是对官方移动端工具的一种非破坏性功能扩展，为不习惯在移动端进行原神游戏的 PC 玩家提供一个在 Windows 平台下获得接近移动端功能权利的途径
 
-[![](https://get.microsoft.com/images/zh-cn%20light.svg)](https://apps.microsoft.com/store/detail/snap-hutao/9PH4NXJ2JN52)
+Snap Hutao is an open-source Genshin Impact toolbox on Windows platform, aim to provide a better gaming experience for players. It's an nondestructive feature extension from Genshin Impact's official mobile application, to provide similar feature on desktop, to allow PC gamers gain deserved benefits from mobile platforms.
 
-## 贡献
+## 下载使用 / Download
 
-* [向我们提交 PR](https://github.com/DGP-Studio/Snap.Hutao/pulls)
-* [在 Crowdin 上进行本地化](https://crowdin.com/project/snap-hutao)
+[<img src="https://get.microsoft.com/images/zh-cn%20light.svg"  width="30%" height="30%">](https://apps.microsoft.com/store/detail/snap-hutao/9PH4NXJ2JN52)
 
-## 特别感谢
+## 贡献 / Contribute
+
+* [向我们提交 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)
+
+## 特别感谢 / Special Thanks
 
 * [HolographicHat](https://github.com/HolographicHat)
 * [UIGF organization](https://uigf.org)
 
-### 特定的原神项目
+### 特定的原神项目 / Specific Genshin-related Project
 
 * [biuuu/genshin-wish-export](https://github.com/biuuu/genshin-wish-export)
 * [xunkong/xunkong](https://github.com/xunkong/xunkong)
 * [YuehaiTeam/cocogoat](https://github.com/YuehaiTeam/cocogoat)
 
-### 使用的技术栈
+### 使用的技术栈 / Tech Stack
 
 * [CommunityToolkit/dotnet](https://github.com/CommunityToolkit/dotnet)
+* [CommunityToolkit/Labs-Windows](https://github.com/CommunityToolkit/Labs-Windows)
 * [CommunityToolkit/WindowsCommunityToolkit](https://github.com/CommunityToolkit/WindowsCommunityToolkit)
 * [dahall/taskscheduler](https://github.com/dahall/taskscheduler)
 * [dotnet/efcore](https://github.com/dotnet/efcore)
@@ -33,13 +39,12 @@
 * [microsoft/vs-validation](https://github.com/microsoft/vs-validation)
 * [microsoft/WindowsAppSDK](https://github.com/microsoft/WindowsAppSDK)
 * [microsoft/microsoft-ui-xaml](https://github.com/microsoft/microsoft-ui-xaml)
-* [WinUICommunity/SettingsUI](https://github.com/WinUICommunity/SettingsUI)
 
-### 支撑项目
+### 支撑项目 / Supporter Project
 
 * [Snap.Hutao.Server](https://github.com/DGP-Studio/Snap.Hutao.Server)
 * [Snap.Metadata](https://github.com/DGP-Studio/Snap.Metadata)
 * [Snap.Data.Mapper](https://github.com/DGP-Studio/Snap.Data.Mapper)
 
-## 近期活跃数据
-![Snap.Hutao](https://repobeats.axiom.co/api/embed/f029553fbe0c60689b1710476ec8512452163fc9.svg)
+## 近期活跃数据 / Active Stat
+![Snap.Hutao](https://repobeats.axiom.co/api/embed/f029553fbe0c60689b1710476ec8512452163fc9.svg)

SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| >=1.4.11   | :white_check_mark: |
+| <1.4.11   | :x:                |
+
+## Reporting a Vulnerability
+
+Please [open an issue](https://github.com/DGP-Studio/Snap.Hutao/issues/new/choose)

azure-pipelines.yml

@@ -65,7 +65,8 @@ steps:
   inputs:
     command: 'restore'
     restoreSolution: '$(solution)'
-    feedsToUse: 'select'
+    feedsToUse: 'config'
+    nugetConfigPath: '$(Build.SourcesDirectory)/NuGet.Config'
 
 - task: MsixPackaging@1
   displayName: Build binary package
@@ -83,7 +84,7 @@ steps:
 
 - task: MagicChunks@2
   inputs:
-    sourcePath: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.18362.0\win10-x64\AppxManifest.xml'
+    sourcePath: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64\AppxManifest.xml'
     fileType: 'Xml'
     targetPathType: 'source'
     transformationType: 'json'
@@ -104,7 +105,7 @@ steps:
       mkdir Assets
       
       mkdir Resource
-    workingDirectory: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.18362.0\win10-x64'
+    workingDirectory: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64'
       
 
 - task: CopyFiles@2
@@ -112,19 +113,19 @@ steps:
   inputs:
     SourceFolder: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\Assets'
     Contents: '**'
-    TargetFolder: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.18362.0\win10-x64\Assets'
+    TargetFolder: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64\Assets'
 
 - task: CopyFiles@2
   displayName: Copy Resource Folder
   inputs:
     SourceFolder: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\Resource'
     Contents: '**'
-    TargetFolder: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.18362.0\win10-x64\Resource'
+    TargetFolder: '$(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64\Resource'
 
 - task: CmdLine@2
   displayName: Build MSIX
   inputs:
-    script: '"C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\makeappx.exe" pack /d $(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.18362.0\win10-x64 /p $(Build.ArtifactStagingDirectory)/Snap.Hutao.Alpha-$(build_date).$(rev_number).msix'
+    script: '"C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\makeappx.exe" pack /d $(Build.SourcesDirectory)\src\Snap.Hutao\Snap.Hutao\bin\x64\Release\net7.0-windows10.0.19041.0\win10-x64 /p $(Build.ArtifactStagingDirectory)/Snap.Hutao.Alpha-$(build_date).$(rev_number).msix'
 
 - task: MsixSigning@1
   name: signMsix
@@ -173,6 +174,7 @@ steps:
     changeLogType: 'commitBased'
 
 - task: DownloadSecureFile@1
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
   name: RcloneConfigFile
   displayName: Download Rclone Config
   inputs:
@@ -180,6 +182,7 @@ steps:
 
 - 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-$(build_date).$(rev_number).msix downloadDGPCN:/releases/Alpha/'
     configPath: '$(RcloneConfigFile.secureFilePath)'

crowdin.yml

@@ -1,3 +1,3 @@
 files:
   - source: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
-    translation: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.%locale%.resx
+    translation: /src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.%osx_locale%.resx

res/LEGAL NOTICE.md

@@ -0,0 +1,3 @@
+本文件夹中的所有图片，均由 [DGP Studio](https://github.com/DGP-Studio) 委托 [Bilibili 画画的芦苇](https://space.bilibili.com/274422134) 绘制
+
+Copyright ©2023 DGP Studio, All Rights Reserved.

src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/HttpClientGenerator.cs

@@ -11,7 +11,7 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 
-namespace Snap.Hutao.SourceGeneration.DedendencyInjection;
+namespace Snap.Hutao.SourceGeneration.DependencyInjection;
 
 /// <summary>
 /// 注入HttpClient代码生成器
@@ -21,9 +21,10 @@ namespace Snap.Hutao.SourceGeneration.DedendencyInjection;
 [Generator]
 public class HttpClientGenerator : ISourceGenerator
 {
-    private const string DefaultName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfigration.Default";
-    private const string XRpcName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfigration.XRpc";
-    private const string XRpc2Name = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfigration.XRpc2";
+    private const string DefaultName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfiguration.Default";
+    private const string XRpcName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfiguration.XRpc";
+    private const string XRpc2Name = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfiguration.XRpc2";
+    private const string XRpc3Name = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.HttpClientConfiguration.XRpc3";
 
     private const string PrimaryHttpMessageHandlerAttributeName = "Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient.PrimaryHttpMessageHandlerAttribute";
     private const string DynamicSecretAttributeName = "Snap.Hutao.Web.Hoyolab.DynamicSecret.UseDynamicSecretAttribute";
@@ -44,38 +45,41 @@ public class HttpClientGenerator : ISourceGenerator
             return;
         }
 
-        string toolName = this.GetGeneratorType().FullName;
-
         StringBuilder sourceCodeBuilder = new();
 
-        sourceCodeBuilder.Append($@"// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
+        sourceCodeBuilder.Append($$"""
+            // Copyright (c) DGP Studio. All rights reserved.
+            // Licensed under the MIT license.
+            
+            // This class is generated by Snap.Hutao.SourceGeneration
+            
+            using Microsoft.Extensions.DependencyInjection;
+            using Snap.Hutao.Web.Hoyolab.DynamicSecret;
+            using System.Net.Http;
+            
+            namespace Snap.Hutao.Core.DependencyInjection;
+            
+            internal static partial class IocHttpClientConfiguration
+            {
+                [global::System.CodeDom.Compiler.GeneratedCodeAttribute("{{nameof(HttpClientGenerator)}}","1.0.0.0")]
+                [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+                public static partial IServiceCollection AddHttpClients(this IServiceCollection services)
+                {
+            """);
 
-// This class is generated by Snap.Hutao.SourceGeneration
+        FillWithHttpClients(receiver, sourceCodeBuilder);
 
-using Microsoft.Extensions.DependencyInjection;
-using Snap.Hutao.Web.Hoyolab.DynamicSecret;
-using System.Net.Http;
+        sourceCodeBuilder.Append("""
 
-namespace Snap.Hutao.Core.DependencyInjection;
-
-internal static partial class IocHttpClientConfiguration
-{{
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute(""{toolName}"",""1.0.0.0"")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial IServiceCollection AddHttpClients(this IServiceCollection services)
-    {{");
-
-        FillWithInjectionServices(receiver, sourceCodeBuilder);
-        sourceCodeBuilder.Append(@"
-        return services;
-    }
-}");
+                    return services;
+                }
+            }
+            """);
 
         context.AddSource("IocHttpClientConfiguration.g.cs", SourceText.From(sourceCodeBuilder.ToString(), Encoding.UTF8));
     }
 
-    private static void FillWithInjectionServices(HttpClientSyntaxContextReceiver receiver, StringBuilder sourceCodeBuilder)
+    private static void FillWithHttpClients(HttpClientSyntaxContextReceiver receiver, StringBuilder sourceCodeBuilder)
     {
         List<string> lines = new();
         StringBuilder lineBuilder = new();
@@ -84,29 +88,39 @@ internal static partial class IocHttpClientConfiguration
         {
             lineBuilder.Clear().Append("\r\n");
             lineBuilder.Append(@"        services.AddHttpClient<");
-            lineBuilder.Append($"{classSymbol.ToDisplayString()}>(");
 
             AttributeData httpClientInfo = classSymbol
                 .GetAttributes()
                 .Single(attr => attr.AttributeClass!.ToDisplayString() == HttpClientSyntaxContextReceiver.AttributeName);
             ImmutableArray<TypedConstant> arguments = httpClientInfo.ConstructorArguments;
 
-            TypedConstant injectAs = arguments[0];
+            if (arguments.Length == 2)
+            {
+                TypedConstant interfaceType = arguments[1];
+                lineBuilder.Append($"{interfaceType.Value}, ");
+            }
 
-            string injectAsName = injectAs.ToCSharpString();
+            TypedConstant configuration = arguments[0];
+
+            lineBuilder.Append($"{classSymbol.ToDisplayString()}>(");
+
+            string injectAsName = configuration.ToCSharpString();
             switch (injectAsName)
             {
                 case DefaultName:
-                    lineBuilder.Append(@"DefaultConfiguration)");
+                    lineBuilder.Append("DefaultConfiguration)");
                     break;
                 case XRpcName:
-                    lineBuilder.Append(@"XRpcConfiguration)");
+                    lineBuilder.Append("XRpcConfiguration)");
                     break;
                 case XRpc2Name:
-                    lineBuilder.Append(@"XRpc2Configuration)");
+                    lineBuilder.Append("XRpc2Configuration)");
+                    break;
+                case XRpc3Name:
+                    lineBuilder.Append("XRpc3Configuration)");
                     break;
                 default:
-                    throw new InvalidOperationException($"非法的HttpClientConfigration值: [{injectAsName}]");
+                    throw new InvalidOperationException($"非法的 HttpClientConfiguration 值: [{injectAsName}]");
             }
 
             AttributeData? handlerInfo = classSymbol
@@ -120,11 +134,11 @@ internal static partial class IocHttpClientConfiguration
 
                 foreach (KeyValuePair<string, TypedConstant> property in properties)
                 {
-                    lineBuilder.Append(" ");
+                    lineBuilder.Append(' ');
                     lineBuilder.Append(property.Key);
                     lineBuilder.Append(" = ");
                     lineBuilder.Append(property.Value.ToCSharpString());
-                    lineBuilder.Append(",");
+                    lineBuilder.Append(',');
                 }
 
                 lineBuilder.Append(" })");
@@ -135,7 +149,7 @@ internal static partial class IocHttpClientConfiguration
                 lineBuilder.Append(".AddHttpMessageHandler<DynamicSecretHandler>()");
             }
 
-            lineBuilder.Append(";");
+            lineBuilder.Append(';');
 
             lines.Add(lineBuilder.ToString());
         }

src/Snap.Hutao/Snap.Hutao.SourceGeneration/DependencyInjection/InjectionGenerator.cs

@@ -11,7 +11,7 @@ using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
 
-namespace Snap.Hutao.SourceGeneration.DedendencyInjection;
+namespace Snap.Hutao.SourceGeneration.DependencyInjection;
 
 /// <summary>
 /// 注入代码生成器
@@ -41,30 +41,32 @@ public class InjectionGenerator : ISourceGenerator
             return;
         }
 
-        string toolName = this.GetGeneratorType().FullName;
-
         StringBuilder sourceCodeBuilder = new();
-        sourceCodeBuilder.Append($@"// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-// This class is generated by Snap.Hutao.SourceGeneration
-
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Snap.Hutao.Core.DependencyInjection;
-
-internal static partial class ServiceCollectionExtension
-{{
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute(""{toolName}"",""1.0.0.0"")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    public static partial IServiceCollection AddInjections(this IServiceCollection services)
-    {{");
+        sourceCodeBuilder.Append($$"""
+            // Copyright (c) DGP Studio. All rights reserved.
+            // Licensed under the MIT license.
+            
+            // This class is generated by Snap.Hutao.SourceGeneration
+            
+            using Microsoft.Extensions.DependencyInjection;
+            
+            namespace Snap.Hutao.Core.DependencyInjection;
+            
+            internal static partial class ServiceCollectionExtension
+            {
+                [global::System.CodeDom.Compiler.GeneratedCodeAttribute("{{nameof(InjectionGenerator)}}","1.0.0.0")]
+                [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+                public static partial IServiceCollection AddInjections(this IServiceCollection services)
+                {
+            """);
 
         FillWithInjectionServices(receiver, sourceCodeBuilder);
-        sourceCodeBuilder.Append(@"
-        return services;
-    }
-}");
+        sourceCodeBuilder.Append("""
+
+                    return services;
+                }
+            }
+            """);
 
         context.AddSource("ServiceCollectionExtension.g.cs", SourceText.From(sourceCodeBuilder.ToString(), Encoding.UTF8));
     }
@@ -76,46 +78,42 @@ internal static partial class ServiceCollectionExtension
 
         foreach (INamedTypeSymbol classSymbol in receiver.Classes)
         {
-            IEnumerable<AttributeData> datas = classSymbol
+            AttributeData injectionInfo = classSymbol
                 .GetAttributes()
-                .Where(attr => attr.AttributeClass!.ToDisplayString() == InjectionSyntaxContextReceiver.AttributeName);
+                .Single(attr => attr.AttributeClass!.ToDisplayString() == InjectionSyntaxContextReceiver.AttributeName);
 
-            foreach (AttributeData injectionInfo in datas)
+            lineBuilder
+                .Clear()
+                .Append("\r\n");
+
+            ImmutableArray<TypedConstant> arguments = injectionInfo.ConstructorArguments;
+            TypedConstant injectAs = arguments[0];
+
+            string injectAsName = injectAs.ToCSharpString();
+            switch (injectAsName)
             {
-                lineBuilder
-                    .Clear()
-                    .Append("\r\n");
-
-                ImmutableArray<TypedConstant> arguments = injectionInfo.ConstructorArguments;
-
-                TypedConstant injectAs = arguments[0];
-
-                string injectAsName = injectAs.ToCSharpString();
-                switch (injectAsName)
-                {
-                    case InjectAsSingletonName:
-                        lineBuilder.Append(@"        services.AddSingleton(");
-                        break;
-                    case InjectAsTransientName:
-                        lineBuilder.Append(@"        services.AddTransient(");
-                        break;
-                    case InjectAsScopedName:
-                        lineBuilder.Append(@"        services.AddScoped(");
-                        break;
-                    default:
-                        throw new InvalidOperationException($"非法的 InjectAs 值: [{injectAsName}]");
-                }
-
-                if (arguments.Length == 2)
-                {
-                    TypedConstant interfaceType = arguments[1];
-                    lineBuilder.Append($"{interfaceType.ToCSharpString()}, ");
-                }
-
-                lineBuilder.Append($"typeof({classSymbol.ToDisplayString()}));");
-
-                lines.Add(lineBuilder.ToString());
+                case InjectAsSingletonName:
+                    lineBuilder.Append(@"        services.AddSingleton<");
+                    break;
+                case InjectAsTransientName:
+                    lineBuilder.Append(@"        services.AddTransient<");
+                    break;
+                case InjectAsScopedName:
+                    lineBuilder.Append(@"        services.AddScoped<");
+                    break;
+                default:
+                    throw new InvalidOperationException($"非法的 InjectAs 值: [{injectAsName}]");
             }
+
+            if (arguments.Length == 2)
+            {
+                TypedConstant interfaceType = arguments[1];
+                lineBuilder.Append($"{interfaceType.Value}, ");
+            }
+
+            lineBuilder.Append($"{classSymbol.ToDisplayString()}>();");
+
+            lines.Add(lineBuilder.ToString());
         }
 
         foreach (string line in lines.OrderBy(x => x))
@@ -153,4 +151,4 @@ internal static partial class ServiceCollectionExtension
             }
         }
     }
-}
+}

src/Snap.Hutao/Snap.Hutao.SourceGeneration/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:启用分析器发布跟踪", Justification = "<挂起>", Scope = "member", Target = "~F:Snap.Hutao.SourceGeneration.TypeInternalAnalyzer.typeInternalDescriptor")]

src/Snap.Hutao/Snap.Hutao.SourceGeneration/TypeInternalAnalyzer.cs

@@ -0,0 +1,62 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Diagnostics;
+using System.Collections.Immutable;
+
+namespace Snap.Hutao.SourceGeneration;
+
+/// <summary>
+/// 类型应为内部分析器
+/// </summary>
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
+internal class TypeInternalAnalyzer : DiagnosticAnalyzer
+{
+    private static readonly DiagnosticDescriptor typeInternalDescriptor = new("SH001", "Type should be internal", "Type should be internal", "Quality", DiagnosticSeverity.Info, true);
+
+    public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(typeInternalDescriptor);
+    
+
+    public override void Initialize(AnalysisContext context)
+    {
+        context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
+        context.EnableConcurrentExecution();
+
+        context.RegisterCompilationStartAction(CompilationStart);
+    }
+
+    private void CompilationStart(CompilationStartAnalysisContext context)
+    {
+        context.RegisterSyntaxNodeAction(HandleSyntax<ClassDeclarationSyntax>, SyntaxKind.ClassDeclaration);
+        context.RegisterSyntaxNodeAction(HandleSyntax<InterfaceDeclarationSyntax>, SyntaxKind.InterfaceDeclaration);
+        context.RegisterSyntaxNodeAction(HandleSyntax<StructDeclarationSyntax>, SyntaxKind.StructDeclaration);
+        context.RegisterSyntaxNodeAction(HandleSyntax<EnumDeclarationSyntax>, SyntaxKind.EnumDeclaration);
+    }
+
+    private void HandleSyntax<TSyntax>(SyntaxNodeAnalysisContext classSyntax)
+        where TSyntax : BaseTypeDeclarationSyntax
+    {
+        TSyntax syntax = (TSyntax)classSyntax.Node;
+
+        bool privateExists = false;
+        bool internalExists = false;
+        foreach(SyntaxToken token in syntax.Modifiers)
+        {
+            if (token.IsKind(SyntaxKind.PrivateKeyword))
+            {
+                privateExists = true;
+            }
+            if (token.IsKind(SyntaxKind.InternalKeyword))
+            {
+                internalExists = true;
+            }
+        }
+
+        if (!privateExists && !internalExists)
+        {
+            Location location = syntax.Identifier.GetLocation();
+            Diagnostic diagnostic = Diagnostic.Create(typeInternalDescriptor, location);
+            classSyntax.ReportDiagnostic(diagnostic);
+        }
+    }
+}

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

@@ -0,0 +1,32 @@
+using Microsoft.Extensions.DependencyInjection;
+using System;
+
+namespace Snap.Hutao.Test;
+
+[TestClass]
+public class DependencyInjectionTest
+{
+    [TestMethod]
+    public void OriginalTypeDiscoverable()
+    {
+        IServiceProvider services = new ServiceCollection()
+            .AddSingleton<IService, ServiceA>()
+            .AddSingleton<IService, ServiceB>()
+            .BuildServiceProvider();
+
+        Assert.IsNotNull(services.GetService<ServiceA>());
+        Assert.IsNotNull(services.GetService<ServiceB>());
+    }
+
+    private interface IService
+    {
+    }
+
+    private sealed class ServiceA : IService
+    {
+    }
+
+    private sealed class ServiceB : IService
+    {
+    }
+}

src/Snap.Hutao/Snap.Hutao.Test/GlobalUsings.cs

@@ -0,0 +1 @@
+global using Microsoft.VisualStudio.TestTools.UnitTesting;

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

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>

src/Snap.Hutao/Snap.Hutao.sln

@@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snap.Hutao.SourceGeneration", "Snap.Hutao.SourceGeneration\Snap.Hutao.SourceGeneration.csproj", "{8B96721E-5604-47D2-9B72-06FEBAD0CE00}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Snap.Hutao.Installer", "Snap.Hutao.Installer\Snap.Hutao.Installer.csproj", "{CEC01691-F65E-4874-9AE2-F571369A7631}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Snap.Hutao.Test", "Snap.Hutao.Test\Snap.Hutao.Test.csproj", "{D691BA9F-904C-4229-87A5-E14F2EFF2F64}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -66,22 +66,22 @@ Global
 		{8B96721E-5604-47D2-9B72-06FEBAD0CE00}.Release|x64.Build.0 = Release|x64
 		{8B96721E-5604-47D2-9B72-06FEBAD0CE00}.Release|x86.ActiveCfg = Release|Any CPU
 		{8B96721E-5604-47D2-9B72-06FEBAD0CE00}.Release|x86.Build.0 = Release|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|Any CPU.Build.0 = Debug|x64
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|x64.ActiveCfg = Debug|x64
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|x64.Build.0 = Debug|x64
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Debug|x86.Build.0 = Debug|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|arm64.Build.0 = Release|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|x64.ActiveCfg = Release|x64
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|x64.Build.0 = Release|x64
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|x86.ActiveCfg = Release|Any CPU
-		{CEC01691-F65E-4874-9AE2-F571369A7631}.Release|x86.Build.0 = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|arm64.Build.0 = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|x64.Build.0 = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Debug|x86.Build.0 = Debug|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|arm64.Build.0 = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|x64.ActiveCfg = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|x64.Build.0 = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|x86.ActiveCfg = Release|Any CPU
+		{D691BA9F-904C-4229-87A5-E14F2EFF2F64}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -10,7 +10,6 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <muxc:XamlControlsResources/>
-                <ResourceDictionary Source="ms-appx:///SettingsUI/Themes/Generic.xaml"/>
                 <ResourceDictionary Source="Control/Theme/FontStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
@@ -48,10 +47,24 @@
             <GridLength x:Key="CompatGridLength2">268</GridLength>
             <!--  Brushes  -->
             <SolidColorBrush x:Key="AvatarPropertyAddValueBrush" Color="{ThemeResource AvatarPropertyAddValueColor}"/>
+            <!--  Settings  -->
+            <x:Double x:Key="SettingsCardSpacing">3</x:Double>
+
+            <Style
+                x:Key="SettingsSectionHeaderTextBlockStyle"
+                BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+                TargetType="TextBlock">
+                <Style.Setters>
+                    <Setter Property="Margin" Value="1,29,0,5"/>
+                </Style.Setters>
+            </Style>
             <!--  Uris  -->
-            <x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html#%E5%A6%82%E4%BD%95%E8%8E%B7%E5%8F%96-cookie</x:String>
+            <x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
             <x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
+            <x:String x:Key="DocumentLink_Translate">https://translate.hut.ao</x:String>
+            <x:String x:Key="DocumentLink_Home">https://hut.ao</x:String>
             <x:String x:Key="HolographicHat_GetToken_Release">https://github.com/HolographicHat/GetToken/releases/latest</x:String>
+            <x:String x:Key="Sponsor_Afadian">https://afdian.net/a/DismissedLight</x:String>
 
             <x:String x:Key="UI_ItemIcon_None">https://static.snapgenshin.com/Bg/UI_ItemIcon_None.png</x:String>
             <x:String x:Key="UI_ImgSign_ItemIcon">https://static.snapgenshin.com/Bg/UI_ImgSign_ItemIcon.png</x:String>
@@ -64,12 +77,13 @@
             <!--  Converters  -->
             <cwuc:BoolNegationConverter x:Key="BoolNegationConverter"/>
             <cwuc:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+            <cwuc:FileSizeToFriendlyStringConverter x:Key="FileSizeToFriendlyStringConverter"/>
             <shmmc:AchievementIconConverter x:Key="AchievementIconConverter"/>
             <shmmc:AvatarCardConverter x:Key="AvatarCardConverter"/>
             <shmmc:AvatarIconConverter x:Key="AvatarIconConverter"/>
             <shmmc:AvatarNameCardPicConverter x:Key="AvatarNameCardPicConverter"/>
             <shmmc:AvatarSideIconConverter x:Key="AvatarSideIconConverter"/>
-            <shmmc:DescParamDescriptor x:Key="DescParamDescriptor"/>
+            <shmmc:ParameterDescriptor x:Key="DescParamDescriptor"/>
             <shmmc:ElementNameIconConverter x:Key="ElementNameIconConverter"/>
             <shmmc:EmotionIconConverter x:Key="EmotionIconConverter"/>
             <shmmc:EquipIconConverter x:Key="EquipIconConverter"/>
@@ -77,7 +91,8 @@
             <shmmc:GachaAvatarIconConverter x:Key="GachaAvatarIconConverter"/>
             <shmmc:GachaEquipIconConverter x:Key="GachaEquipIconConverter"/>
             <shmmc:ItemIconConverter x:Key="ItemIconConverter"/>
-            <shmmc:PropertyInfoDescriptor x:Key="PropertyDescriptor"/>
+            <shmmc:MonsterIconConverter x:Key="MonsterIconConverter"/>
+            <shmmc:PropertyDescriptor x:Key="PropertyDescriptor"/>
             <shmmc:QualityColorConverter x:Key="QualityColorConverter"/>
             <shmmc:WeaponTypeIconConverter x:Key="WeaponTypeIconConverter"/>
             <shvc:BoolToVisibilityRevertConverter x:Key="BoolToVisibilityRevertConverter"/>
@@ -87,6 +102,7 @@
             <shvc:EmptyObjectToVisibilityRevertConverter x:Key="EmptyObjectToVisibilityRevertConverter"/>
             <shvc:Int32ToVisibilityConverter x:Key="Int32ToVisibilityConverter"/>
             <shvc:Int32ToVisibilityRevertConverter x:Key="Int32ToVisibilityRevertConverter"/>
+            <shvc:StringBoolConverter x:Key="StringBoolConverter"/>
             <!--  Styles  -->
 
             <Style

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

@@ -14,9 +14,12 @@ namespace Snap.Hutao;
 
 /// <summary>
 /// Provides application-specific behavior to supplement the default Application class.
+/// This class must be public
 /// </summary>
+[HighQuality]
 [Injection(InjectAs.Singleton)]
-public partial class App : Application
+[SuppressMessage("", "SH001")]
+public sealed partial class App : Application
 {
     private readonly ILogger<App> logger;
 

src/Snap.Hutao/Snap.Hutao/Control/Animation/ImageZoomInAnimation.cs

@@ -4,7 +4,6 @@
 using CommunityToolkit.WinUI.UI;
 using CommunityToolkit.WinUI.UI.Animations;
 using Microsoft.UI.Composition;
-using System.Diagnostics.Contracts;
 using System.Numerics;
 
 namespace Snap.Hutao.Control.Animation;

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

@@ -12,7 +12,7 @@ namespace Snap.Hutao.Control;
 /// when object is not used anymore.
 /// </summary>
 [HighQuality]
-public class BindingProxy : DependencyObject
+internal sealed class BindingProxy : DependencyObject
 {
     private static readonly DependencyProperty DataContextProperty = Property<BindingProxy>.Depend<object>(nameof(DataContext));
 

src/Snap.Hutao/Snap.Hutao/Control/BoxedValues.cs

@@ -19,8 +19,18 @@ internal static class BoxedValues
     /// </summary>
     public static readonly object DoubleOne = 1D;
 
+    /// <summary>
+    /// <see cref="int"/> 0
+    /// </summary>
+    public static readonly object Int32Zero = 0;
+
     /// <summary>
     /// <see cref="true"/>
     /// </summary>
     public static readonly object True = true;
+
+    /// <summary>
+    /// <see cref="false"/>
+    /// </summary>
+    public static readonly object False = false;
 }

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

@@ -5,7 +5,6 @@ using CommunityToolkit.WinUI.UI.Controls;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Snap.Hutao.Core.Caching;
-using Snap.Hutao.Extension;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Control.Image;

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

@@ -2,13 +2,11 @@
 // Licensed under the MIT license.
 
 using CommunityToolkit.WinUI.UI.Animations;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Hosting;
 using Microsoft.UI.Xaml.Media;
 using Snap.Hutao.Core.Caching;
-using Snap.Hutao.Extension;
 using Snap.Hutao.Service.Abstraction;
 using System.IO;
 using System.Net.Http;
@@ -21,7 +19,7 @@ namespace Snap.Hutao.Control.Image;
 /// 为其他图像类控件提供基类
 /// </summary>
 [HighQuality]
-public abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
+internal abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
 {
     private static readonly DependencyProperty SourceProperty = Property<CompositionImage>.Depend(nameof(Source), default(Uri), OnSourceChanged);
     private static readonly DependencyProperty EnableLazyLoadingProperty = Property<CompositionImage>.DependBoxed<bool>(nameof(EnableLazyLoading), BoxedValues.True);

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

@@ -6,9 +6,6 @@ using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 using Snap.Hutao.Win32;
-using System.IO;
-using Windows.Graphics.Imaging;
-using Windows.Storage.Streams;
 
 namespace Snap.Hutao.Control.Image;
 

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

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 using Snap.Hutao.Service.Navigation;

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

@@ -1,10 +1,7 @@
 <!--  Copyright (c) Microsoft Corporation and Contributors.  -->
 <!--  Licensed under the MIT License.  -->
 
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:wsc="using:WinUICommunity.SettingsUI.Controls">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <FontFamily x:Key="MiSans">ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans</FontFamily>
     <FontFamily x:Key="CascadiaMonoAndMiSans">ms-appx:///Resource/Font/CascadiaMono.ttf#Cascadia Mono, ms-appx:///Resource/Font/MiSans-Regular.ttf#MiSans</FontFamily>
 
@@ -84,6 +81,13 @@
         <Setter Property="OpticalMarginAlignment" Value="TrimSideBearings"/>
     </Style>
 
+    <x:Double x:Key="SecondaryTextFontSize">12</x:Double>
+
+    <Style x:Key="SecondaryTextStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}"/>
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}"/>
+    </Style>
+
     <Style BasedOn="{StaticResource DefaultMenuFlyoutItemStyle}" TargetType="MenuFlyoutItem">
         <Setter Property="FontFamily" Value="{StaticResource MiSans}"/>
     </Style>
@@ -99,112 +103,4 @@
     <Style TargetType="InfoBar">
         <Setter Property="FontFamily" Value="{StaticResource MiSans}"/>
     </Style>
-
-    <Style BasedOn="{StaticResource DefaultSettingStyle}" TargetType="wsc:Setting"/>
-
-    <Style x:Key="DefaultSettingStyle" TargetType="wsc:Setting">
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-        <Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}"/>
-        <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}"/>
-        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="Padding" Value="16"/>
-        <Setter Property="Margin" Value="0,0,0,0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="wsc:Setting">
-                    <Grid
-                        x:Name="RootGrid"
-                        MinHeight="48"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <!--  Icon  -->
-                            <ColumnDefinition Width="*"/>
-                            <!--  Header and subtitle  -->
-                            <ColumnDefinition Width="Auto"/>
-                            <!--  Action control  -->
-                        </Grid.ColumnDefinitions>
-
-                        <ContentPresenter
-                            x:Name="IconPresenter"
-                            MaxWidth="20"
-                            Margin="2,0,18,0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            AutomationProperties.AccessibilityView="Raw"
-                            Content="{TemplateBinding Icon}"
-                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                            FontSize="20"
-                            Foreground="{ThemeResource CardPrimaryForegroundBrush}"
-                            IsTextScaleFactorEnabled="False"/>
-
-                        <StackPanel
-                            Grid.Column="1"
-                            Margin="0,0,16,0"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center">
-
-                            <TextBlock
-                                x:Name="HeaderPresenter"
-                                VerticalAlignment="Center"
-                                FontFamily="{StaticResource MiSans}"
-                                Foreground="{ThemeResource CardPrimaryForegroundBrush}"
-                                Text="{TemplateBinding Header}"/>
-
-                            <ContentPresenter
-                                x:Name="DescriptionPresenter"
-                                Content="{TemplateBinding Description}"
-                                FontFamily="{StaticResource MiSans}"
-                                FontSize="{StaticResource SecondaryTextFontSize}"
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                TextWrapping="WrapWholeWords">
-                                <ContentPresenter.Resources>
-                                    <Style BasedOn="{StaticResource CaptionTextBlockStyle}" TargetType="TextBlock">
-                                        <Style.Setters>
-                                            <Setter Property="TextWrapping" Value="WrapWholeWords"/>
-                                        </Style.Setters>
-                                    </Style>
-                                    <Style BasedOn="{StaticResource TextButtonStyle}" TargetType="HyperlinkButton">
-                                        <Style.Setters>
-                                            <Setter Property="FontSize" Value="12"/>
-                                            <Setter Property="Padding" Value="0,0,0,0"/>
-                                        </Style.Setters>
-                                    </Style>
-                                </ContentPresenter.Resources>
-                            </ContentPresenter>
-                        </StackPanel>
-
-                        <ContentPresenter
-                            x:Name="ContentPresenter"
-                            Grid.Column="2"
-                            HorizontalAlignment="Right"
-                            VerticalAlignment="Center"
-                            Content="{TemplateBinding ActionContent}"/>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="Disabled">
-                                    <VisualState.Setters>
-                                        <Setter Target="HeaderPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}"/>
-                                        <Setter Target="DescriptionPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}"/>
-                                        <Setter Target="IconPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}"/>
-                                        <Setter Target="ContentPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
 </ResourceDictionary>

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

@@ -10,7 +10,7 @@ namespace Snap.Hutao.Control.Theme;
 /// 主题帮助工具类
 /// </summary>
 [HighQuality]
-public static class ThemeHelper
+internal static class ThemeHelper
 {
     /// <summary>
     /// 判断主题是否相等

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

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

src/Snap.Hutao/Snap.Hutao/Core/Annotation/HighQualityAttribute.cs

@@ -6,7 +6,7 @@ namespace Snap.Hutao.Core.Annotation;
 /// <summary>
 /// 高质量代码
 /// </summary>
-[AttributeUsage(AttributeTargets.All)]
+[AttributeUsage(AttributeTargets.All, Inherited = false)]
 internal class HighQualityAttribute : Attribute
 {
 }

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

@@ -8,7 +8,7 @@ namespace Snap.Hutao.Core.Caching;
 /// </summary>
 /// <typeparam name="T">缓存类型</typeparam>
 [HighQuality]
-internal interface IImageCache
+internal interface IImageCache : ICastableService
 {
     /// <summary>
     /// Gets the file path containing cached item for given Uri

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

@@ -18,9 +18,9 @@ namespace Snap.Hutao.Core.Caching;
 /// </summary>
 [HighQuality]
 [Injection(InjectAs.Singleton, typeof(IImageCache))]
-[HttpClient(HttpClientConfigration.Default)]
+[HttpClient(HttpClientConfiguration.Default)]
 [PrimaryHttpMessageHandler(MaxConnectionsPerServer = 8)]
-public sealed class ImageCache : IImageCache, IImageCacheFilePathOperation
+internal sealed class ImageCache : IImageCache, IImageCacheFilePathOperation
 {
     private const string CacheFolderName = nameof(ImageCache);
 
@@ -192,7 +192,7 @@ public sealed class ImageCache : IImageCache, IImageCacheFilePathOperation
                 else if (message.StatusCode == HttpStatusCode.NotFound)
                 {
                     // directly goto https://static.hut.ao
-                    retryCount = 3;
+                    retryCount += 3;
                 }
                 else if (message.StatusCode == HttpStatusCode.TooManyRequests)
                 {

src/Snap.Hutao/Snap.Hutao/Core/CoreEnvironment.cs

@@ -4,7 +4,6 @@
 using Microsoft.Win32;
 using Snap.Hutao.Core.Json;
 using Snap.Hutao.Core.Setting;
-using Snap.Hutao.Extension;
 using Snap.Hutao.Web.Hoyolab.DynamicSecret;
 using System.Collections.Immutable;
 using System.IO;
@@ -25,16 +24,31 @@ internal static class CoreEnvironment
     /// </summary>
     public const string HoyolabUA = $"Mozilla/5.0 (Windows NT 10.0; Win64; x64) miHoYoBBS/{HoyolabXrpcVersion}";
 
+    /// <summary>
+    /// Hoyolab请求UA
+    /// </summary>
+    public const string HoyolabOsUA = $"Mozilla/5.0 (Windows NT 10.0; Win64; x64) miHoYoBBSOversea/{HoyolabOsXrpcVersion}";
+
     /// <summary>
     /// 米游社移动端请求UA
     /// </summary>
     public const string HoyolabMobileUA = $"Mozilla/5.0 (Linux; Android 12) Mobile miHoYoBBS/{HoyolabXrpcVersion}";
 
+    /// <summary>
+    /// Hoyolab 移动端请求UA
+    /// </summary>
+    public const string HoyolabOsMobileUA = $"Mozilla/5.0 (Linux; Android 12) Mobile miHoYoBBSOversea/{HoyolabOsXrpcVersion}";
+
     /// <summary>
     /// 米游社 Rpc 版本
     /// </summary>
     public const string HoyolabXrpcVersion = "2.44.1";
 
+    /// <summary>
+    /// Hoyolab Rpc 版本
+    /// </summary>
+    public const string HoyolabOsXrpcVersion = "2.28.0";
+
     /// <summary>
     /// 盐
     /// </summary>
@@ -46,6 +60,9 @@ internal static class CoreEnvironment
         [SaltType.X4] = "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs",
         [SaltType.X6] = "t0qEgfub6cvueAPgR5m9aQWWVciEer7v",
         [SaltType.PROD] = "JwYDpKvLj6MrMqqYU6jTKF17KNO2PXoS",
+
+        // This SALT is not reliable
+        [SaltType.OSK2] = "6cqshh5dhw73bzxn20oexa9k516chk7s",
     }.ToImmutableDictionary();
 
     /// <summary>

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

@@ -11,7 +11,7 @@ namespace Snap.Hutao.Core.Database;
 /// 数据库集合扩展
 /// </summary>
 [HighQuality]
-public static class DbSetExtension
+internal static class DbSetExtension
 {
     /// <summary>
     /// 获取对应的数据库上下文

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

@@ -7,7 +7,7 @@ namespace Snap.Hutao.Core.Database;
 /// 可枚举扩展
 /// </summary>
 [HighQuality]
-public static class EnumerableExtension
+internal static class EnumerableExtension
 {
     /// <summary>
     /// 获取选中的值或默认值

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

@@ -10,7 +10,7 @@ namespace Snap.Hutao.Core.Database;
 /// 必须实现该接口
 /// </summary>
 [HighQuality]
-public interface ISelectable
+internal interface ISelectable
 {
     /// <summary>
     /// 获取或设置当前项的选中状态

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

@@ -11,8 +11,21 @@ namespace Snap.Hutao.Core.Database;
 /// 可查询扩展
 /// </summary>
 [HighQuality]
-public static class QueryableExtension
+internal static class QueryableExtension
 {
+    /// <summary>
+    /// source.Where(predicate).ExecuteDelete()
+    /// </summary>
+    /// <typeparam name="TSource">源类型</typeparam>
+    /// <param name="source">源</param>
+    /// <param name="predicate">条件</param>
+    /// <returns>SQL返回个数</returns>
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int ExecuteDeleteWhere<TSource>(this IQueryable<TSource> source, Expression<Func<TSource, bool>> predicate)
+    {
+        return source.Where(predicate).ExecuteDelete();
+    }
+
     /// <summary>
     /// source.Where(predicate).ExecuteDeleteAsync(token)
     /// </summary>