1.7.15 package

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

@@ -12,6 +12,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Color.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Converter.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/CornerRadius.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/FlyoutStyle.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/FontStyle.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Glyph.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/InfoBarOverride.xaml"/>

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

@@ -0,0 +1,46 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using CommunityToolkit.Labs.WinUI.MarqueeTextRns;
+using CommunityToolkit.WinUI.Behaviors;
+using Microsoft.UI.Xaml.Input;
+
+namespace Snap.Hutao.Control.Behavior;
+
+internal sealed class MarqueeTextBehavior : BehaviorBase<MarqueeText>
+{
+    private readonly PointerEventHandler pointerEnteredEventHandler;
+    private readonly PointerEventHandler pointerExitedEventHandler;
+
+    public MarqueeTextBehavior()
+    {
+        pointerEnteredEventHandler = OnPointerEntered;
+        pointerExitedEventHandler = OnPointerExited;
+    }
+
+    protected override bool Initialize()
+    {
+        AssociatedObject.PointerEntered += pointerEnteredEventHandler;
+        AssociatedObject.PointerExited += pointerExitedEventHandler;
+
+        return true;
+    }
+
+    protected override bool Uninitialize()
+    {
+        AssociatedObject.PointerEntered -= pointerEnteredEventHandler;
+        AssociatedObject.PointerExited -= pointerExitedEventHandler;
+
+        return true;
+    }
+
+    private void OnPointerEntered(object sender, PointerRoutedEventArgs e)
+    {
+        AssociatedObject.StartMarquee();
+    }
+
+    private void OnPointerExited(object sender, PointerRoutedEventArgs e)
+    {
+        AssociatedObject.StopMarquee();
+    }
+}

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

@@ -0,0 +1,31 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using CommunityToolkit.WinUI.Animations;
+using Microsoft.UI.Xaml;
+using Microsoft.Xaml.Interactivity;
+
+namespace Snap.Hutao.Control.Behavior;
+
+[DependencyProperty("Animation", typeof(AnimationSet))]
+[DependencyProperty("TargetObject", typeof(UIElement))]
+internal sealed partial class StartAnimationActionNoThrow : DependencyObject, IAction
+{
+    /// <inheritdoc/>
+    public object Execute(object sender, object parameter)
+    {
+        if (Animation is not null)
+        {
+            if (TargetObject is not null)
+            {
+                Animation.Start(TargetObject);
+            }
+            else
+            {
+                Animation.Start(sender as UIElement);
+            }
+        }
+
+        return default!;
+    }
+}

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

@@ -0,0 +1,22 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style
+        x:Key="WebViewerFlyoutPresenterStyle"
+        BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+        TargetType="FlyoutPresenter">
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="CornerRadius" Value="0"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
+    </Style>
+    <Style
+        x:Key="FlyoutPresenterPadding0And2Style"
+        BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+        TargetType="FlyoutPresenter">
+        <Setter Property="Padding" Value="0,2"/>
+    </Style>
+    <Style
+        x:Key="FlyoutPresenterPadding6Style"
+        BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
+        TargetType="FlyoutPresenter">
+        <Setter Property="Padding" Value="6"/>
+    </Style>
+</ResourceDictionary>

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

@@ -11,13 +11,28 @@
     <ItemsPanelTemplate x:Key="WrapPanelSpacing4Template">
         <cwcont:WrapPanel HorizontalSpacing="4" VerticalSpacing="4"/>
     </ItemsPanelTemplate>
-    <ItemsPanelTemplate x:Key="HorizontalStackPanelTemplate">
+    <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing0Template">
         <StackPanel Orientation="Horizontal"/>
     </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing2Template">
+        <StackPanel Orientation="Horizontal" Spacing="2"/>
+    </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="UniformGridColumns2Spacing2Template">
+        <cwcont:UniformGrid
+            ColumnSpacing="2"
+            Columns="2"
+            RowSpacing="2"/>
+    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="UniformGridColumns5Spacing4Template">
         <cwcont:UniformGrid
             ColumnSpacing="4"
             Columns="5"
             RowSpacing="4"/>
     </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="UniformGridColumns5Spacing8Template">
+        <cwcont:UniformGrid
+            ColumnSpacing="8"
+            Columns="5"
+            RowSpacing="8"/>
+    </ItemsPanelTemplate>
 </ResourceDictionary>

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

@@ -14,4 +14,10 @@
     <TransitionCollection x:Key="ReorderThemeTransitions">
         <ReorderThemeTransition/>
     </TransitionCollection>
+    <TransitionCollection x:Key="RepositionThemeTransitions">
+        <RepositionThemeTransition/>
+    </TransitionCollection>
+    <TransitionCollection x:Key="NavigationThemeTransitions">
+        <NavigationThemeTransition/>
+    </TransitionCollection>
 </ResourceDictionary>

src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs

@@ -48,6 +48,11 @@ internal sealed partial class SettingEntry
     /// </summary>
     public const string DailyNoteSilentWhenPlayingGame = "DailyNote.SilentWhenPlayingGame";
 
+    /// <summary>
+    /// 实时便笺 WebhookUrl
+    /// </summary>
+    public const string DailyNoteWebhookUrl = "DailyNote.WebhookUrl";
+
     /// <summary>
     /// 启动游戏 独占全屏
     /// </summary>
@@ -68,11 +73,15 @@ internal sealed partial class SettingEntry
     /// </summary>
     public const string LaunchScreenWidth = "Launch.ScreenWidth";
 
+    public const string LaunchIsScreenWidthEnabled = "Launch.IsScreenWidthEnabled";
+
     /// <summary>
     /// 启动游戏 高度
     /// </summary>
     public const string LaunchScreenHeight = "Launch.ScreenHeight";
 
+    public const string LaunchIsScreenHeightEnabled = "Launch.IsScreenHeightEnabled";
+
     /// <summary>
     /// 启动游戏 解锁帧率
     /// </summary>
@@ -88,6 +97,8 @@ internal sealed partial class SettingEntry
     /// </summary>
     public const string LaunchMonitor = "Launch.Monitor";
 
+    public const string LaunchIsMonitorEnabled = "Launch.IsMonitorEnabled";
+
     /// <summary>
     /// 启动游戏 多倍启动
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Package.appxmanifest

@@ -12,7 +12,7 @@
   <Identity
     Name="60568DGPStudio.SnapHutao"
     Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.7.13.0" />
+    Version="1.7.15.0" />
 
   <Properties>
     <DisplayName>Snap Hutao</DisplayName>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx

@@ -540,7 +540,7 @@
     <value>Verification failed</value>
   </data>
   <data name="ServerPassportVerifyRequestSuccess" xml:space="preserve">
-    <value>验证码已发送至邮箱</value>
+    <value>The verification code has been sent to your e-mail.</value>
   </data>
   <data name="ServerPassportVerifyTooFrequent" xml:space="preserve">
     <value>Validation request is too frequent. Please try again in 1 minute.</value>
@@ -1167,16 +1167,16 @@
     <value>Configure Geetest CAPTCHA Verficaition API</value>
   </data>
   <data name="ViewDialogHutaoPassportLoginTitle" xml:space="preserve">
-    <value>登录胡桃通行证</value>
+    <value>Login to Snap Hutao Passport</value>
   </data>
   <data name="ViewDialogHutaoPassportRegisterTitle" xml:space="preserve">
-    <value>注册胡桃通行证</value>
+    <value>Signup Snap Hutao Passport</value>
   </data>
   <data name="ViewDialogHutaoPassportResetPasswordTitle" xml:space="preserve">
-    <value>重置胡桃通行证密码</value>
+    <value>Reset Password of Snap Hutao Passport</value>
   </data>
   <data name="ViewDialogHutaoPassportUnregisterTitle" xml:space="preserve">
-    <value>注销胡桃通行证账号</value>
+    <value>Delete Snap Hutao Passport</value>
   </data>
   <data name="ViewDialogImportExportApp" xml:space="preserve">
     <value>Export App</value>
@@ -1941,7 +1941,7 @@
     <value>Reset Password</value>
   </data>
   <data name="ViewPageHutaoPassportResetPasswordHint" xml:space="preserve">
-    <value>注销账号的数据将永远丢失，无法恢复</value>
+    <value>Delete Snap Hutao Passport will cause your data to lose without any recovery option</value>
   </data>
   <data name="ViewPageHutaoPassportUserNameHint" xml:space="preserve">
     <value>Enter your email</value>
@@ -2226,49 +2226,49 @@
     <value>Home</value>
   </data>
   <data name="ViewPageSettingHutaoPassportDangerZoneDescription" xml:space="preserve">
-    <value>三思而后行</value>
+    <value>Proceed with caution</value>
   </data>
   <data name="ViewPageSettingHutaoPassportDangerZoneHeader" xml:space="preserve">
-    <value>危险操作</value>
+    <value>Danger Zone</value>
   </data>
   <data name="ViewPageSettingHutaoPassportGachaLogExpiredAtHeader" xml:space="preserve">
-    <value>胡桃云服务到期时间</value>
+    <value>Snap Hutao Cloud Expiring in</value>
   </data>
   <data name="ViewPageSettingHutaoPassportHeader" xml:space="preserve">
-    <value>胡桃通行证账号</value>
+    <value>Snap Hutao Passport</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLicensedDeveloperDescription" xml:space="preserve">
-    <value>您可以无限制使用任何基于胡桃云服务的功能</value>
+    <value>You are unlimited in any Snap Hutao Cloud features</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLicensedDeveloperHeader" xml:space="preserve">
-    <value>已认证的合作开发者</value>
+    <value>Certificated Developer</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLoginAction" xml:space="preserve">
-    <value>登录</value>
+    <value>Sign in</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLogoutAction" xml:space="preserve">
-    <value>退出登录</value>
+    <value>Sign out</value>
   </data>
   <data name="ViewPageSettingHutaoPassportMaintainerDescription" xml:space="preserve">
-    <value>您可以无限制的使用任何测试功能</value>
+    <value>You are unlimited in any testing feature</value>
   </data>
   <data name="ViewPageSettingHutaoPassportMaintainerHeader" xml:space="preserve">
-    <value>胡桃开发/运维</value>
+    <value>Snap Hutao developer and maintainer</value>
   </data>
   <data name="ViewPageSettingHutaoPassportRedeemCodeDescription" xml:space="preserve">
-    <value>我们有时会向某些用户赠送胡桃云兑换码</value>
+    <value>We sometimes give away Snap Hutao Cloud redemption codes to some users</value>
   </data>
   <data name="ViewPageSettingHutaoPassportRedeemCodeHeader" xml:space="preserve">
-    <value>使用兑换码</value>
+    <value>Use Redemption Code</value>
   </data>
   <data name="ViewPageSettingHutaoPassportRegisterAction" xml:space="preserve">
-    <value>注册</value>
+    <value>Register</value>
   </data>
   <data name="ViewPageSettingHutaoPassportResetPasswordAction" xml:space="preserve">
-    <value>修改密码</value>
+    <value>Change Password</value>
   </data>
   <data name="ViewPageSettingHutaoPassportUnregisterAction" xml:space="preserve">
-    <value>注销账号</value>
+    <value>Delete Account</value>
   </data>
   <data name="ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription" xml:space="preserve">
     <value>After a full reading of the Genshin Impact and Snap Hutao user agreements, I choose to enable「Game Launcher - Advanced Features」.</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx

@@ -540,7 +540,7 @@
     <value>認証に失敗しました。</value>
   </data>
   <data name="ServerPassportVerifyRequestSuccess" xml:space="preserve">
-    <value>验证码已发送至邮箱</value>
+    <value>入力されたメールアドレスへ確認コードが送信されました</value>
   </data>
   <data name="ServerPassportVerifyTooFrequent" xml:space="preserve">
     <value>認証リクエストが多すぎます。一分後にやり直してください。</value>
@@ -1167,16 +1167,16 @@
     <value>Geetest/CAPTCHA 認証APIの設定</value>
   </data>
   <data name="ViewDialogHutaoPassportLoginTitle" xml:space="preserve">
-    <value>登录胡桃通行证</value>
+    <value>胡桃パスポートへログイン</value>
   </data>
   <data name="ViewDialogHutaoPassportRegisterTitle" xml:space="preserve">
-    <value>注册胡桃通行证</value>
+    <value>胡桃パスポートの登録</value>
   </data>
   <data name="ViewDialogHutaoPassportResetPasswordTitle" xml:space="preserve">
-    <value>重置胡桃通行证密码</value>
+    <value>胡桃パスポートのパスワードをリセット</value>
   </data>
   <data name="ViewDialogHutaoPassportUnregisterTitle" xml:space="preserve">
-    <value>注销胡桃通行证账号</value>
+    <value>胡桃パスポート アカウントの削除</value>
   </data>
   <data name="ViewDialogImportExportApp" xml:space="preserve">
     <value>Appをエクスポート</value>
@@ -1941,7 +1941,7 @@
     <value>パスワードを忘れました</value>
   </data>
   <data name="ViewPageHutaoPassportResetPasswordHint" xml:space="preserve">
-    <value>注销账号的数据将永远丢失，无法恢复</value>
+    <value>削除されたアカウントのデータは永久的に削除され、復元することは出来ません。</value>
   </data>
   <data name="ViewPageHutaoPassportUserNameHint" xml:space="preserve">
     <value>メールアドレスを入力してください。</value>
@@ -2226,49 +2226,49 @@
     <value>ホーム</value>
   </data>
   <data name="ViewPageSettingHutaoPassportDangerZoneDescription" xml:space="preserve">
-    <value>三思而后行</value>
+    <value>考え直して！！</value>
   </data>
   <data name="ViewPageSettingHutaoPassportDangerZoneHeader" xml:space="preserve">
-    <value>危险操作</value>
+    <value>危険な操作</value>
   </data>
   <data name="ViewPageSettingHutaoPassportGachaLogExpiredAtHeader" xml:space="preserve">
-    <value>胡桃云服务到期时间</value>
+    <value>胡桃クラウドサービスの有効期限</value>
   </data>
   <data name="ViewPageSettingHutaoPassportHeader" xml:space="preserve">
-    <value>胡桃通行证账号</value>
+    <value>胡桃アカウント</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLicensedDeveloperDescription" xml:space="preserve">
-    <value>您可以无限制使用任何基于胡桃云服务的功能</value>
+    <value>胡桃クラウドのサービスをベースにした様々な機能が制限なく利用できます</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLicensedDeveloperHeader" xml:space="preserve">
-    <value>已认证的合作开发者</value>
+    <value>認定済みの共同開発者</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLoginAction" xml:space="preserve">
-    <value>登录</value>
+    <value>ログイン</value>
   </data>
   <data name="ViewPageSettingHutaoPassportLogoutAction" xml:space="preserve">
-    <value>退出登录</value>
+    <value>ログアウト</value>
   </data>
   <data name="ViewPageSettingHutaoPassportMaintainerDescription" xml:space="preserve">
-    <value>您可以无限制的使用任何测试功能</value>
+    <value>テスト段階のあらゆる機能を使用できます。</value>
   </data>
   <data name="ViewPageSettingHutaoPassportMaintainerHeader" xml:space="preserve">
-    <value>胡桃开发/运维</value>
+    <value>胡桃の運用と開発または保守</value>
   </data>
   <data name="ViewPageSettingHutaoPassportRedeemCodeDescription" xml:space="preserve">
-    <value>我们有时会向某些用户赠送胡桃云兑换码</value>
+    <value>胡桃クラウドの引き替えコードを一部のユーザーに配布する事があります。</value>
   </data>
   <data name="ViewPageSettingHutaoPassportRedeemCodeHeader" xml:space="preserve">
-    <value>使用兑换码</value>
+    <value>引き替えコードの使用</value>
   </data>
   <data name="ViewPageSettingHutaoPassportRegisterAction" xml:space="preserve">
-    <value>注册</value>
+    <value>登録</value>
   </data>
   <data name="ViewPageSettingHutaoPassportResetPasswordAction" xml:space="preserve">
-    <value>修改密码</value>
+    <value>パスワードの変更</value>
   </data>
   <data name="ViewPageSettingHutaoPassportUnregisterAction" xml:space="preserve">
-    <value>注销账号</value>
+    <value>アカウントの削除</value>
   </data>
   <data name="ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription" xml:space="preserve">
     <value>原神およびSnap Hutaoの利用規約を全て熟読し、その後に『ゲームランチャー - 上級者向け設定』を有効にします。</value>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx

@@ -539,9 +539,15 @@
   <data name="ServerPassportVerifyFailed" xml:space="preserve">
     <value>验证失败</value>
   </data>
+  <data name="ServerPassportVerifyRequestNotCurrentUser" xml:space="preserve">
+    <value>验证请求失败，不是当前登录的账号</value>
+  </data>
   <data name="ServerPassportVerifyRequestSuccess" xml:space="preserve">
     <value>验证码已发送至邮箱</value>
   </data>
+  <data name="ServerPassportVerifyRequestUserAlreadyExisted" xml:space="preserve">
+    <value>验证请求失败，当前邮箱已被注册</value>
+  </data>
   <data name="ServerPassportVerifyTooFrequent" xml:space="preserve">
     <value>验证请求过快，请 1 分钟后再试</value>
   </data>
@@ -1796,6 +1802,9 @@
   <data name="ViewPageGachaLogInputAction" xml:space="preserve">
     <value>输入</value>
   </data>
+  <data name="ViewPageGachaLogRecoverFromHutaoCloudDescription" xml:space="preserve">
+    <value>从胡桃云恢复祈愿记录</value>
+  </data>
   <data name="ViewPageGachaLogRefresh" xml:space="preserve">
     <value>刷新</value>
   </data>
@@ -2486,6 +2495,9 @@
   <data name="ViewSpiralAbyssUploadRecord" xml:space="preserve">
     <value>上传数据</value>
   </data>
+  <data name="ViewTitleAutoClicking" xml:space="preserve">
+    <value>自动连点</value>
+  </data>
   <data name="ViewToolHeader" xml:space="preserve">
     <value>工具</value>
   </data>

src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs

@@ -126,7 +126,7 @@ internal sealed partial class DailyNoteOptions : DbStoreOptions
 
     public string? WebhookUrl
     {
-        get => GetOption(ref webhookUrl, SettingEntry.DailyNoteSilentWhenPlayingGame);
-        set => SetOption(ref webhookUrl, SettingEntry.DailyNoteSilentWhenPlayingGame, value);
+        get => GetOption(ref webhookUrl, SettingEntry.DailyNoteWebhookUrl);
+        set => SetOption(ref webhookUrl, SettingEntry.DailyNoteWebhookUrl, value);
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs

@@ -4,6 +4,7 @@
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.IO.Ini;
+using Snap.Hutao.Factory.Abstraction;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Service.Game.Locator;
 using Snap.Hutao.Service.Game.Package;
@@ -25,6 +26,7 @@ namespace Snap.Hutao.Service.Game;
 [Injection(InjectAs.Singleton, typeof(IGameService))]
 internal sealed partial class GameService : IGameService
 {
+    private readonly IContentDialogFactory contentDialogFactory;
     private readonly PackageConverter packageConverter;
     private readonly IServiceProvider serviceProvider;
     private readonly IGameDbService gameDbService;
@@ -300,7 +302,7 @@ internal sealed partial class GameService : IGameService
             {
                 // ContentDialog must be created by main thread.
                 await taskContext.SwitchToMainThreadAsync();
-                LaunchGameAccountNameDialog dialog = serviceProvider.CreateInstance<LaunchGameAccountNameDialog>();
+                LaunchGameAccountNameDialog dialog = await contentDialogFactory.CreateInstanceAsync<LaunchGameAccountNameDialog>().ConfigureAwait(false);
                 (bool isOk, string name) = await dialog.GetInputNameAsync().ConfigureAwait(false);
 
                 if (isOk)

src/Snap.Hutao/Snap.Hutao/Service/Game/KnownLaunchSchemes.cs

@@ -0,0 +1,52 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Service.Game;
+
+internal static class KnownLaunchSchemes
+{
+    private static readonly LaunchScheme ServerChineseChannelDefaultSubChannelDefaultCompat = new LaunchSchemeChinese(ChannelType.Default, SubChannelType.Default, false);
+    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelDefault = new LaunchSchemeChinese(ChannelType.Official, SubChannelType.Default);
+    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelOfficial = new LaunchSchemeChinese(ChannelType.Official, SubChannelType.Official);
+    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelNoTapTap = new LaunchSchemeChinese(ChannelType.Official, SubChannelType.NoTapTap);
+    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelEpicCompat = new LaunchSchemeChinese(ChannelType.Official, SubChannelType.Epic, false);
+
+    private static readonly LaunchScheme ServerChineseChannelBilibiliSubChannelDefault = new LaunchSchemeBilibili(SubChannelType.Default);
+    private static readonly LaunchScheme ServerChineseChannelBilibiliSubChannelOfficialCompat = new LaunchSchemeBilibili(SubChannelType.Official, false);
+
+    private static readonly LaunchScheme ServerGlobalChannelDefaultSubChannelDefaultCompat = new LaunchSchemeOversea(ChannelType.Default, SubChannelType.Default, false);
+    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelDefault = new LaunchSchemeOversea(ChannelType.Official, SubChannelType.Default);
+    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelOfficial = new LaunchSchemeOversea(ChannelType.Official, SubChannelType.Official);
+    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelEpic = new LaunchSchemeOversea(ChannelType.Official, SubChannelType.Epic);
+    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelGoogle = new LaunchSchemeOversea(ChannelType.Official, SubChannelType.Google);
+
+    /// <summary>
+    /// 获取已知的启动方案
+    /// </summary>
+    /// <returns>已知的启动方案</returns>
+    public static List<LaunchScheme> Get()
+    {
+        return new List<LaunchScheme>()
+        {
+            // 官服
+            ServerChineseChannelDefaultSubChannelDefaultCompat,
+            ServerChineseChannelOfficialSubChannelDefault,
+            ServerChineseChannelOfficialSubChannelOfficial,
+            ServerChineseChannelOfficialSubChannelNoTapTap,
+            ServerChineseChannelOfficialSubChannelEpicCompat,
+
+            // 渠道服
+            ServerChineseChannelBilibiliSubChannelDefault,
+            ServerChineseChannelBilibiliSubChannelOfficialCompat,
+
+            // 国际服
+            ServerGlobalChannelDefaultSubChannelDefaultCompat,
+            ServerGlobalChannelOfficialSubChannelDefault,
+            ServerGlobalChannelOfficialSubChannelOfficial,
+            ServerGlobalChannelOfficialSubChannelEpic,
+            ServerGlobalChannelOfficialSubChannelGoogle,
+        };
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs

@@ -27,10 +27,13 @@ internal sealed class LaunchOptions : DbStoreOptions
     private bool? isBorderless;
     private bool? isExclusive;
     private int? screenWidth;
+    private bool? isScreenWidthEnabled;
     private int? screenHeight;
+    private bool? isScreenHeightEnabled;
     private bool? unlockFps;
     private int? targetFps;
     private NameValue<int>? monitor;
+    private bool? isMonitorEnabled;
 
     /// <summary>
     /// 构造一个新的启动游戏选项
@@ -83,6 +86,12 @@ internal sealed class LaunchOptions : DbStoreOptions
         set => SetOption(ref screenWidth, SettingEntry.LaunchScreenWidth, value);
     }
 
+    public bool IsScreenWidthEnabled
+    {
+        get => GetOption(ref isScreenWidthEnabled, SettingEntry.LaunchIsScreenWidthEnabled, true);
+        set => SetOption(ref isScreenWidthEnabled, SettingEntry.LaunchIsScreenWidthEnabled, value);
+    }
+
     /// <summary>
     /// 屏幕高度
     /// </summary>
@@ -92,6 +101,12 @@ internal sealed class LaunchOptions : DbStoreOptions
         set => SetOption(ref screenHeight, SettingEntry.LaunchScreenHeight, value);
     }
 
+    public bool IsScreenHeightEnabled
+    {
+        get => GetOption(ref isScreenHeightEnabled, SettingEntry.LaunchIsScreenHeightEnabled, true);
+        set => SetOption(ref isScreenHeightEnabled, SettingEntry.LaunchIsScreenHeightEnabled, value);
+    }
+
     /// <summary>
     /// 是否全屏
     /// </summary>
@@ -131,6 +146,12 @@ internal sealed class LaunchOptions : DbStoreOptions
         }
     }
 
+    public bool IsMonitorEnabled
+    {
+        get => GetOption(ref isMonitorEnabled, SettingEntry.LaunchIsMonitorEnabled, true);
+        set => SetOption(ref isMonitorEnabled, SettingEntry.LaunchIsMonitorEnabled, value);
+    }
+
     private static void InitializeMonitors(List<NameValue<int>> monitors)
     {
         // This list can't use foreach

src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchScheme.KnownSchemes.cs

@@ -1,160 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Intrinsic;
-
-namespace Snap.Hutao.Service.Game;
-
-/// <summary>
-/// 方案列表部分
-/// </summary>
-internal sealed partial class LaunchScheme
-{
-    private const int SdkStaticLauncherChineseId = 18;
-    private const int SdkStaticLauncherBilibiliId = 17;
-    private const int SdkStaticLauncherGlobalId = 10;
-
-    private const string SdkStaticLauncherChineseKey = "eYd89JmJ";
-    private const string SdkStaticLauncherBilibiliKey = "KAtdSsoQ";
-    private const string SdkStaticLauncherGlobalKey = "gcStgarh";
-
-    private static readonly LaunchScheme ServerChineseChannelDefaultSubChannelDefaultCompatOnly = new()
-    {
-        LauncherId = SdkStaticLauncherChineseId,
-        Key = SdkStaticLauncherChineseKey,
-        Channel = ChannelType.Default,
-        SubChannel = SubChannelType.Default,
-        IsOversea = false,
-        IsNotCompatOnly = false,
-    };
-
-    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelDefault = new()
-    {
-        LauncherId = SdkStaticLauncherChineseId,
-        Key = SdkStaticLauncherChineseKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.Default,
-        IsOversea = false,
-    };
-
-    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelOfficial = new()
-    {
-        LauncherId = SdkStaticLauncherChineseId,
-        Key = SdkStaticLauncherChineseKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.Official,
-        IsOversea = false,
-    };
-
-    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelNoTapTap = new()
-    {
-        LauncherId = SdkStaticLauncherChineseId,
-        Key = SdkStaticLauncherChineseKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.NoTapTap,
-        IsOversea = false,
-    };
-
-    private static readonly LaunchScheme ServerChineseChannelOfficialSubChannelEpicCompatOnly = new()
-    {
-        LauncherId = SdkStaticLauncherChineseId,
-        Key = SdkStaticLauncherChineseKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.Epic,
-        IsOversea = false,
-        IsNotCompatOnly = false,
-    };
-
-    private static readonly LaunchScheme ServerChineseChannelBilibiliSubChannelDefault = new()
-    {
-        LauncherId = SdkStaticLauncherBilibiliId,
-        Key = SdkStaticLauncherBilibiliKey,
-        Channel = ChannelType.Bili,
-        SubChannel = SubChannelType.Default,
-        IsOversea = false,
-    };
-
-    private static readonly LaunchScheme ServerChineseChannelBilibiliSubChannelOfficialCompatOnly = new()
-    {
-        LauncherId = SdkStaticLauncherBilibiliId,
-        Key = SdkStaticLauncherBilibiliKey,
-        Channel = ChannelType.Bili,
-        SubChannel = SubChannelType.Official,
-        IsOversea = false,
-        IsNotCompatOnly = false,
-    };
-
-    private static readonly LaunchScheme ServerGlobalChannelDefaultSubChannelDefaultCompatOnly = new()
-    {
-        LauncherId = SdkStaticLauncherGlobalId,
-        Key = SdkStaticLauncherGlobalKey,
-        Channel = ChannelType.Default,
-        SubChannel = SubChannelType.Default,
-        IsOversea = true,
-        IsNotCompatOnly = false,
-    };
-
-    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelDefault = new()
-    {
-        LauncherId = SdkStaticLauncherGlobalId,
-        Key = SdkStaticLauncherGlobalKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.Default,
-        IsOversea = true,
-    };
-
-    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelOfficial = new()
-    {
-        LauncherId = SdkStaticLauncherGlobalId,
-        Key = SdkStaticLauncherGlobalKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.Official,
-        IsOversea = true,
-    };
-
-    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelEpic = new()
-    {
-        LauncherId = SdkStaticLauncherGlobalId,
-        Key = SdkStaticLauncherGlobalKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.Epic,
-        IsOversea = true,
-    };
-
-    private static readonly LaunchScheme ServerGlobalChannelOfficialSubChannelGoogle = new()
-    {
-        LauncherId = SdkStaticLauncherGlobalId,
-        Key = SdkStaticLauncherGlobalKey,
-        Channel = ChannelType.Official,
-        SubChannel = SubChannelType.Google,
-        IsOversea = true,
-    };
-
-    /// <summary>
-    /// 获取已知的启动方案
-    /// </summary>
-    /// <returns>已知的启动方案</returns>
-    public static List<LaunchScheme> GetKnownSchemes()
-    {
-        return new List<LaunchScheme>()
-        {
-            // 官服
-            ServerChineseChannelDefaultSubChannelDefaultCompatOnly,
-            ServerChineseChannelOfficialSubChannelDefault,
-            ServerChineseChannelOfficialSubChannelOfficial,
-            ServerChineseChannelOfficialSubChannelNoTapTap,
-            ServerChineseChannelOfficialSubChannelEpicCompatOnly,
-
-            // 渠道服
-            ServerChineseChannelBilibiliSubChannelDefault,
-            ServerChineseChannelBilibiliSubChannelOfficialCompatOnly,
-
-            // 国际服
-            ServerGlobalChannelDefaultSubChannelDefaultCompatOnly,
-            ServerGlobalChannelOfficialSubChannelDefault,
-            ServerGlobalChannelOfficialSubChannelOfficial,
-            ServerGlobalChannelOfficialSubChannelEpic,
-            ServerGlobalChannelOfficialSubChannelGoogle,
-        };
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchScheme.cs

@@ -9,7 +9,7 @@ namespace Snap.Hutao.Service.Game;
 /// 启动方案
 /// </summary>
 [HighQuality]
-internal sealed partial class LaunchScheme
+internal partial class LaunchScheme
 {
     /// <summary>
     /// 显示名称
@@ -32,29 +32,29 @@ internal sealed partial class LaunchScheme
     /// <summary>
     /// 通道
     /// </summary>
-    public ChannelType Channel { get; private set; }
+    public ChannelType Channel { get; private protected set; }
 
     /// <summary>
     /// 子通道
     /// </summary>
-    public SubChannelType SubChannel { get; private set; }
+    public SubChannelType SubChannel { get; private protected set; }
 
     /// <summary>
     /// 启动器 Id
     /// </summary>
-    public int LauncherId { get; private set; }
+    public int LauncherId { get; private protected set; }
 
     /// <summary>
     /// API Key
     /// </summary>
-    public string Key { get; private set; } = default!;
+    public string Key { get; private protected set; } = default!;
 
     /// <summary>
     /// 是否为海外
     /// </summary>
-    public bool IsOversea { get; private set; }
+    public bool IsOversea { get; private protected set; }
 
-    public bool IsNotCompatOnly { get; private set; } = true;
+    public bool IsNotCompatOnly { get; private protected set; } = true;
 
     /// <summary>
     /// 多通道相等

src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchSchemeBilibili.cs

@@ -0,0 +1,22 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Service.Game;
+
+internal sealed class LaunchSchemeBilibili : LaunchScheme
+{
+    private const int SdkStaticLauncherBilibiliId = 17;
+    private const string SdkStaticLauncherBilibiliKey = "KAtdSsoQ";
+
+    public LaunchSchemeBilibili(SubChannelType subChannel, bool isNotCompatOnly = true)
+    {
+        LauncherId = SdkStaticLauncherBilibiliId;
+        Key = SdkStaticLauncherBilibiliKey;
+        Channel = ChannelType.Bili;
+        SubChannel = subChannel;
+        IsOversea = false;
+        IsNotCompatOnly = isNotCompatOnly;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchSchemeChinese.cs

@@ -0,0 +1,22 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Service.Game;
+
+internal sealed class LaunchSchemeChinese : LaunchScheme
+{
+    private const int SdkStaticLauncherChineseId = 18;
+    private const string SdkStaticLauncherChineseKey = "eYd89JmJ";
+
+    public LaunchSchemeChinese(ChannelType channel, SubChannelType subChannel, bool isNotCompatOnly = true)
+    {
+        LauncherId = SdkStaticLauncherChineseId;
+        Key = SdkStaticLauncherChineseKey;
+        Channel = channel;
+        SubChannel = subChannel;
+        IsOversea = false;
+        IsNotCompatOnly = isNotCompatOnly;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchSchemeOversea.cs

@@ -0,0 +1,22 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Service.Game;
+
+internal sealed class LaunchSchemeOversea : LaunchScheme
+{
+    private const int SdkStaticLauncherOverseaId = 10;
+    private const string SdkStaticLauncherOverseaKey = "gcStgarh";
+
+    public LaunchSchemeOversea(ChannelType channel, SubChannelType subChannel, bool isNotCompatOnly = true)
+    {
+        LauncherId = SdkStaticLauncherOverseaId;
+        Key = SdkStaticLauncherOverseaKey;
+        Channel = channel;
+        SubChannel = subChannel;
+        IsOversea = true;
+        IsNotCompatOnly = isNotCompatOnly;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/ProcessInterop.cs

@@ -34,9 +34,9 @@ internal static class ProcessInterop
             .AppendIf("-popupwindow", options.IsBorderless)
             .AppendIf("-window-mode", options.IsExclusive, "exclusive")
             .Append("-screen-fullscreen", options.IsFullScreen ? 1 : 0)
-            .Append("-screen-width", options.ScreenWidth)
-            .Append("-screen-height", options.ScreenHeight)
-            .Append("-monitor", options.Monitor.Value)
+            .AppendIf("-screen-width", options.IsScreenWidthEnabled, options.ScreenWidth)
+            .AppendIf("-screen-height", options.IsScreenHeightEnabled, options.ScreenHeight)
+            .AppendIf("-monitor", options.IsMonitorEnabled, options.Monitor.Value)
             .ToString();
 
         return new()

src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserOptions.cs

@@ -4,6 +4,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.Options;
+using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Web.Hutao;
 using System.Text.RegularExpressions;
 
@@ -62,8 +63,11 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions<HutaoUserOpt
     /// <inheritdoc/>
     public HutaoUserOptions Value { get => this; }
 
-    public async ValueTask<bool> PostLoginSucceedAsync(HomaPassportClient passportClient, ITaskContext taskContext, string username, string? token)
+    public async ValueTask<bool> PostLoginSucceedAsync(HomaPassportClient passportClient, ITaskContext taskContext, string username, string password, string? token)
     {
+        LocalSetting.Set(SettingKeys.PassportUserName, username);
+        LocalSetting.Set(SettingKeys.PassportPassword, password);
+
         await taskContext.SwitchToMainThreadAsync();
         UserName = username;
         this.token = token;
@@ -84,6 +88,9 @@ internal sealed class HutaoUserOptions : ObservableObject, IOptions<HutaoUserOpt
 
     public void LogoutOrUnregister()
     {
+        LocalSetting.Set(SettingKeys.PassportUserName, string.Empty);
+        LocalSetting.Set(SettingKeys.PassportPassword, string.Empty);
+
         UserName = null;
         token = null;
         IsLoggedIn = false;

src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoUserService.cs

@@ -32,19 +32,19 @@ internal sealed partial class HutaoUserService : IHutaoUserService, IHutaoUserSe
     public async ValueTask InitializeInternalAsync(CancellationToken token = default)
     {
         string userName = LocalSetting.Get(SettingKeys.PassportUserName, string.Empty);
-        string passport = LocalSetting.Get(SettingKeys.PassportPassword, string.Empty);
+        string password = LocalSetting.Get(SettingKeys.PassportPassword, string.Empty);
 
-        if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(passport))
+        if (string.IsNullOrEmpty(userName) || string.IsNullOrEmpty(password))
         {
             options.SkipLogin();
         }
         else
         {
-            Web.Response.Response<string> response = await passportClient.LoginAsync(userName, passport, token).ConfigureAwait(false);
+            Web.Response.Response<string> response = await passportClient.LoginAsync(userName, password, token).ConfigureAwait(false);
 
             if (response.IsOk())
             {
-                if (await options.PostLoginSucceedAsync(passportClient, taskContext, userName, response.Data).ConfigureAwait(false))
+                if (await options.PostLoginSucceedAsync(passportClient, taskContext, userName, password, response.Data).ConfigureAwait(false))
                 {
                     isInitialized = true;
                 }

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

@@ -79,6 +79,7 @@
     <None Remove="Control\Theme\Color.xaml" />
     <None Remove="Control\Theme\Converter.xaml" />
     <None Remove="Control\Theme\CornerRadius.xaml" />
+    <None Remove="Control\Theme\FlyoutStyle.xaml" />
     <None Remove="Control\Theme\FontStyle.xaml" />
     <None Remove="Control\Theme\Glyph.xaml" />
     <None Remove="Control\Theme\InfoBarOverride.xaml" />
@@ -307,6 +308,12 @@
     <AdditionalFiles Include="Resource\Localization\SH.resx" />
   </ItemGroup>
   
+  <ItemGroup>
+    <Page Update="Control\Theme\FlyoutStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  
   <ItemGroup>
     <Page Update="View\Dialog\HutaoPassportUnregisterDialog.xaml">
       <Generator>MSBuild:Compile</Generator>

src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportLoginDialog.xaml

@@ -13,7 +13,11 @@
     mc:Ignorable="d">
 
     <StackPanel Margin="0,8,0,0">
-        <TextBox PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}" Text="{x:Bind UserName, Mode=TwoWay}"/>
+        <TextBox
+            InputScope="EmailSmtpAddress"
+            IsSpellCheckEnabled="False"
+            PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
+            Text="{x:Bind UserName, Mode=TwoWay}"/>
         <PasswordBox
             Margin="0,16,0,0"
             Password="{x:Bind Password, Mode=TwoWay}"

src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportRegisterDialog.xaml

@@ -13,7 +13,11 @@
     mc:Ignorable="d">
 
     <StackPanel Margin="0,8,0,0">
-        <TextBox PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}" Text="{x:Bind UserName, Mode=TwoWay}"/>
+        <TextBox
+            InputScope="EmailSmtpAddress"
+            IsSpellCheckEnabled="False"
+            PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
+            Text="{x:Bind UserName, Mode=TwoWay}"/>
         <Grid Margin="0,16,0,0" ColumnSpacing="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
@@ -28,7 +32,7 @@
         </Grid>
         <PasswordBox
             Margin="0,16,0,0"
-            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}}"
+            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
             Password="{x:Bind Password, Mode=TwoWay}"
             PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
         <TextBlock
@@ -37,4 +41,4 @@
             Style="{StaticResource CaptionTextBlockStyle}"
             Text="{shcm:ResourceString Name=ViewPageHutaoPassportPasswordRequirementHint}"/>
     </StackPanel>
-</ContentDialog>
+</ContentDialog>

src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportRegisterDialog.xaml.cs

@@ -48,7 +48,7 @@ internal sealed partial class HutaoPassportRegisterDialog : ContentDialog
             return;
         }
 
-        HutaoResponse response = await homaPassportClient.VerifyAsync(UserName, false).ConfigureAwait(false);
+        HutaoResponse response = await homaPassportClient.RequestVerifyAsync(UserName, VerifyCodeRequestType.Registration).ConfigureAwait(false);
         infoBarService.Information(response.GetLocalizationMessage());
     }
 }

src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportResetPasswordDialog.xaml

@@ -13,7 +13,11 @@
     mc:Ignorable="d">
 
     <StackPanel>
-        <TextBox PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}" Text="{x:Bind UserName, Mode=TwoWay}"/>
+        <TextBox
+            InputScope="EmailSmtpAddress"
+            IsSpellCheckEnabled="False"
+            PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
+            Text="{x:Bind UserName, Mode=TwoWay}"/>
         <Grid Margin="0,16,0,0" ColumnSpacing="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
@@ -28,7 +32,7 @@
         </Grid>
         <PasswordBox
             Margin="0,16,0,0"
-            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}}"
+            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
             Password="{x:Bind Password, Mode=TwoWay}"
             PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
         <TextBlock
@@ -37,4 +41,4 @@
             Style="{StaticResource CaptionTextBlockStyle}"
             Text="{shcm:ResourceString Name=ViewPageHutaoPassportPasswordRequirementHint}"/>
     </StackPanel>
-</ContentDialog>
+</ContentDialog>

src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportResetPasswordDialog.xaml.cs

@@ -48,7 +48,7 @@ internal sealed partial class HutaoPassportResetPasswordDialog : ContentDialog
             return;
         }
 
-        HutaoResponse response = await homaPassportClient.VerifyAsync(UserName, false).ConfigureAwait(false);
+        HutaoResponse response = await homaPassportClient.RequestVerifyAsync(UserName, VerifyCodeRequestType.ResetPassword).ConfigureAwait(false);
         infoBarService.Information(response.GetLocalizationMessage());
     }
 }

src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportUnregisterDialog.xaml

@@ -20,11 +20,26 @@
             Severity="Error"/>
         <TextBox
             Margin="0,16,0,0"
+            InputScope="EmailSmtpAddress"
+            IsSpellCheckEnabled="False"
             PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
             Text="{x:Bind UserName, Mode=TwoWay}"/>
+        <Grid Margin="0,16,0,0" ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="auto"/>
+            </Grid.ColumnDefinitions>
+            <TextBox PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}" Text="{x:Bind VerifyCode, Mode=TwoWay}"/>
+            <Button
+                Grid.Column="1"
+                VerticalAlignment="Stretch"
+                Command="{x:Bind VerifyCommand}"
+                Content="{shcm:ResourceString Name=ViewPageHutaoPassportVerifyCodeAction}"/>
+        </Grid>
         <PasswordBox
             Margin="0,16,0,0"
+            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
             Password="{x:Bind Password, Mode=TwoWay}"
             PlaceholderText="{shcm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
     </StackPanel>
-</ContentDialog>
+</ContentDialog>

src/Snap.Hutao/Snap.Hutao/View/Dialog/HutaoPassportUnregisterDialog.xaml.cs

@@ -1,14 +1,20 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.Common;
 using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.Service.Notification;
+using Snap.Hutao.Web.Hutao;
 
 namespace Snap.Hutao.View.Dialog;
 
 [DependencyProperty("UserName", typeof(string))]
 [DependencyProperty("Password", typeof(string))]
+[DependencyProperty("VerifyCode", typeof(string))]
 internal sealed partial class HutaoPassportUnregisterDialog : ContentDialog
 {
+    private readonly HomaPassportClient homaPassportClient;
+    private readonly IInfoBarService infoBarService;
     private readonly ITaskContext taskContext;
 
     public HutaoPassportUnregisterDialog(IServiceProvider serviceProvider)
@@ -16,13 +22,33 @@ internal sealed partial class HutaoPassportUnregisterDialog : ContentDialog
         InitializeComponent();
 
         taskContext = serviceProvider.GetRequiredService<ITaskContext>();
+        homaPassportClient = serviceProvider.GetRequiredService<HomaPassportClient>();
+        infoBarService = serviceProvider.GetRequiredService<IInfoBarService>();
     }
 
-    public async ValueTask<ValueResult<bool, (string UserName, string Passport)>> GetInputAsync()
+    public async ValueTask<ValueResult<bool, (string UserName, string Passport, string VerifyCode)>> GetInputAsync()
     {
         await taskContext.SwitchToMainThreadAsync();
         ContentDialogResult result = await ShowAsync();
 
-        return new(result is ContentDialogResult.Primary, (UserName, Password));
+        return new(result is ContentDialogResult.Primary, (UserName, Password, VerifyCode));
+    }
+
+    [Command("VerifyCommand")]
+    private async Task VerifyAsync()
+    {
+        if (string.IsNullOrEmpty(UserName))
+        {
+            return;
+        }
+
+        if (!UserName.IsEmail())
+        {
+            infoBarService.Warning(SH.ViewModelHutaoPassportEmailNotValidHint);
+            return;
+        }
+
+        HutaoResponse response = await homaPassportClient.RequestVerifyAsync(UserName, VerifyCodeRequestType.CancelRegistration).ConfigureAwait(false);
+        infoBarService.Information(response.GetLocalizationMessage());
     }
 }

src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml

@@ -12,11 +12,9 @@
             MaxWidth="640"
             Margin="32,48,32,32"
             VerticalAlignment="Bottom"
+            ItemContainerTransitions="{StaticResource RepositionThemeTransitions}"
             ItemsSource="{x:Bind InfoBars}"
-            Visibility="{Binding ElementName=VisibilityButton, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}}">
-            <ItemsControl.Transitions>
-                <RepositionThemeTransition/>
-            </ItemsControl.Transitions>
+            Visibility="{x:Bind VisibilityButton.IsChecked, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
             <ItemsControl.Resources>
                 <ResourceDictionary>
                     <ResourceDictionary.ThemeDictionaries>

src/Snap.Hutao/Snap.Hutao/View/MainView.xaml

@@ -17,7 +17,7 @@
         <NavigationView
             x:Name="NavView"
             CompactPaneLength="48"
-            IsBackEnabled="{Binding ElementName=ContentFrame, Path=CanGoBack}"
+            IsBackEnabled="{x:Bind ContentFrame.CanGoBack, Mode=OneWay}"
             IsPaneOpen="True"
             OpenPaneLength="188"
             PaneDisplayMode="Left"
@@ -86,13 +86,10 @@
                 <shv:UserView/>
             </NavigationView.PaneFooter>
 
-            <Frame x:Name="ContentFrame" UseLayoutRounding="True">
-                <Frame.ContentTransitions>
-                    <TransitionCollection>
-                        <NavigationThemeTransition/>
-                    </TransitionCollection>
-                </Frame.ContentTransitions>
-            </Frame>
+            <Frame
+                x:Name="ContentFrame"
+                ContentTransitions="{StaticResource NavigationThemeTransitions}"
+                UseLayoutRounding="True"/>
         </NavigationView>
 
         <shv:InfoBarView/>

src/Snap.Hutao/Snap.Hutao/View/Page/AchievementPage.xaml

@@ -164,6 +164,21 @@
                 </Grid>
             </Border>
         </DataTemplate>
+
+        <Style
+            x:Key="AchievementGoalListViewItemStyle"
+            BasedOn="{StaticResource DefaultListViewItemStyle}"
+            TargetType="ListViewItem">
+            <Setter Property="Margin" Value="0,0,6,0"/>
+        </Style>
+
+        <Style
+            x:Key="AchievementListViewItemStyle"
+            BasedOn="{StaticResource DefaultListViewItemStyle}"
+            TargetType="ListViewItem">
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="Margin" Value="0,4,8,0"/>
+        </Style>
     </Page.Resources>
 
     <mxi:Interaction.Behaviors>
@@ -282,6 +297,7 @@
                         PaneBackground="{x:Null}">
                         <SplitView.Pane>
                             <ListView
+                                ItemContainerStyle="{StaticResource AchievementGoalListViewItemStyle}"
                                 ItemTemplate="{StaticResource AchievementGoalListTemplate}"
                                 ItemsSource="{Binding AchievementGoals}"
                                 SelectedItem="{Binding SelectedAchievementGoal, Mode=TwoWay}"
@@ -289,11 +305,6 @@
                                 <mxi:Interaction.Behaviors>
                                     <shcb:SelectedItemInViewBehavior/>
                                 </mxi:Interaction.Behaviors>
-                                <ListView.ItemContainerStyle>
-                                    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-                                        <Setter Property="Margin" Value="0,0,6,0"/>
-                                    </Style>
-                                </ListView.ItemContainerStyle>
                             </ListView>
                         </SplitView.Pane>
 
@@ -301,16 +312,10 @@
                             <ListView
                                 Margin="8,0,0,0"
                                 Padding="0,0,0,8"
+                                ItemContainerStyle="{StaticResource AchievementListViewItemStyle}"
                                 ItemTemplate="{StaticResource AchievementTemplate}"
                                 ItemsSource="{Binding Achievements}"
-                                SelectionMode="None">
-                                <ListView.ItemContainerStyle>
-                                    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-                                        <Setter Property="Padding" Value="0"/>
-                                        <Setter Property="Margin" Value="0,4,8,0"/>
-                                    </Style>
-                                </ListView.ItemContainerStyle>
-                            </ListView>
+                                SelectionMode="None"/>
                         </SplitView.Content>
                     </SplitView>
                 </cwc:Case>

src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml

@@ -29,9 +29,126 @@
         <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
 
         <DataTemplate x:Key="AnnouncementTemplate">
+            <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                <Border Style="{StaticResource BorderCardStyle}">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <!--  Image Layer  -->
+                        <Border cw:UIElementExtensions.ClipToBounds="True" CornerRadius="{ThemeResource ControlCornerRadiusTop}">
+                            <Border
+                                x:Name="ImageZoomBorder"
+                                VerticalAlignment="Top"
+                                cw:VisualExtensions.NormalizedCenterPoint="0.5">
+                                <cww:ConstrainedBox AspectRatio="1080:390" CornerRadius="{ThemeResource ControlCornerRadiusTop}">
+                                    <shci:CachedImage Source="{Binding Banner}" Stretch="UniformToFill"/>
+                                </cww:ConstrainedBox>
+                                <cwa:Explicit.Animations>
+                                    <cwa:AnimationSet x:Name="ImageZoomInAnimation">
+                                        <shca:ImageZoomInAnimation/>
+                                    </cwa:AnimationSet>
+                                    <cwa:AnimationSet x:Name="ImageZoomOutAnimation">
+                                        <shca:ImageZoomOutAnimation/>
+                                    </cwa:AnimationSet>
+                                </cwa:Explicit.Animations>
+                            </Border>
+                        </Border>
+                        <!--  Time Description  -->
+                        <Grid Grid.Row="0">
+                            <Border
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Bottom"
+                                Visibility="{Binding ShouldShowTimeDescription, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <ProgressBar
+                                    MinHeight="2"
+                                    VerticalAlignment="Bottom"
+                                    Background="Transparent"
+                                    CornerRadius="0"
+                                    Maximum="1"
+                                    Value="{Binding TimePercent, Mode=OneWay}"/>
+                            </Border>
+                        </Grid>
+                        <!--  General Description  -->
+                        <Border Grid.Row="1">
+                            <StackPanel Margin="4" VerticalAlignment="Bottom">
+                                <TextBlock
+                                    Margin="4,6,0,0"
+                                    HorizontalAlignment="Stretch"
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{Binding Subtitle}"
+                                    TextTrimming="WordEllipsis"
+                                    TextWrapping="NoWrap"/>
+
+                                <TextBlock
+                                    Margin="4,6,0,0"
+                                    Opacity="0.6"
+                                    Style="{StaticResource BodyTextBlockStyle}"
+                                    Text="{Binding Title}"
+                                    TextTrimming="WordEllipsis"
+                                    TextWrapping="NoWrap"/>
+
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition/>
+                                        <ColumnDefinition Width="auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        Margin="4,4,0,4"
+                                        FontSize="10"
+                                        Opacity="0.4"
+                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                        Text="{Binding TimeFormatted}"
+                                        TextWrapping="NoWrap"/>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Margin="4,4,4,4"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Bottom"
+                                        FontSize="10"
+                                        Opacity="0.8"
+                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                        Text="{Binding TimeDescription}"
+                                        Visibility="{Binding ShouldShowTimeDescription, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                </Grid>
+                            </StackPanel>
+                        </Border>
+                    </Grid>
+                    <!--  公告详情网页视图  -->
+                    <FlyoutBase.AttachedFlyout>
+                        <Flyout LightDismissOverlayMode="On" Placement="Full">
+                            <Flyout.FlyoutPresenterStyle>
+                                <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
+                                    <Setter Property="Padding" Value="0"/>
+                                    <Setter Property="CornerRadius" Value="0"/>
+                                    <Setter Property="MaxWidth" Value="640"/>
+                                </Style>
+                            </Flyout.FlyoutPresenterStyle>
+                            <shvco:AnnouncementContentViewer Announcement="{Binding}"/>
+                        </Flyout>
+                    </FlyoutBase.AttachedFlyout>
+
+                    <mxi:Interaction.Behaviors>
+                        <mxic:EventTriggerBehavior EventName="Tapped">
+                            <shcb:OpenAttachedFlyoutAction/>
+                        </mxic:EventTriggerBehavior>
+                        <mxic:EventTriggerBehavior EventName="PointerEntered">
+                            <shcb:StartAnimationActionNoThrow Animation="{Binding ElementName=ImageZoomInAnimation}" TargetObject="{Binding ElementName=ImageZoomBorder}"/>
+                        </mxic:EventTriggerBehavior>
+                        <mxic:EventTriggerBehavior EventName="PointerExited">
+                            <shcb:StartAnimationActionNoThrow Animation="{Binding ElementName=ImageZoomOutAnimation}" TargetObject="{Binding ElementName=ImageZoomBorder}"/>
+                        </mxic:EventTriggerBehavior>
+                    </mxi:Interaction.Behaviors>
+                </Border>
+            </ItemContainer>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AnnouncementPivotItemContentTemplate">
             <ItemsRepeater
                 Margin="16,16,16,16"
                 HorizontalAlignment="Stretch"
+                ItemTemplate="{StaticResource AnnouncementTemplate}"
                 ItemsSource="{Binding List}">
                 <ItemsRepeater.Layout>
                     <UniformGridLayout
@@ -41,118 +158,6 @@
                         MinItemWidth="300"
                         MinRowSpacing="12"/>
                 </ItemsRepeater.Layout>
-                <ItemsRepeater.ItemTemplate>
-                    <DataTemplate>
-                        <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                            <Border Style="{StaticResource BorderCardStyle}">
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition/>
-                                        <RowDefinition Height="auto"/>
-                                    </Grid.RowDefinitions>
-                                    <!--  Image Layer  -->
-                                    <Border cw:UIElementExtensions.ClipToBounds="True" CornerRadius="{ThemeResource ControlCornerRadiusTop}">
-                                        <Border VerticalAlignment="Top" cw:VisualExtensions.NormalizedCenterPoint="0.5">
-                                            <cww:ConstrainedBox AspectRatio="1080:390" CornerRadius="{ThemeResource ControlCornerRadiusTop}">
-                                                <shci:CachedImage Source="{Binding Banner}" Stretch="UniformToFill"/>
-                                            </cww:ConstrainedBox>
-                                            <cwa:Explicit.Animations>
-                                                <cwa:AnimationSet x:Name="ImageZoomInAnimation">
-                                                    <shca:ImageZoomInAnimation/>
-                                                </cwa:AnimationSet>
-                                                <cwa:AnimationSet x:Name="ImageZoomOutAnimation">
-                                                    <shca:ImageZoomOutAnimation/>
-                                                </cwa:AnimationSet>
-                                            </cwa:Explicit.Animations>
-                                        </Border>
-                                    </Border>
-                                    <!--  Time Description  -->
-                                    <Grid Grid.Row="0">
-                                        <Border
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Bottom"
-                                            Visibility="{Binding ShouldShowTimeDescription, Converter={StaticResource BoolToVisibilityConverter}}">
-                                            <ProgressBar
-                                                MinHeight="2"
-                                                VerticalAlignment="Bottom"
-                                                Background="Transparent"
-                                                CornerRadius="0"
-                                                Maximum="1"
-                                                Value="{Binding TimePercent, Mode=OneWay}"/>
-                                        </Border>
-                                    </Grid>
-                                    <!--  General Description  -->
-                                    <Border Grid.Row="1">
-                                        <StackPanel Margin="4" VerticalAlignment="Bottom">
-                                            <TextBlock
-                                                Margin="4,6,0,0"
-                                                HorizontalAlignment="Stretch"
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{Binding Subtitle}"
-                                                TextTrimming="WordEllipsis"
-                                                TextWrapping="NoWrap"/>
-
-                                            <TextBlock
-                                                Margin="4,6,0,0"
-                                                Opacity="0.6"
-                                                Style="{StaticResource BodyTextBlockStyle}"
-                                                Text="{Binding Title}"
-                                                TextTrimming="WordEllipsis"
-                                                TextWrapping="NoWrap"/>
-
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition/>
-                                                    <ColumnDefinition Width="auto"/>
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock
-                                                    Margin="4,4,0,4"
-                                                    FontSize="10"
-                                                    Opacity="0.4"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{Binding TimeFormatted}"
-                                                    TextWrapping="NoWrap"/>
-                                                <TextBlock
-                                                    Grid.Column="1"
-                                                    Margin="4,4,4,4"
-                                                    HorizontalAlignment="Right"
-                                                    VerticalAlignment="Bottom"
-                                                    FontSize="10"
-                                                    Opacity="0.8"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{Binding TimeDescription}"
-                                                    Visibility="{Binding ShouldShowTimeDescription, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                            </Grid>
-                                        </StackPanel>
-                                    </Border>
-                                </Grid>
-                                <FlyoutBase.AttachedFlyout>
-                                    <Flyout LightDismissOverlayMode="On" Placement="Full">
-                                        <Flyout.FlyoutPresenterStyle>
-                                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                                <Setter Property="Padding" Value="0"/>
-                                                <Setter Property="CornerRadius" Value="0"/>
-                                                <Setter Property="MaxWidth" Value="640"/>
-                                            </Style>
-                                        </Flyout.FlyoutPresenterStyle>
-                                        <shvco:AnnouncementContentViewer Announcement="{Binding}"/>
-                                    </Flyout>
-                                </FlyoutBase.AttachedFlyout>
-                                <mxi:Interaction.Behaviors>
-                                    <mxic:EventTriggerBehavior EventName="Tapped">
-                                        <shcb:OpenAttachedFlyoutAction/>
-                                    </mxic:EventTriggerBehavior>
-                                    <mxic:EventTriggerBehavior EventName="PointerEntered">
-                                        <cwb:StartAnimationAction Animation="{Binding ElementName=ImageZoomInAnimation}"/>
-                                    </mxic:EventTriggerBehavior>
-                                    <mxic:EventTriggerBehavior EventName="PointerExited">
-                                        <cwb:StartAnimationAction Animation="{Binding ElementName=ImageZoomOutAnimation}"/>
-                                    </mxic:EventTriggerBehavior>
-                                </mxi:Interaction.Behaviors>
-                            </Border>
-                        </ItemContainer>
-                    </DataTemplate>
-                </ItemsRepeater.ItemTemplate>
             </ItemsRepeater>
         </DataTemplate>
 
@@ -184,7 +189,6 @@
                 </ItemContainer.Resources>
             </ItemContainer>
         </DataTemplate>
-
     </shc:ScopedPage.Resources>
 
     <Grid>
@@ -223,11 +227,11 @@
                 <Pivot Style="{StaticResource DefaultPivotStyle}">
                     <PivotItem
                         Content="{Binding Announcement.List[0]}"
-                        ContentTemplate="{StaticResource AnnouncementTemplate}"
+                        ContentTemplate="{StaticResource AnnouncementPivotItemContentTemplate}"
                         Header="{shcm:ResourceString Name=ViewPageAnnouncementActivity}"/>
                     <PivotItem
                         Content="{Binding Announcement.List[1]}"
-                        ContentTemplate="{StaticResource AnnouncementTemplate}"
+                        ContentTemplate="{StaticResource AnnouncementPivotItemContentTemplate}"
                         Header="{shcm:ResourceString Name=ViewPageAnnouncementGame}"/>
                 </Pivot>
             </StackPanel>

src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml

@@ -58,6 +58,382 @@
                 GridValue="{x:Bind GridImageExportPanel}"
                 ListValue="{x:Bind ListImageExportPanel}"/>
 
+            <DataTemplate x:Key="AvatarGridViewSkillTemplate">
+                <Border
+                    Width="40"
+                    Margin="0,0,6,0"
+                    Style="{StaticResource BorderCardStyle}">
+                    <StackPanel>
+                        <shci:MonoChrome
+                            Width="32"
+                            Height="32"
+                            Margin="4,4,4,0"
+                            HorizontalAlignment="Center"
+                            EnableLazyLoading="False"
+                            Source="{Binding Icon}"/>
+                        <TextBlock
+                            Margin="0,0,0,4"
+                            HorizontalAlignment="Center"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding Level}"/>
+                    </StackPanel>
+                </Border>
+
+            </DataTemplate>
+
+            <DataTemplate x:Key="AvatarGridViewTemplate">
+                <Grid ColumnSpacing="6" Style="{ThemeResource GridCardStyle}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <Border
+                        Grid.RowSpan="2"
+                        Grid.ColumnSpan="2"
+                        CornerRadius="{ThemeResource ControlCornerRadius}">
+                        <shci:CachedImage
+                            MaxWidth="145"
+                            HorizontalAlignment="Right"
+                            Opacity="0.5"
+                            Source="{Binding NameCard}"
+                            Stretch="UniformToFill"/>
+                    </Border>
+
+                    <shvcont:BottomTextControl
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="6,6,0,6"
+                        Text="{Binding Level}">
+                        <Grid>
+                            <shvcont:ItemIcon
+                                Width="61.5"
+                                Height="61.5"
+                                Icon="{Binding Icon}"
+                                Quality="{Binding Quality}"/>
+                            <Border
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Background="#80000000"
+                                CornerRadius="0,6,0,6">
+                                <TextBlock
+                                    Margin="6,0,6,2"
+                                    Foreground="#FFFFFFFF"
+                                    Text="{Binding ActivatedConstellationCount}"/>
+                            </Border>
+                        </Grid>
+                    </shvcont:BottomTextControl>
+                    <shvcont:BottomTextControl
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Margin="0,6,6,6"
+                        Text="{Binding Weapon.Level}">
+                        <Grid>
+                            <shvcont:ItemIcon
+                                Width="61.5"
+                                Height="61.5"
+                                Icon="{Binding Weapon.Icon}"
+                                Quality="{Binding Weapon.Quality}"/>
+                            <Border
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Background="#80000000"
+                                CornerRadius="0,6,0,6">
+                                <TextBlock
+                                    Margin="6,0,6,2"
+                                    Foreground="#FFFFFFFF"
+                                    Text="{Binding Weapon.AffixLevelNumber}"/>
+                            </Border>
+                        </Grid>
+                    </shvcont:BottomTextControl>
+
+                    <ItemsControl
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Grid.ColumnSpan="2"
+                        Margin="6,0,0,6"
+                        VerticalAlignment="Bottom"
+                        ItemTemplate="{StaticResource AvatarGridViewSkillTemplate}"
+                        ItemsPanel="{StaticResource HorizontalStackPanelSpacing0Template}"
+                        ItemsSource="{Binding Skills}"/>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="AvatarListViewTemplate">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+                    <shci:CachedImage
+                        Grid.Column="0"
+                        Width="48"
+                        Height="48"
+                        Margin="0,0,12,12"
+                        Source="{Binding SideIcon, Mode=OneWay}"/>
+                    <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                        <TextBlock
+                            Margin="12,0,0,0"
+                            Text="{Binding Name}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"/>
+                        <TextBlock
+                            Margin="12,0,0,0"
+                            Opacity="0.7"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding Level}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"/>
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Opacity="0.7"
+                        Visibility="{Binding ElementName=RefreshTimeToggle, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            FontSize="11"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding ShowcaseRefreshTimeFormat}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"/>
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            FontSize="11"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding GameRecordRefreshTimeFormat}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"/>
+                        <TextBlock
+                            HorizontalAlignment="Right"
+                            FontSize="11"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding CalculatorRefreshTimeFormat}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"/>
+                    </StackPanel>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="AvatarConstellationTemplate">
+                <Button
+                    Margin="0,0,2,0"
+                    Padding="2"
+                    Background="Transparent"
+                    BorderBrush="{x:Null}">
+                    <Button.Content>
+                        <Grid>
+                            <shci:CachedImage
+                                Width="36"
+                                Height="36"
+                                Opacity="{Binding IsActivated, Converter={StaticResource BoolToOpacityConverter}}"
+                                Source="{Binding Icon}"/>
+                            <Image
+                                Width="16"
+                                Height="16"
+                                Source="ms-appx:///Resource/Icon/UI_Icon_Locked.png"
+                                Visibility="{Binding IsActivated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                        </Grid>
+                    </Button.Content>
+                    <Button.Flyout>
+                        <Flyout Placement="Bottom">
+                            <shct:DescriptionTextBlock MaxWidth="320" Description="{Binding Description}">
+                                <shct:DescriptionTextBlock.Resources>
+                                    <Style BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
+                                        <Setter Property="TextWrapping" Value="Wrap"/>
+                                    </Style>
+                                </shct:DescriptionTextBlock.Resources>
+                            </shct:DescriptionTextBlock>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+            </DataTemplate>
+
+            <DataTemplate x:Key="AvatarPropertyTemplate">
+                <Grid Padding="16,8" Background="{Binding Background, Mode=OneWay}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="108"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <shci:MonoChrome
+                        Width="16"
+                        Height="16"
+                        Source="{Binding Icon}"/>
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Margin="16,0,0,0"
+                        HorizontalAlignment="Left"
+                        Text="{Binding Name}"/>
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        HorizontalAlignment="Right"
+                        Text="{Binding Value}"/>
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="3"
+                        Margin="8,0,0,0"
+                        HorizontalAlignment="Left"
+                        Foreground="{StaticResource AvatarPropertyAddValueColorBrush}"
+                        Text="{Binding AddValue}"/>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="AvatarReliquarySubPropertyTemplate">
+                <Grid ColumnSpacing="6">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Style="{StaticResource BaseTextBlockStyle}"
+                        Text="{Binding Name}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap"/>
+                    <TextBlock Grid.Column="1" Text="{Binding Value}"/>
+                    <Grid Grid.Column="2" Opacity="1">
+                        <Ellipse
+                            Width="16"
+                            Height="16"
+                            Margin="0,0,0,0"
+                            Opacity="0.8"
+                            StrokeThickness="1">
+                            <Ellipse.Stroke>
+                                <SolidColorBrush Color="{Binding EnhancedCount, Converter={ThemeResource CountToGradientColorConverter}}"/>
+                            </Ellipse.Stroke>
+                        </Ellipse>
+                        <TextBlock
+                            Grid.Column="2"
+                            Margin="0,0,0,1"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="{ThemeResource InfoBadgeValueFontSize}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding EnhancedCount}">
+                            <TextBlock.Foreground>
+                                <SolidColorBrush Color="{Binding EnhancedCount, Converter={ThemeResource CountToGradientColorConverter}}"/>
+                            </TextBlock.Foreground>
+                        </TextBlock>
+                    </Grid>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="AvatarReliquarySparseSubPropertyTemplate">
+                <Grid Opacity="{Binding Opacity}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock
+                        Text="{Binding Name}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap"/>
+                    <TextBlock Grid.Column="1" Text="{Binding Value}"/>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="AvatarReliquaryTemplate">
+                <Expander
+                    Margin="0,0,0,16"
+                    Padding="16"
+                    HorizontalAlignment="Stretch"
+                    HorizontalContentAlignment="Stretch">
+                    <Expander.Header>
+                        <Grid Margin="0,8,8,8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <shvcont:ItemIcon
+                                Grid.Column="0"
+                                Width="32"
+                                Height="32"
+                                Icon="{Binding Icon}"
+                                Quality="{Binding Quality}"/>
+                            <Grid
+                                Grid.Column="1"
+                                Margin="16,0,0,0"
+                                ColumnSpacing="8">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="auto"/>
+                                    <ColumnDefinition Width="2*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <StackPanel Grid.Column="0">
+                                    <!--  主属性  -->
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock
+                                            Style="{StaticResource BaseTextBlockStyle}"
+                                            Text="{Binding MainProperty.Name}"
+                                            TextTrimming="CharacterEllipsis"/>
+                                        <TextBlock Grid.Column="1" Text="{Binding MainProperty.Value}"/>
+                                    </Grid>
+                                    <!--  评分  -->
+                                    <Grid Margin="0,8,0,0">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock
+                                            Style="{StaticResource BaseTextBlockStyle}"
+                                            Text="{shcm:ResourceString Name=ViewPageAvatarPropertyScore}"
+                                            TextTrimming="CharacterEllipsis"
+                                            TextWrapping="NoWrap"/>
+                                        <TextBlock Grid.Column="1" Text="{Binding ScoreFormatted}"/>
+                                    </Grid>
+                                </StackPanel>
+                                <AppBarSeparator Grid.Column="1"/>
+                                <ItemsControl
+                                    Grid.Column="2"
+                                    ItemTemplate="{StaticResource AvatarReliquarySubPropertyTemplate}"
+                                    ItemsSource="{Binding ComposedSubProperties}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <cwcont:UniformGrid
+                                                ColumnSpacing="16"
+                                                Columns="2"
+                                                RowSpacing="8"/>
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                </ItemsControl>
+                            </Grid>
+                        </Grid>
+                    </Expander.Header>
+
+                    <StackPanel>
+                        <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageAvatarPropertyPrimaryProperties}"/>
+                        <ItemsControl
+                            ItemTemplate="{StaticResource AvatarReliquarySparseSubPropertyTemplate}"
+                            ItemsPanel="{StaticResource UniformGridColumns5Spacing8Template}"
+                            ItemsSource="{Binding PrimarySubProperties}"/>
+                        <TextBlock
+                            Margin="0,16,0,0"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{shcm:ResourceString Name=ViewPageAvatarPropertySecondaryProperties}"/>
+                        <ItemsControl
+                            ItemTemplate="{StaticResource AvatarReliquarySparseSubPropertyTemplate}"
+                            ItemsPanel="{StaticResource UniformGridColumns5Spacing8Template}"
+                            ItemsSource="{Binding SecondarySubProperties}"/>
+                    </StackPanel>
+                </Expander>
+            </DataTemplate>
         </ResourceDictionary>
     </Page.Resources>
 
@@ -110,12 +486,10 @@
                     </AppBarButton>
                 </CommandBar>
 
-                <cwcont:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current, Mode=OneWay}">
-                    <cwcont:SwitchPresenter.ContentTransitions>
-                        <TransitionCollection>
-                            <ContentThemeTransition/>
-                        </TransitionCollection>
-                    </cwcont:SwitchPresenter.ContentTransitions>
+                <cwcont:SwitchPresenter
+                    Grid.Row="1"
+                    ContentTransitions="{ThemeResource ContentThemeTransitions}"
+                    Value="{Binding ElementName=ItemsPanelSelector, Path=Current, Mode=OneWay}">
                     <cwcont:Case Value="Grid">
                         <ScrollViewer>
                             <StackPanel x:Name="GridImageExportPanel" Background="Transparent">
@@ -123,117 +497,9 @@
                                     Margin="16,16,4,-8"
                                     cwa:ItemsReorderAnimation.Duration="0:0:0.1"
                                     ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                                    ItemTemplate="{StaticResource AvatarGridViewTemplate}"
                                     ItemsSource="{Binding Summary.Avatars}"
-                                    SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}">
-                                    <GridView.ItemTemplate>
-                                        <DataTemplate>
-                                            <Border Style="{StaticResource BorderCardStyle}">
-                                                <Grid ColumnSpacing="6">
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition/>
-                                                        <ColumnDefinition/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="auto"/>
-                                                        <RowDefinition/>
-                                                    </Grid.RowDefinitions>
-                                                    <Border
-                                                        Grid.RowSpan="2"
-                                                        Grid.ColumnSpan="2"
-                                                        CornerRadius="{ThemeResource ControlCornerRadius}">
-                                                        <shci:CachedImage
-                                                            MaxWidth="145"
-                                                            HorizontalAlignment="Right"
-                                                            Opacity="0.5"
-                                                            Source="{Binding NameCard}"
-                                                            Stretch="UniformToFill"/>
-                                                    </Border>
-
-                                                    <shvcont:BottomTextControl
-                                                        Grid.Row="0"
-                                                        Grid.Column="0"
-                                                        Margin="6,6,0,6"
-                                                        Text="{Binding Level}">
-                                                        <Grid>
-                                                            <shvcont:ItemIcon
-                                                                Width="61.5"
-                                                                Height="61.5"
-                                                                Icon="{Binding Icon}"
-                                                                Quality="{Binding Quality}"/>
-                                                            <Border
-                                                                HorizontalAlignment="Right"
-                                                                VerticalAlignment="Top"
-                                                                Background="#80000000"
-                                                                CornerRadius="0,6,0,6">
-                                                                <TextBlock
-                                                                    Margin="6,0,6,2"
-                                                                    Foreground="#FFFFFFFF"
-                                                                    Text="{Binding ActivatedConstellationCount}"/>
-                                                            </Border>
-                                                        </Grid>
-                                                    </shvcont:BottomTextControl>
-                                                    <shvcont:BottomTextControl
-                                                        Grid.Row="0"
-                                                        Grid.Column="1"
-                                                        Margin="0,6,6,6"
-                                                        Text="{Binding Weapon.Level}">
-                                                        <Grid>
-                                                            <shvcont:ItemIcon
-                                                                Width="61.5"
-                                                                Height="61.5"
-                                                                Icon="{Binding Weapon.Icon}"
-                                                                Quality="{Binding Weapon.Quality}"/>
-                                                            <Border
-                                                                HorizontalAlignment="Right"
-                                                                VerticalAlignment="Top"
-                                                                Background="#80000000"
-                                                                CornerRadius="0,6,0,6">
-                                                                <TextBlock
-                                                                    Margin="6,0,6,2"
-                                                                    Foreground="#FFFFFFFF"
-                                                                    Text="{Binding Weapon.AffixLevelNumber}"/>
-                                                            </Border>
-                                                        </Grid>
-                                                    </shvcont:BottomTextControl>
-
-                                                    <ItemsControl
-                                                        Grid.Row="1"
-                                                        Grid.Column="0"
-                                                        Grid.ColumnSpan="2"
-                                                        Margin="6,0,0,6"
-                                                        VerticalAlignment="Bottom"
-                                                        ItemsPanel="{StaticResource HorizontalStackPanelTemplate}"
-                                                        ItemsSource="{Binding Skills}">
-                                                        <ItemsControl.ItemTemplate>
-                                                            <DataTemplate>
-                                                                <Border
-                                                                    Width="40"
-                                                                    Margin="0,0,6,0"
-                                                                    Style="{StaticResource BorderCardStyle}">
-                                                                    <StackPanel>
-                                                                        <shci:MonoChrome
-                                                                            Width="32"
-                                                                            Height="32"
-                                                                            Margin="4,4,4,0"
-                                                                            HorizontalAlignment="Center"
-                                                                            EnableLazyLoading="False"
-                                                                            Source="{Binding Icon}"/>
-                                                                        <TextBlock
-                                                                            Margin="0,0,0,4"
-                                                                            HorizontalAlignment="Center"
-                                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                                            Text="{Binding Level}"/>
-                                                                    </StackPanel>
-                                                                </Border>
-
-                                                            </DataTemplate>
-                                                        </ItemsControl.ItemTemplate>
-                                                    </ItemsControl>
-                                                </Grid>
-                                            </Border>
-                                        </DataTemplate>
-                                    </GridView.ItemTemplate>
-                                </GridView>
+                                    SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}"/>
                             </StackPanel>
                         </ScrollViewer>
                     </cwcont:Case>
@@ -245,66 +511,10 @@
                             OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength2}"
                             PaneBackground="Transparent">
                             <SplitView.Pane>
-                                <ListView ItemsSource="{Binding Summary.Avatars}" SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}">
-                                    <ListView.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="auto"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                    <ColumnDefinition Width="auto"/>
-                                                </Grid.ColumnDefinitions>
-                                                <shci:CachedImage
-                                                    Grid.Column="0"
-                                                    Width="48"
-                                                    Height="48"
-                                                    Margin="0,0,12,12"
-                                                    Source="{Binding SideIcon, Mode=OneWay}"/>
-                                                <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                                                    <TextBlock
-                                                        Margin="12,0,0,0"
-                                                        Text="{Binding Name}"
-                                                        TextTrimming="CharacterEllipsis"
-                                                        TextWrapping="NoWrap"/>
-                                                    <TextBlock
-                                                        Margin="12,0,0,0"
-                                                        Opacity="0.7"
-                                                        Style="{StaticResource CaptionTextBlockStyle}"
-                                                        Text="{Binding Level}"
-                                                        TextTrimming="CharacterEllipsis"
-                                                        TextWrapping="NoWrap"/>
-                                                </StackPanel>
-                                                <StackPanel
-                                                    Grid.Column="2"
-                                                    VerticalAlignment="Center"
-                                                    Opacity="0.7"
-                                                    Visibility="{Binding ElementName=RefreshTimeToggle, Path=IsChecked, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
-                                                    <TextBlock
-                                                        HorizontalAlignment="Right"
-                                                        FontSize="11"
-                                                        Style="{StaticResource CaptionTextBlockStyle}"
-                                                        Text="{Binding ShowcaseRefreshTimeFormat}"
-                                                        TextTrimming="CharacterEllipsis"
-                                                        TextWrapping="NoWrap"/>
-                                                    <TextBlock
-                                                        HorizontalAlignment="Right"
-                                                        FontSize="11"
-                                                        Style="{StaticResource CaptionTextBlockStyle}"
-                                                        Text="{Binding GameRecordRefreshTimeFormat}"
-                                                        TextTrimming="CharacterEllipsis"
-                                                        TextWrapping="NoWrap"/>
-                                                    <TextBlock
-                                                        HorizontalAlignment="Right"
-                                                        FontSize="11"
-                                                        Style="{StaticResource CaptionTextBlockStyle}"
-                                                        Text="{Binding CalculatorRefreshTimeFormat}"
-                                                        TextTrimming="CharacterEllipsis"
-                                                        TextWrapping="NoWrap"/>
-                                                </StackPanel>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ListView.ItemTemplate>
-                                </ListView>
+                                <ListView
+                                    ItemTemplate="{StaticResource AvatarListViewTemplate}"
+                                    ItemsSource="{Binding Summary.Avatars}"
+                                    SelectedItem="{Binding SelectedAvatar, Mode=TwoWay}"/>
                             </SplitView.Pane>
                             <SplitView.Content>
                                 <ScrollViewer>
@@ -449,12 +659,8 @@
                                                     Grid.Row="1"
                                                     Grid.Column="0"
                                                     Margin="16"
+                                                    ItemsPanel="{StaticResource HorizontalStackPanelSpacing0Template}"
                                                     ItemsSource="{Binding SelectedAvatar.Constellations}">
-                                                    <ItemsControl.ItemsPanel>
-                                                        <ItemsPanelTemplate>
-                                                            <StackPanel Orientation="Horizontal"/>
-                                                        </ItemsPanelTemplate>
-                                                    </ItemsControl.ItemsPanel>
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <Button
@@ -523,70 +729,8 @@
                                                     Grid.Column="1"
                                                     Margin="16"
                                                     VerticalAlignment="Bottom"
-                                                    ItemsSource="{Binding SelectedAvatar.Skills}">
-                                                    <ItemsControl.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <Button
-                                                                Margin="0,2,0,0"
-                                                                Padding="4"
-                                                                Background="Transparent"
-                                                                BorderBrush="{x:Null}">
-                                                                <Button.Content>
-                                                                    <Grid>
-                                                                        <Grid.ColumnDefinitions>
-                                                                            <ColumnDefinition Width="auto"/>
-                                                                            <ColumnDefinition Width="48"/>
-                                                                        </Grid.ColumnDefinitions>
-                                                                        <shci:CachedImage
-                                                                            Grid.Column="0"
-                                                                            Width="36"
-                                                                            Height="36"
-                                                                            Source="{Binding Icon}"/>
-                                                                        <TextBlock
-                                                                            Grid.Column="1"
-                                                                            Margin="6,0,0,2"
-                                                                            HorizontalAlignment="Left"
-                                                                            VerticalAlignment="Center"
-                                                                            Foreground="#FFFFFFFF"
-                                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                                            Text="{Binding Info.Level}"/>
-                                                                    </Grid>
-                                                                </Button.Content>
-                                                                <Button.Flyout>
-                                                                    <Flyout Placement="Left">
-                                                                        <StackPanel MaxWidth="320">
-                                                                            <StackPanel.Resources>
-                                                                                <Thickness x:Key="SettingsCardPadding">16</Thickness>
-                                                                                <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
-                                                                                <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
-                                                                                <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
-                                                                            </StackPanel.Resources>
-                                                                            <shct:DescriptionTextBlock Description="{Binding Description}">
-                                                                                <shct:DescriptionTextBlock.Resources>
-                                                                                    <Style BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
-                                                                                        <Setter Property="TextWrapping" Value="Wrap"/>
-                                                                                    </Style>
-                                                                                </shct:DescriptionTextBlock.Resources>
-                                                                            </shct:DescriptionTextBlock>
-                                                                            <ItemsControl Margin="0,12,0,0" ItemsSource="{Binding Info.Parameters}">
-                                                                                <ItemsControl.ItemTemplate>
-                                                                                    <DataTemplate>
-                                                                                        <cwcont:SettingsCard
-                                                                                            Margin="0,2,0,0"
-                                                                                            Padding="12,0"
-                                                                                            Header="{Binding Description}">
-                                                                                            <TextBlock Margin="0,8" Text="{Binding Parameter}"/>
-                                                                                        </cwcont:SettingsCard>
-                                                                                    </DataTemplate>
-                                                                                </ItemsControl.ItemTemplate>
-                                                                            </ItemsControl>
-                                                                        </StackPanel>
-                                                                    </Flyout>
-                                                                </Button.Flyout>
-                                                            </Button>
-                                                        </DataTemplate>
-                                                    </ItemsControl.ItemTemplate>
-                                                </ItemsControl>
+                                                    ItemTemplate="{StaticResource AvatarConstellationTemplate}"
+                                                    ItemsSource="{Binding SelectedAvatar.Skills}"/>
                                             </Grid>
                                         </Border>
 
@@ -598,221 +742,19 @@
                                             HorizontalContentAlignment="Stretch"
                                             Background="{x:Null}"
                                             Header="{shcm:ResourceString Name=ViewPageAvatarPropertyHeader}">
-                                            <Border Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}" CornerRadius="0,0,4,4">
+                                            <Border Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}" CornerRadius="{ThemeResource ControlCornerRadiusBottom}">
                                                 <shcca:AlternatingItemsControl
                                                     Margin="0,0,0,-2"
                                                     ItemAlternateBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
-                                                    ItemsSource="{Binding SelectedAvatar.Properties}">
-                                                    <shcca:AlternatingItemsControl.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <Grid Padding="16,8" Background="{Binding Background, Mode=OneWay}">
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="auto"/>
-                                                                    <ColumnDefinition/>
-                                                                    <ColumnDefinition Width="auto"/>
-                                                                    <ColumnDefinition Width="108"/>
-                                                                </Grid.ColumnDefinitions>
-                                                                <Grid.RowDefinitions>
-                                                                    <RowDefinition/>
-                                                                    <RowDefinition Height="auto"/>
-                                                                </Grid.RowDefinitions>
-                                                                <shci:MonoChrome
-                                                                    Width="16"
-                                                                    Height="16"
-                                                                    Source="{Binding Icon}"/>
-                                                                <TextBlock
-                                                                    Grid.Row="0"
-                                                                    Grid.Column="1"
-                                                                    Margin="16,0,0,0"
-                                                                    HorizontalAlignment="Left"
-                                                                    Text="{Binding Name}"/>
-                                                                <TextBlock
-                                                                    Grid.Row="0"
-                                                                    Grid.Column="2"
-                                                                    HorizontalAlignment="Right"
-                                                                    Text="{Binding Value}"/>
-                                                                <TextBlock
-                                                                    Grid.Row="0"
-                                                                    Grid.Column="3"
-                                                                    Margin="8,0,0,0"
-                                                                    HorizontalAlignment="Left"
-                                                                    Foreground="{StaticResource AvatarPropertyAddValueColorBrush}"
-                                                                    Text="{Binding AddValue}"/>
-                                                            </Grid>
-                                                        </DataTemplate>
-                                                    </shcca:AlternatingItemsControl.ItemTemplate>
-                                                </shcca:AlternatingItemsControl>
+                                                    ItemTemplate="{StaticResource AvatarPropertyTemplate}"
+                                                    ItemsSource="{Binding SelectedAvatar.Properties}"/>
                                             </Border>
                                         </Expander>
                                         <!--  圣遗物  -->
-                                        <ItemsControl Margin="16,16,16,0" ItemsSource="{Binding SelectedAvatar.Reliquaries}">
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Expander
-                                                        Margin="0,0,0,16"
-                                                        Padding="16"
-                                                        HorizontalAlignment="Stretch"
-                                                        HorizontalContentAlignment="Stretch">
-                                                        <Expander.Header>
-                                                            <Grid Margin="0,8,8,8">
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="auto"/>
-                                                                    <ColumnDefinition/>
-                                                                </Grid.ColumnDefinitions>
-                                                                <shvcont:ItemIcon
-                                                                    Grid.Column="0"
-                                                                    Width="32"
-                                                                    Height="32"
-                                                                    Icon="{Binding Icon}"
-                                                                    Quality="{Binding Quality}"/>
-                                                                <Grid
-                                                                    Grid.Column="1"
-                                                                    Margin="16,0,0,0"
-                                                                    ColumnSpacing="8">
-                                                                    <Grid.ColumnDefinitions>
-                                                                        <ColumnDefinition Width="1*"/>
-                                                                        <ColumnDefinition Width="auto"/>
-                                                                        <ColumnDefinition Width="2*"/>
-                                                                    </Grid.ColumnDefinitions>
-
-                                                                    <StackPanel Grid.Column="0">
-                                                                        <!--  主属性  -->
-                                                                        <Grid>
-                                                                            <Grid.ColumnDefinitions>
-                                                                                <ColumnDefinition/>
-                                                                                <ColumnDefinition Width="auto"/>
-                                                                            </Grid.ColumnDefinitions>
-                                                                            <TextBlock
-                                                                                Style="{StaticResource BaseTextBlockStyle}"
-                                                                                Text="{Binding MainProperty.Name}"
-                                                                                TextTrimming="CharacterEllipsis"/>
-                                                                            <TextBlock Grid.Column="1" Text="{Binding MainProperty.Value}"/>
-                                                                        </Grid>
-                                                                        <!--  评分  -->
-                                                                        <Grid Margin="0,8,0,0">
-                                                                            <Grid.ColumnDefinitions>
-                                                                                <ColumnDefinition/>
-                                                                                <ColumnDefinition Width="auto"/>
-                                                                            </Grid.ColumnDefinitions>
-                                                                            <TextBlock
-                                                                                Style="{StaticResource BaseTextBlockStyle}"
-                                                                                Text="{shcm:ResourceString Name=ViewPageAvatarPropertyScore}"
-                                                                                TextTrimming="CharacterEllipsis"
-                                                                                TextWrapping="NoWrap"/>
-                                                                            <TextBlock Grid.Column="1" Text="{Binding ScoreFormatted}"/>
-                                                                        </Grid>
-                                                                    </StackPanel>
-                                                                    <AppBarSeparator Grid.Column="1"/>
-                                                                    <ItemsControl Grid.Column="2" ItemsSource="{Binding ComposedSubProperties}">
-                                                                        <ItemsControl.ItemsPanel>
-                                                                            <ItemsPanelTemplate>
-                                                                                <cwcont:UniformGrid
-                                                                                    ColumnSpacing="16"
-                                                                                    Columns="2"
-                                                                                    RowSpacing="8"/>
-                                                                            </ItemsPanelTemplate>
-                                                                        </ItemsControl.ItemsPanel>
-                                                                        <ItemsControl.ItemTemplate>
-                                                                            <DataTemplate>
-                                                                                <Grid ColumnSpacing="6">
-                                                                                    <Grid.ColumnDefinitions>
-                                                                                        <ColumnDefinition/>
-                                                                                        <ColumnDefinition Width="auto"/>
-                                                                                        <ColumnDefinition Width="auto"/>
-                                                                                    </Grid.ColumnDefinitions>
-                                                                                    <TextBlock
-                                                                                        Style="{StaticResource BaseTextBlockStyle}"
-                                                                                        Text="{Binding Name}"
-                                                                                        TextTrimming="CharacterEllipsis"
-                                                                                        TextWrapping="NoWrap"/>
-                                                                                    <TextBlock Grid.Column="1" Text="{Binding Value}"/>
-                                                                                    <Grid Grid.Column="2" Opacity="1">
-                                                                                        <Ellipse
-                                                                                            Width="16"
-                                                                                            Height="16"
-                                                                                            Margin="0,0,0,0"
-                                                                                            Opacity="0.8"
-                                                                                            StrokeThickness="1">
-                                                                                            <Ellipse.Stroke>
-                                                                                                <SolidColorBrush Color="{Binding EnhancedCount, Converter={ThemeResource CountToGradientColorConverter}}"/>
-                                                                                            </Ellipse.Stroke>
-                                                                                        </Ellipse>
-                                                                                        <TextBlock
-                                                                                            Grid.Column="2"
-                                                                                            Margin="0,0,0,1"
-                                                                                            HorizontalAlignment="Center"
-                                                                                            VerticalAlignment="Center"
-                                                                                            FontSize="{ThemeResource InfoBadgeValueFontSize}"
-                                                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                                                            Text="{Binding EnhancedCount}">
-                                                                                            <TextBlock.Foreground>
-                                                                                                <SolidColorBrush Color="{Binding EnhancedCount, Converter={ThemeResource CountToGradientColorConverter}}"/>
-                                                                                            </TextBlock.Foreground>
-                                                                                        </TextBlock>
-                                                                                    </Grid>
-                                                                                </Grid>
-                                                                            </DataTemplate>
-                                                                        </ItemsControl.ItemTemplate>
-                                                                    </ItemsControl>
-                                                                </Grid>
-                                                            </Grid>
-                                                        </Expander.Header>
-
-                                                        <StackPanel>
-                                                            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageAvatarPropertyPrimaryProperties}"/>
-                                                            <ItemsControl ItemsSource="{Binding PrimarySubProperties}">
-                                                                <ItemsControl.ItemsPanel>
-                                                                    <ItemsPanelTemplate>
-                                                                        <cwcont:UniformGrid ColumnSpacing="8" Columns="5"/>
-                                                                    </ItemsPanelTemplate>
-                                                                </ItemsControl.ItemsPanel>
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <Grid Opacity="{Binding Opacity}">
-                                                                            <Grid.ColumnDefinitions>
-                                                                                <ColumnDefinition/>
-                                                                                <ColumnDefinition Width="auto"/>
-                                                                            </Grid.ColumnDefinitions>
-                                                                            <TextBlock
-                                                                                Text="{Binding Name}"
-                                                                                TextTrimming="CharacterEllipsis"
-                                                                                TextWrapping="NoWrap"/>
-                                                                            <TextBlock Grid.Column="1" Text="{Binding Value}"/>
-                                                                        </Grid>
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
-                                                            </ItemsControl>
-                                                            <TextBlock
-                                                                Margin="0,16,0,0"
-                                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                                Text="{shcm:ResourceString Name=ViewPageAvatarPropertySecondaryProperties}"/>
-                                                            <ItemsControl ItemsSource="{Binding SecondarySubProperties}">
-                                                                <ItemsControl.ItemsPanel>
-                                                                    <ItemsPanelTemplate>
-                                                                        <cwcont:UniformGrid ColumnSpacing="8" Columns="5"/>
-                                                                    </ItemsPanelTemplate>
-                                                                </ItemsControl.ItemsPanel>
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <Grid Opacity="{Binding Opacity}">
-                                                                            <Grid.ColumnDefinitions>
-                                                                                <ColumnDefinition/>
-                                                                                <ColumnDefinition Width="auto"/>
-                                                                            </Grid.ColumnDefinitions>
-                                                                            <TextBlock
-                                                                                Text="{Binding Name}"
-                                                                                TextTrimming="CharacterEllipsis"
-                                                                                TextWrapping="NoWrap"/>
-                                                                            <TextBlock Grid.Column="1" Text="{Binding Value}"/>
-                                                                        </Grid>
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
-                                                            </ItemsControl>
-                                                        </StackPanel>
-                                                    </Expander>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
-                                        </ItemsControl>
+                                        <ItemsControl
+                                            Margin="16,16,16,0"
+                                            ItemTemplate="{StaticResource AvatarReliquaryTemplate}"
+                                            ItemsSource="{Binding SelectedAvatar.Reliquaries}"/>
                                     </StackPanel>
                                 </ScrollViewer>
                             </SplitView.Content>

src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml

@@ -20,27 +20,219 @@
     mc:Ignorable="d">
 
     <Page.Resources>
-        <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <cwconv:BoolToObjectConverter x:Key="BoolToBrushSelector" FalseValue="{StaticResource ControlFillColorTransparentBrush}">
+                        <cwconv:BoolToObjectConverter.TrueValue>
+                            <SolidColorBrush Color="#206A890A"/>
+                        </cwconv:BoolToObjectConverter.TrueValue>
+                    </cwconv:BoolToObjectConverter>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <cwconv:BoolToObjectConverter x:Key="BoolToBrushSelector" FalseValue="{StaticResource ControlFillColorTransparentBrush}">
+                        <cwconv:BoolToObjectConverter.TrueValue>
+                            <SolidColorBrush Color="#20A5D610"/>
+                        </cwconv:BoolToObjectConverter.TrueValue>
+                    </cwconv:BoolToObjectConverter>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+            <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
 
-        <cwconv:BoolToObjectConverter x:Key="BoolToOpacityConverter">
-            <cwconv:BoolToObjectConverter.TrueValue>
-                <x:Double>0.4</x:Double>
-            </cwconv:BoolToObjectConverter.TrueValue>
-            <cwconv:BoolToObjectConverter.FalseValue>
-                <x:Double>1</x:Double>
-            </cwconv:BoolToObjectConverter.FalseValue>
-        </cwconv:BoolToObjectConverter>
+            <cwconv:BoolToObjectConverter x:Key="BoolToOpacityConverter">
+                <cwconv:BoolToObjectConverter.TrueValue>
+                    <x:Double>0.4</x:Double>
+                </cwconv:BoolToObjectConverter.TrueValue>
+                <cwconv:BoolToObjectConverter.FalseValue>
+                    <x:Double>1</x:Double>
+                </cwconv:BoolToObjectConverter.FalseValue>
+            </cwconv:BoolToObjectConverter>
 
-        <cwconv:BoolToObjectConverter
-            x:Key="BoolToStyleSelector"
-            FalseValue="{StaticResource BodyTextBlockStyle}"
-            TrueValue="{StaticResource BaseTextBlockStyle}"/>
+            <cwconv:BoolToObjectConverter
+                x:Key="BoolToStyleSelector"
+                FalseValue="{StaticResource BodyTextBlockStyle}"
+                TrueValue="{StaticResource BaseTextBlockStyle}"/>
 
-        <cwconv:BoolToObjectConverter x:Key="BoolToBrushSelector" FalseValue="{StaticResource ControlFillColorTransparentBrush}">
-            <cwconv:BoolToObjectConverter.TrueValue>
-                <SolidColorBrush Color="#20A5D610"/>
-            </cwconv:BoolToObjectConverter.TrueValue>
-        </cwconv:BoolToObjectConverter>
+            <DataTemplate x:Key="CultivateEntryItemTemplate">
+                <Grid Margin="0,4,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <shvco:ItemIcon
+                            Width="32"
+                            Height="32"
+                            Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                            Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
+                            Quality="{Binding Inner.RankLevel}"/>
+                        <FontIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="24"
+                            Glyph="&#xE73E;"
+                            Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                    </Grid>
+                    <Button
+                        Grid.Column="1"
+                        Height="32"
+                        Margin="6,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        Background="{Binding IsToday, Converter={ThemeResource BoolToBrushSelector}}"
+                        Command="{Binding Path=DataContext.FinishStateCommand, Source={StaticResource BindingProxy}}"
+                        CommandParameter="{Binding}"
+                        Style="{StaticResource ButtonRevealStyle}">
+                        <Grid Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,0,0"
+                                VerticalAlignment="Center"
+                                Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
+                                Text="{Binding Inner.Name}"
+                                TextTrimming="CharacterEllipsis"/>
+                            <TextBlock
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
+                                Text="{Binding Entity.Count}"/>
+                        </Grid>
+                    </Button>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="CultivateEntryTemplate">
+                <ItemContainer Margin="0,0,0,16">
+                    <ItemContainer.Resources>
+                        <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                    </ItemContainer.Resources>
+                    <Grid Style="{ThemeResource GridCardStyle}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0" Margin="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="auto"/>
+                            </Grid.ColumnDefinitions>
+                            <shvco:ItemIcon
+                                Width="48"
+                                Height="48"
+                                Icon="{Binding Icon}"
+                                Quality="{Binding Quality}"/>
+                            <TextBlock
+                                Grid.Column="1"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center"
+                                Text="{Binding Name}"/>
+                            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                <Button
+                                    Width="48"
+                                    Height="48"
+                                    Margin="8,0,0,0"
+                                    Background="Transparent"
+                                    Command="{Binding Path=DataContext.RemoveEntryCommand, Source={StaticResource BindingProxy}}"
+                                    CommandParameter="{Binding}"
+                                    Content="&#xE74D;"
+                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                    Style="{StaticResource ButtonRevealStyle}"
+                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageCultivationRemoveEntry}"/>
+                            </StackPanel>
+                        </Grid>
+                        <MenuFlyoutSeparator Grid.Row="1"/>
+                        <ScrollViewer
+                            Grid.Row="2"
+                            Height="296"
+                            Margin="0,2,0,0">
+                            <ItemsControl
+                                Margin="8,0,8,8"
+                                ItemTemplate="{StaticResource CultivateEntryItemTemplate}"
+                                ItemsSource="{Binding Items}"/>
+                        </ScrollViewer>
+                    </Grid>
+                </ItemContainer>
+            </DataTemplate>
+
+            <DataTemplate x:Key="StatisticsItemTemplate">
+                <ItemContainer Margin="0,0,0,16">
+                    <ItemContainer.Resources>
+                        <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                    </ItemContainer.Resources>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="auto"/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="auto"/>
+                        </Grid.ColumnDefinitions>
+                        <shvco:ItemIcon
+                            Grid.Column="0"
+                            Width="32"
+                            Height="32"
+                            Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                            Quality="{Binding Inner.RankLevel}"/>
+                        <TextBlock
+                            Grid.Column="1"
+                            Margin="16,0,0,0"
+                            VerticalAlignment="Center"
+                            Text="{Binding Inner.Name}"
+                            TextTrimming="CharacterEllipsis"/>
+                        <TextBlock
+                            Grid.Column="2"
+                            Margin="16,0,4,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Text="{Binding CountFormatted}"/>
+                    </Grid>
+                </ItemContainer>
+            </DataTemplate>
+
+            <DataTemplate x:Key="InventoryItemTemplate">
+                <ItemContainer>
+                    <ItemContainer.Resources>
+                        <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                    </ItemContainer.Resources>
+                    <Button
+                        Padding="0"
+                        Background="Transparent"
+                        BorderBrush="{x:Null}"
+                        BorderThickness="0">
+                        <shvco:BottomTextControl Text="{Binding Count, Mode=OneWay}">
+                            <shvco:ItemIcon Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Inner.RankLevel}"/>
+                        </shvco:BottomTextControl>
+                        <Button.Flyout>
+                            <Flyout>
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Inner.Name}"/>
+                                    <NumberBox
+                                        Grid.Row="1"
+                                        MinWidth="160"
+                                        Margin="0,16,0,0"
+                                        Maximum="4294967295"
+                                        Minimum="0"
+                                        Value="{Binding Count, Mode=TwoWay}"/>
+                                </Grid>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+                </ItemContainer>
+            </DataTemplate>
+        </ResourceDictionary>
     </Page.Resources>
 
     <mxi:Interaction.Behaviors>
@@ -85,6 +277,7 @@
                                 <ItemsView
                                     Padding="16,0"
                                     IsItemInvokedEnabled="False"
+                                    ItemTemplate="{StaticResource CultivateEntryTemplate}"
                                     ItemsSource="{Binding CultivateEntries}"
                                     SelectionMode="None">
                                     <ItemsView.Layout>
@@ -95,158 +288,13 @@
                                             MinItemWidth="300"
                                             MinRowSpacing="-4"/>
                                     </ItemsView.Layout>
-                                    <ItemsView.ItemTemplate>
-                                        <DataTemplate>
-                                            <ItemContainer Margin="0,0,0,16">
-                                                <ItemContainer.Resources>
-                                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
-                                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
-                                                </ItemContainer.Resources>
-                                                <Border Style="{StaticResource BorderCardStyle}">
-                                                    <Grid Background="Transparent">
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition Height="auto"/>
-                                                            <RowDefinition Height="auto"/>
-                                                            <RowDefinition Height="auto"/>
-                                                        </Grid.RowDefinitions>
-                                                        <Grid Grid.Row="0" Margin="8">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition/>
-                                                                <ColumnDefinition Width="auto"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <shvco:ItemIcon
-                                                                Width="48"
-                                                                Height="48"
-                                                                Icon="{Binding Icon}"
-                                                                Quality="{Binding Quality}"/>
-                                                            <TextBlock
-                                                                Grid.Column="1"
-                                                                Margin="8,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                Text="{Binding Name}"/>
-                                                            <StackPanel
-                                                                x:Name="ButtonPanel"
-                                                                Grid.Column="2"
-                                                                Orientation="Horizontal"
-                                                                Visibility="Collapsed">
-                                                                <Button
-                                                                    Width="48"
-                                                                    Height="48"
-                                                                    Margin="8,0,0,0"
-                                                                    Background="Transparent"
-                                                                    Command="{Binding Path=DataContext.RemoveEntryCommand, Source={StaticResource BindingProxy}}"
-                                                                    CommandParameter="{Binding}"
-                                                                    Content="&#xE74D;"
-                                                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                                    Style="{StaticResource ButtonRevealStyle}"
-                                                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageCultivationRemoveEntry}"/>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                        <MenuFlyoutSeparator Grid.Row="1"/>
-                                                        <ScrollViewer
-                                                            Grid.Row="2"
-                                                            Height="296"
-                                                            Margin="0,2,0,0">
-                                                            <ItemsControl Margin="8,0,8,8" ItemsSource="{Binding Items}">
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <Grid Margin="0,4,0,0">
-                                                                            <Grid.ColumnDefinitions>
-                                                                                <ColumnDefinition Width="auto"/>
-                                                                                <ColumnDefinition/>
-                                                                            </Grid.ColumnDefinitions>
-                                                                            <Grid>
-                                                                                <shvco:ItemIcon
-                                                                                    Width="32"
-                                                                                    Height="32"
-                                                                                    Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                                                                    Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
-                                                                                    Quality="{Binding Inner.RankLevel}"/>
-                                                                                <FontIcon
-                                                                                    HorizontalAlignment="Center"
-                                                                                    VerticalAlignment="Center"
-                                                                                    FontSize="24"
-                                                                                    Glyph="&#xE73E;"
-                                                                                    Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                                            </Grid>
-                                                                            <Button
-                                                                                Grid.Column="1"
-                                                                                Height="32"
-                                                                                Margin="6,0,0,0"
-                                                                                HorizontalAlignment="Stretch"
-                                                                                HorizontalContentAlignment="Stretch"
-                                                                                Background="{Binding IsToday, Converter={StaticResource BoolToBrushSelector}}"
-                                                                                Command="{Binding Path=DataContext.FinishStateCommand, Source={StaticResource BindingProxy}}"
-                                                                                CommandParameter="{Binding}"
-                                                                                Style="{StaticResource ButtonRevealStyle}">
-                                                                                <Grid Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}">
-                                                                                    <Grid.ColumnDefinitions>
-                                                                                        <ColumnDefinition Width="auto"/>
-                                                                                        <ColumnDefinition/>
-                                                                                    </Grid.ColumnDefinitions>
-                                                                                    <TextBlock
-                                                                                        Grid.Column="0"
-                                                                                        Margin="0,0,0,0"
-                                                                                        VerticalAlignment="Center"
-                                                                                        Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
-                                                                                        Text="{Binding Inner.Name}"
-                                                                                        TextTrimming="CharacterEllipsis"/>
-                                                                                    <TextBlock
-                                                                                        Grid.Column="1"
-                                                                                        HorizontalAlignment="Right"
-                                                                                        VerticalAlignment="Center"
-                                                                                        Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
-                                                                                        Text="{Binding Entity.Count}"/>
-                                                                                </Grid>
-                                                                            </Button>
-                                                                        </Grid>
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
-                                                            </ItemsControl>
-                                                        </ScrollViewer>
-
-                                                        <Grid.Resources>
-                                                            <Storyboard x:Name="ButtonPanelVisibleStoryboard">
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0">
-                                                                        <DiscreteObjectKeyFrame.Value>
-                                                                            <Visibility>Visible</Visibility>
-                                                                        </DiscreteObjectKeyFrame.Value>
-                                                                    </DiscreteObjectKeyFrame>
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                            </Storyboard>
-
-                                                            <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0">
-                                                                        <DiscreteObjectKeyFrame.Value>
-                                                                            <Visibility>Collapsed</Visibility>
-                                                                        </DiscreteObjectKeyFrame.Value>
-                                                                    </DiscreteObjectKeyFrame>
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                            </Storyboard>
-                                                        </Grid.Resources>
-
-                                                        <mxi:Interaction.Behaviors>
-                                                            <mxic:EventTriggerBehavior EventName="PointerEntered">
-                                                                <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
-                                                            </mxic:EventTriggerBehavior>
-                                                            <mxic:EventTriggerBehavior EventName="PointerExited">
-                                                                <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
-                                                            </mxic:EventTriggerBehavior>
-                                                        </mxi:Interaction.Behaviors>
-                                                    </Grid>
-                                                </Border>
-                                            </ItemContainer>
-                                        </DataTemplate>
-                                    </ItemsView.ItemTemplate>
                                 </ItemsView>
                             </PivotItem>
                             <PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationMaterialStatistics}">
                                 <ItemsView
                                     Padding="16,0"
                                     IsItemInvokedEnabled="False"
+                                    ItemTemplate="{StaticResource StatisticsItemTemplate}"
                                     ItemsSource="{Binding StatisticsItems}"
                                     SelectionMode="None">
                                     <ItemsView.Layout>
@@ -257,42 +305,6 @@
                                             MinItemWidth="300"
                                             MinRowSpacing="-4"/>
                                     </ItemsView.Layout>
-                                    <ItemsView.ItemTemplate>
-                                        <DataTemplate>
-                                            <ItemContainer Margin="0,0,0,16">
-                                                <ItemContainer.Resources>
-                                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
-                                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
-                                                </ItemContainer.Resources>
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="auto"/>
-                                                        <ColumnDefinition/>
-                                                        <ColumnDefinition Width="auto"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <shvco:ItemIcon
-                                                        Grid.Column="0"
-                                                        Width="32"
-                                                        Height="32"
-                                                        Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                                        Quality="{Binding Inner.RankLevel}"/>
-                                                    <TextBlock
-                                                        Grid.Column="1"
-                                                        Margin="16,0,0,0"
-                                                        VerticalAlignment="Center"
-                                                        Text="{Binding Inner.Name}"
-                                                        TextTrimming="CharacterEllipsis"/>
-                                                    <TextBlock
-                                                        Grid.Column="2"
-                                                        Margin="16,0,4,0"
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Center"
-                                                        Text="{Binding CountFormatted}"/>
-                                                </Grid>
-                                            </ItemContainer>
-
-                                        </DataTemplate>
-                                    </ItemsView.ItemTemplate>
                                 </ItemsView>
                             </PivotItem>
                         </Pivot>
@@ -336,51 +348,15 @@
                 </PivotItem>
                 <PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationInventoryItem}">
                     <ScrollView HorizontalScrollBarVisibility="Hidden">
-                        <ItemsRepeater Margin="16" ItemsSource="{Binding InventoryItems}">
+                        <ItemsRepeater
+                            Margin="16"
+                            ItemTemplate="{StaticResource InventoryItemTemplate}"
+                            ItemsSource="{Binding InventoryItems}">
                             <ItemsRepeater.Layout>
                                 <cwcont:WrapLayout HorizontalSpacing="12" VerticalSpacing="12"/>
                             </ItemsRepeater.Layout>
-                            <ItemsRepeater.ItemTemplate>
-                                <DataTemplate>
-                                    <ItemContainer>
-                                        <ItemContainer.Resources>
-                                            <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
-                                            <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
-                                        </ItemContainer.Resources>
-                                        <Button
-                                            Padding="0"
-                                            Background="Transparent"
-                                            BorderBrush="{x:Null}"
-                                            BorderThickness="0">
-                                            <shvco:BottomTextControl Text="{Binding Count, Mode=OneWay}">
-                                                <shvco:ItemIcon Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Inner.RankLevel}"/>
-                                            </shvco:BottomTextControl>
-                                            <Button.Flyout>
-                                                <Flyout>
-                                                    <Grid>
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
-                                                        </Grid.RowDefinitions>
-                                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Inner.Name}"/>
-                                                        <NumberBox
-                                                            Grid.Row="1"
-                                                            MinWidth="160"
-                                                            Margin="0,16,0,0"
-                                                            Maximum="4294967295"
-                                                            Minimum="0"
-                                                            Value="{Binding Count, Mode=TwoWay}"/>
-                                                    </Grid>
-                                                </Flyout>
-                                            </Button.Flyout>
-                                        </Button>
-                                    </ItemContainer>
-                                </DataTemplate>
-                            </ItemsRepeater.ItemTemplate>
                         </ItemsRepeater>
                     </ScrollView>
-
                 </PivotItem>
             </Pivot>
         </Grid>

src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml

@@ -27,6 +27,361 @@
 
     <Page.Resources>
         <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
+
+        <DataTemplate x:Key="UserAndUidTemplate">
+            <Grid Padding="0,0,0,16">
+                <TextBlock VerticalAlignment="Center" Text="{Binding Uid}"/>
+                <Button
+                    Margin="16,0,0,0"
+                    Padding="6"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Command="{Binding DataContext.TrackRoleCommand, Source={StaticResource ViewModelBindingProxy}}"
+                    CommandParameter="{Binding}"
+                    Content="&#xE710;"
+                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                    Style="{StaticResource ButtonRevealStyle}"
+                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryToolTip}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="DailyNoteEntryTemplate">
+            <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                <ItemContainer.Resources>
+                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                </ItemContainer.Resources>
+                <Grid Padding="8" Style="{ThemeResource GridCardStyle}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+
+                    <Grid MinHeight="40" HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="4,2,0,4"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource BaseTextBlockStyle}"
+                            Text="{Binding UserGameRole}"
+                            TextTrimming="CharacterEllipsis"
+                            TextWrapping="NoWrap"/>
+                        <StackPanel
+                            x:Name="ButtonPanel"
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal">
+                            <Button
+                                Margin="8,0,0,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Stretch"
+                                shch:FrameworkElementHelper.SquareLength="40"
+                                Background="Transparent"
+                                BorderBrush="{x:Null}"
+                                BorderThickness="0"
+                                Command="{Binding DataContext.RemoveDailyNoteCommand, Source={StaticResource ViewModelBindingProxy}}"
+                                CommandParameter="{Binding}"
+                                Content="{StaticResource FontIconContentDelete}"
+                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteRemoveToolTip}"/>
+                            <Button
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Stretch"
+                                shch:FrameworkElementHelper.SquareLength="40"
+                                Background="Transparent"
+                                BorderBrush="{x:Null}"
+                                BorderThickness="0"
+                                Command="{Binding DataContext.ModifyNotificationCommand, Source={StaticResource ViewModelBindingProxy}}"
+                                CommandParameter="{Binding}"
+                                Content="{StaticResource FontIconContentSetting}"
+                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}"/>
+                        </StackPanel>
+                    </Grid>
+
+                    <StackPanel
+                        Grid.Row="1"
+                        Margin="0,8,0,0"
+                        Spacing="6">
+                        <Grid Style="{ThemeResource GridCardStyle}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <ProgressBar
+                                Grid.ColumnSpan="2"
+                                Height="40"
+                                MinHeight="48"
+                                Background="{x:Null}"
+                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                Maximum="{Binding DailyNote.MaxResin, Mode=OneWay}"
+                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                Value="{Binding DailyNote.CurrentResin, Mode=OneWay}"/>
+                            <shci:CachedImage
+                                Grid.Column="0"
+                                Margin="4"
+                                VerticalAlignment="Center"
+                                shch:FrameworkElementHelper.SquareLength="32"
+                                Source="{StaticResource UI_ItemIcon_210}"/>
+                            <StackPanel
+                                Grid.Column="1"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center">
+                                <TextBlock
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{Binding DailyNote.ResinFormatted, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                                <TextBlock
+                                    Opacity="0.6"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{Binding DailyNote.ResinRecoveryTargetTime, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                            </StackPanel>
+                        </Grid>
+                        <Grid Style="{ThemeResource GridCardStyle}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <ProgressBar
+                                Grid.ColumnSpan="2"
+                                Height="40"
+                                MinHeight="48"
+                                Background="{x:Null}"
+                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                Maximum="{Binding DailyNote.MaxHomeCoin, Mode=OneWay}"
+                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                Value="{Binding DailyNote.CurrentHomeCoin, Mode=OneWay}"/>
+                            <shci:CachedImage
+                                Grid.Column="0"
+                                Margin="4"
+                                VerticalAlignment="Center"
+                                shch:FrameworkElementHelper.SquareLength="32"
+                                Source="{StaticResource UI_ItemIcon_204}"/>
+                            <StackPanel
+                                Grid.Column="1"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center">
+                                <TextBlock
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{Binding DailyNote.HomeCoinFormatted, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                                <TextBlock
+                                    Opacity="0.6"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{Binding DailyNote.HomeCoinRecoveryTargetTimeFormatted, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                            </StackPanel>
+                        </Grid>
+                        <Grid Style="{ThemeResource GridCardStyle}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="auto"/>
+                            </Grid.ColumnDefinitions>
+                            <ProgressBar
+                                Grid.ColumnSpan="3"
+                                Height="40"
+                                MinHeight="48"
+                                Background="{x:Null}"
+                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                Maximum="{Binding DailyNote.TotalTaskNum, Mode=OneWay}"
+                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                Value="{Binding DailyNote.FinishedTaskNum, Mode=OneWay}"/>
+                            <shci:CachedImage
+                                Grid.Column="0"
+                                Margin="4"
+                                VerticalAlignment="Center"
+                                shch:FrameworkElementHelper.SquareLength="32"
+                                Source="{StaticResource UI_MarkQuest_Events_Proce}"/>
+                            <StackPanel
+                                Grid.Column="1"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center">
+                                <TextBlock
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{Binding DailyNote.TaskFormatted, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                                <TextBlock
+                                    Opacity="0.6"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{Binding DailyNote.ExtraTaskRewardDescription, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                            </StackPanel>
+                            <Button
+                                Grid.Column="2"
+                                Width="32"
+                                Height="32"
+                                Margin="0,0,8,0"
+                                Padding="6"
+                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAttendanceStatusInfo}"
+                                Visibility="{Binding DailyNote.DailyTask.AttendanceVisible, Mode=OneWay}">
+                                <BitmapIcon ShowAsMonochrome="True" UriSource="ms-appx:///Resource/Icon/UI_Icon_Gift.png"/>
+                                <Button.Flyout>
+                                    <Flyout FlyoutPresenterStyle="{StaticResource FlyoutPresenterPadding6Style}" Placement="BottomEdgeAlignedRight">
+                                        <ItemsControl Margin="0,-3,0,0" ItemsSource="{Binding DailyNote.DailyTask.AttendanceRewards}">
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <shvcp:CardProgressBar
+                                                        MinWidth="120"
+                                                        MinHeight="32"
+                                                        Margin="0,3,0,0"
+                                                        Description="{Binding Progress}"
+                                                        Header="{Binding StatusFormatted}"
+                                                        Maximum="2000"
+                                                        ProgressForeground="{ThemeResource HyperlinkButtonForeground}"
+                                                        Value="{Binding Progress}"/>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                    </Flyout>
+                                </Button.Flyout>
+                            </Button>
+                        </Grid>
+                        <Grid Style="{ThemeResource GridCardStyle}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <ProgressBar
+                                Grid.ColumnSpan="2"
+                                Height="40"
+                                MinHeight="48"
+                                Background="{x:Null}"
+                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                Maximum="{Binding DailyNote.ResinDiscountNumLimit, Mode=OneWay}"
+                                Opacity="{ThemeResource LargeBackgroundProgressBarOpacity}"
+                                Value="{Binding DailyNote.ResinDiscountUsedNum, Mode=OneWay}"/>
+                            <shci:CachedImage
+                                Grid.Column="0"
+                                Margin="4"
+                                VerticalAlignment="Center"
+                                shch:FrameworkElementHelper.SquareLength="32"
+                                Source="{StaticResource UI_MarkTower}"/>
+                            <StackPanel
+                                Grid.Column="1"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center">
+                                <TextBlock
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{Binding DailyNote.ResinDiscountFormatted, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                                <TextBlock
+                                    Opacity="0.6"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{shcm:ResourceString Name=ViewPageDailyNoteResinDiscountUsed}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                            </StackPanel>
+                        </Grid>
+                        <Grid Style="{ThemeResource GridCardStyle}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <ProgressBar
+                                Grid.ColumnSpan="2"
+                                Height="40"
+                                MinHeight="48"
+                                Background="{x:Null}"
+                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                Maximum="604800"
+                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                Value="{Binding DailyNote.Transformer.RecoveryTime.TotalSeconds, Mode=OneWay}"/>
+                            <shci:CachedImage
+                                Grid.Column="0"
+                                Margin="4"
+                                VerticalAlignment="Center"
+                                shch:FrameworkElementHelper.SquareLength="32"
+                                Source="{StaticResource UI_ItemIcon_220021}"/>
+                            <StackPanel
+                                Grid.Column="1"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center">
+                                <TextBlock
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{Binding DailyNote.Transformer.ObtainedAndReachedFormatted, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                                <TextBlock
+                                    Opacity="0.6"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{Binding DailyNote.Transformer.ObtainedAndTimeFormatted, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis"
+                                    TextWrapping="NoWrap"/>
+                            </StackPanel>
+                        </Grid>
+                    </StackPanel>
+
+                    <MenuFlyoutSeparator Grid.Row="2" Margin="6,6,6,0"/>
+
+                    <ItemsControl
+                        Grid.Row="3"
+                        Margin="0,6,0,0"
+                        ItemsSource="{Binding DailyNote.Expeditions, Mode=OneWay}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <cwc:UniformGrid
+                                    ColumnSpacing="8"
+                                    Columns="2"
+                                    RowSpacing="8"/>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid Style="{ThemeResource GridCardStyle}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <ProgressBar
+                                        Grid.ColumnSpan="2"
+                                        MinHeight="40"
+                                        HorizontalAlignment="Stretch"
+                                        Background="{x:Null}"
+                                        CornerRadius="{ThemeResource ControlCornerRadius}"
+                                        Maximum="{Binding TotalTime, Mode=OneWay}"
+                                        Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                        Value="{Binding PassedTime, Mode=OneWay}"/>
+                                    <shci:CachedImage
+                                        Margin="0,0,0,8"
+                                        shch:FrameworkElementHelper.SquareLength="32"
+                                        Source="{Binding AvatarSideIcon, Mode=OneWay}"/>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Margin="16,0,0,0"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource BaseTextBlockStyle}"
+                                        Text="{Binding RemainedTimeFormatted, Mode=OneWay}"/>
+                                </Grid>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                    <TextBlock
+                        Grid.Row="4"
+                        Margin="0,6,0,0"
+                        Opacity="0.7"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="{Binding RefreshTimeFormatted}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap"/>
+                </Grid>
+            </ItemContainer>
+        </DataTemplate>
     </Page.Resources>
 
     <Grid>
@@ -46,54 +401,27 @@
                 Label="{shcm:ResourceString Name=ViewPageDailyNoteVerify}">
                 <AppBarButton.Flyout>
                     <Flyout
+                        FlyoutPresenterStyle="{ThemeResource WebViewerFlyoutPresenterStyle}"
                         LightDismissOverlayMode="On"
                         Placement="Full"
                         ShowMode="Standard">
-                        <Flyout.FlyoutPresenterStyle>
-                            <Style TargetType="FlyoutPresenter">
-                                <Setter Property="Padding" Value="0"/>
-                                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
-                            </Style>
-                        </Flyout.FlyoutPresenterStyle>
                         <shvc:WebViewer SourceProvider="{Binding VerifyUrlSource, Mode=OneWay}"/>
                     </Flyout>
                 </AppBarButton.Flyout>
             </AppBarButton>
             <AppBarButton Icon="{shcm:FontIcon Glyph={StaticResource FontIconContentAdd}}" Label="{shcm:ResourceString Name=ViewPageDailyNoteAddEntry}">
                 <AppBarButton.Flyout>
-                    <Flyout LightDismissOverlayMode="On" Placement="Bottom">
-                        <Flyout.FlyoutPresenterStyle>
-                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                <Setter Property="Padding" Value="0,2,0,2"/>
-                                <Setter Property="Background" Value="{ThemeResource FlyoutPresenterBackground}"/>
-                            </Style>
-                        </Flyout.FlyoutPresenterStyle>
+                    <Flyout
+                        FlyoutPresenterStyle="{StaticResource FlyoutPresenterPadding0And2Style}"
+                        LightDismissOverlayMode="On"
+                        Placement="Bottom">
                         <StackPanel>
                             <TextBlock
                                 Margin="16,12,16,16"
                                 Style="{StaticResource BaseTextBlockStyle}"
                                 Text="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryHint}"/>
                             <ScrollViewer MaxHeight="320" Padding="16,0">
-                                <ItemsControl ItemsSource="{Binding UserAndUids}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid Padding="0,0,0,16">
-                                                <TextBlock VerticalAlignment="Center" Text="{Binding Uid}"/>
-                                                <Button
-                                                    Margin="16,0,0,0"
-                                                    Padding="6"
-                                                    HorizontalAlignment="Right"
-                                                    VerticalAlignment="Center"
-                                                    Command="{Binding DataContext.TrackRoleCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                                    CommandParameter="{Binding}"
-                                                    Content="&#xE710;"
-                                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                    Style="{StaticResource ButtonRevealStyle}"
-                                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryToolTip}"/>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
+                                <ItemsControl ItemTemplate="{StaticResource UserAndUidTemplate}" ItemsSource="{Binding UserAndUids}"/>
                             </ScrollViewer>
                         </StackPanel>
                     </Flyout>
@@ -185,7 +513,10 @@
                 </ScrollViewer>
             </SplitView.Pane>
             <ScrollView>
-                <ItemsRepeater Margin="16" ItemsSource="{Binding DailyNoteEntries}">
+                <ItemsRepeater
+                    Margin="16"
+                    ItemTemplate="{StaticResource DailyNoteEntryTemplate}"
+                    ItemsSource="{Binding DailyNoteEntries}">
                     <ItemsRepeater.Layout>
                         <UniformGridLayout
                             ItemsJustification="Start"
@@ -194,382 +525,6 @@
                             MinItemWidth="300"
                             MinRowSpacing="12"/>
                     </ItemsRepeater.Layout>
-                    <ItemsRepeater.ItemTemplate>
-                        <DataTemplate>
-                            <ItemContainer cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                <ItemContainer.Resources>
-                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
-                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
-                                </ItemContainer.Resources>
-                                <Grid Padding="8" Style="{ThemeResource GridCardStyle}">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="auto"/>
-                                        <RowDefinition Height="auto"/>
-                                        <RowDefinition Height="auto"/>
-                                        <RowDefinition Height="auto"/>
-                                        <RowDefinition Height="auto"/>
-                                    </Grid.RowDefinitions>
-
-                                    <Grid.Resources>
-                                        <Storyboard x:Name="ButtonPanelVisibleStoryboard">
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0">
-                                                    <DiscreteObjectKeyFrame.Value>
-                                                        <Visibility>Visible</Visibility>
-                                                    </DiscreteObjectKeyFrame.Value>
-                                                </DiscreteObjectKeyFrame>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-
-                                        <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0">
-                                                    <DiscreteObjectKeyFrame.Value>
-                                                        <Visibility>Collapsed</Visibility>
-                                                    </DiscreteObjectKeyFrame.Value>
-                                                </DiscreteObjectKeyFrame>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </Grid.Resources>
-
-                                    <mxi:Interaction.Behaviors>
-                                        <mxic:EventTriggerBehavior EventName="PointerEntered">
-                                            <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
-                                        </mxic:EventTriggerBehavior>
-                                        <mxic:EventTriggerBehavior EventName="PointerExited">
-                                            <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
-                                        </mxic:EventTriggerBehavior>
-                                    </mxi:Interaction.Behaviors>
-
-                                    <Grid MinHeight="40" HorizontalAlignment="Stretch">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition/>
-                                            <ColumnDefinition Width="auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="4,2,0,4"
-                                            VerticalAlignment="Center"
-                                            Style="{StaticResource BaseTextBlockStyle}"
-                                            Text="{Binding UserGameRole}"
-                                            TextTrimming="CharacterEllipsis"
-                                            TextWrapping="NoWrap"/>
-                                        <StackPanel
-                                            x:Name="ButtonPanel"
-                                            Grid.Column="1"
-                                            HorizontalAlignment="Right"
-                                            Orientation="Horizontal"
-                                            Visibility="Collapsed">
-                                            <Button
-                                                Margin="8,0,0,0"
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Stretch"
-                                                shch:FrameworkElementHelper.SquareLength="40"
-                                                Background="Transparent"
-                                                BorderBrush="{x:Null}"
-                                                BorderThickness="0"
-                                                Command="{Binding DataContext.RemoveDailyNoteCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                                CommandParameter="{Binding}"
-                                                Content="{StaticResource FontIconContentDelete}"
-                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteRemoveToolTip}"/>
-                                            <Button
-                                                Margin="8,0,0,0"
-                                                VerticalAlignment="Stretch"
-                                                shch:FrameworkElementHelper.SquareLength="40"
-                                                Background="Transparent"
-                                                BorderBrush="{x:Null}"
-                                                BorderThickness="0"
-                                                Command="{Binding DataContext.ModifyNotificationCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                                CommandParameter="{Binding}"
-                                                Content="{StaticResource FontIconContentSetting}"
-                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}"/>
-                                        </StackPanel>
-                                    </Grid>
-
-                                    <StackPanel
-                                        Grid.Row="1"
-                                        Margin="0,8,0,0"
-                                        Spacing="6">
-                                        <Grid Style="{ThemeResource GridCardStyle}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <ProgressBar
-                                                Grid.ColumnSpan="2"
-                                                Height="40"
-                                                MinHeight="48"
-                                                Background="{x:Null}"
-                                                CornerRadius="{ThemeResource ControlCornerRadius}"
-                                                Maximum="{Binding DailyNote.MaxResin, Mode=OneWay}"
-                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                                Value="{Binding DailyNote.CurrentResin, Mode=OneWay}"/>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Margin="4"
-                                                VerticalAlignment="Center"
-                                                shch:FrameworkElementHelper.SquareLength="32"
-                                                Source="{StaticResource UI_ItemIcon_210}"/>
-                                            <StackPanel
-                                                Grid.Column="1"
-                                                Margin="8,0,0,0"
-                                                VerticalAlignment="Center">
-                                                <TextBlock
-                                                    Style="{StaticResource SubtitleTextBlockStyle}"
-                                                    Text="{Binding DailyNote.ResinFormatted, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                                <TextBlock
-                                                    Opacity="0.6"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{Binding DailyNote.ResinRecoveryTargetTime, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                            </StackPanel>
-                                        </Grid>
-                                        <Grid Style="{ThemeResource GridCardStyle}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <ProgressBar
-                                                Grid.ColumnSpan="2"
-                                                Height="40"
-                                                MinHeight="48"
-                                                Background="{x:Null}"
-                                                CornerRadius="{ThemeResource ControlCornerRadius}"
-                                                Maximum="{Binding DailyNote.MaxHomeCoin, Mode=OneWay}"
-                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                                Value="{Binding DailyNote.CurrentHomeCoin, Mode=OneWay}"/>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Margin="4"
-                                                VerticalAlignment="Center"
-                                                shch:FrameworkElementHelper.SquareLength="32"
-                                                Source="{StaticResource UI_ItemIcon_204}"/>
-                                            <StackPanel
-                                                Grid.Column="1"
-                                                Margin="8,0,0,0"
-                                                VerticalAlignment="Center">
-                                                <TextBlock
-                                                    Style="{StaticResource SubtitleTextBlockStyle}"
-                                                    Text="{Binding DailyNote.HomeCoinFormatted, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                                <TextBlock
-                                                    Opacity="0.6"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{Binding DailyNote.HomeCoinRecoveryTargetTimeFormatted, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                            </StackPanel>
-                                        </Grid>
-                                        <Grid Style="{ThemeResource GridCardStyle}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                                <ColumnDefinition Width="auto"/>
-                                            </Grid.ColumnDefinitions>
-                                            <ProgressBar
-                                                Grid.ColumnSpan="3"
-                                                Height="40"
-                                                MinHeight="48"
-                                                Background="{x:Null}"
-                                                CornerRadius="{ThemeResource ControlCornerRadius}"
-                                                Maximum="{Binding DailyNote.TotalTaskNum, Mode=OneWay}"
-                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                                Value="{Binding DailyNote.FinishedTaskNum, Mode=OneWay}"/>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Margin="4"
-                                                VerticalAlignment="Center"
-                                                shch:FrameworkElementHelper.SquareLength="32"
-                                                Source="{StaticResource UI_MarkQuest_Events_Proce}"/>
-                                            <StackPanel
-                                                Grid.Column="1"
-                                                Margin="8,0,0,0"
-                                                VerticalAlignment="Center">
-                                                <TextBlock
-                                                    Style="{StaticResource SubtitleTextBlockStyle}"
-                                                    Text="{Binding DailyNote.TaskFormatted, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                                <TextBlock
-                                                    Opacity="0.6"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{Binding DailyNote.ExtraTaskRewardDescription, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                            </StackPanel>
-                                            <Button
-                                                Grid.Column="2"
-                                                Width="32"
-                                                Height="32"
-                                                Margin="0,0,8,0"
-                                                Padding="6"
-                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAttendanceStatusInfo}"
-                                                Visibility="{Binding DailyNote.DailyTask.AttendanceVisible, Mode=OneWay}">
-                                                <BitmapIcon ShowAsMonochrome="True" UriSource="ms-appx:///Resource/Icon/UI_Icon_Gift.png"/>
-                                                <Button.Flyout>
-                                                    <Flyout Placement="BottomEdgeAlignedRight">
-                                                        <Flyout.FlyoutPresenterStyle>
-                                                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                                                <Setter Property="Padding" Value="6"/>
-                                                            </Style>
-                                                        </Flyout.FlyoutPresenterStyle>
-                                                        <ItemsControl Margin="0,-3,0,0" ItemsSource="{Binding DailyNote.DailyTask.AttendanceRewards}">
-                                                            <ItemsControl.ItemTemplate>
-                                                                <DataTemplate>
-                                                                    <shvcp:CardProgressBar
-                                                                        MinWidth="120"
-                                                                        MinHeight="32"
-                                                                        Margin="0,3,0,0"
-                                                                        Description="{Binding Progress}"
-                                                                        Header="{Binding StatusFormatted}"
-                                                                        Maximum="2000"
-                                                                        ProgressForeground="{ThemeResource HyperlinkButtonForeground}"
-                                                                        Value="{Binding Progress}"/>
-                                                                </DataTemplate>
-                                                            </ItemsControl.ItemTemplate>
-                                                        </ItemsControl>
-                                                    </Flyout>
-                                                </Button.Flyout>
-                                            </Button>
-                                        </Grid>
-                                        <Grid Style="{ThemeResource GridCardStyle}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <ProgressBar
-                                                Grid.ColumnSpan="2"
-                                                Height="40"
-                                                MinHeight="48"
-                                                Background="{x:Null}"
-                                                CornerRadius="{ThemeResource ControlCornerRadius}"
-                                                Maximum="{Binding DailyNote.ResinDiscountNumLimit, Mode=OneWay}"
-                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                                Value="{Binding DailyNote.ResinDiscountUsedNum, Mode=OneWay}"/>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Margin="4"
-                                                VerticalAlignment="Center"
-                                                shch:FrameworkElementHelper.SquareLength="32"
-                                                Source="{StaticResource UI_MarkTower}"/>
-                                            <StackPanel
-                                                Grid.Column="1"
-                                                Margin="8,0,0,0"
-                                                VerticalAlignment="Center">
-                                                <TextBlock
-                                                    Style="{StaticResource SubtitleTextBlockStyle}"
-                                                    Text="{Binding DailyNote.ResinDiscountFormatted, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                                <TextBlock
-                                                    Opacity="0.6"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{shcm:ResourceString Name=ViewPageDailyNoteResinDiscountUsed}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                            </StackPanel>
-                                        </Grid>
-                                        <Grid Style="{ThemeResource GridCardStyle}">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <ProgressBar
-                                                Grid.ColumnSpan="2"
-                                                Height="40"
-                                                MinHeight="48"
-                                                Background="{x:Null}"
-                                                CornerRadius="{ThemeResource ControlCornerRadius}"
-                                                Maximum="604800"
-                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                                Value="{Binding DailyNote.Transformer.RecoveryTime.TotalSeconds, Mode=OneWay}"/>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Margin="4"
-                                                VerticalAlignment="Center"
-                                                shch:FrameworkElementHelper.SquareLength="32"
-                                                Source="{StaticResource UI_ItemIcon_220021}"/>
-                                            <StackPanel
-                                                Grid.Column="1"
-                                                Margin="8,0,0,0"
-                                                VerticalAlignment="Center">
-                                                <TextBlock
-                                                    Style="{StaticResource SubtitleTextBlockStyle}"
-                                                    Text="{Binding DailyNote.Transformer.ObtainedAndReachedFormatted, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                                <TextBlock
-                                                    Opacity="0.6"
-                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                    Text="{Binding DailyNote.Transformer.ObtainedAndTimeFormatted, Mode=OneWay}"
-                                                    TextTrimming="CharacterEllipsis"
-                                                    TextWrapping="NoWrap"/>
-                                            </StackPanel>
-                                        </Grid>
-                                    </StackPanel>
-
-                                    <MenuFlyoutSeparator Grid.Row="2" Margin="6,6,6,0"/>
-
-                                    <ItemsControl
-                                        Grid.Row="3"
-                                        Margin="0,6,0,0"
-                                        ItemsSource="{Binding DailyNote.Expeditions, Mode=OneWay}">
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <cwc:UniformGrid
-                                                    ColumnSpacing="8"
-                                                    Columns="2"
-                                                    RowSpacing="8"/>
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                        <ItemsControl.ItemTemplate>
-                                            <DataTemplate>
-                                                <Grid Style="{ThemeResource GridCardStyle}">
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="auto"/>
-                                                        <ColumnDefinition/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <ProgressBar
-                                                        Grid.ColumnSpan="2"
-                                                        MinHeight="40"
-                                                        HorizontalAlignment="Stretch"
-                                                        Background="{x:Null}"
-                                                        CornerRadius="{ThemeResource ControlCornerRadius}"
-                                                        Maximum="{Binding TotalTime, Mode=OneWay}"
-                                                        Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                                        Value="{Binding PassedTime, Mode=OneWay}"/>
-                                                    <shci:CachedImage
-                                                        Margin="0,0,0,8"
-                                                        shch:FrameworkElementHelper.SquareLength="32"
-                                                        Source="{Binding AvatarSideIcon, Mode=OneWay}"/>
-                                                    <TextBlock
-                                                        Grid.Column="1"
-                                                        Margin="16,0,0,0"
-                                                        VerticalAlignment="Center"
-                                                        Style="{StaticResource BaseTextBlockStyle}"
-                                                        Text="{Binding RemainedTimeFormatted, Mode=OneWay}"/>
-                                                </Grid>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ItemsControl>
-                                    <TextBlock
-                                        Grid.Row="4"
-                                        Margin="0,6,0,0"
-                                        Opacity="0.7"
-                                        Style="{StaticResource CaptionTextBlockStyle}"
-                                        Text="{Binding RefreshTimeFormatted}"
-                                        TextTrimming="CharacterEllipsis"
-                                        TextWrapping="NoWrap"/>
-                                </Grid>
-                            </ItemContainer>
-                        </DataTemplate>
-                    </ItemsRepeater.ItemTemplate>
                 </ItemsRepeater>
             </ScrollView>
         </SplitView>

src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml

@@ -7,6 +7,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
+    xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:shc="using:Snap.Hutao.Control"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shci="using:Snap.Hutao.Control.Image"
@@ -21,6 +22,206 @@
         <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
     </mxi:Interaction.Behaviors>
 
+    <Page.Resources>
+        <Flyout x:Key="HutaoCloudFlyout">
+            <Grid>
+                <mxi:Interaction.Behaviors>
+                    <shcb:InvokeCommandOnLoadedBehavior Command="{Binding HutaoCloudViewModel.OpenUICommand}"/>
+                </mxi:Interaction.Behaviors>
+                <Grid Visibility="{Binding HutaoCloudViewModel.IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}">
+                    <Grid Visibility="{Binding HutaoCloudViewModel.Options.IsCloudServiceAllowed, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0">
+                            <StackPanel Margin="0,0,0,12">
+                                <TextBlock
+                                    HorizontalTextAlignment="Center"
+                                    Text="{Binding HutaoCloudViewModel.Options.GachaLogExpireAt}"
+                                    TextAlignment="Center"/>
+                                <TextBlock
+                                    Margin="0,6,0,0"
+                                    HorizontalTextAlignment="Center"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudDeveloperHint}"
+                                    Visibility="{Binding HutaoCloudViewModel.Options.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                            </StackPanel>
+                        </Grid>
+                        <ScrollViewer Grid.Row="1" Margin="0,0,0,8">
+                            <ScrollViewer.Resources>
+                                <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
+                                <shc:BindingProxy x:Key="HutaoCloudViewModelBindingProxy" DataContext="{Binding HutaoCloudViewModel}"/>
+
+                                <DataTemplate x:Key="UidOperationTemplate">
+                                    <Grid Margin="0,0,0,8">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <StackPanel Grid.Column="0" VerticalAlignment="Center">
+                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Uid}"/>
+                                            <TextBlock
+                                                Opacity="0.7"
+                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                Text="{Binding ItemCount}"/>
+                                        </StackPanel>
+
+                                        <StackPanel
+                                            Grid.Column="1"
+                                            Margin="6,0,0,0"
+                                            Orientation="Horizontal">
+                                            <Button
+                                                Margin="6,0,0,0"
+                                                VerticalAlignment="Stretch"
+                                                Background="Transparent"
+                                                Command="{Binding RetrieveCommand}"
+                                                CommandParameter="{Binding Uid}"
+                                                Content="&#xE896;"
+                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                Style="{StaticResource ButtonRevealStyle}"
+                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudRetrieve}"/>
+                                            <Button
+                                                Margin="6,0,0,0"
+                                                HorizontalAlignment="Right"
+                                                VerticalAlignment="Stretch"
+                                                Background="Transparent"
+                                                Command="{Binding DeleteCommand}"
+                                                CommandParameter="{Binding Uid}"
+                                                Content="&#xE74D;"
+                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                Style="{StaticResource ButtonRevealStyle}"
+                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudDelete}"/>
+                                        </StackPanel>
+                                    </Grid>
+                                </DataTemplate>
+                            </ScrollViewer.Resources>
+                            <ItemsControl ItemTemplate="{StaticResource UidOperationTemplate}" ItemsSource="{Binding HutaoCloudViewModel.UidOperations}"/>
+                        </ScrollViewer>
+                        <Button
+                            Grid.Row="2"
+                            HorizontalAlignment="Stretch"
+                            Command="{Binding HutaoCloudViewModel.UploadCommand}"
+                            CommandParameter="{Binding SelectedArchive}"
+                            Content="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudUpload}"/>
+                    </Grid>
+                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}" Visibility="{Binding HutaoCloudViewModel.Options.IsCloudServiceAllowed, Converter={StaticResource BoolToVisibilityRevertConverter}}">
+                        <StackPanel.Resources>
+                            <Thickness x:Key="SettingsCardPadding">16</Thickness>
+                            <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
+                            <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
+                            <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
+                        </StackPanel.Resources>
+
+                        <TextBlock
+                            Margin="0,0,0,8"
+                            Style="{StaticResource SubtitleTextBlockStyle}"
+                            Text="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudNotAllowed}"
+                            TextAlignment="Center"/>
+                        <cwc:SettingsCard
+                            Command="{Binding HutaoCloudViewModel.NavigateToSpiralAbyssRecordCommand}"
+                            Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityDescription}"
+                            Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityHeader}"
+                            IsClickEnabled="True"/>
+                        <cwc:SettingsCard
+                            Command="{Binding HutaoCloudViewModel.NavigateToAfdianSkuCommand}"
+                            Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseDescription}"
+                            Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseHeader}"
+                            IsClickEnabled="True"/>
+                    </StackPanel>
+                </Grid>
+                <shvc:LoadingViewSlim
+                    MinWidth="240"
+                    Margin="-16"
+                    IsLoading="{Binding HutaoCloudViewModel.IsInitialized, Converter={StaticResource BoolNegationConverter}}"/>
+            </Grid>
+        </Flyout>
+
+        <DataTemplate x:Key="HistoryWishItemTemplate">
+            <Border Width="40" Style="{StaticResource BorderCardStyle}">
+                <StackPanel>
+                    <shvc:ItemIcon
+                        Width="40"
+                        Height="40"
+                        Icon="{Binding Icon}"
+                        Quality="{Binding Quality}"/>
+                    <TextBlock
+                        HorizontalTextAlignment="Center"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="{Binding Count}"
+                        TextTrimming="None"
+                        TextWrapping="NoWrap"/>
+                </StackPanel>
+            </Border>
+        </DataTemplate>
+
+        <DataTemplate x:Key="HistoryWishListTemplate">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+
+                <StackPanel Margin="0,8,0,0" Orientation="Horizontal">
+                    <TextBlock
+                        Width="32"
+                        Style="{StaticResource BaseTextBlockStyle}"
+                        Text="{Binding Version}"/>
+                    <TextBlock
+                        Margin="0,0,0,0"
+                        Style="{StaticResource BaseTextBlockStyle}"
+                        Text="{Binding Name}"/>
+                </StackPanel>
+
+                <TextBlock
+                    Margin="0,8,0,0"
+                    HorizontalAlignment="Right"
+                    Style="{StaticResource BaseTextBlockStyle}"
+                    Text="{Binding TotalCountFormatted}"/>
+                <ItemsControl
+                    Grid.Row="1"
+                    Margin="0,6,0,0"
+                    HorizontalAlignment="Left"
+                    ItemTemplate="{StaticResource HistoryWishItemTemplate}"
+                    ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
+                    ItemsSource="{Binding OrangeUpList}"/>
+                <ItemsControl
+                    Grid.Row="1"
+                    Margin="0,6,0,0"
+                    HorizontalAlignment="Right"
+                    ItemTemplate="{StaticResource HistoryWishItemTemplate}"
+                    ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
+                    ItemsSource="{Binding PurpleUpList}"/>
+                <TextBlock
+                    Grid.Row="2"
+                    Margin="0,6,0,8"
+                    Opacity="0.6"
+                    Text="{Binding TimeSpanFormatted}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="HistoryWishGridTemplate">
+            <Grid>
+                <shvc:ItemIcon
+                    Badge="{Binding Badge}"
+                    Icon="{Binding Icon}"
+                    Quality="{Binding Quality}"/>
+                <Border
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Background="#80000000"
+                    CornerRadius="0,6,0,6">
+                    <TextBlock
+                        Margin="6,0,6,2"
+                        Foreground="#FFFFFFFF"
+                        Text="{Binding Count}"/>
+                </Border>
+            </Grid>
+        </DataTemplate>
+    </Page.Resources>
+
     <Grid Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}">
         <Grid Visibility="{Binding Statistics, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
             <Rectangle
@@ -63,126 +264,10 @@
                             </AppBarButton.Flyout>
                         </AppBarButton>
                         <AppBarSeparator/>
-                        <AppBarButton Icon="{shcm:FontIcon Glyph=&#xE753;}" Label="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloud}">
-                            <AppBarButton.Flyout>
-                                <Flyout Placement="Bottom">
-                                    <Grid>
-                                        <mxi:Interaction.Behaviors>
-                                            <shcb:InvokeCommandOnLoadedBehavior Command="{Binding HutaoCloudViewModel.OpenUICommand}"/>
-                                        </mxi:Interaction.Behaviors>
-                                        <Grid Visibility="{Binding HutaoCloudViewModel.IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}">
-                                            <Grid Visibility="{Binding HutaoCloudViewModel.Options.IsCloudServiceAllowed, Converter={StaticResource BoolToVisibilityConverter}}">
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="auto"/>
-                                                    <RowDefinition Height="auto"/>
-                                                    <RowDefinition Height="auto"/>
-                                                </Grid.RowDefinitions>
-                                                <Grid Grid.Row="0">
-                                                    <StackPanel Margin="0,0,0,12">
-                                                        <TextBlock
-                                                            HorizontalTextAlignment="Center"
-                                                            Text="{Binding HutaoCloudViewModel.Options.GachaLogExpireAt}"
-                                                            TextAlignment="Center"/>
-                                                        <TextBlock
-                                                            Margin="0,6,0,0"
-                                                            HorizontalTextAlignment="Center"
-                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudDeveloperHint}"
-                                                            Visibility="{Binding HutaoCloudViewModel.Options.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                    </StackPanel>
-                                                </Grid>
-                                                <ScrollViewer Grid.Row="1" Margin="0,0,0,8">
-                                                    <ScrollViewer.Resources>
-                                                        <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
-                                                        <shc:BindingProxy x:Key="HutaoCloudViewModelBindingProxy" DataContext="{Binding HutaoCloudViewModel}"/>
-                                                    </ScrollViewer.Resources>
-                                                    <ItemsControl ItemsSource="{Binding HutaoCloudViewModel.UidOperations}">
-                                                        <ItemsControl.ItemTemplate>
-                                                            <DataTemplate>
-                                                                <Grid Margin="0,0,0,8">
-                                                                    <Grid.ColumnDefinitions>
-                                                                        <ColumnDefinition/>
-                                                                        <ColumnDefinition Width="auto"/>
-                                                                    </Grid.ColumnDefinitions>
-                                                                    <StackPanel Grid.Column="0" VerticalAlignment="Center">
-                                                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Uid}"/>
-                                                                        <TextBlock
-                                                                            Opacity="0.7"
-                                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                                            Text="{Binding ItemCount}"/>
-                                                                    </StackPanel>
-
-                                                                    <StackPanel
-                                                                        Grid.Column="1"
-                                                                        Margin="6,0,0,0"
-                                                                        Orientation="Horizontal">
-                                                                        <Button
-                                                                            Margin="6,0,0,0"
-                                                                            VerticalAlignment="Stretch"
-                                                                            Background="Transparent"
-                                                                            Command="{Binding RetrieveCommand}"
-                                                                            CommandParameter="{Binding Uid}"
-                                                                            Content="&#xE896;"
-                                                                            FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                                            Style="{StaticResource ButtonRevealStyle}"
-                                                                            ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudRetrieve}"/>
-                                                                        <Button
-                                                                            Margin="6,0,0,0"
-                                                                            HorizontalAlignment="Right"
-                                                                            VerticalAlignment="Stretch"
-                                                                            Background="Transparent"
-                                                                            Command="{Binding DeleteCommand}"
-                                                                            CommandParameter="{Binding Uid}"
-                                                                            Content="&#xE74D;"
-                                                                            FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                                            Style="{StaticResource ButtonRevealStyle}"
-                                                                            ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudDelete}"/>
-                                                                    </StackPanel>
-                                                                </Grid>
-                                                            </DataTemplate>
-                                                        </ItemsControl.ItemTemplate>
-                                                    </ItemsControl>
-                                                </ScrollViewer>
-                                                <Button
-                                                    Grid.Row="2"
-                                                    HorizontalAlignment="Stretch"
-                                                    Command="{Binding HutaoCloudViewModel.UploadCommand}"
-                                                    CommandParameter="{Binding SelectedArchive}"
-                                                    Content="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudUpload}"/>
-                                            </Grid>
-                                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}" Visibility="{Binding HutaoCloudViewModel.Options.IsCloudServiceAllowed, Converter={StaticResource BoolToVisibilityRevertConverter}}">
-                                                <StackPanel.Resources>
-                                                    <Thickness x:Key="SettingsCardPadding">16</Thickness>
-                                                    <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
-                                                    <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
-                                                    <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
-                                                </StackPanel.Resources>
-
-                                                <TextBlock
-                                                    Margin="0,0,0,8"
-                                                    Style="{StaticResource SubtitleTextBlockStyle}"
-                                                    Text="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudNotAllowed}"
-                                                    TextAlignment="Center"/>
-                                                <cwc:SettingsCard
-                                                    Command="{Binding HutaoCloudViewModel.NavigateToSpiralAbyssRecordCommand}"
-                                                    Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityDescription}"
-                                                    Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityHeader}"
-                                                    IsClickEnabled="True"/>
-                                                <cwc:SettingsCard
-                                                    Command="{Binding HutaoCloudViewModel.NavigateToAfdianSkuCommand}"
-                                                    Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseDescription}"
-                                                    Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseHeader}"
-                                                    IsClickEnabled="True"/>
-                                            </StackPanel>
-                                        </Grid>
-                                        <shvc:LoadingViewSlim
-                                            MinWidth="240"
-                                            Margin="-16"
-                                            IsLoading="{Binding HutaoCloudViewModel.IsInitialized, Converter={StaticResource BoolNegationConverter}}"/>
-                                    </Grid>
-                                </Flyout>
-                            </AppBarButton.Flyout>
-                        </AppBarButton>
+                        <AppBarButton
+                            Flyout="{StaticResource HutaoCloudFlyout}"
+                            Icon="{shcm:FontIcon Glyph=&#xE753;}"
+                            Label="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloud}"/>
                         <AppBarSeparator/>
                         <AppBarButton
                             Command="{Binding ImportFromUIGFJsonCommand}"
@@ -230,100 +315,10 @@
                         OpenPaneLength="323"
                         PaneBackground="Transparent">
                         <SplitView.Pane>
-                            <ListView ItemsSource="{Binding Statistics.HistoryWishes}" SelectedItem="{Binding SelectedHistoryWish, Mode=TwoWay}">
-                                <ListView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="auto"/>
-                                                <RowDefinition/>
-                                                <RowDefinition/>
-                                            </Grid.RowDefinitions>
-                                            <StackPanel Margin="0,8,0,0" Orientation="Horizontal">
-                                                <TextBlock
-                                                    Width="32"
-                                                    Style="{StaticResource BaseTextBlockStyle}"
-                                                    Text="{Binding Version}"/>
-                                                <TextBlock
-                                                    Margin="0,0,0,0"
-                                                    Style="{StaticResource BaseTextBlockStyle}"
-                                                    Text="{Binding Name}"/>
-                                            </StackPanel>
-
-                                            <TextBlock
-                                                Margin="0,8,0,0"
-                                                HorizontalAlignment="Right"
-                                                Style="{StaticResource BaseTextBlockStyle}"
-                                                Text="{Binding TotalCountFormatted}"/>
-                                            <ItemsControl
-                                                Grid.Row="1"
-                                                Margin="0,6,0,0"
-                                                HorizontalAlignment="Left"
-                                                ItemsSource="{Binding OrangeUpList}">
-                                                <ItemsControl.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <StackPanel Orientation="Horizontal" Spacing="2"/>
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Border Width="40" Style="{StaticResource BorderCardStyle}">
-                                                            <StackPanel>
-                                                                <shvc:ItemIcon
-                                                                    Width="40"
-                                                                    Height="40"
-                                                                    Icon="{Binding Icon}"
-                                                                    Quality="{Binding Quality}"/>
-                                                                <TextBlock
-                                                                    HorizontalTextAlignment="Center"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Count}"
-                                                                    TextTrimming="None"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                        </Border>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-                                            <ItemsControl
-                                                Grid.Row="1"
-                                                Margin="0,6,0,0"
-                                                HorizontalAlignment="Right"
-                                                ItemsSource="{Binding PurpleUpList}">
-                                                <ItemsControl.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <StackPanel Orientation="Horizontal" Spacing="2"/>
-                                                    </ItemsPanelTemplate>
-                                                </ItemsControl.ItemsPanel>
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Border Width="40" Style="{StaticResource BorderCardStyle}">
-                                                            <StackPanel>
-                                                                <shvc:ItemIcon
-                                                                    Width="40"
-                                                                    Height="40"
-                                                                    Icon="{Binding Icon}"
-                                                                    Quality="{Binding Quality}"/>
-                                                                <TextBlock
-                                                                    HorizontalTextAlignment="Center"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Count}"
-                                                                    TextTrimming="None"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                        </Border>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
-                                            <TextBlock
-                                                Grid.Row="2"
-                                                Margin="0,6,0,8"
-                                                Opacity="0.6"
-                                                Text="{Binding TimeSpanFormatted}"/>
-                                        </Grid>
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
-                            </ListView>
+                            <ListView
+                                ItemTemplate="{StaticResource HistoryWishListTemplate}"
+                                ItemsSource="{Binding Statistics.HistoryWishes}"
+                                SelectedItem="{Binding SelectedHistoryWish, Mode=TwoWay}"/>
                         </SplitView.Pane>
                         <SplitView.Content>
                             <ScrollViewer>
@@ -345,91 +340,35 @@
                                         </Border>
                                     </Border>
 
-
-
                                     <TextBlock
                                         Margin="0,16,0,8"
                                         Style="{StaticResource BaseTextBlockStyle}"
                                         Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
                                         Visibility="{Binding SelectedHistoryWish.OrangeList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
-                                    <GridView ItemsSource="{Binding SelectedHistoryWish.OrangeList}" SelectionMode="None">
-                                        <GridView.ItemTemplate>
-                                            <DataTemplate>
-                                                <Grid>
-                                                    <shvc:ItemIcon
-                                                        Badge="{Binding Badge}"
-                                                        Icon="{Binding Icon}"
-                                                        Quality="{Binding Quality}"/>
-                                                    <Border
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Top"
-                                                        Background="#80000000"
-                                                        CornerRadius="0,6,0,6">
-                                                        <TextBlock
-                                                            Margin="6,0,6,2"
-                                                            Foreground="#FFFFFFFF"
-                                                            Text="{Binding Count}"/>
-                                                    </Border>
-                                                </Grid>
-                                            </DataTemplate>
-                                        </GridView.ItemTemplate>
-                                    </GridView>
+                                    <GridView
+                                        ItemTemplate="{StaticResource HistoryWishGridTemplate}"
+                                        ItemsSource="{Binding SelectedHistoryWish.OrangeList}"
+                                        SelectionMode="None"/>
 
                                     <TextBlock
                                         Margin="0,0,0,8"
                                         Style="{StaticResource BaseTextBlockStyle}"
                                         Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
                                         Visibility="{Binding SelectedHistoryWish.PurpleList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
-                                    <GridView ItemsSource="{Binding SelectedHistoryWish.PurpleList}" SelectionMode="None">
-                                        <GridView.ItemTemplate>
-                                            <DataTemplate>
-                                                <Grid>
-                                                    <shvc:ItemIcon
-                                                        Badge="{Binding Badge}"
-                                                        Icon="{Binding Icon}"
-                                                        Quality="{Binding Quality}"/>
-                                                    <Border
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Top"
-                                                        Background="#80000000"
-                                                        CornerRadius="0,6,0,6">
-                                                        <TextBlock
-                                                            Margin="6,0,6,2"
-                                                            Foreground="#FFFFFFFF"
-                                                            Text="{Binding Count}"/>
-                                                    </Border>
-                                                </Grid>
-                                            </DataTemplate>
-                                        </GridView.ItemTemplate>
-                                    </GridView>
+                                    <GridView
+                                        ItemTemplate="{StaticResource HistoryWishGridTemplate}"
+                                        ItemsSource="{Binding SelectedHistoryWish.PurpleList}"
+                                        SelectionMode="None"/>
 
                                     <TextBlock
                                         Margin="0,0,0,8"
                                         Style="{StaticResource BaseTextBlockStyle}"
                                         Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"
                                         Visibility="{Binding SelectedHistoryWish.BlueList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
-                                    <GridView ItemsSource="{Binding SelectedHistoryWish.BlueList}" SelectionMode="None">
-                                        <GridView.ItemTemplate>
-                                            <DataTemplate>
-                                                <Grid>
-                                                    <shvc:ItemIcon
-                                                        Badge="{Binding Badge}"
-                                                        Icon="{Binding Icon}"
-                                                        Quality="{Binding Quality}"/>
-                                                    <Border
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Top"
-                                                        Background="#80000000"
-                                                        CornerRadius="0,6,0,6">
-                                                        <TextBlock
-                                                            Margin="6,0,6,2"
-                                                            Foreground="#FFFFFFFF"
-                                                            Text="{Binding Count}"/>
-                                                    </Border>
-                                                </Grid>
-                                            </DataTemplate>
-                                        </GridView.ItemTemplate>
-                                    </GridView>
+                                    <GridView
+                                        ItemTemplate="{StaticResource HistoryWishGridTemplate}"
+                                        ItemsSource="{Binding SelectedHistoryWish.BlueList}"
+                                        SelectionMode="None"/>
                                 </StackPanel>
                             </ScrollViewer>
                         </SplitView.Content>
@@ -442,55 +381,19 @@
                                 Margin="0,16,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
                                 Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
-                            <GridView ItemsSource="{Binding Statistics.OrangeAvatars}" SelectionMode="None">
-                                <GridView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <shvc:ItemIcon
-                                                Badge="{Binding Badge}"
-                                                Icon="{Binding Icon}"
-                                                Quality="{Binding Quality}"/>
-                                            <Border
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Top"
-                                                Background="#80000000"
-                                                CornerRadius="0,6,0,6">
-                                                <TextBlock
-                                                    Margin="6,0,6,2"
-                                                    Foreground="#FFFFFFFF"
-                                                    Text="{Binding Count}"/>
-                                            </Border>
-                                        </Grid>
-                                    </DataTemplate>
-                                </GridView.ItemTemplate>
-                            </GridView>
+                            <GridView
+                                ItemTemplate="{StaticResource HistoryWishItemTemplate}"
+                                ItemsSource="{Binding Statistics.OrangeAvatars}"
+                                SelectionMode="None"/>
 
                             <TextBlock
                                 Margin="0,0,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
                                 Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
-                            <GridView ItemsSource="{Binding Statistics.PurpleAvatars}" SelectionMode="None">
-                                <GridView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <shvc:ItemIcon
-                                                Badge="{Binding Badge}"
-                                                Icon="{Binding Icon}"
-                                                Quality="{Binding Quality}"/>
-                                            <Border
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Top"
-                                                Background="#80000000"
-                                                CornerRadius="0,6,0,6">
-                                                <TextBlock
-                                                    Margin="6,0,6,2"
-                                                    Foreground="#FFFFFFFF"
-                                                    Text="{Binding Count}"/>
-                                            </Border>
-                                        </Grid>
-                                    </DataTemplate>
-                                </GridView.ItemTemplate>
-                            </GridView>
+                            <GridView
+                                ItemTemplate="{StaticResource HistoryWishItemTemplate}"
+                                ItemsSource="{Binding Statistics.PurpleAvatars}"
+                                SelectionMode="None"/>
                         </StackPanel>
                     </ScrollViewer>
                 </PivotItem>
@@ -501,82 +404,28 @@
                                 Margin="0,16,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
                                 Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
-                            <GridView ItemsSource="{Binding Statistics.OrangeWeapons}" SelectionMode="None">
-                                <GridView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <shvc:ItemIcon
-                                                Badge="{Binding Badge}"
-                                                Icon="{Binding Icon}"
-                                                Quality="{Binding Quality}"/>
-                                            <Border
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Top"
-                                                Background="#80000000"
-                                                CornerRadius="0,6,0,6">
-                                                <TextBlock
-                                                    Margin="6,0,6,2"
-                                                    Foreground="#FFFFFFFF"
-                                                    Text="{Binding Count}"/>
-                                            </Border>
-                                        </Grid>
-                                    </DataTemplate>
-                                </GridView.ItemTemplate>
-                            </GridView>
+                            <GridView
+                                ItemTemplate="{StaticResource HistoryWishItemTemplate}"
+                                ItemsSource="{Binding Statistics.OrangeWeapons}"
+                                SelectionMode="None"/>
 
                             <TextBlock
                                 Margin="0,0,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
                                 Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
-                            <GridView ItemsSource="{Binding Statistics.PurpleWeapons}" SelectionMode="None">
-                                <GridView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <shvc:ItemIcon
-                                                Badge="{Binding Badge}"
-                                                Icon="{Binding Icon}"
-                                                Quality="{Binding Quality}"/>
-                                            <Border
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Top"
-                                                Background="#80000000"
-                                                CornerRadius="0,6,0,6">
-                                                <TextBlock
-                                                    Margin="6,0,6,2"
-                                                    Foreground="#FFFFFFFF"
-                                                    Text="{Binding Count}"/>
-                                            </Border>
-                                        </Grid>
-                                    </DataTemplate>
-                                </GridView.ItemTemplate>
-                            </GridView>
+                            <GridView
+                                ItemTemplate="{StaticResource HistoryWishItemTemplate}"
+                                ItemsSource="{Binding Statistics.PurpleWeapons}"
+                                SelectionMode="None"/>
 
                             <TextBlock
                                 Margin="0,0,0,8"
                                 Style="{StaticResource BaseTextBlockStyle}"
                                 Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"/>
-                            <GridView ItemsSource="{Binding Statistics.BlueWeapons}" SelectionMode="None">
-                                <GridView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <shvc:ItemIcon
-                                                Badge="{Binding Badge}"
-                                                Icon="{Binding Icon}"
-                                                Quality="{Binding Quality}"/>
-                                            <Border
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Top"
-                                                Background="#80000000"
-                                                CornerRadius="0,6,0,6">
-                                                <TextBlock
-                                                    Margin="6,0,6,2"
-                                                    Foreground="#FFFFFFFF"
-                                                    Text="{Binding Count}"/>
-                                            </Border>
-                                        </Grid>
-                                    </DataTemplate>
-                                </GridView.ItemTemplate>
-                            </GridView>
+                            <GridView
+                                ItemTemplate="{StaticResource HistoryWishItemTemplate}"
+                                ItemsSource="{Binding Statistics.BlueWeapons}"
+                                SelectionMode="None"/>
                         </StackPanel>
                     </ScrollViewer>
                 </PivotItem>
@@ -647,6 +496,18 @@
                         Header="{shcm:ResourceString Name=ViewPageGachaLogImportHeader}"
                         HeaderIcon="{shcm:FontIcon Glyph=&#xE8B5;}"
                         IsClickEnabled="True"/>
+                    <cwc:SettingsCard
+                        Description="{shcm:ResourceString Name=ViewPageGachaLogRecoverFromHutaoCloudDescription}"
+                        FlyoutBase.AttachedFlyout="{StaticResource HutaoCloudFlyout}"
+                        Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloud}"
+                        HeaderIcon="{shcm:FontIcon Glyph=&#xE8B5;}"
+                        IsClickEnabled="True">
+                        <mxi:Interaction.Behaviors>
+                            <mxic:EventTriggerBehavior EventName="Click">
+                                <shcb:OpenAttachedFlyoutAction/>
+                            </mxic:EventTriggerBehavior>
+                        </mxi:Interaction.Behaviors>
+                    </cwc:SettingsCard>
                 </StackPanel>
             </StackPanel>
         </Grid>

src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml

@@ -26,6 +26,14 @@
     <Page.Resources>
         <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
         <Visibility x:Key="VisibilityCollapsed">Collapsed</Visibility>
+
+        <DataTemplate x:Key="GameResourceTemplate">
+            <shvc:LaunchGameResourceExpander
+                Margin="16,16,16,0"
+                cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
+                DataContext="{Binding Mode=OneWay}"
+                Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
+        </DataTemplate>
     </Page.Resources>
     <Grid>
         <Grid
@@ -202,23 +210,35 @@
                                         <ToggleSwitch Width="156" IsOn="{Binding Options.IsBorderless, Mode=TwoWay}"/>
                                     </cwc:SettingsCard>
                                     <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenWidthDescription}" Header="-screen-width">
-                                        <NumberBox
-                                            Width="156"
-                                            Padding="10,6,0,0"
-                                            Value="{Binding Options.ScreenWidth, Mode=TwoWay}"/>
+                                        <StackPanel Orientation="Horizontal" Spacing="16">
+                                            <NumberBox
+                                                Width="156"
+                                                Padding="10,6,0,0"
+                                                IsEnabled="{Binding Options.IsScreenWidthEnabled}"
+                                                Value="{Binding Options.ScreenWidth, Mode=TwoWay}"/>
+                                            <ToggleSwitch Width="156" IsOn="{Binding Options.IsScreenWidthEnabled, Mode=TwoWay}"/>
+                                        </StackPanel>
                                     </cwc:SettingsCard>
                                     <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenHeightDescription}" Header="-screen-height">
-                                        <NumberBox
-                                            Width="156"
-                                            Padding="10,6,0,0"
-                                            Value="{Binding Options.ScreenHeight, Mode=TwoWay}"/>
+                                        <StackPanel Orientation="Horizontal" Spacing="16">
+                                            <NumberBox
+                                                Width="156"
+                                                Padding="10,6,0,0"
+                                                IsEnabled="{Binding Options.IsScreenHeightEnabled}"
+                                                Value="{Binding Options.ScreenHeight, Mode=TwoWay}"/>
+                                            <ToggleSwitch Width="156" IsOn="{Binding Options.IsScreenHeightEnabled, Mode=TwoWay}"/>
+                                        </StackPanel>
                                     </cwc:SettingsCard>
                                     <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameMonitorsDescription}" Header="-monitor">
-                                        <ComboBox
-                                            Width="156"
-                                            DisplayMemberPath="Name"
-                                            ItemsSource="{Binding Options.Monitors}"
-                                            SelectedItem="{Binding Options.Monitor, Mode=TwoWay}"/>
+                                        <StackPanel Orientation="Horizontal" Spacing="16">
+                                            <ComboBox
+                                                Width="156"
+                                                DisplayMemberPath="Name"
+                                                IsEnabled="{Binding Options.IsMonitorEnabled}"
+                                                ItemsSource="{Binding Options.Monitors}"
+                                                SelectedItem="{Binding Options.Monitor, Mode=TwoWay}"/>
+                                            <ToggleSwitch Width="156" IsOn="{Binding Options.IsMonitorEnabled, Mode=TwoWay}"/>
+                                        </StackPanel>
                                     </cwc:SettingsCard>
                                 </cwc:SettingsExpander.Items>
                             </cwc:SettingsExpander>
@@ -266,33 +286,19 @@
                                     DataContext="{Binding GameResource.PreDownloadGame.Latest, Mode=OneWay}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameResourcePreDownloadHeader}"
                                     Visibility="{Binding FallbackValue={StaticResource VisibilityCollapsed}, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
-                                <ItemsControl Margin="0,0,0,0" ItemsSource="{Binding GameResource.PreDownloadGame.Diffs, Mode=OneWay}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <shvc:LaunchGameResourceExpander
-                                                Margin="16,16,16,0"
-                                                cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
-                                                DataContext="{Binding Mode=OneWay}"
-                                                Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
+                                <ItemsControl
+                                    Margin="0,0,0,0"
+                                    ItemTemplate="{StaticResource GameResourceTemplate}"
+                                    ItemsSource="{Binding GameResource.PreDownloadGame.Diffs, Mode=OneWay}"/>
                                 <shvc:LaunchGameResourceExpander
                                     Margin="16,16,16,0"
                                     cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                     DataContext="{Binding GameResource.Game.Latest, Mode=OneWay}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceLatestHeader}"/>
-                                <ItemsControl Margin="0,0,0,16" ItemsSource="{Binding GameResource.Game.Diffs, Mode=OneWay}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <shvc:LaunchGameResourceExpander
-                                                Margin="16,16,16,0"
-                                                cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
-                                                DataContext="{Binding Mode=OneWay}"
-                                                Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
+                                <ItemsControl
+                                    Margin="0,0,0,16"
+                                    ItemTemplate="{StaticResource GameResourceTemplate}"
+                                    ItemsSource="{Binding GameResource.Game.Diffs, Mode=OneWay}"/>
                             </StackPanel>
                         </Grid>
                     </ScrollViewer>

src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml

@@ -58,6 +58,132 @@
                 </shct:DescriptionTextBlock.Resources>
             </shct:DescriptionTextBlock>
         </DataTemplate>
+
+        <DataTemplate x:Key="AvatarListTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Grid.Column="0"
+                    Width="48"
+                    Height="48"
+                    Margin="0,0,12,12"
+                    Source="{Binding SideIcon, Converter={StaticResource AvatarSideIconConverter}, Mode=OneWay}"/>
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="12,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding Name}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CultivationItemTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CollocationTemplate">
+            <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CollocationReliquaryTemplate">
+            <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
+                <cwc:SwitchPresenter Value="{Binding Icons.Count, Mode=OneWay}">
+                    <cwc:Case IsDefault="True">
+                        <cwc:Case.Value>
+                            <x:Int32>0</x:Int32>
+                        </cwc:Case.Value>
+                        <Grid>
+                            <shvc:ItemIcon
+                                Width="80"
+                                Height="80"
+                                Icon="{StaticResource UI_ItemIcon_None}"
+                                Quality="QUALITY_ORANGE"/>
+                        </Grid>
+                    </cwc:Case>
+                    <cwc:Case>
+                        <cwc:Case.Value>
+                            <x:Int32>1</x:Int32>
+                        </cwc:Case.Value>
+                        <Grid>
+                            <shvc:ItemIcon
+                                Width="80"
+                                Height="80"
+                                Icon="{Binding Icons[0]}"
+                                Quality="QUALITY_ORANGE"/>
+                        </Grid>
+                    </cwc:Case>
+                    <cwc:Case>
+                        <cwc:Case.Value>
+                            <x:Int32>2</x:Int32>
+                        </cwc:Case.Value>
+                        <Grid>
+                            <shvc:ItemIcon Quality="QUALITY_ORANGE"/>
+                            <shci:CachedImage
+                                Width="54"
+                                Margin="0,4,0,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                Source="{Binding Icons[0]}"/>
+                            <shci:CachedImage
+                                Width="54"
+                                Margin="0,0,0,4"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Bottom"
+                                Source="{Binding Icons[1]}"/>
+                        </Grid>
+                    </cwc:Case>
+                </cwc:SwitchPresenter>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CostumeTemplate">
+            <Grid Margin="0,0,0,16">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Width="80"
+                    Height="80"
+                    Margin="0,0,16,0"
+                    Source="{StaticResource UI_AvatarIcon_Costume_Card}"/>
+                <shci:CachedImage
+                    Width="80"
+                    Height="80"
+                    Margin="0,0,16,0"
+                    Source="{Binding FrontIcon, Converter={StaticResource AvatarCardConverter}}"/>
+                <StackPanel Grid.Column="1" Margin="0,0,16,-4">
+                    <TextBlock Text="{Binding Name}"/>
+                    <TextBlock
+                        Margin="0,8,0,16"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="{Binding Description}"/>
+                </StackPanel>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="FetterStoryTemplate">
+            <StackPanel Margin="0,0,0,0">
+                <TextBlock Text="{Binding Title}"/>
+                <shct:DescriptionTextBlock
+                    Margin="0,8,0,0"
+                    Description="{Binding Context}"
+                    TextStyle="{StaticResource CaptionTextBlockStyle}"/>
+                <MenuFlyoutSeparator Margin="0,8"/>
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AvatarGridTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
     </Page.Resources>
 
     <Grid>
@@ -100,12 +226,10 @@
                     Icon="{shcm:FontIcon Glyph=&#xE8EF;}"
                     Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/>
             </CommandBar>
-            <cwc:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
-                <cwc:SwitchPresenter.ContentTransitions>
-                    <TransitionCollection>
-                        <ContentThemeTransition/>
-                    </TransitionCollection>
-                </cwc:SwitchPresenter.ContentTransitions>
+            <cwc:SwitchPresenter
+                Grid.Row="1"
+                ContentTransitions="{ThemeResource ContentThemeTransitions}"
+                Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
                 <cwc:Case Value="List">
                     <SplitView
                         Grid.Row="1"
@@ -116,33 +240,13 @@
                         <SplitView.Pane>
                             <ListView
                                 Grid.Row="1"
+                                ItemTemplate="{StaticResource AvatarListTemplate}"
                                 ItemsSource="{Binding Avatars}"
                                 SelectedItem="{Binding Selected, Mode=TwoWay}"
                                 SelectionMode="Single">
                                 <mxi:Interaction.Behaviors>
                                     <shcb:SelectedItemInViewBehavior/>
                                 </mxi:Interaction.Behaviors>
-                                <ListView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Width="48"
-                                                Height="48"
-                                                Margin="0,0,12,12"
-                                                Source="{Binding SideIcon, Converter={StaticResource AvatarSideIconConverter}, Mode=OneWay}"/>
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                Margin="12,0,0,0"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding Name}"/>
-                                        </Grid>
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
                             </ListView>
                         </SplitView.Pane>
                         <SplitView.Content>
@@ -290,16 +394,9 @@
                                             Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
                                         <GridView
                                             Margin="16,16,0,0"
+                                            ItemTemplate="{StaticResource CultivationItemTemplate}"
                                             ItemsSource="{Binding Selected.CultivationItemsView}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
 
                                         <TextBlock
                                             Margin="16,32,0,0"
@@ -326,16 +423,9 @@
                                             Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
                                         <GridView
                                             Margin="16,16,0,0"
+                                            ItemTemplate="{StaticResource CollocationTemplate}"
                                             ItemsSource="{Binding Selected.Collocation.Avatars}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
                                         <TextBlock
                                             Margin="16,0,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
@@ -344,16 +434,9 @@
                                             Margin="16,16,0,0"
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
+                                            ItemTemplate="{StaticResource CollocationTemplate}"
                                             ItemsSource="{Binding Selected.Collocation.Weapons}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
                                         <TextBlock
                                             Margin="16,0,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
@@ -362,61 +445,9 @@
                                             Margin="16,16,0,0"
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
+                                            ItemTemplate="{StaticResource CollocationReliquaryTemplate}"
                                             ItemsSource="{Binding Selected.Collocation.ReliquarySets}"
-                                            SelectionMode="None">
-                                            <GridView.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                        <cwc:SwitchPresenter Value="{Binding Icons.Count, Mode=OneWay}">
-                                                            <cwc:Case IsDefault="True">
-                                                                <cwc:Case.Value>
-                                                                    <x:Int32>0</x:Int32>
-                                                                </cwc:Case.Value>
-                                                                <Grid>
-                                                                    <shvc:ItemIcon
-                                                                        Width="80"
-                                                                        Height="80"
-                                                                        Icon="{StaticResource UI_ItemIcon_None}"
-                                                                        Quality="QUALITY_ORANGE"/>
-                                                                </Grid>
-                                                            </cwc:Case>
-                                                            <cwc:Case>
-                                                                <cwc:Case.Value>
-                                                                    <x:Int32>1</x:Int32>
-                                                                </cwc:Case.Value>
-                                                                <Grid>
-                                                                    <shvc:ItemIcon
-                                                                        Width="80"
-                                                                        Height="80"
-                                                                        Icon="{Binding Icons[0]}"
-                                                                        Quality="QUALITY_ORANGE"/>
-                                                                </Grid>
-                                                            </cwc:Case>
-                                                            <cwc:Case>
-                                                                <cwc:Case.Value>
-                                                                    <x:Int32>2</x:Int32>
-                                                                </cwc:Case.Value>
-                                                                <Grid>
-                                                                    <shvc:ItemIcon Quality="QUALITY_ORANGE"/>
-                                                                    <shci:CachedImage
-                                                                        Width="54"
-                                                                        Margin="0,4,0,0"
-                                                                        HorizontalAlignment="Left"
-                                                                        VerticalAlignment="Top"
-                                                                        Source="{Binding Icons[0]}"/>
-                                                                    <shci:CachedImage
-                                                                        Width="54"
-                                                                        Margin="0,0,0,4"
-                                                                        HorizontalAlignment="Right"
-                                                                        VerticalAlignment="Bottom"
-                                                                        Source="{Binding Icons[1]}"/>
-                                                                </Grid>
-                                                            </cwc:Case>
-                                                        </cwc:SwitchPresenter>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </GridView.ItemTemplate>
-                                        </GridView>
+                                            SelectionMode="None"/>
 
                                         <TextBlock
                                             Margin="16,32,0,0"
@@ -504,7 +535,6 @@
                                                         Text="{Binding Item.EffectDescription}"
                                                         TextWrapping="Wrap"/>
                                                 </StackPanel>
-
                                             </Grid>
                                         </Expander>
                                         <!--  衣装  -->
@@ -513,35 +543,10 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarCostumeHeader}">
-                                            <ItemsControl Margin="0,0,0,-16" ItemsSource="{Binding Selected.Costumes}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <Grid Margin="0,0,0,16">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <shci:CachedImage
-                                                                Width="80"
-                                                                Height="80"
-                                                                Margin="0,0,16,0"
-                                                                Source="{StaticResource UI_AvatarIcon_Costume_Card}"/>
-                                                            <shci:CachedImage
-                                                                Width="80"
-                                                                Height="80"
-                                                                Margin="0,0,16,0"
-                                                                Source="{Binding FrontIcon, Converter={StaticResource AvatarCardConverter}}"/>
-                                                            <StackPanel Grid.Column="1" Margin="0,0,16,-4">
-                                                                <TextBlock Text="{Binding Name}"/>
-                                                                <TextBlock
-                                                                    Margin="0,8,0,16"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Description}"/>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
+                                            <ItemsControl
+                                                Margin="0,0,0,-16"
+                                                ItemTemplate="{StaticResource CostumeTemplate}"
+                                                ItemsSource="{Binding Selected.Costumes}"/>
                                         </Expander>
                                         <!--  资料  -->
                                         <Expander
@@ -549,20 +554,10 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}">
-                                            <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.Fetters}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <StackPanel Margin="0,0,0,0">
-                                                            <TextBlock Text="{Binding Title}"/>
-                                                            <shct:DescriptionTextBlock
-                                                                Margin="0,8,0,0"
-                                                                Description="{Binding Context}"
-                                                                TextStyle="{StaticResource CaptionTextBlockStyle}"/>
-                                                            <MenuFlyoutSeparator Margin="0,8"/>
-                                                        </StackPanel>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
+                                            <ItemsControl
+                                                Margin="0,0,0,-24"
+                                                ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                ItemsSource="{Binding Selected.FetterInfo.Fetters}"/>
                                         </Expander>
                                         <!--  故事  -->
                                         <Expander
@@ -570,20 +565,10 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}">
-                                            <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.FetterStories}">
-                                                <ItemsControl.ItemTemplate>
-                                                    <DataTemplate>
-                                                        <StackPanel Margin="0,0,0,0">
-                                                            <TextBlock Text="{Binding Title}"/>
-                                                            <TextBlock
-                                                                Margin="0,8,0,0"
-                                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                                Text="{Binding Context}"/>
-                                                            <MenuFlyoutSeparator Margin="0,8"/>
-                                                        </StackPanel>
-                                                    </DataTemplate>
-                                                </ItemsControl.ItemTemplate>
-                                            </ItemsControl>
+                                            <ItemsControl
+                                                Margin="0,0,0,-24"
+                                                ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                ItemsSource="{Binding Selected.FetterInfo.FetterStories}"/>
                                         </Expander>
                                     </StackPanel>
                                 </ScrollViewer>
@@ -597,23 +582,16 @@
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Left"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                        ItemTemplate="{StaticResource AvatarGridTemplate}"
                         ItemsSource="{Binding Avatars}"
                         SelectedItem="{Binding Selected, Mode=TwoWay}"
                         SelectionMode="Single">
                         <mxi:Interaction.Behaviors>
                             <shcb:SelectedItemInViewBehavior/>
                         </mxi:Interaction.Behaviors>
-                        <GridView.ItemTemplate>
-                            <DataTemplate>
-                                <shvc:BottomTextControl Text="{Binding Name}">
-                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
-                                </shvc:BottomTextControl>
-                            </DataTemplate>
-                        </GridView.ItemTemplate>
                     </GridView>
                 </cwc:Case>
             </cwc:SwitchPresenter>
-
         </Grid>
         <shvc:LoadingView IsLoading="{Binding Avatars, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
     </Grid>

src/Snap.Hutao/Snap.Hutao/View/Page/WikiMonsterPage.xaml

@@ -22,6 +22,47 @@
     <mxi:Interaction.Behaviors>
         <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
     </mxi:Interaction.Behaviors>
+
+    <Page.Resources>
+        <DataTemplate x:Key="MonsterListTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Grid.Column="0"
+                    Width="48"
+                    Height="48"
+                    Margin="0,6,12,6"
+                    Source="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}"/>
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="12,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding Name}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonsterBaseValueTemplate">
+            <cwc:SettingsCard Header="{Binding Name}">
+                <TextBlock Text="{Binding Value}"/>
+            </cwc:SettingsCard>
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonsterDropTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonsterGridTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}" Quality="QUALITY_NONE"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+    </Page.Resources>
+
     <Grid>
         <Grid Visibility="{Binding Monsters, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
             <Grid.RowDefinitions>
@@ -66,33 +107,13 @@
                         <SplitView.Pane>
                             <ListView
                                 Grid.Row="1"
+                                ItemTemplate="{StaticResource MonsterListTemplate}"
                                 ItemsSource="{Binding Monsters}"
                                 SelectedItem="{Binding Selected, Mode=TwoWay}"
                                 SelectionMode="Single">
                                 <mxi:Interaction.Behaviors>
                                     <shcb:SelectedItemInViewBehavior/>
                                 </mxi:Interaction.Behaviors>
-                                <ListView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Width="48"
-                                                Height="48"
-                                                Margin="0,6,12,6"
-                                                Source="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}"/>
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                Margin="12,0,0,0"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding Name}"/>
-                                        </Grid>
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
                             </ListView>
                         </SplitView.Pane>
                         <SplitView.Content>
@@ -126,27 +147,16 @@
                                             HorizontalContentAlignment="Stretch"
                                             BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"
                                             IsPromoteVisible="False"/>
-                                        <ItemsControl Margin="16,16,0,0" ItemsSource="{Binding Selected.BaseValue.SubHurts}">
+                                        <ItemsControl
+                                            Margin="16,16,0,0"
+                                            ItemTemplate="{StaticResource MonsterBaseValueTemplate}"
+                                            ItemsPanel="{StaticResource UniformGridColumns2Spacing2Template}"
+                                            ItemsSource="{Binding Selected.BaseValue.SubHurts}">
                                             <ItemsControl.Resources>
                                                 <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
                                                 <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
                                                 <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
                                             </ItemsControl.Resources>
-                                            <ItemsControl.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <cwc:UniformGrid
-                                                        ColumnSpacing="2"
-                                                        Columns="2"
-                                                        RowSpacing="2"/>
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate>
-                                                    <cwc:SettingsCard Header="{Binding Name}">
-                                                        <TextBlock Text="{Binding Value}"/>
-                                                    </cwc:SettingsCard>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
                                         </ItemsControl>
                                         <TextBlock
                                             Margin="16,32,0,0"
@@ -156,17 +166,10 @@
                                         <GridView
                                             Margin="16,16,-4,12"
                                             Padding="0"
+                                            ItemTemplate="{StaticResource MonsterDropTemplate}"
                                             ItemsSource="{Binding Selected.DropsView}"
                                             SelectionMode="None"
-                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shvc:BottomTextControl Text="{Binding Name}">
-                                                        <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-                                                    </shvc:BottomTextControl>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
-                                        </GridView>
+                                            Visibility="{Binding Selected.DropsView, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
                                     </StackPanel>
                                 </Grid>
                             </ScrollViewer>
@@ -179,24 +182,13 @@
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Left"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                        ItemTemplate="{StaticResource MonsterGridTemplate}"
                         ItemsSource="{Binding Monsters}"
                         SelectedItem="{Binding Selected, Mode=TwoWay}"
                         SelectionMode="Single">
                         <mxi:Interaction.Behaviors>
                             <shcb:SelectedItemInViewBehavior/>
                         </mxi:Interaction.Behaviors>
-                        <GridView.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <ItemsWrapGrid Orientation="Horizontal"/>
-                            </ItemsPanelTemplate>
-                        </GridView.ItemsPanel>
-                        <GridView.ItemTemplate>
-                            <DataTemplate>
-                                <shvc:BottomTextControl Text="{Binding Name}">
-                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource MonsterIconConverter}, Mode=OneWay}" Quality="QUALITY_NONE"/>
-                                </shvc:BottomTextControl>
-                            </DataTemplate>
-                        </GridView.ItemTemplate>
                     </GridView>
                 </cwc:Case>
             </cwc:SwitchPresenter>

src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml

@@ -30,6 +30,58 @@
                 PreferredSelectedIndex="13"
                 Source="{Binding Converter={StaticResource PropertyDescriptor}}"/>
         </DataTemplate>
+
+        <DataTemplate x:Key="WeaponListTemplate">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <shci:CachedImage
+                    Grid.Column="0"
+                    Width="48"
+                    Height="48"
+                    Margin="0,0,12,6"
+                    Source="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}"/>
+                <TextBlock
+                    Grid.Column="1"
+                    Margin="12,0,0,0"
+                    VerticalAlignment="Center"
+                    Text="{Binding Name}"/>
+            </Grid>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CultivateItemTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AffixPivotHeaderTemplate">
+            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{Binding LevelFormatted}"/>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AffixPivotItemTemplate">
+            <shct:DescriptionTextBlock Margin="16,16,0,0" Description="{Binding Description}">
+                <shct:DescriptionTextBlock.Resources>
+                    <Style BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
+                        <Setter Property="TextWrapping" Value="Wrap"/>
+                    </Style>
+                </shct:DescriptionTextBlock.Resources>
+            </shct:DescriptionTextBlock>
+        </DataTemplate>
+
+        <DataTemplate x:Key="CollocationTemplate">
+            <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
+
+        <DataTemplate x:Key="WeaponGridTemplate">
+            <shvc:BottomTextControl Text="{Binding Name}">
+                <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
+            </shvc:BottomTextControl>
+        </DataTemplate>
     </Page.Resources>
 
     <Grid>
@@ -70,12 +122,10 @@
                     Icon="{shcm:FontIcon Glyph=&#xE8EF;}"
                     Label="{shcm:ResourceString Name=ViewPageWiKiGeneralAddToDevPlanButtonLabel}"/>
             </CommandBar>
-            <cwc:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
-                <cwc:SwitchPresenter.ContentTransitions>
-                    <TransitionCollection>
-                        <ContentThemeTransition/>
-                    </TransitionCollection>
-                </cwc:SwitchPresenter.ContentTransitions>
+            <cwc:SwitchPresenter
+                Grid.Row="1"
+                ContentTransitions="{ThemeResource ContentThemeTransitions}"
+                Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
                 <cwc:Case Value="List">
                     <SplitView
                         DisplayMode="Inline"
@@ -85,35 +135,14 @@
                         <SplitView.Pane>
                             <ListView
                                 Grid.Row="1"
+                                ItemTemplate="{StaticResource WeaponListTemplate}"
                                 ItemsSource="{Binding Weapons}"
                                 SelectedItem="{Binding Selected, Mode=TwoWay}"
                                 SelectionMode="Single">
                                 <mxi:Interaction.Behaviors>
                                     <shcb:SelectedItemInViewBehavior/>
                                 </mxi:Interaction.Behaviors>
-                                <ListView.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <shci:CachedImage
-                                                Grid.Column="0"
-                                                Width="48"
-                                                Height="48"
-                                                Margin="0,0,12,6"
-                                                Source="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}"/>
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                Margin="12,0,0,0"
-                                                VerticalAlignment="Center"
-                                                Text="{Binding Name}"/>
-                                        </Grid>
-                                    </DataTemplate>
-                                </ListView.ItemTemplate>
                             </ListView>
-
                         </SplitView.Pane>
                         <SplitView.Content>
                             <ScrollViewer>
@@ -186,39 +215,18 @@
                                         Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
                                     <GridView
                                         Margin="16,16,0,0"
+                                        ItemTemplate="{StaticResource CultivateItemTemplate}"
                                         ItemsSource="{Binding Selected.CultivationItemsView}"
-                                        SelectionMode="None">
-                                        <GridView.ItemTemplate>
-                                            <DataTemplate>
-                                                <shvc:BottomTextControl Text="{Binding Name}">
-                                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding RankLevel}"/>
-                                                </shvc:BottomTextControl>
-                                            </DataTemplate>
-                                        </GridView.ItemTemplate>
-                                    </GridView>
+                                        SelectionMode="None"/>
                                     <StackPanel Visibility="{Binding Selected.Affix, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
                                         <TextBlock
                                             Margin="16,16,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
                                             Text="{Binding Selected.Affix.Name}"/>
-                                        <Pivot ItemsSource="{Binding Selected.Affix.Descriptions}">
-                                            <Pivot.HeaderTemplate>
-                                                <DataTemplate>
-                                                    <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{Binding LevelFormatted}"/>
-                                                </DataTemplate>
-                                            </Pivot.HeaderTemplate>
-                                            <Pivot.ItemTemplate>
-                                                <DataTemplate>
-                                                    <shct:DescriptionTextBlock Margin="16,16,0,0" Description="{Binding Description}">
-                                                        <shct:DescriptionTextBlock.Resources>
-                                                            <Style BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
-                                                                <Setter Property="TextWrapping" Value="Wrap"/>
-                                                            </Style>
-                                                        </shct:DescriptionTextBlock.Resources>
-                                                    </shct:DescriptionTextBlock>
-                                                </DataTemplate>
-                                            </Pivot.ItemTemplate>
-                                        </Pivot>
+                                        <Pivot
+                                            HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
+                                            ItemTemplate="{StaticResource AffixPivotItemTemplate}"
+                                            ItemsSource="{Binding Selected.Affix.Descriptions}"/>
                                     </StackPanel>
 
                                     <TextBlock
@@ -229,16 +237,9 @@
                                         Margin="16,16,0,0"
                                         HorizontalAlignment="Stretch"
                                         HorizontalContentAlignment="Stretch"
+                                        ItemTemplate="{StaticResource CollocationTemplate}"
                                         ItemsSource="{Binding Selected.Collocation.Avatars}"
-                                        SelectionMode="None">
-                                        <GridView.ItemTemplate>
-                                            <DataTemplate>
-                                                <shvc:BottomTextControl Text="{Binding Rate}" ToolTipService.ToolTip="{Binding Name}">
-                                                    <shvc:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
-                                                </shvc:BottomTextControl>
-                                            </DataTemplate>
-                                        </GridView.ItemTemplate>
-                                    </GridView>
+                                        SelectionMode="None"/>
                                 </StackPanel>
 
                             </ScrollViewer>
@@ -251,19 +252,13 @@
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Left"
                         ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                        ItemTemplate="{StaticResource WeaponGridTemplate}"
                         ItemsSource="{Binding Weapons}"
                         SelectedItem="{Binding Selected, Mode=TwoWay}"
                         SelectionMode="Single">
                         <mxi:Interaction.Behaviors>
                             <shcb:SelectedItemInViewBehavior/>
                         </mxi:Interaction.Behaviors>
-                        <GridView.ItemTemplate>
-                            <DataTemplate>
-                                <shvc:BottomTextControl Text="{Binding Name}">
-                                    <shvc:ItemIcon Icon="{Binding Icon, Converter={StaticResource EquipIconConverter}, Mode=OneWay}" Quality="{Binding Quality}"/>
-                                </shvc:BottomTextControl>
-                            </DataTemplate>
-                        </GridView.ItemTemplate>
                     </GridView>
                 </cwc:Case>
             </cwc:SwitchPresenter>

src/Snap.Hutao/Snap.Hutao/View/TitleView.xaml

@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:shcm="using:Snap.Hutao.Control.Markup"
     Height="44"
     VerticalAlignment="Top"
     mc:Ignorable="d">
@@ -38,7 +39,7 @@
                 <TextBlock
                     Grid.Column="1"
                     Margin="6,0,0,0"
-                    Text="自动连点"/>
+                    Text="{shcm:ResourceString Name=ViewTitleAutoClicking}"/>
             </Grid>
         </ToggleButton>
     </Grid>

src/Snap.Hutao/Snap.Hutao/View/UserView.xaml

@@ -189,19 +189,14 @@
                                 Style="{StaticResource DefaultAppBarButtonStyle}">
                                 <AppBarButton.Flyout>
                                     <Flyout
+                                        FlyoutPresenterStyle="{StaticResource WebViewerFlyoutPresenterStyle}"
                                         LightDismissOverlayMode="On"
                                         Placement="Full"
                                         ShouldConstrainToRootBounds="False">
-                                        <Flyout.FlyoutPresenterStyle>
-                                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                                <Setter Property="Padding" Value="0"/>
-                                                <Setter Property="CornerRadius" Value="0"/>
-                                            </Style>
-                                        </Flyout.FlyoutPresenterStyle>
                                         <Grid>
                                             <shvc:WebViewer>
                                                 <shvc:WebViewer.SourceProvider>
-                                                    <shvc:StaticWebview2ViewerSource ChineseSource="https://webstatic.mihoyo.com/app/community-game-records/index.html"/>
+                                                    <shvc:StaticWebview2ViewerSource ChineseSource="https://webstatic.mihoyo.com/bbs/event/e20200511toolbox/index.html?game_biz=ys_cn"/>
                                                 </shvc:WebViewer.SourceProvider>
                                             </shvc:WebViewer>
                                         </Grid>
@@ -280,7 +275,6 @@
                                     Text="{shcm:ResourceString Name=ViewUserUser}"/>
                                 <ListView
                                     Grid.Row="1"
-                                    MaxHeight="224"
                                     Margin="4"
                                     ItemsSource="{Binding Users}"
                                     SelectedItem="{Binding SelectedUser, Mode=TwoWay}"

src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs

@@ -55,7 +55,7 @@ internal sealed partial class LaunchGameViewModel : Abstraction.ViewModel
     /// 已知的服务器方案
     /// </summary>
     [SuppressMessage("", "CA1822")]
-    public List<LaunchScheme> KnownSchemes { get => LaunchScheme.GetKnownSchemes(); }
+    public List<LaunchScheme> KnownSchemes { get => KnownLaunchSchemes.Get(); }
 
     /// <summary>
     /// 当前选择的服务器方案

src/Snap.Hutao/Snap.Hutao/ViewModel/Setting/HutaoPassportViewModel.cs

@@ -31,12 +31,6 @@ internal sealed partial class HutaoPassportViewModel : Abstraction.ViewModel
         await Launcher.LaunchUriAsync("https://homa.snapgenshin.com/redeem.html".ToUri());
     }
 
-    private static void SaveUserNameAndPassword(string username, string password)
-    {
-        LocalSetting.Set(SettingKeys.PassportUserName, username);
-        LocalSetting.Set(SettingKeys.PassportPassword, password);
-    }
-
     [Command("RegisterCommand")]
     private async Task RegisterAsync()
     {
@@ -56,9 +50,8 @@ internal sealed partial class HutaoPassportViewModel : Abstraction.ViewModel
 
             if (response.IsOk())
             {
-                SaveUserNameAndPassword(username, password);
                 infoBarService.Information(response.Message);
-                await hutaoUserOptions.PostLoginSucceedAsync(homaPassportClient, taskContext, username, response.Data).ConfigureAwait(false);
+                await hutaoUserOptions.PostLoginSucceedAsync(homaPassportClient, taskContext, username, password, response.Data).ConfigureAwait(false);
             }
         }
     }
@@ -67,18 +60,18 @@ internal sealed partial class HutaoPassportViewModel : Abstraction.ViewModel
     private async Task UnregisterAsync()
     {
         HutaoPassportUnregisterDialog dialog = await contentDialogFactory.CreateInstanceAsync<HutaoPassportUnregisterDialog>().ConfigureAwait(false);
-        ValueResult<bool, (string UserName, string Password)> result = await dialog.GetInputAsync().ConfigureAwait(false);
+        ValueResult<bool, (string UserName, string Password, string VerifyCode)> result = await dialog.GetInputAsync().ConfigureAwait(false);
 
         if (result.IsOk)
         {
-            (string username, string password) = result.Value;
+            (string username, string password, string verifyCode) = result.Value;
 
-            if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))
+            if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(verifyCode))
             {
                 return;
             }
 
-            Response response = await homaPassportClient.UnregisterAsync(username, password).ConfigureAwait(false);
+            HutaoResponse response = await homaPassportClient.UnregisterAsync(username, password, verifyCode).ConfigureAwait(false);
 
             if (response.IsOk())
             {
@@ -109,10 +102,8 @@ internal sealed partial class HutaoPassportViewModel : Abstraction.ViewModel
 
             if (response.IsOk())
             {
-                SaveUserNameAndPassword(username, password);
                 infoBarService.Information(response.Message);
-
-                await hutaoUserOptions.PostLoginSucceedAsync(homaPassportClient, taskContext, username, response.Data).ConfigureAwait(false);
+                await hutaoUserOptions.PostLoginSucceedAsync(homaPassportClient, taskContext, username, password, response.Data).ConfigureAwait(false);
             }
         }
     }
@@ -121,6 +112,8 @@ internal sealed partial class HutaoPassportViewModel : Abstraction.ViewModel
     private void LogoutAsync()
     {
         hutaoUserOptions.LogoutOrUnregister();
+        LocalSetting.Set(SettingKeys.PassportUserName, string.Empty);
+        LocalSetting.Set(SettingKeys.PassportPassword, string.Empty);
     }
 
     [Command("ResetPasswordCommand")]
@@ -142,10 +135,8 @@ internal sealed partial class HutaoPassportViewModel : Abstraction.ViewModel
 
             if (response.IsOk())
             {
-                SaveUserNameAndPassword(username, password);
                 infoBarService.Information(response.Message);
-
-                await hutaoUserOptions.PostLoginSucceedAsync(homaPassportClient, taskContext, username, response.Data).ConfigureAwait(false);
+                await hutaoUserOptions.PostLoginSucceedAsync(homaPassportClient, taskContext, username, password, response.Data).ConfigureAwait(false);
             }
         }
     }

src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs

@@ -7,6 +7,7 @@ using Microsoft.UI.Xaml.Controls.Primitives;
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.IO.DataTransfer;
+using Snap.Hutao.Factory.Abstraction;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.SignIn;
@@ -28,6 +29,7 @@ namespace Snap.Hutao.ViewModel.User;
 [Injection(InjectAs.Singleton)]
 internal sealed partial class UserViewModel : ObservableObject
 {
+    private readonly IContentDialogFactory contentDialogFactory;
     private readonly IDocumentationProvider documentationProvider;
     private readonly INavigationService navigationService;
     private readonly IServiceProvider serviceProvider;
@@ -131,7 +133,7 @@ internal sealed partial class UserViewModel : ObservableObject
         await taskContext.SwitchToMainThreadAsync();
 
         // Get cookie from user input
-        UserDialog dialog = serviceProvider.CreateInstance<UserDialog>();
+        UserDialog dialog = await contentDialogFactory.CreateInstanceAsync<UserDialog>().ConfigureAwait(false);
         ValueResult<bool, string> result = await dialog.GetInputCookieAsync().ConfigureAwait(false);
 
         // User confirms the input

src/Snap.Hutao/Snap.Hutao/Web/ApiEndpoints.cs

@@ -168,7 +168,7 @@ internal static class ApiEndpoints
     }
     #endregion
 
-    #region
+    #region ApiTakumiEventBbsSignReward
 
     /// <summary>
     /// 签到活动Id
@@ -367,6 +367,19 @@ internal static class ApiEndpoints
     public const string AccountCreateActionTicket = $"{PassportApi}/account/ma-cn-verifier/app/createActionTicketByToken";
     #endregion
 
+    #region PublicDataApi
+
+    /// <summary>
+    /// 获取 fingerprint
+    /// </summary>
+    public const string DeviceFpGetFp = $"{PublicDataApiDeviceFpApi}/getFp";
+
+    public static string DeviceFpGetExtList(int platform)
+    {
+        return $"{PublicDataApiDeviceFpApi}/getExtList?platform={platform:D}";
+    }
+    #endregion
+
     #region SdkStaticLauncherApi
 
     /// <summary>
@@ -418,6 +431,9 @@ internal static class ApiEndpoints
     private const string PassportApiAuthApi = $"{PassportApi}/account/auth/api";
     private const string PassportApiV4 = "https://passport-api-v4.mihoyo.com";
 
+    private const string PublicDataApi = "https://public-data-api.mihoyo.com";
+    private const string PublicDataApiDeviceFpApi = $"{PublicDataApi}/device-fp/api";
+
     private const string SdkStatic = "https://sdk-static.mihoyo.com";
     private const string SdkStaticLauncherApi = $"{SdkStatic}/hk4e_cn/mdk/launcher/api";
 

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/PublicData/DeviceFp/DeviceFpClient.cs

@@ -0,0 +1,12 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
+
+namespace Snap.Hutao.Web.Hoyolab.PublicData.DeviceFp;
+
+[HttpClient(HttpClientConfiguration.Default)]
+internal sealed partial class DeviceFpClient
+{
+
+}

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/PublicData/DeviceFp/DeviceFpData.cs

@@ -0,0 +1,31 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Web.Hoyolab.PublicData.DeviceFp;
+
+internal sealed class DeviceFpData
+{
+    [JsonPropertyName("device_id")]
+    public string DeviceId { get; set; } = default!;
+
+    [JsonPropertyName("bbs_device_id")]
+    public string? BbsDeviceId { get; set; }
+
+    [JsonPropertyName("seed_id")]
+    public string SeedId { get; set; } = default!;
+
+    [JsonPropertyName("seed_time")]
+    public string SeedTime { get; set; } = default!;
+
+    [JsonPropertyName("platform")]
+    public string Platform { get; set; } = default!;
+
+    [JsonPropertyName("device_fp")]
+    public string DeviceFp { get; set; } = default!;
+
+    [JsonPropertyName("app_name")]
+    public string AppName { get; set; } = default!;
+
+    [JsonPropertyName("ext_fields")]
+    public Dictionary<string, string> ExtFields { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs

@@ -40,25 +40,29 @@ internal sealed partial class HomaPassportClient
     private readonly HutaoUserOptions hutaoUserOptions;
     private readonly HttpClient httpClient;
 
-    /// <summary>
-    /// 异步获取验证码
-    /// </summary>
-    /// <param name="email">邮箱</param>
-    /// <param name="isResetPassword">是否重置账号密码</param>
-    /// <param name="token">取消令牌</param>
-    /// <returns>响应</returns>
-    public async ValueTask<HutaoResponse> VerifyAsync(string email, bool isResetPassword, CancellationToken token = default)
+    public async ValueTask<HutaoResponse> RequestVerifyAsync(string email, VerifyCodeRequestType requestType, CancellationToken token = default)
     {
         Dictionary<string, object> data = new()
         {
             ["UserName"] = Encrypt(email),
-            ["IsResetPassword"] = isResetPassword,
         };
 
+        if (requestType.HasFlag(VerifyCodeRequestType.ResetPassword))
+        {
+            data["IsResetPassword"] = true;
+        }
+
+        if (requestType.HasFlag(VerifyCodeRequestType.CancelRegistration))
+        {
+            data["IsCancelRegistration"] = true;
+        }
+
         HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()
             .SetRequestUri(HutaoEndpoints.PassportVerify)
             .PostJson(data);
 
+        await builder.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false);
+
         HutaoResponse? resp = await builder
             .TryCatchSendAsync<HutaoResponse>(httpClient, logger, token)
             .ConfigureAwait(false);
@@ -94,18 +98,21 @@ internal sealed partial class HomaPassportClient
         return HutaoResponse.DefaultIfNull(resp);
     }
 
-    public async ValueTask<HutaoResponse> UnregisterAsync(string email, string password, CancellationToken token = default)
+    public async ValueTask<HutaoResponse> UnregisterAsync(string email, string password, string verifyCode, CancellationToken token = default)
     {
         Dictionary<string, string> data = new()
         {
             ["UserName"] = Encrypt(email),
             ["Password"] = Encrypt(password),
+            ["VerifyCode"] = Encrypt(verifyCode),
         };
 
         HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()
             .SetRequestUri(HutaoEndpoints.PassportCancel)
             .PostJson(data);
 
+        await builder.TrySetTokenAsync(hutaoUserOptions).ConfigureAwait(false);
+
         HutaoResponse? resp = await builder
             .TryCatchSendAsync<HutaoResponse>(httpClient, logger, token)
             .ConfigureAwait(false);

src/Snap.Hutao/Snap.Hutao/Web/Hutao/HutaoResponse.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Service.Notification;
 using System.Runtime.CompilerServices;
 
 namespace Snap.Hutao.Web.Hutao;

src/Snap.Hutao/Snap.Hutao/Web/Hutao/VerifyCodeRequestType.cs

@@ -0,0 +1,12 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Web.Hutao;
+
+[Flags]
+internal enum VerifyCodeRequestType
+{
+    Registration = 0b0000,
+    ResetPassword = 0b0001,
+    CancelRegistration = 0b0010,
+}