Merge pull request #1473 from DGP-Studio/develop

Bumps the packages group in /src/Snap.Hutao with 1 update: [MSTest.TestAdapter](https://github.com/microsoft/testfx).


Updates `MSTest.TestAdapter` from 3.2.1 to 3.2.2
- [Release notes](https://github.com/microsoft/testfx/releases)
- [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md)
- [Commits](https://github.com/microsoft/testfx/compare/v3.2.1...v3.2.2)

---
updated-dependencies:
- dependency-name: MSTest.TestAdapter
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: packages
...

Signed-off-by: dependabot[bot] <support@github.com>

README.md

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

build.cake

@@ -69,6 +69,15 @@ else if (AppVeyor.IsRunningOnAppVeyor)
     })[..^2];
     Information($"Version: {version}");
 }
+else // Local
+{
+    repoDir = System.Environment.CurrentDirectory;
+    outputPath = System.IO.Path.Combine(repoDir, "src", "output");
+
+    version = System.DateTime.Now.ToString("yyyy.M.d.") + ((int)((System.DateTime.Now - System.DateTime.Today).TotalSeconds / 86400 * 65535)).ToString();
+
+    Information($"Version: {version}");
+}
 
 Task("Build")
     .IsDependentOn("Build binary package")
@@ -112,6 +121,17 @@ Task("Generate AppxManifest")
         Information("Using Release configuration");
         content = System.Text.RegularExpressions.Regex.Replace(content, "  Publisher=\"([^\"]*)\"", "  Publisher=\"CN=SignPath Foundation, O=SignPath Foundation, L=Lewes, S=Delaware, C=US\"");
     }
+    else
+    {
+        Information("Using Local configuration.");
+        content = content
+            .Replace("Snap Hutao", "Snap Hutao Local")
+            .Replace("胡桃", "胡桃 Local")
+            .Replace("DGP Studio", "DGP Studio CI");
+        content = System.Text.RegularExpressions.Regex.Replace(content, "  Name=\"([^\"]*)\"", "  Name=\"E8B6E2B3-D2A0-4435-A81D-2A16AAF405C7\"");
+        content = System.Text.RegularExpressions.Regex.Replace(content, "  Publisher=\"([^\"]*)\"", "  Publisher=\"E=admin@dgp-studio.cn, CN=DGP Studio CI, OU=CI, O=DGP-Studio, L=San Jose, S=CA, C=US\"");
+        content = System.Text.RegularExpressions.Regex.Replace(content, "  Version=\"([0-9\\.]+)\"", $"  Version=\"{version}\"");
+    }
 
     System.IO.File.WriteAllText(manifest, content);
 
@@ -173,6 +193,10 @@ Task("Build MSIX")
     {
         arguments = "pack /d " + binPath + " /p " + System.IO.Path.Combine(outputPath, $"Snap.Hutao-{version}.msix");
     }
+    else
+    {
+        arguments = "pack /d " + binPath + " /p " + System.IO.Path.Combine(outputPath, $"Snap.Hutao.Local-{version}.msix");
+    }
     var p = StartProcess(
         "makeappx.exe",
         new ProcessSettings

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

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>

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

@@ -9,8 +9,6 @@
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenizingTextBox/TokenizingTextBox.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Loading.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Image/CachedImage.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Segmented/Segmented.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/Segmented/SegmentedItem.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Card.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Color.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/ComboBox.xaml"/>
@@ -25,6 +23,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/PageOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/PivotOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/ScrollViewer.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/SegmentedOverride.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/SettingsStyle.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Thickness.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/TransitionCollection.xaml"/>

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

@@ -1,10 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.Control.AutoSuggestBox;

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

@@ -168,6 +168,7 @@ internal abstract partial class CompositionImage : Microsoft.UI.Xaml.Controls.Co
             if (surface.DecodedPhysicalSize.Size() <= 0D)
             {
                 await Task.WhenAny(surfaceLoadTaskCompletionSource.Task, Task.Delay(5000, token)).ConfigureAwait(true);
+                await Task.Delay(50, token).ConfigureAwait(true);
             }
 
             LoadImageSurfaceCompleted(surface);

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

@@ -1,11 +1,12 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
 using System.Data;
+using System.Runtime.InteropServices;
 using Windows.Foundation;
 
-namespace Snap.Hutao.Control.Segmented;
+namespace Snap.Hutao.Control.Panel;
 
 [DependencyProperty("Spacing", typeof(double), default(double), nameof(OnSpacingChanged))]
 internal partial class EqualPanel : Microsoft.UI.Xaml.Controls.Panel
@@ -24,10 +25,10 @@ internal partial class EqualPanel : Microsoft.UI.Xaml.Controls.Panel
         maxItemWidth = 0;
         maxItemHeight = 0;
 
-        IEnumerable<UIElement> elements = Children.Where(static e => e.Visibility == Visibility.Visible);
-        visibleItemsCount = elements.Count();
+        List<UIElement> elements = [.. Children.Where(element => element.Visibility == Visibility.Visible)];
+        visibleItemsCount = elements.Count;
 
-        foreach (UIElement child in elements)
+        foreach (ref readonly UIElement child in CollectionsMarshal.AsSpan(elements))
         {
             child.Measure(availableSize);
             maxItemWidth = Math.Max(maxItemWidth, child.DesiredSize.Width);
@@ -38,7 +39,7 @@ internal partial class EqualPanel : Microsoft.UI.Xaml.Controls.Panel
         {
             // Return equal widths based on the widest item
             // In very specific edge cases the AvailableWidth might be infinite resulting in a crash.
-            if (HorizontalAlignment != HorizontalAlignment.Stretch || double.IsInfinity(availableSize.Width))
+            if (HorizontalAlignment is not HorizontalAlignment.Stretch || double.IsInfinity(availableSize.Width))
             {
                 return new Size((maxItemWidth * visibleItemsCount) + (Spacing * (visibleItemsCount - 1)), maxItemHeight);
             }
@@ -78,12 +79,11 @@ internal partial class EqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        EqualPanel panel = (EqualPanel)d;
-        panel.InvalidateMeasure();
+        (d as EqualPanel)?.InvalidateMeasure();
     }
 
     private void OnHorizontalAlignmentChanged(DependencyObject sender, DependencyProperty dp)
     {
         InvalidateMeasure();
     }
-}
+}

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

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

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

@@ -1,21 +1,21 @@
-<shcs:Segmented
+<cwc:Segmented
     x:Class="Snap.Hutao.Control.Panel.PanelSelector"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    xmlns:shcs="using:Snap.Hutao.Control.Segmented"
     Style="{StaticResource DefaultSegmentedStyle}"
     mc:Ignorable="d">
 
-    <shcs:SegmentedItem
+    <cwc:SegmentedItem
         Icon="{shcm:FontIcon Glyph={StaticResource FontIconContentBulletedList}}"
         Tag="List"
         ToolTipService.ToolTip="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownListName}"/>
-    <shcs:SegmentedItem
+    <cwc:SegmentedItem
         Icon="{shcm:FontIcon Glyph={StaticResource FontIconContentGridView}}"
         Tag="Grid"
         ToolTipService.ToolTip="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownGridName}"/>
 
-</shcs:Segmented>
+</cwc:Segmented>

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

@@ -1,8 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Segmented;
 using Snap.Hutao.Core.Setting;
 using System.Collections.Frozen;
 
@@ -15,7 +15,7 @@ namespace Snap.Hutao.Control.Panel;
 [DependencyProperty("Current", typeof(string), List)]
 [DependencyProperty("LocalSettingKeySuffixForCurrent", typeof(string))]
 [DependencyProperty("LocalSettingKeyExtraForCurrent", typeof(string), "")]
-internal sealed partial class PanelSelector : Segmented.Segmented
+internal sealed partial class PanelSelector : Segmented
 {
     public const string List = nameof(List);
     public const string Grid = nameof(Grid);

src/Snap.Hutao/Snap.Hutao/Control/Segmented/Segmented.cs

@@ -1,127 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-using Windows.System;
-
-namespace Snap.Hutao.Control.Segmented;
-
-internal partial class Segmented : ListViewBase
-{
-    private int correctSelectedIndex = -1;
-
-    public Segmented()
-    {
-        DefaultStyleKey = typeof(Segmented);
-
-        RegisterPropertyChangedCallback(SelectedIndexProperty, OnSelectedIndexChanged);
-    }
-
-    protected override DependencyObject GetContainerForItemOverride() => new SegmentedItem();
-
-    protected override bool IsItemItsOwnContainerOverride(object item)
-    {
-        return item is SegmentedItem;
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-        if (!IsLoaded)
-        {
-            SelectedIndex = correctSelectedIndex;
-        }
-
-        PreviewKeyDown -= OnPreviewKeyDown;
-        PreviewKeyDown += OnPreviewKeyDown;
-    }
-
-    protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
-    {
-        base.PrepareContainerForItemOverride(element, item);
-        if (element is SegmentedItem segmentedItem)
-        {
-            segmentedItem.Loaded += OnLoaded;
-        }
-    }
-
-    protected override void OnItemsChanged(object e)
-    {
-        base.OnItemsChanged(e);
-    }
-
-    private void OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
-    {
-        switch (e.Key)
-        {
-            case VirtualKey.Left:
-                e.Handled = MoveFocus(true);
-                break;
-            case VirtualKey.Right:
-                e.Handled = MoveFocus(false);
-                break;
-        }
-    }
-
-    private void OnLoaded(object sender, RoutedEventArgs e)
-    {
-        if (sender is SegmentedItem segmentedItem)
-        {
-            segmentedItem.Loaded -= OnLoaded;
-        }
-    }
-
-    private bool MoveFocus(bool reverse)
-    {
-        SegmentedItem? currentContainerItem = GetCurrentContainerItem();
-
-        if (currentContainerItem is null)
-        {
-            return false;
-        }
-
-        int previousIndex = Items.IndexOf(ItemFromContainer(currentContainerItem));
-
-        if (reverse)
-        {
-            if (previousIndex > 0 && ContainerFromIndex(previousIndex - 1) is SegmentedItem newItem)
-            {
-                newItem.Focus(FocusState.Keyboard);
-                return true;
-            }
-        }
-        else
-        {
-            if (previousIndex < Items.Count - 1 && ContainerFromIndex(previousIndex + 1) is SegmentedItem newItem)
-            {
-                newItem.Focus(FocusState.Keyboard);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private SegmentedItem? GetCurrentContainerItem()
-    {
-        if (XamlRoot is not null)
-        {
-            return (SegmentedItem)FocusManager.GetFocusedElement(XamlRoot);
-        }
-        else
-        {
-            return (SegmentedItem)FocusManager.GetFocusedElement();
-        }
-    }
-
-    private void OnSelectedIndexChanged(DependencyObject sender, DependencyProperty dp)
-    {
-        // https://github.com/microsoft/microsoft-ui-xaml/issues/8257
-        if (correctSelectedIndex == -1 && SelectedIndex > -1)
-        {
-            correctSelectedIndex = SelectedIndex;
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Segmented/SegmentedItem.cs

@@ -1,62 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.Control.Segmented;
-
-[DependencyProperty("Icon", typeof(IconElement), null, nameof(OnIconPropertyChanged))]
-internal partial class SegmentedItem : ListViewItem
-{
-    private const string IconLeftState = "IconLeft";
-    private const string IconOnlyState = "IconOnly";
-    private const string ContentOnlyState = "ContentOnly";
-
-    public SegmentedItem()
-    {
-        DefaultStyleKey = typeof(SegmentedItem);
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-        OnIconChanged();
-        ContentChanged();
-    }
-
-    protected override void OnContentChanged(object oldContent, object newContent)
-    {
-        base.OnContentChanged(oldContent, newContent);
-        ContentChanged();
-    }
-
-    private static void OnIconPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        ((SegmentedItem)d).OnIconChanged();
-    }
-
-    private void ContentChanged()
-    {
-        if (Content is not null)
-        {
-            VisualStateManager.GoToState(this, IconLeftState, true);
-        }
-        else
-        {
-            VisualStateManager.GoToState(this, IconOnlyState, true);
-        }
-    }
-
-    private void OnIconChanged()
-    {
-        if (Icon is not null)
-        {
-            VisualStateManager.GoToState(this, IconLeftState, true);
-        }
-        else
-        {
-            VisualStateManager.GoToState(this, ContentOnlyState, true);
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Segmented/SegmentedItem.xaml

@@ -1,875 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:shcs="using:Snap.Hutao.Control.Segmented"
-    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <!--  Background  -->
-            <StaticResource x:Key="SegmentedItemBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundSelected" ResourceKey="ControlFillColorDefaultBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush"/>
-
-            <!--  BorderBrush  -->
-            <StaticResource x:Key="SegmentedItemBorderBrush" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushSelected" ResourceKey="ControlElevationBorderBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushDisabled" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-            <!--  Foreground  -->
-            <StaticResource x:Key="SegmentedItemForeground" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
-
-            <!--  Pill  -->
-            <StaticResource x:Key="SegmentedPillBackground" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush"/>
-
-            <Thickness x:Key="SegmentedItemBorderThickness">1</Thickness>
-            <x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double>
-
-            <!--  PillSegmentedStyle  -->
-            <!--  Background  -->
-            <StaticResource x:Key="PivotItemBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundPointerOver" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundSelected" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundPressed" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundDisabled" ResourceKey="ControlFillColorTransparentBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="PivotItemForeground" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundPressed" ResourceKey="TextFillColorTertiaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
-
-            <!--  Pill  -->
-            <StaticResource x:Key="PivotItemPillBackground" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundDisabled" ResourceKey="AccentFillColorDefaultBrush"/>
-
-            <!--  ButtonSegmentedStyle  -->
-            <!--  Background  -->
-            <StaticResource x:Key="ButtonItemBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundPressed" ResourceKey="SubtleFillColorTertiary"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelected" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelectedPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelectedPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundDisabled" ResourceKey="ControlFillColorTransparentBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="ButtonItemForeground" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelected" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelectedPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelectedPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Light">
-            <!--  Background  -->
-            <StaticResource x:Key="SegmentedItemBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundSelected" ResourceKey="ControlFillColorDefaultBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush"/>
-
-            <!--  BorderBrush  -->
-            <StaticResource x:Key="SegmentedItemBorderBrush" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushSelected" ResourceKey="ControlElevationBorderBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushDisabled" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="SegmentedItemForeground" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
-
-            <!--  Pill  -->
-            <StaticResource x:Key="SegmentedPillBackground" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush"/>
-
-            <Thickness x:Key="SegmentedItemBorderThickness">1</Thickness>
-            <x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double>
-
-            <!--  PillSegmentedStyle  -->
-            <!--  Background  -->
-            <StaticResource x:Key="PivotItemBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundPointerOver" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundSelected" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundPressed" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="PivotItemBackgroundDisabled" ResourceKey="ControlFillColorTransparentBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="PivotItemForeground" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundPressed" ResourceKey="TextFillColorTertiaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="PivotItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
-
-            <!--  Pill  -->
-            <StaticResource x:Key="PivotItemPillBackground" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundDisabled" ResourceKey="AccentFillColorDefaultBrush"/>
-
-            <!--  ButtonSegmentedStyle  -->
-            <!--  Background  -->
-            <StaticResource x:Key="ButtonItemBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundPressed" ResourceKey="SubtleFillColorTertiary"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelected" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelectedPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelectedPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundDisabled" ResourceKey="ControlFillColorTransparentBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="ButtonItemForeground" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelected" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelectedPointerOver" ResourceKey="TextOnAccentFillColorPrimaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelectedPressed" ResourceKey="TextOnAccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush"/>
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="HighContrast">
-            <!--  Background  -->
-            <StaticResource x:Key="SegmentedItemBackground" ResourceKey="SystemColorButtonFaceColor"/>
-            <StaticResource x:Key="SegmentedItemBackgroundPointerOver" ResourceKey="SystemColorHighlightColor"/>
-            <StaticResource x:Key="SegmentedItemBackgroundSelected" ResourceKey="SystemColorHighlightColor"/>
-            <StaticResource x:Key="SegmentedItemBackgroundPressed" ResourceKey="SystemColorHighlightColor"/>
-            <StaticResource x:Key="SegmentedItemBackgroundDisabled" ResourceKey="SystemControlTransparentBrush"/>
-
-            <!--  BorderBrush  -->
-            <StaticResource x:Key="SegmentedItemBorderBrush" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushPointerOver" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushSelected" ResourceKey="ControlElevationBorderBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushPressed" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedItemBorderBrushDisabled" ResourceKey="ControlAltFillColorSecondaryBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="SegmentedItemForeground" ResourceKey="SystemColorButtonTextColor"/>
-            <StaticResource x:Key="SegmentedItemForegroundPointerOver" ResourceKey="SystemColorHighlightTextColor"/>
-            <StaticResource x:Key="SegmentedItemForegroundSelected" ResourceKey="SystemColorHighlightTextColor"/>
-            <StaticResource x:Key="SegmentedItemForegroundPressed" ResourceKey="SystemColorHighlightTextColor"/>
-            <StaticResource x:Key="SegmentedItemForegroundDisabled" ResourceKey="SystemColorGrayTextColor"/>
-
-            <!--  Pill  -->
-            <StaticResource x:Key="SegmentedPillBackground" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="SegmentedPillBackgroundDisabled" ResourceKey="AccentFillColorDisabledBrush"/>
-
-            <Thickness x:Key="SegmentedItemBorderThickness">1</Thickness>
-            <x:Double x:Key="SegmentedItemDisabledOpacity">0.55</x:Double>
-
-            <!--  PillSegmentedStyle  -->
-            <!--  Background  -->
-            <StaticResource x:Key="PivotItemBackground" ResourceKey="SystemColorButtonFaceColor"/>
-            <StaticResource x:Key="PivotItemBackgroundPointerOver" ResourceKey="SystemColorHighlightColor"/>
-            <StaticResource x:Key="PivotItemBackgroundSelected" ResourceKey="SystemColorHighlightColor"/>
-            <StaticResource x:Key="PivotItemBackgroundPressed" ResourceKey="SystemColorHighlightColor"/>
-            <StaticResource x:Key="PivotItemBackgroundDisabled" ResourceKey="SystemColorButtonTextColor"/>
-
-            <!--  Pill  -->
-            <StaticResource x:Key="PivotItemPillBackground" ResourceKey="AccentFillColorDefaultBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundPointerOver" ResourceKey="AccentFillColorSecondaryBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundPressed" ResourceKey="AccentFillColorTertiaryBrush"/>
-            <StaticResource x:Key="PivotItemPillBackgroundDisabled" ResourceKey="AccentFillColorDefaultBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="PivotItemForeground" ResourceKey="SystemColorButtonTextColor"/>
-            <StaticResource x:Key="PivotItemForegroundPointerOver" ResourceKey="SystemColorHighlightTextColor"/>
-            <StaticResource x:Key="PivotItemForegroundSelected" ResourceKey="SystemColorHighlightTextColor"/>
-            <StaticResource x:Key="PivotItemForegroundPressed" ResourceKey="SystemColorHighlightTextColor"/>
-            <StaticResource x:Key="PivotItemForegroundDisabled" ResourceKey="SystemColorGrayTextColor"/>
-
-            <!--  ButtonSegmentedStyle  -->
-            <!--  Background  -->
-            <StaticResource x:Key="ButtonItemBackground" ResourceKey="ControlFillColorTransparentBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelected" ResourceKey="SystemControlHighlightAccentBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelectedPointerOver" ResourceKey="SystemColorButtonTextColorBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundSelectedPressed" ResourceKey="SystemColorHighlightTextColorBrush"/>
-            <StaticResource x:Key="ButtonItemBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush"/>
-
-            <!--  Foreground  -->
-            <StaticResource x:Key="ButtonItemForeground" ResourceKey="SystemColorButtonTextColorBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelected" ResourceKey="SystemControlHighlightAltChromeWhiteBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelectedPointerOver" ResourceKey="SystemColorButtonFaceColorBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundSelectedPressed" ResourceKey="SystemColorHighlightColorBrush"/>
-            <StaticResource x:Key="ButtonItemForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush"/>
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-
-    <x:String x:Key="SegmentedItemScaleAnimationDuration">00:00:00.167</x:String>
-
-    <Style BasedOn="{StaticResource DefaultSegmentedItemStyle}" TargetType="shcs:SegmentedItem"/>
-
-    <shcs:SegmentedMarginConverter
-        x:Name="MarginConverter"
-        LeftItemMargin="{StaticResource LeftItemHoverMargin}"
-        MiddleItemMargin="{StaticResource MiddleItemHoverMargin}"
-        RightItemMargin="{StaticResource RightItemHoverMargin}"/>
-
-    <Thickness x:Key="LeftItemHoverMargin">3, 3, 1, 3</Thickness>
-    <Thickness x:Key="MiddleItemHoverMargin">1, 3, 1, 3</Thickness>
-    <Thickness x:Key="RightItemHoverMargin">1, 3, 3, 3</Thickness>
-    <Thickness x:Key="ButtonItemPadding">11</Thickness>
-    <Style x:Key="DefaultSegmentedItemStyle" TargetType="shcs:SegmentedItem">
-        <Style.Setters>
-            <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
-            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
-            <Setter Property="Background" Value="{ThemeResource SegmentedItemBackground}"/>
-            <Setter Property="BorderBrush" Value="{ThemeResource SegmentedItemBorderBrush}"/>
-            <Setter Property="BorderThickness" Value="{ThemeResource SegmentedItemBorderThickness}"/>
-            <Setter Property="Foreground" Value="{ThemeResource SegmentedItemForeground}"/>
-            <Setter Property="FontWeight" Value="Normal"/>
-            <Setter Property="TabNavigation" Value="Local"/>
-            <Setter Property="UseSystemFocusVisuals" Value="True"/>
-            <Setter Property="FocusVisualMargin" Value="-3"/>
-            <Setter Property="BackgroundSizing" Value="InnerBorderEdge"/>
-            <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
-            <Setter Property="VerticalAlignment" Value="Stretch"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="shcs:SegmentedItem">
-                        <Grid
-                            x:Name="PART_Root"
-                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Control.IsTemplateFocusTarget="True"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-                            <win:Grid.BackgroundTransition>
-                                <win:BrushTransition Duration="0:0:0.083"/>
-                            </win:Grid.BackgroundTransition>
-
-                            <Border
-                                x:Name="PART_Hover"
-                                Margin="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource MarginConverter}}"
-                                Background="Transparent"
-                                CornerRadius="2"
-                                RenderTransformOrigin="0.5, 0.5">
-                                <win:Border.BackgroundTransition>
-                                    <win:BrushTransition Duration="0:0:0.083"/>
-                                </win:Border.BackgroundTransition>
-                                <Border.RenderTransform>
-                                    <CompositeTransform/>
-                                </Border.RenderTransform>
-                            </Border>
-
-                            <!--  Content  -->
-                            <Grid
-                                x:Name="ContentHolder"
-                                Margin="11,0,11,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Stretch"
-                                ColumnSpacing="8">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Viewbox
-                                    x:Name="PART_IconBox"
-                                    Width="16"
-                                    Margin="0,7,0,7"
-                                    VerticalAlignment="Center">
-                                    <ContentPresenter
-                                        x:Name="PART_IconPresenter"
-                                        win:HighContrastAdjustment="None"
-                                        Content="{TemplateBinding Icon}"
-                                        Foreground="{TemplateBinding Foreground}"/>
-                                </Viewbox>
-
-                                <ContentPresenter
-                                    x:Name="PART_ContentPresenter"
-                                    Grid.Column="1"
-                                    Margin="0,5,0,6"
-                                    VerticalAlignment="Center"
-                                    win:HighContrastAdjustment="None"
-                                    win:OpticalMarginAlignment="TrimSideBearings"
-                                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTransitions="{TemplateBinding ContentTransitions}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    Foreground="{TemplateBinding Foreground}"/>
-                                <Rectangle
-                                    x:Name="PART_Pill"
-                                    Grid.Column="1"
-                                    Width="4"
-                                    Height="3"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Bottom"
-                                    Fill="{ThemeResource SegmentedPillBackground}"
-                                    Opacity="0"
-                                    RadiusX="0.5"
-                                    RadiusY="1"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                    <Rectangle.RenderTransform>
-                                        <CompositeTransform x:Name="PillTransform" ScaleX="1"/>
-                                    </Rectangle.RenderTransform>
-                                </Rectangle>
-                            </Grid>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="SegmentedIconPositionStates">
-                                    <VisualState x:Name="IconOnLeft"/>
-                                    <VisualState x:Name="IconOnly">
-                                        <VisualState.Setters>
-                                            <Setter Target="PART_ContentPresenter.Visibility" Value="Collapsed"/>
-                                            <Setter Target="PART_Pill.(Grid.Column)" Value="0"/>
-                                            <Setter Target="ContentHolder.ColumnSpacing" Value="0"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="ContentOnly">
-                                        <VisualState.Setters>
-                                            <Setter Target="PART_IconBox.Visibility" Value="Collapsed"/>
-                                            <Setter Target="ContentHolder.ColumnSpacing" Value="0"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                </VisualStateGroup>
-
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal"/>
-                                    <VisualState x:Name="PointerOver">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Hover" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBackgroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Pressed">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Hover" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="0.96"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Hover" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleY)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="0.96"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Hover" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBackgroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Selected">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="4"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Opacity">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="1"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedPillBackground}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBackgroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBorderBrushSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PointerOverSelected">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="4"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Opacity">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="1"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedPillBackgroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBackgroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBorderBrushSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PressedSelected">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="2"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Opacity">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="1"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedPillBackgroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBackgroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="BorderBrush">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemBorderBrushSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SegmentedItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="DisabledStates">
-                                    <VisualState x:Name="Enabled"/>
-                                    <VisualState x:Name="Disabled">
-                                        <Storyboard>
-                                            <DoubleAnimation
-                                                Storyboard.TargetName="PART_Root"
-                                                Storyboard.TargetProperty="Opacity"
-                                                To="{ThemeResource SegmentedItemDisabledOpacity}"
-                                                Duration="0:0:0.083"/>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <Style
-        x:Key="PivotSegmentedItemStyle"
-        BasedOn="{StaticResource DefaultSegmentedItemStyle}"
-        TargetType="shcs:SegmentedItem">
-        <Style.Setters>
-            <Setter Property="Background" Value="{ThemeResource PivotItemBackground}"/>
-            <Setter Property="Foreground" Value="{ThemeResource PivotItemForeground}"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="shcs:SegmentedItem">
-                        <Grid
-                            x:Name="PART_Root"
-                            Background="{TemplateBinding Background}"
-                            Control.IsTemplateFocusTarget="True"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-                            <!--  Content  -->
-                            <Grid
-                                x:Name="ContentHolder"
-                                Margin="12,0,12,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Stretch"
-                                ColumnSpacing="8">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Viewbox
-                                    x:Name="PART_IconBox"
-                                    Width="16"
-                                    Margin="0,11,0,11"
-                                    VerticalAlignment="Center">
-                                    <ContentPresenter
-                                        x:Name="PART_IconPresenter"
-                                        win:HighContrastAdjustment="None"
-                                        Content="{TemplateBinding Icon}"
-                                        Foreground="{TemplateBinding Foreground}"/>
-                                </Viewbox>
-
-                                <ContentPresenter
-                                    x:Name="PART_ContentPresenter"
-                                    Grid.Column="1"
-                                    Margin="0,9,0,10"
-                                    VerticalAlignment="Center"
-                                    win:HighContrastAdjustment="None"
-                                    win:OpticalMarginAlignment="TrimSideBearings"
-                                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTransitions="{TemplateBinding ContentTransitions}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    Foreground="{TemplateBinding Foreground}"/>
-                                <Rectangle
-                                    x:Name="PART_Pill"
-                                    Grid.Column="1"
-                                    Width="4"
-                                    Height="3"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Bottom"
-                                    Fill="{ThemeResource PivotItemPillBackground}"
-                                    Opacity="0"
-                                    RadiusX="0.5"
-                                    RadiusY="1"
-                                    RenderTransformOrigin="0.5, 0.5">
-                                    <Rectangle.RenderTransform>
-                                        <CompositeTransform x:Name="PillTransform" ScaleX="1"/>
-                                    </Rectangle.RenderTransform>
-                                </Rectangle>
-                            </Grid>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="SegmentedIconPositionStates">
-                                    <VisualState x:Name="IconOnLeft"/>
-                                    <VisualState x:Name="IconOnly">
-                                        <VisualState.Setters>
-                                            <Setter Target="PART_ContentPresenter.Visibility" Value="Collapsed"/>
-                                            <Setter Target="PART_Pill.(Grid.Column)" Value="0"/>
-                                            <Setter Target="ContentHolder.ColumnSpacing" Value="0"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="ContentOnly">
-                                        <VisualState.Setters>
-                                            <Setter Target="PART_IconBox.Visibility" Value="Collapsed"/>
-                                            <Setter Target="ContentHolder.ColumnSpacing" Value="0"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                </VisualStateGroup>
-
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal"/>
-                                    <VisualState x:Name="PointerOver">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemBackgroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Pressed">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemBackgroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Selected">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="4"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Opacity">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="1"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemBackgroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PointerOverSelected">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="4"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Opacity">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="1"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemBackgroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PressedSelected">
-                                        <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.ScaleX)">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="2"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Pill" Storyboard.TargetProperty="Opacity">
-                                                <SplineDoubleKeyFrame
-                                                    KeySpline="0,0,0,1"
-                                                    KeyTime="{ThemeResource SegmentedItemScaleAnimationDuration}"
-                                                    Value="1"/>
-                                            </DoubleAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemBackgroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="DisabledStates">
-                                    <VisualState x:Name="Enabled"/>
-                                    <VisualState x:Name="Disabled">
-                                        <Storyboard>
-                                            <DoubleAnimation
-                                                Storyboard.TargetName="PART_Root"
-                                                Storyboard.TargetProperty="Opacity"
-                                                To="{ThemeResource SegmentedItemDisabledOpacity}"
-                                                Duration="0:0:0.083"/>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <Style
-        x:Key="ButtonSegmentedItemStyle"
-        BasedOn="{StaticResource DefaultSegmentedItemStyle}"
-        TargetType="shcs:SegmentedItem">
-        <Style.Setters>
-            <Setter Property="Background" Value="{ThemeResource ButtonItemBackground}"/>
-            <Setter Property="Foreground" Value="{ThemeResource ButtonItemForeground}"/>
-            <Setter Property="Padding" Value="{ThemeResource ButtonItemPadding}"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="shcs:SegmentedItem">
-                        <Grid
-                            x:Name="PART_Root"
-                            Background="{TemplateBinding Background}"
-                            BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                            Control.IsTemplateFocusTarget="True"
-                            CornerRadius="{TemplateBinding CornerRadius}">
-                            <win:Grid.BackgroundTransition>
-                                <win:BrushTransition Duration="0:0:0.083"/>
-                            </win:Grid.BackgroundTransition>
-
-                            <!--  Content  -->
-                            <Grid
-                                x:Name="ContentHolder"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Stretch"
-                                ColumnSpacing="8">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-                                <Viewbox
-                                    x:Name="PART_IconBox"
-                                    Width="16"
-                                    VerticalAlignment="Center">
-                                    <ContentPresenter
-                                        x:Name="PART_IconPresenter"
-                                        win:HighContrastAdjustment="None"
-                                        Content="{TemplateBinding Icon}"
-                                        Foreground="{TemplateBinding Foreground}"/>
-                                </Viewbox>
-
-                                <ContentPresenter
-                                    x:Name="PART_ContentPresenter"
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    win:HighContrastAdjustment="None"
-                                    win:OpticalMarginAlignment="TrimSideBearings"
-                                    BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTransitions="{TemplateBinding ContentTransitions}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    Foreground="{TemplateBinding Foreground}"/>
-                            </Grid>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="SegmentedIconPositionStates">
-                                    <VisualState x:Name="IconOnLeft"/>
-                                    <VisualState x:Name="IconOnly">
-                                        <VisualState.Setters>
-                                            <Setter Target="PART_ContentPresenter.Visibility" Value="Collapsed"/>
-                                            <Setter Target="ContentHolder.ColumnSpacing" Value="0"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="ContentOnly">
-                                        <VisualState.Setters>
-                                            <Setter Target="PART_IconBox.Visibility" Value="Collapsed"/>
-                                            <Setter Target="ContentHolder.ColumnSpacing" Value="0"/>
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                </VisualStateGroup>
-
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal"/>
-                                    <VisualState x:Name="PointerOver">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemBackgroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Pressed">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemBackgroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Selected">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemBackgroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundSelected}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PointerOverSelected">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemBackgroundSelectedPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundSelectedPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundSelectedPointerOver}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="PressedSelected">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Root" Storyboard.TargetProperty="Background">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemBackgroundSelectedPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundSelectedPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_IconPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonItemForegroundSelectedPressed}"/>
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="DisabledStates">
-                                    <VisualState x:Name="Enabled"/>
-                                    <VisualState x:Name="Disabled">
-                                        <Storyboard>
-                                            <DoubleAnimation
-                                                Storyboard.TargetName="PART_Root"
-                                                Storyboard.TargetProperty="Opacity"
-                                                To="{ThemeResource SegmentedItemDisabledOpacity}"
-                                                Duration="0:0:0.083"/>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-</ResourceDictionary>
-

src/Snap.Hutao/Snap.Hutao/Control/Segmented/SegmentedMarginConverter.cs

@@ -1,40 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Data;
-
-namespace Snap.Hutao.Control.Segmented;
-
-[DependencyProperty("LeftItemMargin", typeof(Thickness))]
-[DependencyProperty("MiddleItemMargin", typeof(Thickness))]
-[DependencyProperty("RightItemMargin", typeof(Thickness))]
-internal partial class SegmentedMarginConverter : DependencyObject, IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        SegmentedItem segmentedItem = (SegmentedItem)value;
-        ItemsControl listView = ItemsControl.ItemsControlFromItemContainer(segmentedItem);
-
-        int index = listView.IndexFromContainer(segmentedItem);
-
-        if (index == 0)
-        {
-            return LeftItemMargin;
-        }
-        else if (index == listView.Items.Count - 1)
-        {
-            return RightItemMargin;
-        }
-        else
-        {
-            return MiddleItemMargin;
-        }
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        return value;
-    }
-}

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

@@ -4,21 +4,19 @@
     xmlns:cwm="using:CommunityToolkit.WinUI.Media">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
-            <cwm:AttachedCardShadow
-                x:Key="CompatCardShadow"
-                BlurRadius="8"
-                Opacity="0.14"
-                Offset="0,4,0"/>
+            <x:Double x:Key="CompatShadowThemeOpacity">0.14</x:Double>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
-            <cwm:AttachedCardShadow
-                x:Key="CompatCardShadow"
-                BlurRadius="8"
-                Opacity="0.28"
-                Offset="0,4,0"/>
+            <x:Double x:Key="CompatShadowThemeOpacity">0.28</x:Double>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <cwm:AttachedCardShadow
+        x:Key="CompatCardShadow"
+        BlurRadius="8"
+        Opacity="{ThemeResource CompatShadowThemeOpacity}"
+        Offset="0,4,0"/>
+
     <Style x:Key="BorderCardStyle" TargetType="Border">
         <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
         <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>

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

@@ -8,6 +8,9 @@
     <ItemsPanelTemplate x:Key="WrapPanelSpacing0Template">
         <cwcont:WrapPanel/>
     </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="WrapPanelSpacing2Template">
+        <cwcont:WrapPanel HorizontalSpacing="2" VerticalSpacing="2"/>
+    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="WrapPanelSpacing4Template">
         <cwcont:WrapPanel HorizontalSpacing="4" VerticalSpacing="4"/>
     </ItemsPanelTemplate>

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

@@ -1,12 +1,13 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cw="using:CommunityToolkit.WinUI"
-    xmlns:shcs="using:Snap.Hutao.Control.Segmented"
+    xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
+    xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Control/Segmented/SegmentedItem.xaml"/>
+        <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/SegmentedItem/SegmentedItem.xaml"/>
     </ResourceDictionary.MergedDictionaries>
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
@@ -29,9 +30,9 @@
     <x:Double x:Key="SegmentedItemSpacing">1</x:Double>
     <x:Double x:Key="ButtonItemSpacing">2</x:Double>
 
-    <Style BasedOn="{StaticResource DefaultSegmentedStyle}" TargetType="shcs:Segmented"/>
+    <Style BasedOn="{StaticResource DefaultSegmentedStyle}" TargetType="cwc:Segmented"/>
 
-    <Style x:Key="DefaultSegmentedStyle" TargetType="shcs:Segmented">
+    <Style x:Key="DefaultSegmentedStyle" TargetType="cwc:Segmented">
         <Style.Setters>
             <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
             <Setter Property="Background" Value="{ThemeResource SegmentedBackground}"/>
@@ -47,16 +48,16 @@
             <Setter Property="ItemsPanel">
                 <Setter.Value>
                     <ItemsPanelTemplate>
-                        <shcs:EqualPanel
+                        <shcp:EqualPanel
                             HorizontalAlignment="{Binding (cw:FrameworkElementExtensions.Ancestor).HorizontalAlignment, RelativeSource={RelativeSource Self}}"
-                            cw:FrameworkElementExtensions.AncestorType="shcs:Segmented"
+                            cw:FrameworkElementExtensions.AncestorType="cwc:Segmented"
                             Spacing="{ThemeResource SegmentedItemSpacing}"/>
                     </ItemsPanelTemplate>
                 </Setter.Value>
             </Setter>
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="shcs:Segmented">
+                    <ControlTemplate TargetType="cwc:Segmented">
                         <Grid>
                             <Border
                                 VerticalAlignment="Stretch"
@@ -75,7 +76,7 @@
     <Style
         x:Key="PivotSegmentedStyle"
         BasedOn="{StaticResource DefaultSegmentedStyle}"
-        TargetType="shcs:Segmented">
+        TargetType="cwc:Segmented">
         <Style.Setters>
             <Setter Property="Background" Value="Transparent"/>
             <Setter Property="BorderBrush" Value="Transparent"/>
@@ -95,7 +96,7 @@
     <Style
         x:Key="ButtonSegmentedStyle"
         BasedOn="{StaticResource DefaultSegmentedStyle}"
-        TargetType="shcs:Segmented">
+        TargetType="cwc:Segmented">
         <Style.Setters>
             <Setter Property="Background" Value="Transparent"/>
             <Setter Property="BorderBrush" Value="Transparent"/>
@@ -111,4 +112,4 @@
             </Setter>
         </Style.Setters>
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

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

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

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

@@ -1,8 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using System.Numerics;
-
 namespace Snap.Hutao.Core.ExceptionService;
 
 internal sealed class HutaoException : Exception
@@ -34,6 +32,14 @@ internal sealed class HutaoException : Exception
         }
     }
 
+    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
+    {
+        if (!condition)
+        {
+            throw new HutaoException(kind, message, innerException);
+        }
+    }
+
     public static HutaoException ServiceTypeCastFailed<TFrom, TTo>(string name, Exception? innerException = default)
     {
         string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";

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

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

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

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

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

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

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

@@ -41,21 +41,18 @@ internal readonly struct WindowOptions
     /// </summary>
     public readonly bool PersistSize;
 
-    public readonly bool UseSystemBackdrop;
-
     /// <summary>
     /// 是否使用 Win UI 3 自带的拓展标题栏实现
     /// </summary>
     public readonly bool UseLegacyDragBarImplementation = !AppWindowTitleBar.IsCustomizationSupported();
 
-    public WindowOptions(Window window, FrameworkElement titleBar, SizeInt32 initSize, bool persistSize = false, bool useSystemBackdrop = true)
+    public WindowOptions(Window window, FrameworkElement titleBar, SizeInt32 initSize, bool persistSize = false)
     {
         Hwnd = WindowNative.GetWindowHandle(window);
         InputNonClientPointerSource = InputNonClientPointerSource.GetForWindowId(window.AppWindow.Id);
         TitleBar = titleBar;
         InitSize = initSize;
         PersistSize = persistSize;
-        UseSystemBackdrop = useSystemBackdrop;
     }
 
     /// <summary>

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

@@ -13,6 +13,7 @@ internal sealed partial class SettingEntry
     public const string Culture = "Culture";
 
     public const string SystemBackdropType = "SystemBackdropType";
+    public const string ElementTheme = "ElementTheme";
     public const string BackgroundImageType = "BackgroundImageType";
 
     public const string AnnouncementRegion = "AnnouncementRegion";

src/Snap.Hutao/Snap.Hutao/Model/InterChange/GachaLog/UIGF.cs

@@ -17,7 +17,7 @@ internal sealed class UIGF : IJsonOnSerializing, IJsonOnDeserialized
     /// <summary>
     /// 当前版本
     /// </summary>
-    public const string CurrentVersion = "v2.4";
+    public const string CurrentVersion = "v3.0";
 
     /// <summary>
     /// 信息
@@ -61,6 +61,7 @@ internal sealed class UIGF : IJsonOnSerializing, IJsonOnDeserialized
             "v2.2" => UIGFVersion.Major2Minor2OrLower,
             "v2.3" => UIGFVersion.Major2Minor3OrHigher,
             "v2.4" => UIGFVersion.Major2Minor3OrHigher,
+            "v3.0" => UIGFVersion.Major2Minor3OrHigher,
             _ => UIGFVersion.NotSupported,
         };
 

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Achievement/Reward.cs

@@ -1,8 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Primitive;
-
 namespace Snap.Hutao.Model.Metadata.Achievement;
 
 /// <summary>

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Furniture/FurnitureMake.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Primitive;
 
 namespace Snap.Hutao.Model.Metadata.Furniture;

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Furniture/FurnitureSuite.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Primitive;
 
 namespace Snap.Hutao.Model.Metadata.Furniture;

src/Snap.Hutao/Snap.Hutao/Model/Metadata/IdCount.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Primitive;
 
 namespace Snap.Hutao.Model.Metadata;

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

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

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

@@ -13,7 +13,7 @@
   <Identity
     Name="60568DGPStudio.SnapHutaoDev"
     Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.9.7.0" />
+    Version="1.9.8.0" />
 
   <Properties>
     <DisplayName>Snap Hutao Dev</DisplayName>

src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Snap.Hutao": {
       "commandName": "MsixPackage",
-      "nativeDebugging": true,
+      "nativeDebugging": false,
       "doNotLaunchApp": false,
       "allowLocalNetworkLoopbackProperty": true
     },

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

@@ -186,6 +186,18 @@
   <data name="CoreWebView2HelperVersionUndetected" xml:space="preserve">
     <value>No WebView2 Runtime detected</value>
   </data>
+  <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
+    <value>Register [{0}] hotkey [{1}] failed</value>
+  </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>Dark</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>Light</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>System</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>Export</value>
   </data>
@@ -857,6 +869,9 @@
   <data name="ServiceGachaLogFactoryAvatarWishName" xml:space="preserve">
     <value>Character Event Wish</value>
   </data>
+  <data name="ServiceGachaLogFactoryChronicledWishName" xml:space="preserve">
+    <value>Chronicled Wish</value>
+  </data>
   <data name="ServiceGachaLogFactoryPermanentWishName" xml:space="preserve">
     <value>Wanderlust Invocation</value>
   </data>
@@ -2214,7 +2229,7 @@
     <value>Auto start Better GUI for automation tasks after game launched</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>Automated Tasks</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>General</value>
@@ -2232,7 +2247,7 @@
     <value>File</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>InterProcess</value>
+    <value>Process Linkage</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>Run the software on the selected monitor</value>
@@ -2253,7 +2268,7 @@
     <value>Try to start Starward after the game is started for game duration statistics</value>
   </data>
   <data name="ViewPageLaunchGamePlayTimeHeader" xml:space="preserve">
-    <value>Hours Played</value>
+    <value>Game Hours Record</value>
   </data>
   <data name="ViewPageLaunchGameProcessHeader" xml:space="preserve">
     <value>Progress</value>
@@ -2366,6 +2381,9 @@
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
     <value>Wallpaper Image</value>
   </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>Using local images as the background</value>
+  </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>Images cache are saved here</value>
   </data>
@@ -2621,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>Rate Snap Hutao</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>Change window theme</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>Theme</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>Contribute Translations</value>
   </data>
@@ -2630,6 +2654,12 @@
   <data name="ViewPageSettingWebview2Header" xml:space="preserve">
     <value>Webview2 Runtime</value>
   </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceDownHeader" xml:space="preserve">
+    <value>Second Half</value>
+  </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceUpHeader" xml:space="preserve">
+    <value>First Half</value>
+  </data>
   <data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
     <value>Artifact Set Combination</value>
   </data>
@@ -2736,7 +2766,7 @@
     <value>Character Appearance Rate = Character Appearance in this Floor (only count for 1 if repeated) / Total Number of Abyss Record of this Floor</value>
   </data>
   <data name="ViewSpiralAbyssAvatarUsageRankDescription" xml:space="preserve">
-    <value>Character Usage Rate = Character Appearance in this Floor (only count for 1 is repeated) / Number of Player who Own this Character</value>
+    <value>Character Usage Rate = Character Appearance in this Floor (only count for 1 if repeated) / Number of Player who Own this Character</value>
   </data>
   <data name="ViewSpiralAbyssBattleHeader" xml:space="preserve">
     <value>Battle Statistics</value>
@@ -3044,6 +3074,9 @@
   <data name="WebGachaConfigTypeAvatarEventWish2" xml:space="preserve">
     <value>Character Event Wish-2</value>
   </data>
+  <data name="WebGachaConfigTypeChronicledWish" xml:space="preserve">
+    <value>Chronicled Wish</value>
+  </data>
   <data name="WebGachaConfigTypeNoviceWish" xml:space="preserve">
     <value>Beginners' Wish</value>
   </data>

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

@@ -186,6 +186,18 @@
   <data name="CoreWebView2HelperVersionUndetected" xml:space="preserve">
     <value>WebView2 Runtime tidak terdeteksi.</value>
   </data>
+  <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
+    <value>[{0}] Hotkey [{1}] gagal terdaftar</value>
+  </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>浅色</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>跟随系统</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>Ekspor</value>
   </data>
@@ -199,19 +211,19 @@
     <value>Pilih akun untuk memulai</value>
   </data>
   <data name="MetadataSpecialNameMetaAvatarSexProInfoPronounBoyGirlD" xml:space="preserve">
-    <value>&lt;color=#1E90FF&gt;王子&lt;/color&gt;/&lt;color=#FFB6C1&gt;公主&lt;/color&gt;</value>
+    <value>&lt;color=#1E90FF&gt;Prince&lt;/color&gt;/&lt;color=#FFB6C1&gt;Princess&lt;/color&gt;</value>
   </data>
   <data name="MetadataSpecialNameMetaAvatarSexProInfoPronounBoyGirlFirst" xml:space="preserve">
-    <value>&lt;color=#1E90FF&gt;我&lt;/color&gt;/&lt;color=#FFB6C1&gt;我&lt;/color&gt;</value>
+    <value>&lt;color=#1E90FF&gt;I&lt;/color&gt;/&lt;color=#FFB6C1&gt;I&lt;/color&gt;</value>
   </data>
   <data name="MetadataSpecialNameNickname" xml:space="preserve">
     <value>Pengembara</value>
   </data>
   <data name="MetadataSpecialNamePlayerAvatarSexProInfoPronounHeShe" xml:space="preserve">
-    <value>&lt;color=#1E90FF&gt;他&lt;/color&gt;/&lt;color=#FFB6C1&gt;她&lt;/color&gt;</value>
+    <value>&lt;color=#1E90FF&gt;He&lt;/color&gt;/&lt;color=#FFB6C1&gt;She&lt;/color&gt;</value>
   </data>
   <data name="MetadataSpecialNameRealNameId1" xml:space="preserve">
-    <value>流浪者</value>
+    <value>Pengembara</value>
   </data>
   <data name="ModelBindingAvatarPropertyWeaponAffixFormat" xml:space="preserve">
     <value>Perbaiki {0}</value>
@@ -513,7 +525,7 @@
     <value>Gelombang 4: Gelombang akan muncul hanya setelah membunuh semua musuh di gelombang sebelumnya</value>
   </data>
   <data name="ModelMetadataTowerWaveTypeWave99999" xml:space="preserve">
-    <value>维持场上 4 个盗宝团怪物，击杀后立即替换，总数 12 个</value>
+    <value>Tetapkan 4 Perampok Harta Karun di lapangan, langsung muncul kembali setelah mati. Total 12.</value>
   </data>
   <data name="ModelNameValueDefaultDescription" xml:space="preserve">
     <value>Silakan perbarui data tampilan.</value>
@@ -768,19 +780,19 @@
     <value>Pameran Karakter: {0:MM-dd HH:mm}</value>
   </data>
   <data name="ServiceBackgroundImageTypeBing" xml:space="preserve">
-    <value>必应每日一图</value>
+    <value>Wallpaper Harian Bing</value>
   </data>
   <data name="ServiceBackgroundImageTypeDaily" xml:space="preserve">
-    <value>胡桃每日一图</value>
+    <value>Wallpaper Harian Hutao</value>
   </data>
   <data name="ServiceBackgroundImageTypeLauncher" xml:space="preserve">
-    <value>官方启动器壁纸</value>
+    <value>Wallpaper Resmi Peluncur Genshin</value>
   </data>
   <data name="ServiceBackgroundImageTypeLocalFolder" xml:space="preserve">
-    <value>本地随机图片</value>
+    <value>Gambar Acak Lokal</value>
   </data>
   <data name="ServiceBackgroundImageTypeNone" xml:space="preserve">
-    <value>无背景图片</value>
+    <value>Tanpa Gambar Latar</value>
   </data>
   <data name="ServiceCultivationProjectCurrentUserdataCourrpted" xml:space="preserve">
     <value>Gagal menyimpan status rencana pengembangan</value>
@@ -840,7 +852,7 @@
     <value>Parametric Transformer telah siap</value>
   </data>
   <data name="ServiceDiscordActivityElevationRequiredHint" xml:space="preserve">
-    <value>权限不足，将无法为您设置 Discord Activity 状态</value>
+    <value>Izin hilang, tidak dapat mengatur Aktivitas Discord Anda.</value>
   </data>
   <data name="ServiceDiscordGameActivityDetails" xml:space="preserve">
     <value>Menjelajahi di Teyvat</value>
@@ -857,6 +869,9 @@
   <data name="ServiceGachaLogFactoryAvatarWishName" xml:space="preserve">
     <value>Event Wish Karakter</value>
   </data>
+  <data name="ServiceGachaLogFactoryChronicledWishName" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="ServiceGachaLogFactoryPermanentWishName" xml:space="preserve">
     <value>Wanderlust Invocation</value>
   </data>
@@ -1224,10 +1239,10 @@
     <value>Catatan Realtime Webhook URL</value>
   </data>
   <data name="ViewDialogFeedbackEnableLoopbackContent" xml:space="preserve">
-    <value>解除限制后需要使用其他工具恢复限制</value>
+    <value>Anda memerlukan alat lain untuk mengembalikan loopback setelah dikecualikan</value>
   </data>
   <data name="ViewDialogFeedbackEnableLoopbackTitle" xml:space="preserve">
-    <value>是否解除 Loopback 限制</value>
+    <value>Konfirmasi untuk Mengonfigurasi Pengecualian Loopback</value>
   </data>
   <data name="ViewDialogGachaLogImportTitle" xml:space="preserve">
     <value>Mengimpor riwayat wish</value>
@@ -1410,7 +1425,7 @@
     <value>Game Launcher</value>
   </data>
   <data name="ViewListViewDragElevatedHint" xml:space="preserve">
-    <value>管理员模式下无法拖动排序</value>
+    <value>Tidak dapat mengurutkan dalam Mode Administrator</value>
   </data>
   <data name="ViewModelAchievementArchiveAdded" xml:space="preserve">
     <value>Arsip [{0}] berhasil ditambahkan</value>
@@ -1692,7 +1707,7 @@
     <value>Selesai</value>
   </data>
   <data name="ViewModelWelcomeDownloadSummaryContentTypeNotMatch" xml:space="preserve">
-    <value>响应内容不是有效的文件字节流</value>
+    <value>Stream respons tidak berisi tipe konten yang valid</value>
   </data>
   <data name="ViewModelWelcomeDownloadSummaryDefault" xml:space="preserve">
     <value>Mengantre</value>
@@ -1911,16 +1926,16 @@
     <value>Tautan Berguna</value>
   </data>
   <data name="ViewPageFeedbackCurrentProxyHeader" xml:space="preserve">
-    <value>当前代理</value>
+    <value>Proxy Saat ini</value>
   </data>
   <data name="ViewPageFeedbackCurrentProxyNoProxyDescription" xml:space="preserve">
-    <value>无代理</value>
+    <value>Tidak ada Proxy</value>
   </data>
   <data name="ViewPageFeedbackEnableLoopbackEnabledDescription" xml:space="preserve">
-    <value>已解除</value>
+    <value>Dikecualikan</value>
   </data>
   <data name="ViewPageFeedbackEnableLoopbackHeader" xml:space="preserve">
-    <value>解除 Loopback 限制</value>
+    <value>Konfigurasikan Pengecualian Loopback</value>
   </data>
   <data name="ViewPageFeedbackEngageWithUsDescription" xml:space="preserve">
     <value>Tetap berhubungan dengan kami</value>
@@ -2211,10 +2226,10 @@
     <value>Argumen Awalan</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIDescription" xml:space="preserve">
-    <value>在游戏启动后尝试启动并使用 Better GI 进行自动化任务</value>
+    <value>Mulai Otomatis Antarmuka Pengguna yang Lebih Baik untuk tugas otomatis setelah game diluncurkan</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>Umum</value>
@@ -2232,7 +2247,7 @@
     <value>Berkas</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>InterProcess</value>
+    <value>进程联动</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>Menjalankan perangkat lunak pada layar yang dipilih</value>
@@ -2358,13 +2373,16 @@
     <value>Backdrop Material</value>
   </data>
   <data name="ViewPageSettingBackgroundImageCopyrightHeader" xml:space="preserve">
-    <value>图片版权信息</value>
+    <value>Informasi Hak Cipta Gambar</value>
   </data>
   <data name="ViewPageSettingBackgroundImageDescription" xml:space="preserve">
-    <value>更改窗体的背景图片来源，重启胡桃以尽快生效</value>
+    <value>Ubah sumber gambar latar, restart Snap Hutao untuk menerapkan perubahan</value>
   </data>
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
-    <value>背景图片</value>
+    <value>Gambar Latar</value>
+  </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>当前背景为本地图片，如遇版权问题由用户个人负责</value>
   </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>Cache gambar disimpan di sini</value>
@@ -2373,7 +2391,7 @@
     <value>Berkas Cache</value>
   </data>
   <data name="ViewPageSettingCardHutaoPassportHeader" xml:space="preserve">
-    <value>胡桃通行证</value>
+    <value>Hutao Passport</value>
   </data>
   <data name="ViewPageSettingCopyDeviceIdAction" xml:space="preserve">
     <value>Salin</value>
@@ -2568,10 +2586,10 @@
     <value>Website Resmi</value>
   </data>
   <data name="ViewPageSettingOpenBackgroundImageFolderDescription" xml:space="preserve">
-    <value>自定义背景图片，支持 bmp / gif / ico / jpg / jpeg / png / tiff / webp 格式</value>
+    <value>Latar Belakang Kustom, format didukung bmp/gif/ico/jpg/jpeg/png/tiff/webp</value>
   </data>
   <data name="ViewPageSettingOpenBackgroundImageFolderHeader" xml:space="preserve">
-    <value>打开背景图片文件夹</value>
+    <value>Buka Berkas Latar Belakang</value>
   </data>
   <data name="ViewPageSettingResetAction" xml:space="preserve">
     <value>Reset</value>
@@ -2583,10 +2601,10 @@
     <value>Setel ulang Sumber Daya Gambar</value>
   </data>
   <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsDescription" xml:space="preserve">
-    <value>在启动游戏页面的进程部分加入解锁帧率限制选项</value>
+    <value>Tambahkan Opsi Batasan FPS di Bagian Proses Peluncur Permainan</value>
   </data>
   <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsHeader" xml:space="preserve">
-    <value>启动游戏-解锁帧率限制</value>
+    <value>Peluncur Permainan - Buka Limit FPS</value>
   </data>
   <data name="ViewPageSettingSetDataFolderDescription" xml:space="preserve">
     <value>Anda perlu memindahkan data di direktori secara manual, jika tidak, data pengguna baru akan dibuat.</value>
@@ -2621,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>Beri Rating untuk Snap Hutao</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>更改窗体的颜色主题</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>颜色主题</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>Kontribusi penerjemahan</value>
   </data>
@@ -2630,6 +2654,12 @@
   <data name="ViewPageSettingWebview2Header" xml:space="preserve">
     <value>Webview2 Runtime</value>
   </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceDownHeader" xml:space="preserve">
+    <value>下半</value>
+  </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceUpHeader" xml:space="preserve">
+    <value>上半</value>
+  </data>
   <data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
     <value>Kombinasi Set Artefak</value>
   </data>
@@ -2892,7 +2922,7 @@
     <value>〓Durasi Event〓.*?\d\.\d Tersedia selama versi ini</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓Durasi Event〓|Durasi Event Wish|【Ketersediaan DUrasi】).*?(\d\.\dSetelah pembaruan versi).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
+    <value>(?:〓Waktu Acara〓|Waktu Menginginkan|【Waktu Peluncuran】|〓Waktu Diskon〓).*?(\d\.\d Setelah Pembaruan Versi).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓Durasi Pemeliharaan Pembaruan.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
@@ -3044,6 +3074,9 @@
   <data name="WebGachaConfigTypeAvatarEventWish2" xml:space="preserve">
     <value>Event WIsh Karakter-2</value>
   </data>
+  <data name="WebGachaConfigTypeChronicledWish" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="WebGachaConfigTypeNoviceWish" xml:space="preserve">
     <value>Wish Pemula</value>
   </data>

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

@@ -186,6 +186,18 @@
   <data name="CoreWebView2HelperVersionUndetected" xml:space="preserve">
     <value>WebView2 ランタイムが検出されませんでした</value>
   </data>
+  <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
+    <value>[{0}] 热键 [{1}] 注册失败</value>
+  </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>浅色</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>跟随系统</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>エクスポート</value>
   </data>
@@ -857,6 +869,9 @@
   <data name="ServiceGachaLogFactoryAvatarWishName" xml:space="preserve">
     <value>イベント祈願・キャラクター</value>
   </data>
+  <data name="ServiceGachaLogFactoryChronicledWishName" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="ServiceGachaLogFactoryPermanentWishName" xml:space="preserve">
     <value>奔走世間</value>
   </data>
@@ -2214,7 +2229,7 @@
     <value>在游戏启动后尝试启动并使用 Better GI 进行自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>一般</value>
@@ -2232,7 +2247,7 @@
     <value>ファイル</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>インタープロセス</value>
+    <value>进程联动</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>指定したディスプレイで実行</value>
@@ -2366,6 +2381,9 @@
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
     <value>背景图片</value>
   </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>当前背景为本地图片，如遇版权问题由用户个人负责</value>
+  </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>イメージキャッシュはここに格納されます</value>
   </data>
@@ -2621,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>レビューや感想</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>更改窗体的颜色主题</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>颜色主题</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>和訳を提供</value>
   </data>
@@ -2630,6 +2654,12 @@
   <data name="ViewPageSettingWebview2Header" xml:space="preserve">
     <value>Webview2 ランタイム</value>
   </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceDownHeader" xml:space="preserve">
+    <value>下半</value>
+  </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceUpHeader" xml:space="preserve">
+    <value>上半</value>
+  </data>
   <data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
     <value>おすすめ聖遺物</value>
   </data>
@@ -2892,13 +2922,13 @@
     <value>〓イベント期間〓.*?\d\.\d当バージョン期間オープン</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓イベント期間〓|祈願期間|【開始日時】).*?(\d\.\dバージョンアップ完了後).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
+    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
-    <value>〓更新日時〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
+    <value>〓メンテナンス時間〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTitle" xml:space="preserve">
-    <value>Ver.\d\.\d 更新内容</value>
+    <value>Ver.\d\.\d.+正式リリース</value>
   </data>
   <data name="WebAnnouncementTimeDaysBeginFormat" xml:space="preserve">
     <value>{0} 日後に開始</value>
@@ -3044,6 +3074,9 @@
   <data name="WebGachaConfigTypeAvatarEventWish2" xml:space="preserve">
     <value>イベント祈願・キャラクター2</value>
   </data>
+  <data name="WebGachaConfigTypeChronicledWish" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="WebGachaConfigTypeNoviceWish" xml:space="preserve">
     <value>初心者祈願</value>
   </data>

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

@@ -186,6 +186,18 @@
   <data name="CoreWebView2HelperVersionUndetected" xml:space="preserve">
     <value>WebView2 런타임이 감지되지 않음</value>
   </data>
+  <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
+    <value>[{0}] 热键 [{1}] 注册失败</value>
+  </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>浅色</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>跟随系统</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>내보내기</value>
   </data>
@@ -857,6 +869,9 @@
   <data name="ServiceGachaLogFactoryAvatarWishName" xml:space="preserve">
     <value>캐릭터 이벤트</value>
   </data>
+  <data name="ServiceGachaLogFactoryChronicledWishName" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="ServiceGachaLogFactoryPermanentWishName" xml:space="preserve">
     <value>세상 여행</value>
   </data>
@@ -2214,7 +2229,7 @@
     <value>在游戏启动后尝试启动并使用 Better GI 进行自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>보통</value>
@@ -2232,7 +2247,7 @@
     <value>文件</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>进程间</value>
+    <value>进程联动</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>지정한 모니터에서 실행</value>
@@ -2366,6 +2381,9 @@
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
     <value>背景图片</value>
   </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>当前背景为本地图片，如遇版权问题由用户个人负责</value>
+  </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>여기에 저장된 이미지 캐시</value>
   </data>
@@ -2621,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>评价软件</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>更改窗体的颜色主题</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>颜色主题</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>번역에 기여하기</value>
   </data>
@@ -2630,6 +2654,12 @@
   <data name="ViewPageSettingWebview2Header" xml:space="preserve">
     <value>Webview2 런타임</value>
   </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceDownHeader" xml:space="preserve">
+    <value>下半</value>
+  </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceUpHeader" xml:space="preserve">
+    <value>上半</value>
+  </data>
   <data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
     <value>搭配圣遗物</value>
   </data>
@@ -2892,7 +2922,7 @@
     <value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
+    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓更新时间〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
@@ -3044,6 +3074,9 @@
   <data name="WebGachaConfigTypeAvatarEventWish2" xml:space="preserve">
     <value>캐릭터 이벤트 기원-2</value>
   </data>
+  <data name="WebGachaConfigTypeChronicledWish" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="WebGachaConfigTypeNoviceWish" xml:space="preserve">
     <value>초심자 기원</value>
   </data>

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

@@ -186,6 +186,18 @@
   <data name="CoreWebView2HelperVersionUndetected" xml:space="preserve">
     <value>O WebView2 Runtime não foi detectado</value>
   </data>
+  <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
+    <value>[{0}] 热键 [{1}] 注册失败</value>
+  </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>浅色</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>跟随系统</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>Exportar</value>
   </data>
@@ -857,6 +869,9 @@
   <data name="ServiceGachaLogFactoryAvatarWishName" xml:space="preserve">
     <value>Evento de oração de personagem</value>
   </data>
+  <data name="ServiceGachaLogFactoryChronicledWishName" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="ServiceGachaLogFactoryPermanentWishName" xml:space="preserve">
     <value>Invocação do Mochileiro</value>
   </data>
@@ -1122,7 +1137,7 @@
     <value>Sorte média</value>
   </data>
   <data name="ViewControlStatisticsCardUpText" xml:space="preserve">
-    <value>Acima</value>
+    <value>Em destaque</value>
   </data>
   <data name="ViewControlStatisticsSegmentedItemContentPrediction" xml:space="preserve">
     <value>Previsão</value>
@@ -1140,7 +1155,7 @@
     <value>Planejamento</value>
   </data>
   <data name="ViewDailyNoteHeader" xml:space="preserve">
-    <value>Lembrete em tempo real</value>
+    <value>Lembretes</value>
   </data>
   <data name="ViewDataHeader" xml:space="preserve">
     <value>Dados</value>
@@ -2034,7 +2049,7 @@
     <value>Visão geral</value>
   </data>
   <data name="ViewPageGahcaLogPivotStatistics" xml:space="preserve">
-    <value>全球祈愿统计</value>
+    <value>Estatísticas globais</value>
   </data>
   <data name="ViewPageGahcaLogPivotWeapon" xml:space="preserve">
     <value>Arma</value>
@@ -2214,7 +2229,7 @@
     <value>在游戏启动后尝试启动并使用 Better GI 进行自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>Geral</value>
@@ -2232,7 +2247,7 @@
     <value>Arquivo</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>Comunicações entre processos</value>
+    <value>进程联动</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>Executar o software na tela selecionada</value>
@@ -2366,6 +2381,9 @@
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
     <value>背景图片</value>
   </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>当前背景为本地图片，如遇版权问题由用户个人负责</value>
+  </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>O cache de imagens é salvo aqui</value>
   </data>
@@ -2621,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>Avalie o Snap Hutao</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>更改窗体的颜色主题</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>颜色主题</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>Contribuir com traduções</value>
   </data>
@@ -2630,6 +2654,12 @@
   <data name="ViewPageSettingWebview2Header" xml:space="preserve">
     <value>Webview2 Runtime</value>
   </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceDownHeader" xml:space="preserve">
+    <value>下半</value>
+  </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceUpHeader" xml:space="preserve">
+    <value>上半</value>
+  </data>
   <data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
     <value>Combinação de conjuntos de artefatos</value>
   </data>
@@ -2892,7 +2922,7 @@
     <value>〓Duração do evento〓.*?\d\.\d Disponível em toda as versões</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓Duração do evento〓|Duração da oração do evento|【Duração da disponibilidade】).*?(\d\.\dApós a atualização da versão).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
+    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓Duração da manutenção da atualização.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
@@ -2961,7 +2991,7 @@
     <value>Recompensa de comissão diária resgatada</value>
   </data>
   <data name="WebDailyNoteHomeCoinRecoveryFormat" xml:space="preserve">
-    <value>Estará cheio em {0} {1:HH:mm}</value>
+    <value>Estará cheio {0} às {1:HH:mm}</value>
   </data>
   <data name="WebDailyNoteHomeLocked" xml:space="preserve">
     <value>Bule de Relachá não desbloqueado</value>
@@ -3044,6 +3074,9 @@
   <data name="WebGachaConfigTypeAvatarEventWish2" xml:space="preserve">
     <value>Evento de oração de personagem-2</value>
   </data>
+  <data name="WebGachaConfigTypeChronicledWish" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="WebGachaConfigTypeNoviceWish" xml:space="preserve">
     <value>Oração de Novatos</value>
   </data>

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

@@ -189,6 +189,15 @@
   <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
     <value>[{0}] 热键 [{1}] 注册失败</value>
   </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>浅色</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>跟随系统</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>导出</value>
   </data>
@@ -2220,7 +2229,7 @@
     <value>在游戏启动后尝试启动并使用 Better GI 进行自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>常规</value>
@@ -2238,7 +2247,7 @@
     <value>文件</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>进程间</value>
+    <value>进程联动</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>在指定的显示器上运行</value>
@@ -2372,6 +2381,9 @@
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
     <value>背景图片</value>
   </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>当前背景为本地图片，如遇版权问题由用户个人负责</value>
+  </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>图片缓存 在此处存放</value>
   </data>
@@ -2627,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>评价软件</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>更改窗体的颜色主题</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>颜色主题</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>贡献翻译</value>
   </data>

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

@@ -186,6 +186,18 @@
   <data name="CoreWebView2HelperVersionUndetected" xml:space="preserve">
     <value>Среда выполнения WebView2 не обнаружена</value>
   </data>
+  <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
+    <value>[{0}] 热键 [{1}] 注册失败</value>
+  </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>浅色</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>跟随系统</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>Экспорт</value>
   </data>
@@ -857,6 +869,9 @@
   <data name="ServiceGachaLogFactoryAvatarWishName" xml:space="preserve">
     <value>角色活动</value>
   </data>
+  <data name="ServiceGachaLogFactoryChronicledWishName" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="ServiceGachaLogFactoryPermanentWishName" xml:space="preserve">
     <value>奔行世间</value>
   </data>
@@ -2214,7 +2229,7 @@
     <value>在游戏启动后尝试启动并使用 Better GI 进行自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>自动化任务</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>常规</value>
@@ -2232,7 +2247,7 @@
     <value>文件</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>进程间</value>
+    <value>进程联动</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>在指定的显示器上运行</value>
@@ -2366,6 +2381,9 @@
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
     <value>背景图片</value>
   </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>当前背景为本地图片，如遇版权问题由用户个人负责</value>
+  </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>图片缓存 在此处存放</value>
   </data>
@@ -2621,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>评价软件</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>更改窗体的颜色主题</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>颜色主题</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>贡献翻译</value>
   </data>
@@ -2630,6 +2654,12 @@
   <data name="ViewPageSettingWebview2Header" xml:space="preserve">
     <value>Webview2 Runtime</value>
   </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceDownHeader" xml:space="preserve">
+    <value>下半</value>
+  </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceUpHeader" xml:space="preserve">
+    <value>上半</value>
+  </data>
   <data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
     <value>搭配圣遗物</value>
   </data>
@@ -2892,7 +2922,7 @@
     <value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
+    <value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d版本更新后).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓更新时间〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
@@ -3044,6 +3074,9 @@
   <data name="WebGachaConfigTypeAvatarEventWish2" xml:space="preserve">
     <value>Молитва события персонажа - 2</value>
   </data>
+  <data name="WebGachaConfigTypeChronicledWish" xml:space="preserve">
+    <value>集录祈愿</value>
+  </data>
   <data name="WebGachaConfigTypeNoviceWish" xml:space="preserve">
     <value>Молитва новичка</value>
   </data>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx

@@ -186,6 +186,18 @@
   <data name="CoreWebView2HelperVersionUndetected" xml:space="preserve">
     <value>未檢測到 WebView2 運行時</value>
   </data>
+  <data name="CoreWindowHotkeyCombinationRegisterFailed" xml:space="preserve">
+    <value>[{0}] 鍵盤快速鍵 [{1}] 註冊失敗</value>
+  </data>
+  <data name="CoreWindowThemeDark" xml:space="preserve">
+    <value>深色</value>
+  </data>
+  <data name="CoreWindowThemeLight" xml:space="preserve">
+    <value>淺色</value>
+  </data>
+  <data name="CoreWindowThemeSystem" xml:space="preserve">
+    <value>跟隨系統</value>
+  </data>
   <data name="FilePickerExportCommit" xml:space="preserve">
     <value>匯出</value>
   </data>
@@ -205,7 +217,7 @@
     <value>&lt;color=#1E90FF&gt;我&lt;/color&gt;/&lt;color=#FFB6C1&gt;我&lt;/color&gt;</value>
   </data>
   <data name="MetadataSpecialNameNickname" xml:space="preserve">
-    <value>旅人</value>
+    <value>旅行者</value>
   </data>
   <data name="MetadataSpecialNamePlayerAvatarSexProInfoPronounHeShe" xml:space="preserve">
     <value>&lt;color=#1E90FF&gt;他&lt;/color&gt;/&lt;color=#FFB6C1&gt;她&lt;/color&gt;</value>
@@ -513,7 +525,7 @@
     <value>第四波：擊敗所有怪物，下一波才會出現</value>
   </data>
   <data name="ModelMetadataTowerWaveTypeWave99999" xml:space="preserve">
-    <value>维持场上 4 个盗宝团怪物，击杀后立即替换，总数 12 个</value>
+    <value>維持場上 4 個盜寶團怪物，擊殺後立即替換，總數 12 個</value>
   </data>
   <data name="ModelNameValueDefaultDescription" xml:space="preserve">
     <value>請更新角色櫥窗數據</value>
@@ -768,19 +780,19 @@
     <value>角色櫥窗：{0:MM-dd HH:mm}</value>
   </data>
   <data name="ServiceBackgroundImageTypeBing" xml:space="preserve">
-    <value>必应每日一图</value>
+    <value>Bing每日一圖</value>
   </data>
   <data name="ServiceBackgroundImageTypeDaily" xml:space="preserve">
-    <value>胡桃每日一图</value>
+    <value>胡桃每日一圖</value>
   </data>
   <data name="ServiceBackgroundImageTypeLauncher" xml:space="preserve">
-    <value>官方启动器壁纸</value>
+    <value>官方啟動器壁紙</value>
   </data>
   <data name="ServiceBackgroundImageTypeLocalFolder" xml:space="preserve">
-    <value>本地随机图片</value>
+    <value>本地隨機圖片</value>
   </data>
   <data name="ServiceBackgroundImageTypeNone" xml:space="preserve">
-    <value>无背景图片</value>
+    <value>無背景圖片</value>
   </data>
   <data name="ServiceCultivationProjectCurrentUserdataCourrpted" xml:space="preserve">
     <value>保存養成計劃狀態失敗</value>
@@ -840,7 +852,7 @@
     <value>參量質變儀已準備完成</value>
   </data>
   <data name="ServiceDiscordActivityElevationRequiredHint" xml:space="preserve">
-    <value>权限不足，将无法为您设置 Discord Activity 状态</value>
+    <value>權限不足，將無法為您設定 Discord Activity 狀態</value>
   </data>
   <data name="ServiceDiscordGameActivityDetails" xml:space="preserve">
     <value>正在提瓦特大陸中探索</value>
@@ -857,6 +869,9 @@
   <data name="ServiceGachaLogFactoryAvatarWishName" xml:space="preserve">
     <value>角色活動</value>
   </data>
+  <data name="ServiceGachaLogFactoryChronicledWishName" xml:space="preserve">
+    <value>集錄祈願</value>
+  </data>
   <data name="ServiceGachaLogFactoryPermanentWishName" xml:space="preserve">
     <value>奔行世間</value>
   </data>
@@ -1224,7 +1239,7 @@
     <value>即時便箋 Webhook Url</value>
   </data>
   <data name="ViewDialogFeedbackEnableLoopbackContent" xml:space="preserve">
-    <value>解除限制后需要使用其他工具恢复限制</value>
+    <value>解除限制後需使用其他工具恢復限制</value>
   </data>
   <data name="ViewDialogFeedbackEnableLoopbackTitle" xml:space="preserve">
     <value>是否解除 Loopback 限制</value>
@@ -1410,7 +1425,7 @@
     <value>啟動遊戲</value>
   </data>
   <data name="ViewListViewDragElevatedHint" xml:space="preserve">
-    <value>管理员模式下无法拖动排序</value>
+    <value>管理員模式下無法拖動排序</value>
   </data>
   <data name="ViewModelAchievementArchiveAdded" xml:space="preserve">
     <value>存檔 [{0}] 添加成功</value>
@@ -1692,7 +1707,7 @@
     <value>完成</value>
   </data>
   <data name="ViewModelWelcomeDownloadSummaryContentTypeNotMatch" xml:space="preserve">
-    <value>响应内容不是有效的文件字节流</value>
+    <value>回應內容不是有效的檔案位元組</value>
   </data>
   <data name="ViewModelWelcomeDownloadSummaryDefault" xml:space="preserve">
     <value>待處理</value>
@@ -1911,16 +1926,16 @@
     <value>常用連結</value>
   </data>
   <data name="ViewPageFeedbackCurrentProxyHeader" xml:space="preserve">
-    <value>当前代理</value>
+    <value>當前代理</value>
   </data>
   <data name="ViewPageFeedbackCurrentProxyNoProxyDescription" xml:space="preserve">
-    <value>无代理</value>
+    <value>無代理</value>
   </data>
   <data name="ViewPageFeedbackEnableLoopbackEnabledDescription" xml:space="preserve">
     <value>已解除</value>
   </data>
   <data name="ViewPageFeedbackEnableLoopbackHeader" xml:space="preserve">
-    <value>解除 Loopback 限制</value>
+    <value>是否解除 Loopback 限制</value>
   </data>
   <data name="ViewPageFeedbackEngageWithUsDescription" xml:space="preserve">
     <value>與我們密切聯繫</value>
@@ -2211,10 +2226,10 @@
     <value>啟動參數</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIDescription" xml:space="preserve">
-    <value>在游戏启动后尝试启动并使用 Better GI 进行自动化任务</value>
+    <value>在遊戲啟動後嘗試啟動並使用 Better GI 進行自動化任務</value>
   </data>
   <data name="ViewPageLaunchGameBetterGIHeader" xml:space="preserve">
-    <value>Better GI</value>
+    <value>自動化任務</value>
   </data>
   <data name="ViewPageLaunchGameCommonHeader" xml:space="preserve">
     <value>一般</value>
@@ -2232,7 +2247,7 @@
     <value>檔案</value>
   </data>
   <data name="ViewPageLaunchGameInterProcessHeader" xml:space="preserve">
-    <value>行程間</value>
+    <value>進程聯動</value>
   </data>
   <data name="ViewPageLaunchGameMonitorsDescription" xml:space="preserve">
     <value>在指定的屏幕上運行</value>
@@ -2358,13 +2373,16 @@
     <value>背景材質</value>
   </data>
   <data name="ViewPageSettingBackgroundImageCopyrightHeader" xml:space="preserve">
-    <value>图片版权信息</value>
+    <value>圖片版權訊息</value>
   </data>
   <data name="ViewPageSettingBackgroundImageDescription" xml:space="preserve">
-    <value>更改窗体的背景图片来源，重启胡桃以尽快生效</value>
+    <value>更改視窗的背景圖片來源，重啟胡桃以盡快生效</value>
   </data>
   <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
-    <value>背景图片</value>
+    <value>背景圖片</value>
+  </data>
+  <data name="ViewPageSettingBackgroundImageLocalFolderCopyrightHeader" xml:space="preserve">
+    <value>當前背景為本地圖片，如遇版權問題由用戶個人負責</value>
   </data>
   <data name="ViewPageSettingCacheFolderDescription" xml:space="preserve">
     <value>圖片暫存存放在此</value>
@@ -2373,7 +2391,7 @@
     <value>暫存檔案夾</value>
   </data>
   <data name="ViewPageSettingCardHutaoPassportHeader" xml:space="preserve">
-    <value>胡桃通行证</value>
+    <value>胡桃通行證</value>
   </data>
   <data name="ViewPageSettingCopyDeviceIdAction" xml:space="preserve">
     <value>複製</value>
@@ -2568,10 +2586,10 @@
     <value>前往官網</value>
   </data>
   <data name="ViewPageSettingOpenBackgroundImageFolderDescription" xml:space="preserve">
-    <value>自定义背景图片，支持 bmp / gif / ico / jpg / jpeg / png / tiff / webp 格式</value>
+    <value>自定義背景圖片，支援 bmp / gif / ico / jpg / jpeg / png / tiff / webp 格式</value>
   </data>
   <data name="ViewPageSettingOpenBackgroundImageFolderHeader" xml:space="preserve">
-    <value>打开背景图片文件夹</value>
+    <value>打開背景圖片資料夾</value>
   </data>
   <data name="ViewPageSettingResetAction" xml:space="preserve">
     <value>重設</value>
@@ -2583,10 +2601,10 @@
     <value>重設圖片資源</value>
   </data>
   <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsDescription" xml:space="preserve">
-    <value>在启动游戏页面的进程部分加入解锁帧率限制选项</value>
+    <value>在啟動遊戲頁面的程序部分加入解鎖幀率限制選項</value>
   </data>
   <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsHeader" xml:space="preserve">
-    <value>启动游戏-解锁帧率限制</value>
+    <value>啟動遊戲-解鎖幀率限制</value>
   </data>
   <data name="ViewPageSettingSetDataFolderDescription" xml:space="preserve">
     <value>更改目錄后需要手動移動目錄内的數據，否則會重新創建用戶數據</value>
@@ -2621,6 +2639,12 @@
   <data name="ViewPageSettingStoreReviewNavigate" xml:space="preserve">
     <value>評價軟體</value>
   </data>
+  <data name="ViewPageSettingThemeDescription" xml:space="preserve">
+    <value>更改窗體的顏色主題</value>
+  </data>
+  <data name="ViewPageSettingThemeHeader" xml:space="preserve">
+    <value>顏色主題</value>
+  </data>
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>貢獻翻譯</value>
   </data>
@@ -2630,6 +2654,12 @@
   <data name="ViewPageSettingWebview2Header" xml:space="preserve">
     <value>WebView 2 運行時</value>
   </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceDownHeader" xml:space="preserve">
+    <value>下半</value>
+  </data>
+  <data name="ViewPageSpiralAbyssTeamAppearanceUpHeader" xml:space="preserve">
+    <value>上半</value>
+  </data>
   <data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
     <value>搭配聖遺物</value>
   </data>
@@ -2892,7 +2922,7 @@
     <value>〓活動時間〓.*?\d\.\d版本期間持續開放</value>
   </data>
   <data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
-    <value>(?:〓活動時間〓|祈願時間|【上架時間】).*?(\d\.\d版本更新後).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
+    <value>(?:〓活動時間〓|祈願時間|【上架時間】|〓折扣時間〓).*?(\d\.\d版本更新後).*?~.*?&amp;lt;t class="t_(?:gl|lc)".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
   </data>
   <data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
     <value>〓更新時間〓.+?&amp;lt;t class=\"t_(?:gl|lc)\".*?&amp;gt;(.*?)&amp;lt;/t&amp;gt;</value>
@@ -3044,6 +3074,9 @@
   <data name="WebGachaConfigTypeAvatarEventWish2" xml:space="preserve">
     <value>角色活動祈願-2</value>
   </data>
+  <data name="WebGachaConfigTypeChronicledWish" xml:space="preserve">
+    <value>集錄祈願</value>
+  </data>
   <data name="WebGachaConfigTypeNoviceWish" xml:space="preserve">
     <value>新手祈願</value>
   </data>

src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs

@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.UI.Xaml;
 using Snap.Hutao.Core.Windowing;
 using Snap.Hutao.Model;
 using Snap.Hutao.Model.Entity;
@@ -16,6 +17,7 @@ internal sealed partial class AppOptions : DbStoreOptions
 {
     private bool? isEmptyHistoryWishVisible;
     private BackdropType? backdropType;
+    private ElementTheme? elementTheme;
     private BackgroundImageType? backgroundImageType;
     private Region? region;
     private string? geetestCustomCompositeUrl;
@@ -34,6 +36,19 @@ internal sealed partial class AppOptions : DbStoreOptions
         set => SetOption(ref backdropType, SettingEntry.SystemBackdropType, value, EnumToStringOrEmpty);
     }
 
+    public Lazy<List<NameValue<ElementTheme>>> LazyElementThemes { get; } = new(() =>
+    [
+        new(SH.CoreWindowThemeLight, ElementTheme.Light),
+        new(SH.CoreWindowThemeDark, ElementTheme.Dark),
+        new(SH.CoreWindowThemeSystem, ElementTheme.Default),
+    ]);
+
+    public ElementTheme ElementTheme
+    {
+        get => GetOption(ref elementTheme, SettingEntry.ElementTheme, EnumParse<ElementTheme>, ElementTheme.Default).Value;
+        set => SetOption(ref elementTheme, SettingEntry.ElementTheme, value, EnumToStringOrEmpty);
+    }
+
     public List<NameValue<BackgroundImageType>> BackgroundImageTypes { get; } = CollectionsNameValue.FromEnum<BackgroundImageType>(type => type.GetLocalizedDescription());
 
     public BackgroundImageType BackgroundImageType

src/Snap.Hutao/Snap.Hutao/Service/BackgroundImage/BackgroundImageService.cs

@@ -37,7 +37,7 @@ internal sealed partial class BackgroundImageService : IBackgroundImageService
             return new(true, default!);
         }
 
-        string path = System.Random.Shared.GetItems([..backgroundSet], 1)[0];
+        string path = System.Random.Shared.GetItems([.. backgroundSet], 1)[0];
         backgroundSet.Remove(path);
 
         if (string.Equals(path, previous?.Path, StringComparison.OrdinalIgnoreCase))

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs

@@ -3,7 +3,6 @@
 
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Metadata.Weapon;
 using Snap.Hutao.Service.Metadata;

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaTypeComparer.cs

@@ -18,9 +18,9 @@ internal sealed class GachaTypeComparer : IComparer<GachaType>
         KeyValuePair.Create(GachaType.ActivityAvatar, 0),
         KeyValuePair.Create(GachaType.SpecialActivityAvatar, 1),
         KeyValuePair.Create(GachaType.ActivityWeapon, 2),
-        KeyValuePair.Create(GachaType.Standard, 3),
-        KeyValuePair.Create(GachaType.NewBie, 4),
-        KeyValuePair.Create(GachaType.ActivityCity, 5),
+        KeyValuePair.Create(GachaType.ActivityCity, 3),
+        KeyValuePair.Create(GachaType.Standard, 4),
+        KeyValuePair.Create(GachaType.NewBie, 5),
     ]);
 
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/PullPrediction.cs

@@ -38,6 +38,10 @@ internal sealed class PullPrediction
             typedWishSummary.PredictedPullLeftToOrange = result.PredictedPullLeftToOrange;
             typedWishSummary.IsPredictPullAvailable = true;
         }
+        else
+        {
+            await barrier.SignalAndWaitAsync().ConfigureAwait(false);
+        }
     }
 
     private static PredictResult PredictCore(List<PullCount> distribution, TypedWishSummary typedWishSummary)

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/TypedWishSummaryBuilder.cs

@@ -5,7 +5,6 @@ using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Metadata.Abstraction;
 using Snap.Hutao.ViewModel.GachaLog;
-using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 
 namespace Snap.Hutao.Service.GachaLog.Factory;
 

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogHutaoCloudService.cs

@@ -2,10 +2,6 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Model.Entity;
-using Snap.Hutao.Model.Metadata;
-using Snap.Hutao.Model.Metadata.Avatar;
-using Snap.Hutao.Model.Metadata.Weapon;
-using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Service.GachaLog.Factory;
 using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Metadata.ContextAbstraction;

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogService.cs

@@ -5,7 +5,6 @@ using Snap.Hutao.Core.Database;
 using Snap.Hutao.Core.Diagnostics;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.InterChange.GachaLog;
-using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Service.GachaLog.Factory;
 using Snap.Hutao.Service.GachaLog.QueryProvider;
 using Snap.Hutao.Service.Metadata;

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/QueryProvider/GachaLogQueryWebCacheProvider.cs

@@ -105,8 +105,8 @@ internal sealed partial class GachaLogQueryWebCacheProvider : IGachaLogQueryProv
     {
         ReadOnlySpan<byte> span = stream.ToArray();
         ReadOnlySpan<byte> match = isOversea
-            ? "https://gs.hoyoverse.com/genshin/event/e20190909gacha-v2/index.html"u8
-            : "https://webstatic.mihoyo.com/hk4e/event/e20190909gacha-v2/index.html"u8;
+            ? "https://gs.hoyoverse.com/genshin/event/e20190909gacha-v3/index.html"u8
+            : "https://webstatic.mihoyo.com/hk4e/event/e20190909gacha-v3/index.html"u8;
 
         int index = span.LastIndexOf(match);
         if (index >= 0)

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

@@ -109,7 +109,7 @@ internal sealed class LaunchOptions : DbStoreOptions
 
     public bool IsEnabled
     {
-        get => GetOption(ref isEnabled, SettingEntry.LaunchIsLaunchOptionsEnabled, true);
+        get => GetOption(ref isEnabled, SettingEntry.LaunchIsLaunchOptionsEnabled, false);
         set => SetOption(ref isEnabled, SettingEntry.LaunchIsLaunchOptionsEnabled, value);
     }
 

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

@@ -17,9 +17,9 @@ internal sealed class LaunchStatus
 
     public string Description { get; set; }
 
-    public static LaunchStatus FromUnlockStatus(UnlockerStatus unlockerStatus)
+    public static LaunchStatus FromUnlockState(GameFpsUnlockerState unlockerState)
     {
-        if (unlockerStatus.FindModuleState == FindModuleResult.Ok)
+        if (unlockerState.FindModuleResult == FindModuleResult.Ok)
         {
             return new(LaunchPhase.UnlockFpsSucceed, SH.ServiceGameLaunchPhaseUnlockFpsSucceed);
         }

src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionBetterGenshinImpactAutomationHandlder.cs

@@ -30,6 +30,7 @@ internal sealed class LaunchExecutionBetterGenshinImpactAutomationHandlder : ILa
             }
             catch (InvalidOperationException)
             {
+                context.Logger.LogInformation("Failed to wait Input idle waiting");
                 return;
             }
 

src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionEnsureGameNotRunningHandler.cs

@@ -1,18 +1,27 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Diagnostics;
+
 namespace Snap.Hutao.Service.Game.Launching.Handler;
 
 internal sealed class LaunchExecutionEnsureGameNotRunningHandler : ILaunchExecutionDelegateHandler
 {
-    public static bool IsGameRunning([NotNullWhen(true)] out System.Diagnostics.Process? runningProcess)
+    public static bool IsGameRunning([NotNullWhen(true)] out Process? runningProcess)
     {
+        int currentSessionId = Process.GetCurrentProcess().SessionId;
+
         // GetProcesses once and manually loop is O(n)
-        foreach (ref readonly System.Diagnostics.Process process in System.Diagnostics.Process.GetProcesses().AsSpan())
+        foreach (ref readonly Process process in Process.GetProcesses().AsSpan())
         {
             if (string.Equals(process.ProcessName, GameConstants.YuanShenProcessName, StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(process.ProcessName, GameConstants.GenshinImpactProcessName, StringComparison.OrdinalIgnoreCase))
             {
+                if (process.SessionId != currentSessionId)
+                {
+                    continue;
+                }
+
                 runningProcess = process;
                 return true;
             }
@@ -24,7 +33,7 @@ internal sealed class LaunchExecutionEnsureGameNotRunningHandler : ILaunchExecut
 
     public async ValueTask OnExecutionAsync(LaunchExecutionContext context, LaunchExecutionDelegate next)
     {
-        if (IsGameRunning(out System.Diagnostics.Process? process))
+        if (IsGameRunning(out Process? process))
         {
             context.Logger.LogInformation("Game process detected, id: {Id}", process.Id);
 

src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/Handler/LaunchExecutionUnlockFpsHandler.cs

@@ -18,12 +18,13 @@ internal sealed class LaunchExecutionUnlockFpsHandler : ILaunchExecutionDelegate
             context.Progress.Report(new(LaunchPhase.UnlockingFps, SH.ServiceGameLaunchPhaseUnlockingFps));
 
             IProgressFactory progressFactory = context.ServiceProvider.GetRequiredService<IProgressFactory>();
-            IProgress<UnlockerStatus> progress = progressFactory.CreateForMainThread<UnlockerStatus>(status => context.Progress.Report(LaunchStatus.FromUnlockStatus(status)));
-            GameFpsUnlocker unlocker = context.ServiceProvider.CreateInstance<GameFpsUnlocker>(context.Process);
+            IProgress<GameFpsUnlockerState> progress = progressFactory.CreateForMainThread<GameFpsUnlockerState>(status => context.Progress.Report(LaunchStatus.FromUnlockState(status)));
+            GameFpsUnlocker unlocker = new(context.ServiceProvider, context.Process, new(100, 20000, 3000), progress);
 
             try
             {
-                await unlocker.UnlockAsync(new(100, 20000, 3000), progress, context.CancellationToken).ConfigureAwait(false);
+                await unlocker.UnlockAsync(context.CancellationToken).ConfigureAwait(false);
+                unlocker.PostUnlockAsync(context.CancellationToken).SafeForget();
             }
             catch (InvalidOperationException ex)
             {

src/Snap.Hutao/Snap.Hutao/Service/Game/Launching/LaunchExecutionInvoker.cs

@@ -24,25 +24,25 @@ internal sealed class LaunchExecutionInvoker
         handlers.Enqueue(new LaunchExecutionGameProcessInitializationHandler());
         handlers.Enqueue(new LaunchExecutionSetDiscordActivityHandler());
         handlers.Enqueue(new LaunchExecutionGameProcessStartHandler());
+        handlers.Enqueue(new LaunchExecutionUnlockFpsHandler());
         handlers.Enqueue(new LaunchExecutionStarwardPlayTimeStatisticsHandler());
         handlers.Enqueue(new LaunchExecutionBetterGenshinImpactAutomationHandlder());
-        handlers.Enqueue(new LaunchExecutionUnlockFpsHandler());
         handlers.Enqueue(new LaunchExecutionGameProcessExitHandler());
     }
 
     public async ValueTask<LaunchExecutionResult> InvokeAsync(LaunchExecutionContext context)
     {
-        await InvokeHandlerAsync(context).ConfigureAwait(false);
+        await RecursiveInvokeHandlerAsync(context).ConfigureAwait(false);
         return context.Result;
     }
 
-    private async ValueTask<LaunchExecutionContext> InvokeHandlerAsync(LaunchExecutionContext context)
+    private async ValueTask<LaunchExecutionContext> RecursiveInvokeHandlerAsync(LaunchExecutionContext context)
     {
         if (handlers.TryDequeue(out ILaunchExecutionDelegateHandler? handler))
         {
             string typeName = TypeNameHelper.GetTypeDisplayName(handler, false);
             context.Logger.LogInformation("Handler [{Handler}] begin execution", typeName);
-            await handler.OnExecutionAsync(context, () => InvokeHandlerAsync(context)).ConfigureAwait(false);
+            await handler.OnExecutionAsync(context, () => RecursiveInvokeHandlerAsync(context)).ConfigureAwait(false);
             context.Logger.LogInformation("Handler [{Handler}] end execution", typeName);
         }
 

src/Snap.Hutao/Snap.Hutao/Service/Game/Package/PackageConverter.cs

@@ -168,9 +168,14 @@ internal sealed partial class PackageConverter
     {
         try
         {
-            using (Stream remoteSteam = await httpClient.GetStreamAsync(pkgVersionUrl).ConfigureAwait(false))
+            // Server might close the connection shortly,
+            // we have to cache the content immediately.
+            using (HttpResponseMessage responseMessage = await httpClient.GetAsync(pkgVersionUrl, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false))
             {
-                return await GetVersionItemsAsync(remoteSteam).ConfigureAwait(false);
+                using (Stream remoteSteam = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                {
+                    return await GetVersionItemsAsync(remoteSteam).ConfigureAwait(false);
+                }
             }
         }
         catch (IOException ex)

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsAddress.cs

@@ -0,0 +1,82 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.ExceptionService;
+using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.Memory;
+using System.Diagnostics;
+using static Snap.Hutao.Win32.Kernel32;
+
+namespace Snap.Hutao.Service.Game.Unlocker;
+
+internal static class GameFpsAddress
+{
+#pragma warning disable SA1310
+    private const byte ASM_CALL = 0xE8;
+    private const byte ASM_JMP = 0xE9;
+#pragma warning restore SA1310
+
+    public static unsafe void UnsafeFindFpsAddress(GameFpsUnlockerState state, in RequiredGameModule requiredGameModule)
+    {
+        bool readOk = UnsafeReadModulesMemory(state.GameProcess, requiredGameModule, out VirtualMemory localMemory);
+        HutaoException.ThrowIfNot(readOk, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
+
+        using (localMemory)
+        {
+            int offset = IndexOfPattern(localMemory.AsSpan()[(int)requiredGameModule.UnityPlayer.Size..]);
+            HutaoException.ThrowIfNot(offset >= 0, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerInterestedPatternNotFound);
+
+            byte* pLocalMemory = (byte*)localMemory.Pointer;
+            ref readonly Module unityPlayer = ref requiredGameModule.UnityPlayer;
+            ref readonly Module userAssembly = ref requiredGameModule.UserAssembly;
+
+            nuint localMemoryUnityPlayerAddress = (nuint)pLocalMemory;
+            nuint localMemoryUserAssemblyAddress = localMemoryUnityPlayerAddress + unityPlayer.Size;
+
+            nuint rip = localMemoryUserAssemblyAddress + (uint)offset;
+            rip += 5U;
+            rip += (nuint)(*(int*)(rip + 2U) + 6);
+
+            nuint address = userAssembly.Address + (rip - localMemoryUserAssemblyAddress);
+
+            nuint ptr = 0;
+            SpinWait.SpinUntil(() => UnsafeReadProcessMemory(state.GameProcess, address, out ptr) && ptr != 0);
+
+            rip = ptr - unityPlayer.Address + localMemoryUnityPlayerAddress;
+
+            while (*(byte*)rip is ASM_CALL or ASM_JMP)
+            {
+                rip += (nuint)(*(int*)(rip + 1) + 5);
+            }
+
+            nuint localMemoryActualAddress = rip + *(uint*)(rip + 2) + 6;
+            nuint actualOffset = localMemoryActualAddress - localMemoryUnityPlayerAddress;
+            state.FpsAddress = unityPlayer.Address + actualOffset;
+        }
+    }
+
+    private static int IndexOfPattern(in ReadOnlySpan<byte> memory)
+    {
+        // B9 3C 00 00 00 FF 15
+        ReadOnlySpan<byte> part = [0xB9, 0x3C, 0x00, 0x00, 0x00, 0xFF, 0x15];
+        return memory.IndexOf(part);
+    }
+
+    private static unsafe bool UnsafeReadModulesMemory(Process process, in RequiredGameModule moduleEntryInfo, out VirtualMemory memory)
+    {
+        ref readonly Module unityPlayer = ref moduleEntryInfo.UnityPlayer;
+        ref readonly Module userAssembly = ref moduleEntryInfo.UserAssembly;
+
+        memory = new VirtualMemory(unityPlayer.Size + userAssembly.Size);
+        return ReadProcessMemory(process.Handle, (void*)unityPlayer.Address, memory.AsSpan()[..(int)unityPlayer.Size], out _)
+            && ReadProcessMemory(process.Handle, (void*)userAssembly.Address, memory.AsSpan()[(int)unityPlayer.Size..], out _);
+    }
+
+    private static unsafe bool UnsafeReadProcessMemory(Process process, nuint baseAddress, out nuint value)
+    {
+        value = 0;
+        bool result = ReadProcessMemory((HANDLE)process.Handle, (void*)baseAddress, ref value, out _);
+        HutaoException.ThrowIfNot(result, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadProcessMemoryPointerAddressFailed);
+        return result;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs

@@ -1,11 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Core.Diagnostics;
+using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Win32.Foundation;
-using Snap.Hutao.Win32.Memory;
-using Snap.Hutao.Win32.System.ProcessStatus;
-using System.Runtime.InteropServices;
+using System.Diagnostics;
 using static Snap.Hutao.Win32.Kernel32;
 
 namespace Snap.Hutao.Service.Game.Unlocker;
@@ -17,255 +15,54 @@ namespace Snap.Hutao.Service.Game.Unlocker;
 [HighQuality]
 internal sealed class GameFpsUnlocker : IGameFpsUnlocker
 {
-    private readonly System.Diagnostics.Process gameProcess;
     private readonly LaunchOptions launchOptions;
-    private readonly UnlockerStatus status = new();
+    private readonly GameFpsUnlockerState state = new();
 
-    /// <summary>
-    /// 构造一个新的 <see cref="GameFpsUnlocker"/> 对象，
-    /// 每个解锁器只能解锁一次原神的进程，
-    /// 再次解锁需要重新创建对象
-    /// <para/>
-    /// 解锁器需要在管理员模式下才能正确的完成解锁操作，
-    /// 非管理员模式不能解锁
-    /// </summary>
-    /// <param name="serviceProvider">服务提供器</param>
-    /// <param name="gameProcess">游戏进程</param>
-    public GameFpsUnlocker(IServiceProvider serviceProvider, System.Diagnostics.Process gameProcess)
+    public GameFpsUnlocker(IServiceProvider serviceProvider, Process gameProcess, in UnlockTimingOptions options, IProgress<GameFpsUnlockerState> progress)
     {
         launchOptions = serviceProvider.GetRequiredService<LaunchOptions>();
-        this.gameProcess = gameProcess;
+
+        state.GameProcess = gameProcess;
+        state.TimingOptions = options;
+        state.Progress = progress;
     }
 
     /// <inheritdoc/>
-    public async ValueTask UnlockAsync(UnlockTimingOptions options, IProgress<UnlockerStatus> progress, CancellationToken token = default)
+    public async ValueTask UnlockAsync(CancellationToken token = default)
     {
-        Verify.Operation(status.IsUnlockerValid, "This Unlocker is invalid");
+        HutaoException.ThrowIfNot(state.IsUnlockerValid, HutaoExceptionKind.GameFpsUnlockingFailed, "This Unlocker is invalid");
+        (FindModuleResult result, RequiredGameModule gameModule) = await GameProcessModule.FindModuleAsync(state).ConfigureAwait(false);
+        HutaoException.ThrowIfNot(result != FindModuleResult.TimeLimitExeeded, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
+        HutaoException.ThrowIfNot(result != FindModuleResult.NoModuleFound, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleNoModuleFound);
 
-        (FindModuleResult result, GameModule moduleEntryInfo) = await FindModuleAsync(options.FindModuleDelay, options.FindModuleLimit).ConfigureAwait(false);
-        Verify.Operation(result != FindModuleResult.TimeLimitExeeded, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
-        Verify.Operation(result != FindModuleResult.NoModuleFound, SH.ServiceGameUnlockerFindModuleNoModuleFound);
-
-        // Read UnityPlayer.dll
-        UnsafeFindFpsAddress(moduleEntryInfo);
-        progress.Report(status);
-
-        // When player switch between scenes, we have to re adjust the fps
-        // So we keep a loop here
-        await LoopAdjustFpsAsync(options.AdjustFpsDelay, progress, token).ConfigureAwait(false);
+        GameFpsAddress.UnsafeFindFpsAddress(state, gameModule);
+        state.Report();
     }
 
-    private static unsafe bool UnsafeReadModulesMemory(System.Diagnostics.Process process, in GameModule moduleEntryInfo, out VirtualMemory memory)
+    public async ValueTask PostUnlockAsync(CancellationToken token = default)
     {
-        ref readonly Module unityPlayer = ref moduleEntryInfo.UnityPlayer;
-        ref readonly Module userAssembly = ref moduleEntryInfo.UserAssembly;
-
-        memory = new VirtualMemory(unityPlayer.Size + userAssembly.Size);
-        return ReadProcessMemory(process.Handle, (void*)unityPlayer.Address, memory.AsSpan()[..(int)unityPlayer.Size], out _)
-            && ReadProcessMemory(process.Handle, (void*)userAssembly.Address, memory.AsSpan()[(int)unityPlayer.Size..], out _);
-    }
-
-    private static unsafe bool UnsafeReadProcessMemory(System.Diagnostics.Process process, nuint baseAddress, out nuint value)
-    {
-        value = 0;
-        bool result = ReadProcessMemory((HANDLE)process.Handle, (void*)baseAddress, ref value, out _);
-        Verify.Operation(result, SH.ServiceGameUnlockerReadProcessMemoryPointerAddressFailed);
-        return result;
-    }
-
-    private static unsafe bool UnsafeWriteProcessMemory(System.Diagnostics.Process process, nuint baseAddress, int value)
-    {
-        return WriteProcessMemory((HANDLE)process.Handle, (void*)baseAddress, ref value, out _);
-    }
-
-    private static unsafe FindModuleResult UnsafeTryFindModule(in HANDLE hProcess, in ReadOnlySpan<char> moduleName, out Module module)
-    {
-        HMODULE[] buffer = new HMODULE[128];
-        if (!K32EnumProcessModules(hProcess, buffer, out uint actualSize))
-        {
-            Marshal.ThrowExceptionForHR(Marshal.GetLastPInvokeError());
-        }
-
-        if (actualSize == 0)
-        {
-            module = default!;
-            return FindModuleResult.NoModuleFound;
-        }
-
-        foreach (ref readonly HMODULE hModule in buffer.AsSpan()[..(int)(actualSize / sizeof(HMODULE))])
-        {
-            char[] baseName = new char[256];
-
-            if (K32GetModuleBaseNameW(hProcess, hModule, baseName) == 0)
-            {
-                continue;
-            }
-
-            fixed (char* lpBaseName = baseName)
-            {
-                ReadOnlySpan<char> szModuleName = MemoryMarshal.CreateReadOnlySpanFromNullTerminated(lpBaseName);
-                if (!szModuleName.SequenceEqual(moduleName))
-                {
-                    continue;
-                }
-            }
-
-            if (!K32GetModuleInformation(hProcess, hModule, out MODULEINFO moduleInfo))
-            {
-                continue;
-            }
-
-            module = new((nuint)moduleInfo.lpBaseOfDll, moduleInfo.SizeOfImage);
-            return FindModuleResult.Ok;
-        }
-
-        module = default;
-        return FindModuleResult.ModuleNotLoaded;
-    }
-
-    private static int IndexOfPattern(in ReadOnlySpan<byte> memory)
-    {
-        // B9 3C 00 00 00 FF 15
-        ReadOnlySpan<byte> part = [0xB9, 0x3C, 0x00, 0x00, 0x00, 0xFF, 0x15];
-        return memory.IndexOf(part);
-    }
-
-    private static FindModuleResult UnsafeGetGameModuleInfo(in HANDLE hProcess, out GameModule info)
-    {
-        FindModuleResult unityPlayerResult = UnsafeTryFindModule(hProcess, "UnityPlayer.dll", out Module unityPlayer);
-        FindModuleResult userAssemblyResult = UnsafeTryFindModule(hProcess, "UserAssembly.dll", out Module userAssembly);
-
-        if (unityPlayerResult == FindModuleResult.Ok && userAssemblyResult == FindModuleResult.Ok)
-        {
-            info = new(unityPlayer, userAssembly);
-            return FindModuleResult.Ok;
-        }
-
-        if (unityPlayerResult == FindModuleResult.NoModuleFound && userAssemblyResult == FindModuleResult.NoModuleFound)
-        {
-            info = default;
-            return FindModuleResult.NoModuleFound;
-        }
-
-        info = default;
-        return FindModuleResult.ModuleNotLoaded;
-    }
-
-    private async ValueTask<ValueResult<FindModuleResult, GameModule>> FindModuleAsync(TimeSpan findModuleDelay, TimeSpan findModuleLimit)
-    {
-        ValueStopwatch watch = ValueStopwatch.StartNew();
-        using (PeriodicTimer timer = new(findModuleDelay))
-        {
-            while (await timer.WaitForNextTickAsync().ConfigureAwait(false))
-            {
-                FindModuleResult result = UnsafeGetGameModuleInfo((HANDLE)gameProcess.Handle, out GameModule gameModule);
-                if (result == FindModuleResult.Ok)
-                {
-                    return new(FindModuleResult.Ok, gameModule);
-                }
-
-                if (result == FindModuleResult.NoModuleFound)
-                {
-                    return new(FindModuleResult.NoModuleFound, default);
-                }
-
-                if (watch.GetElapsedTime() > findModuleLimit)
-                {
-                    break;
-                }
-            }
-        }
-
-        return new(FindModuleResult.TimeLimitExeeded, default);
-    }
-
-    private async ValueTask LoopAdjustFpsAsync(TimeSpan adjustFpsDelay, IProgress<UnlockerStatus> progress, CancellationToken token)
-    {
-        using (PeriodicTimer timer = new(adjustFpsDelay))
+        using (PeriodicTimer timer = new(state.TimingOptions.AdjustFpsDelay))
         {
             while (await timer.WaitForNextTickAsync(token).ConfigureAwait(false))
             {
-                if (!gameProcess.HasExited && status.FpsAddress != 0U)
+                if (!state.GameProcess.HasExited && state.FpsAddress != 0U)
                 {
-                    UnsafeWriteProcessMemory(gameProcess, status.FpsAddress, launchOptions.TargetFps);
-                    progress.Report(status);
+                    UnsafeWriteProcessMemory(state.GameProcess, state.FpsAddress, launchOptions.TargetFps);
+                    state.Report();
                 }
                 else
                 {
-                    status.IsUnlockerValid = false;
-                    status.FpsAddress = 0;
-                    progress.Report(status);
+                    state.IsUnlockerValid = false;
+                    state.FpsAddress = 0;
+                    state.Report();
                     return;
                 }
             }
         }
     }
 
-    private unsafe void UnsafeFindFpsAddress(in GameModule moduleEntryInfo)
+    private static unsafe bool UnsafeWriteProcessMemory(Process process, nuint baseAddress, int value)
     {
-        bool readOk = UnsafeReadModulesMemory(gameProcess, moduleEntryInfo, out VirtualMemory localMemory);
-        Verify.Operation(readOk, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
-
-        using (localMemory)
-        {
-            int offset = IndexOfPattern(localMemory.AsSpan()[(int)moduleEntryInfo.UnityPlayer.Size..]);
-            Must.Range(offset >= 0, SH.ServiceGameUnlockerInterestedPatternNotFound);
-
-            byte* pLocalMemory = (byte*)localMemory.Pointer;
-            ref readonly Module unityPlayer = ref moduleEntryInfo.UnityPlayer;
-            ref readonly Module userAssembly = ref moduleEntryInfo.UserAssembly;
-
-            nuint localMemoryUnityPlayerAddress = (nuint)pLocalMemory;
-            nuint localMemoryUserAssemblyAddress = localMemoryUnityPlayerAddress + unityPlayer.Size;
-
-            nuint rip = localMemoryUserAssemblyAddress + (uint)offset;
-            rip += 5U;
-            rip += (nuint)(*(int*)(rip + 2U) + 6);
-
-            nuint address = userAssembly.Address + (rip - localMemoryUserAssemblyAddress);
-
-            nuint ptr = 0;
-            SpinWait.SpinUntil(() => UnsafeReadProcessMemory(gameProcess, address, out ptr) && ptr != 0);
-
-            rip = ptr - unityPlayer.Address + localMemoryUnityPlayerAddress;
-
-            // CALL or JMP
-            while (*(byte*)rip == 0xE8 || *(byte*)rip == 0xE9)
-            {
-                rip += (nuint)(*(int*)(rip + 1) + 5);
-            }
-
-            nuint localMemoryActualAddress = rip + *(uint*)(rip + 2) + 6;
-            nuint actualOffset = localMemoryActualAddress - localMemoryUnityPlayerAddress;
-            status.FpsAddress = unityPlayer.Address + actualOffset;
-        }
-    }
-
-    private readonly struct GameModule
-    {
-        public readonly bool HasValue = false;
-        public readonly Module UnityPlayer;
-        public readonly Module UserAssembly;
-
-        public GameModule(in Module unityPlayer, in Module userAssembly)
-        {
-            HasValue = true;
-            UnityPlayer = unityPlayer;
-            UserAssembly = userAssembly;
-        }
-    }
-
-    private readonly struct Module
-    {
-        public readonly bool HasValue = false;
-        public readonly nuint Address;
-        public readonly uint Size;
-
-        public Module(nuint address, uint size)
-        {
-            HasValue = true;
-            Address = address;
-            Size = size;
-        }
+        return WriteProcessMemory((HANDLE)process.Handle, (void*)baseAddress, ref value, out _);
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlockerState.cs

@@ -0,0 +1,31 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Diagnostics;
+
+namespace Snap.Hutao.Service.Game.Unlocker;
+
+/// <summary>
+/// 解锁状态
+/// </summary>
+internal sealed class GameFpsUnlockerState
+{
+    public string Description { get; set; } = default!;
+
+    public FindModuleResult FindModuleResult { get; set; }
+
+    public bool IsUnlockerValid { get; set; } = true;
+
+    public nuint FpsAddress { get; set; }
+
+    public UnlockTimingOptions TimingOptions { get; set; }
+
+    public Process GameProcess { get; set; } = default!;
+
+    public IProgress<GameFpsUnlockerState> Progress { get; set; } = default!;
+
+    public void Report()
+    {
+        Progress.Report(this);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameProcessModule.cs

@@ -0,0 +1,108 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Diagnostics;
+using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.Memory;
+using Snap.Hutao.Win32.System.ProcessStatus;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using static Snap.Hutao.Win32.Kernel32;
+
+namespace Snap.Hutao.Service.Game.Unlocker;
+
+internal static class GameProcessModule
+{
+    public static async ValueTask<ValueResult<FindModuleResult, RequiredGameModule>> FindModuleAsync(GameFpsUnlockerState state)
+    {
+        ValueStopwatch watch = ValueStopwatch.StartNew();
+        using (PeriodicTimer timer = new(state.TimingOptions.FindModuleDelay))
+        {
+            while (await timer.WaitForNextTickAsync().ConfigureAwait(false))
+            {
+                FindModuleResult result = UnsafeGetGameModuleInfo((HANDLE)state.GameProcess.Handle, out RequiredGameModule gameModule);
+                if (result == FindModuleResult.Ok)
+                {
+                    return new(FindModuleResult.Ok, gameModule);
+                }
+
+                if (result == FindModuleResult.NoModuleFound)
+                {
+                    return new(FindModuleResult.NoModuleFound, default);
+                }
+
+                if (watch.GetElapsedTime() > state.TimingOptions.FindModuleLimit)
+                {
+                    break;
+                }
+            }
+        }
+
+        return new(FindModuleResult.TimeLimitExeeded, default);
+    }
+
+    private static FindModuleResult UnsafeGetGameModuleInfo(in HANDLE hProcess, out RequiredGameModule info)
+    {
+        FindModuleResult unityPlayerResult = UnsafeFindModule(hProcess, "UnityPlayer.dll", out Module unityPlayer);
+        FindModuleResult userAssemblyResult = UnsafeFindModule(hProcess, "UserAssembly.dll", out Module userAssembly);
+
+        if (unityPlayerResult is FindModuleResult.Ok && userAssemblyResult is FindModuleResult.Ok)
+        {
+            info = new(unityPlayer, userAssembly);
+            return FindModuleResult.Ok;
+        }
+
+        if (unityPlayerResult is FindModuleResult.NoModuleFound && userAssemblyResult is FindModuleResult.NoModuleFound)
+        {
+            info = default;
+            return FindModuleResult.NoModuleFound;
+        }
+
+        info = default;
+        return FindModuleResult.ModuleNotLoaded;
+    }
+
+    private static unsafe FindModuleResult UnsafeFindModule(in HANDLE hProcess, in ReadOnlySpan<char> moduleName, out Module module)
+    {
+        HMODULE[] buffer = new HMODULE[128];
+        if (!K32EnumProcessModules(hProcess, buffer, out uint actualSize))
+        {
+            Marshal.ThrowExceptionForHR(Marshal.GetLastPInvokeError());
+        }
+
+        if (actualSize == 0)
+        {
+            module = default!;
+            return FindModuleResult.NoModuleFound;
+        }
+
+        foreach (ref readonly HMODULE hModule in buffer.AsSpan()[..(int)(actualSize / sizeof(HMODULE))])
+        {
+            char[] baseName = new char[256];
+
+            if (K32GetModuleBaseNameW(hProcess, hModule, baseName) == 0)
+            {
+                continue;
+            }
+
+            fixed (char* lpBaseName = baseName)
+            {
+                if (!moduleName.SequenceEqual(MemoryMarshal.CreateReadOnlySpanFromNullTerminated(lpBaseName)))
+                {
+                    continue;
+                }
+            }
+
+            if (!K32GetModuleInformation(hProcess, hModule, out MODULEINFO moduleInfo))
+            {
+                continue;
+            }
+
+            module = new((nuint)moduleInfo.lpBaseOfDll, moduleInfo.SizeOfImage);
+            return FindModuleResult.Ok;
+        }
+
+        module = default;
+        return FindModuleResult.ModuleNotLoaded;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/IGameFpsUnlocker.cs

@@ -9,12 +9,7 @@ namespace Snap.Hutao.Service.Game.Unlocker;
 [HighQuality]
 internal interface IGameFpsUnlocker
 {
-    /// <summary>
-    /// 异步的解锁帧数限制
-    /// </summary>
-    /// <param name="options">选项</param>
-    /// <param name="progress">进度</param>
-    /// <param name="token">取消令牌</param>
-    /// <returns>解锁的结果</returns>
-    ValueTask UnlockAsync(UnlockTimingOptions options, IProgress<UnlockerStatus> progress, CancellationToken token = default);
+    ValueTask PostUnlockAsync(CancellationToken token = default);
+
+    ValueTask UnlockAsync(CancellationToken token = default);
 }

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/Module.cs

@@ -0,0 +1,18 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Service.Game.Unlocker;
+
+internal readonly struct Module
+{
+    public readonly bool HasValue = false;
+    public readonly nuint Address;
+    public readonly uint Size;
+
+    public Module(nuint address, uint size)
+    {
+        HasValue = true;
+        Address = address;
+        Size = size;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/RequiredGameModule.cs

@@ -0,0 +1,18 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Service.Game.Unlocker;
+
+internal readonly struct RequiredGameModule
+{
+    public readonly bool HasValue = false;
+    public readonly Module UnityPlayer;
+    public readonly Module UserAssembly;
+
+    public RequiredGameModule(in Module unityPlayer, in Module userAssembly)
+    {
+        HasValue = true;
+        UnityPlayer = unityPlayer;
+        UserAssembly = userAssembly;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/UnlockerStatus.cs

@@ -1,30 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Game.Unlocker;
-
-/// <summary>
-/// 解锁状态
-/// </summary>
-internal sealed class UnlockerStatus
-{
-    /// <summary>
-    /// 状态描述
-    /// </summary>
-    public string Description { get; set; } = default!;
-
-    /// <summary>
-    /// 查找模块状态
-    /// </summary>
-    public FindModuleResult FindModuleState { get; set; }
-
-    /// <summary>
-    /// 当前解锁器是否有效
-    /// </summary>
-    public bool IsUnlockerValid { get; set; } = true;
-
-    /// <summary>
-    /// FPS 字节地址
-    /// </summary>
-    public nuint FpsAddress { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/IMetadataService.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.Extensions.Caching.Memory;
-using Snap.Hutao.Core.DependencyInjection.Abstraction;
 
 namespace Snap.Hutao.Service.Metadata;
 

src/Snap.Hutao/Snap.Hutao/Service/Navigation/INavigationService.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Core.DependencyInjection.Abstraction;
 
 namespace Snap.Hutao.Service.Navigation;
 

src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs

@@ -3,7 +3,6 @@
 
 using CommunityToolkit.Mvvm.Messaging;
 using Snap.Hutao.Core.Database;
-using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Message;
 using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Hoyolab.Takumi.Binding;

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

@@ -156,6 +156,7 @@
     <None Remove="View\Control\LoadingView.xaml" />
     <None Remove="View\Control\LoadingViewSlim.xaml" />
     <None Remove="View\Control\SkillPivot.xaml" />
+    <None Remove="View\Control\SegmentedOverride.xaml" />
     <None Remove="View\Control\StatisticsCard.xaml" />
     <None Remove="View\Control\StatisticsSegmented.xaml" />
     <None Remove="View\Control\WebViewer.xaml" />
@@ -296,6 +297,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.0.240109" />
@@ -347,6 +349,11 @@
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
+  <ItemGroup>
+    <Page Update="Control\Theme\SegmentedOverride.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <ItemGroup>
     <Page Update="Control\Theme\Thickness.xaml">
       <Generator>MSBuild:Compile</Generator>

src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml

@@ -15,6 +15,7 @@
     HorizontalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance shva:AchievementViewModelSlim}"
     Background="Transparent"
+    BorderBrush="{x:Null}"
     Command="{Binding NavigateCommand}"
     Style="{ThemeResource DefaultButtonStyle}"
     mc:Ignorable="d">
@@ -51,11 +52,12 @@
                     Grid.Row="0"
                     HorizontalAlignment="Right"
                     Text="{Binding DisplayName}"/>
-                <TextBlock
-                    Grid.Row="1"
-                    Margin="0,4,0,0"
-                    Style="{StaticResource TitleTextBlockStyle}"
-                    Text="{Binding FinishDescription}"/>
+                <Viewbox Grid.Row="1" StretchDirection="DownOnly">
+                    <TextBlock
+                        Margin="0,4,0,0"
+                        Style="{StaticResource TitleTextBlockStyle}"
+                        Text="{Binding FinishDescription}"/>
+                </Viewbox>
                 <ItemsControl
                     Grid.Row="2"
                     ItemTemplate="{StaticResource AchievementTempate}"

src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml

@@ -17,6 +17,7 @@
     HorizontalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance shvd:DailyNoteViewModelSlim}"
     Background="Transparent"
+    BorderBrush="{x:Null}"
     Command="{Binding NavigateCommand}"
     Style="{ThemeResource DefaultButtonStyle}"
     mc:Ignorable="d">

src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml

@@ -16,6 +16,7 @@
     HorizontalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance shvg:GachaLogViewModelSlim}"
     Background="Transparent"
+    BorderBrush="{x:Null}"
     Command="{Binding NavigateCommand}"
     Style="{ThemeResource DefaultButtonStyle}"
     mc:Ignorable="d">

src/Snap.Hutao/Snap.Hutao/View/Card/LaunchGameCard.xaml

@@ -17,6 +17,7 @@
     VerticalContentAlignment="Stretch"
     d:DataContext="{d:DesignInstance shvg:LaunchGameViewModelSlim}"
     Background="Transparent"
+    BorderBrush="{x:Null}"
     Command="{Binding LaunchCommand}"
     Style="{ThemeResource DefaultButtonStyle}"
     mc:Ignorable="d">

src/Snap.Hutao/Snap.Hutao/View/Control/BaseValueSlider.xaml

@@ -22,35 +22,37 @@
         </DataTemplate>
     </UserControl.Resources>
 
-    <cwc:SettingsExpander
-        Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
-        IsExpanded="True"
-        ItemTemplate="{StaticResource BaseValueTemplate}"
-        ItemsSource="{x:Bind BaseValueInfo.Values, Mode=OneWay}">
-        <StackPanel
-            Height="16"
-            Margin="8,0,0,0"
-            Orientation="Horizontal"
-            Spacing="16">
-            <TextBlock VerticalAlignment="Center" Text="{x:Bind BaseValueInfo.CurrentLevelFormatted, Mode=OneWay}"/>
-            <CheckBox
-                MinWidth="0"
-                Margin="0,-8,0,-8"
-                Padding="8,0,0,0"
-                VerticalAlignment="Center"
-                VerticalContentAlignment="Center"
-                Content="{shcm:ResourceString Name=ViewControlBaseValueSliderPromoted}"
-                IsChecked="{x:Bind BaseValueInfo.Promoted, Mode=TwoWay}"
-                Visibility="{x:Bind IsPromoteVisible, Converter={StaticResource BoolToVisibilityConverter}}"/>
-            <Slider
-                MinWidth="240"
-                Margin="0,-16,0,-16"
-                VerticalAlignment="Center"
-                Maximum="{x:Bind BaseValueInfo.MaxLevel, Mode=OneWay}"
-                Minimum="1"
-                StepFrequency="1"
-                Value="{x:Bind BaseValueInfo.CurrentLevel, Mode=TwoWay}"/>
-        </StackPanel>
-    </cwc:SettingsExpander>
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
+        <cwc:SettingsExpander
+            Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
+            IsExpanded="True"
+            ItemTemplate="{StaticResource BaseValueTemplate}"
+            ItemsSource="{x:Bind BaseValueInfo.Values, Mode=OneWay}">
+            <StackPanel
+                Height="16"
+                Margin="8,0,0,0"
+                Orientation="Horizontal"
+                Spacing="16">
+                <TextBlock VerticalAlignment="Center" Text="{x:Bind BaseValueInfo.CurrentLevelFormatted, Mode=OneWay}"/>
+                <CheckBox
+                    MinWidth="0"
+                    Margin="0,-8,0,-8"
+                    Padding="8,0,0,0"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Content="{shcm:ResourceString Name=ViewControlBaseValueSliderPromoted}"
+                    IsChecked="{x:Bind BaseValueInfo.Promoted, Mode=TwoWay}"
+                    Visibility="{x:Bind IsPromoteVisible, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                <Slider
+                    MinWidth="240"
+                    Margin="0,-16,0,-16"
+                    VerticalAlignment="Center"
+                    Maximum="{x:Bind BaseValueInfo.MaxLevel, Mode=OneWay}"
+                    Minimum="1"
+                    StepFrequency="1"
+                    Value="{x:Bind BaseValueInfo.CurrentLevel, Mode=TwoWay}"/>
+            </StackPanel>
+        </cwc:SettingsExpander>
+    </ScrollViewer>
 
 </UserControl>

src/Snap.Hutao/Snap.Hutao/View/Control/DescParamComboBox.xaml

@@ -26,17 +26,19 @@
         </DataTemplate>
     </UserControl.Resources>
 
-    <cwc:SettingsExpander
-        Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
-        IsExpanded="True"
-        ItemTemplate="{StaticResource ParameterDescriptionTemplate}"
-        ItemsSource="{x:Bind SelectedItem.Parameters, Mode=OneWay}">
-        <shc:SizeRestrictedContentControl Margin="0,-8">
-            <ComboBox
-                x:Name="LevelSelectorComboBox"
-                DisplayMemberPath="Level"
-                SelectionChanged="OnLevelSelectorComboBoxSelectionChanged"
-                Style="{StaticResource SettingsContentComboBoxStyle}"/>
-        </shc:SizeRestrictedContentControl>
-    </cwc:SettingsExpander>
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
+        <cwc:SettingsExpander
+            Header="{shcm:ResourceString Name=ViewControlBaseValueSliderLevel}"
+            IsExpanded="True"
+            ItemTemplate="{StaticResource ParameterDescriptionTemplate}"
+            ItemsSource="{x:Bind SelectedItem.Parameters, Mode=OneWay}">
+            <shc:SizeRestrictedContentControl Margin="0,-8">
+                <ComboBox
+                    x:Name="LevelSelectorComboBox"
+                    DisplayMemberPath="Level"
+                    SelectionChanged="OnLevelSelectorComboBoxSelectionChanged"
+                    Style="{StaticResource SettingsContentComboBoxStyle}"/>
+            </shc:SizeRestrictedContentControl>
+        </cwc:SettingsExpander>
+    </ScrollViewer>
 </UserControl>

src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml

@@ -7,7 +7,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shch="using:Snap.Hutao.Control.Helper"
     xmlns:shci="using:Snap.Hutao.Control.Image"
-    xmlns:shcs="using:Snap.Hutao.Control.Segmented"
     xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
     mc:Ignorable="d">
 
@@ -26,11 +25,11 @@
     </UserControl.Resources>
 
     <StackPanel>
-        <shcs:Segmented
+        <cwc:Segmented
             x:Name="SkillSelectorSegmented"
             HorizontalAlignment="Stretch"
-            ItemTemplate="{StaticResource SkillHeaderTemplate}"
-            SelectionChanged="OnSkillSelectorSegmentedSelectionChanged"/>
+            SelectionChanged="OnSkillSelectorSegmentedSelectionChanged"
+            ItemTemplate="{StaticResource SkillHeaderTemplate}"/>
         <ContentPresenter Content="{x:Bind Selected, Mode=OneWay}" ContentTemplate="{x:Bind ItemTemplate}"/>
     </StackPanel>
 </UserControl>

src/Snap.Hutao/Snap.Hutao/View/Control/SkillPivot.xaml.cs

@@ -1,9 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Segmented;
 using System.Collections;
 
 namespace Snap.Hutao.View.Control;

src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml

@@ -21,6 +21,12 @@
     mc:Ignorable="d">
 
     <UserControl.Resources>
+        <shvconv:BoolToGridLengthConverter x:Key="BoolToGridLengthConverter"/>
+        <shvconv:BoolToGridLengthConverter
+            x:Key="BoolToGridLengthSpacingConverter"
+            FalseValue="0"
+            TrueValue="4"/>
+
         <shvconv:Int32ToGradientColorConverter x:Key="Int32ToGradientColorConverter" MaximumValue="{Binding GuaranteeOrangeThreshold}"/>
 
         <DataTemplate x:Key="OrangeListTemplate" d:DataType="shvg:SummaryItem">
@@ -226,10 +232,12 @@
                     Padding="0,12"
                     Value="{x:Bind StatisticsSegmented.SelectedIndex, Mode=OneWay}">
                     <cwcont:Case Value="{shcm:Int32 Value=0}">
-                        <Grid ColumnSpacing="2">
+                        <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition/>
-                                <ColumnDefinition/>
+                                <ColumnDefinition Width="{x:Bind ShowUpPull, Converter={StaticResource BoolToGridLengthSpacingConverter}}"/>
+                                <ColumnDefinition Width="{x:Bind ShowUpPull, Converter={StaticResource BoolToGridLengthConverter}}"/>
+                                <ColumnDefinition Width="4"/>
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <Border Grid.Column="0" Style="{ThemeResource BorderCardStyle}">
@@ -243,7 +251,7 @@
                                     </StackPanel>
                                 </Viewbox>
                             </Border>
-                            <Border Grid.Column="1" Style="{ThemeResource BorderCardStyle}">
+                            <Border Grid.Column="2" Style="{ThemeResource BorderCardStyle}">
                                 <Viewbox Margin="8,0" StretchDirection="DownOnly">
                                     <Grid>
                                         <StackPanel
@@ -266,7 +274,7 @@
                                 </Viewbox>
                             </Border>
 
-                            <Grid Grid.Column="2" RowSpacing="2">
+                            <Grid Grid.Column="4" RowSpacing="4">
                                 <Grid.RowDefinitions>
                                     <RowDefinition/>
                                     <RowDefinition/>
@@ -298,7 +306,7 @@
                                 <RowDefinition/>
                                 <RowDefinition Height="auto"/>
                             </Grid.RowDefinitions>
-                            <Grid ColumnSpacing="2">
+                            <Grid ColumnSpacing="4">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition/>
                                     <ColumnDefinition/>
@@ -360,7 +368,7 @@
 
                     </cwcont:Case>
                     <cwcont:Case Value="{shcm:Int32 Value=2}">
-                        <Grid RowSpacing="2">
+                        <Grid RowSpacing="4">
                             <Grid.RowDefinitions>
                                 <RowDefinition/>
                                 <RowDefinition/>

src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsSegmented.xaml

@@ -1,14 +1,14 @@
-<shcs:Segmented
+<cwc:Segmented
     x:Class="Snap.Hutao.View.Control.StatisticsSegmented"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    xmlns:shcs="using:Snap.Hutao.Control.Segmented"
     Style="{StaticResource DefaultSegmentedStyle}"
     mc:Ignorable="d">
-    <shcs:SegmentedItem Content="{shcm:ResourceString Name=ViewControlStatisticsSegmentedItemContentStatistics}" Icon="{shcm:FontIcon Glyph=&#xE9D2;}"/>
-    <shcs:SegmentedItem Content="{shcm:ResourceString Name=ViewControlStatisticsSegmentedItemContentProportion}" Icon="{shcm:FontIcon Glyph=&#xEB05;}"/>
-</shcs:Segmented>
+    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewControlStatisticsSegmentedItemContentStatistics}" Icon="{shcm:FontIcon Glyph=&#xE9D2;}"/>
+    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewControlStatisticsSegmentedItemContentProportion}" Icon="{shcm:FontIcon Glyph=&#xEB05;}"/>
+</cwc:Segmented>
 

src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsSegmented.xaml.cs

@@ -1,9 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Segmented;
 
 namespace Snap.Hutao.View.Control;
 

src/Snap.Hutao/Snap.Hutao/View/Converter/BoolToGridLengthConverter.cs

@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using CommunityToolkit.WinUI.Converters;
+using Microsoft.UI.Xaml;
+
+namespace Snap.Hutao.View.Converter;
+
+internal sealed class BoolToGridLengthConverter : BoolToObjectConverter
+{
+    public BoolToGridLengthConverter()
+    {
+        TrueValue = new GridLength(1D, GridUnitType.Star);
+        FalseValue = new GridLength(0D);
+    }
+}

src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml

@@ -8,7 +8,6 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    xmlns:shcs="using:Snap.Hutao.Control.Segmented"
     xmlns:shvg="using:Snap.Hutao.ViewModel.Guide"
     d:DataContext="{d:DesignInstance shvg:GuideViewModel}"
     mc:Ignorable="d">
@@ -189,15 +188,15 @@
         </cwc:SwitchPresenter>
         <Grid Grid.Row="1">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                <shcs:Segmented
+                <cwc:Segmented
                     Margin="16"
                     IsHitTestVisible="False"
                     SelectedIndex="{Binding State, Mode=TwoWay}">
-                    <shcs:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepLanguage}" Icon="{shcm:FontIcon Glyph=&#xF2B7;}"/>
-                    <shcs:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepDocument}" Icon="{shcm:FontIcon Glyph=&#xF28B;}"/>
-                    <shcs:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepEnvironment}" Icon="{shcm:FontIcon Glyph=&#xE81E;}"/>
-                    <shcs:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepStaticResource}" Icon="{shcm:FontIcon Glyph=&#xE8B9;}"/>
-                </shcs:Segmented>
+                    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepLanguage}" Icon="{shcm:FontIcon Glyph=&#xF2B7;}"/>
+                    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepDocument}" Icon="{shcm:FontIcon Glyph=&#xF28B;}"/>
+                    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepEnvironment}" Icon="{shcm:FontIcon Glyph=&#xE81E;}"/>
+                    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepStaticResource}" Icon="{shcm:FontIcon Glyph=&#xE8B9;}"/>
+                </cwc:Segmented>
                 <Button
                     Command="{Binding NextOrCompleteCommand}"
                     Content="{Binding NextOrCompleteButtonText}"

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

@@ -212,7 +212,7 @@
                             LocalSettingKeySuffixForCurrent="AchievementPage.AchievementGoals"/>
                         <Viewbox
                             Height="32"
-                            MaxWidth="192"
+                            MaxWidth="190"
                             Margin="8,0,0,0"
                             HorizontalAlignment="Left"
                             Stretch="Uniform"

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

@@ -43,6 +43,7 @@
                                 cw:VisualExtensions.NormalizedCenterPoint="0.5">
                                 <cww:ConstrainedBox AspectRatio="1080:390" CornerRadius="{ThemeResource ControlCornerRadiusTop}">
                                     <shci:CachedImage
+                                        Margin="-1"
                                         VerticalAlignment="Center"
                                         PlaceholderMargin="16"
                                         PlaceholderSource="{StaticResource UI_EmotionIcon271}"

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

@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:clw="using:CommunityToolkit.Labs.WinUI"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwcont="using:CommunityToolkit.WinUI.Controls"
     xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -50,240 +51,248 @@
             <SplitView.Pane>
                 <ScrollViewer>
                     <StackPanel Margin="16" Spacing="3">
-                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
-                            <cwcont:SettingsExpander
-                                Description="{Binding RuntimeOptions.Version}"
-                                Header="{shcm:ResourceString Name=AppName}"
-                                HeaderIcon="{shcm:FontIcon Glyph=&#xECAA;}"
-                                IsExpanded="True">
-                                <cwcont:SettingsExpander.Items>
-                                    <cwcont:SettingsCard
-                                        ActionIcon="{shcm:FontIcon Glyph=&#xE8C8;}"
-                                        ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingCopyDeviceIdAction}"
-                                        Command="{Binding CopyDeviceIdCommand}"
-                                        Description="{Binding RuntimeOptions.DeviceId}"
-                                        Header="{shcm:ResourceString Name=ViewPageSettingDeviceIdHeader}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard Description="{Binding IPInformation}" Header="{shcm:ResourceString Name=ViewPageSettingDeviceIpHeader}"/>
-                                    <cwcont:SettingsCard Description="{Binding DynamicHttpProxy.CurrentProxyUri}" Header="{shcm:ResourceString Name=ViewPageFeedbackCurrentProxyHeader}"/>
-                                    <cwcont:SettingsCard
-                                        Command="{Binding EnableLoopbackCommand}"
-                                        Header="{shcm:ResourceString Name=ViewPageFeedbackEnableLoopbackHeader}"
-                                        IsClickEnabled="True"
-                                        IsEnabled="{Binding LoopbackManager.IsLoopbackEnabled, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
-                                        <cwcont:SettingsCard.Description>
-                                            <UserControl Content="{Binding LoopbackManager.IsLoopbackEnabled, Converter={StaticResource BoolToLoopbackDescriptionControlConverter}, Mode=OneWay}"/>
-                                        </cwcont:SettingsCard.Description>
-                                    </cwcont:SettingsCard>
-                                    <cwcont:SettingsCard Description="{Binding RuntimeOptions.WebView2Version}" Header="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
-                                </cwcont:SettingsExpander.Items>
-                            </cwcont:SettingsExpander>
+                        <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                            <Border Style="{ThemeResource AcrylicBorderCardStyle}">
+                                <cwcont:SettingsExpander
+                                    Description="{Binding RuntimeOptions.Version}"
+                                    Header="{shcm:ResourceString Name=AppName}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xECAA;}"
+                                    IsExpanded="True">
+                                    <cwcont:SettingsExpander.Items>
+                                        <cwcont:SettingsCard
+                                            ActionIcon="{shcm:FontIcon Glyph=&#xE8C8;}"
+                                            ActionIconToolTip="{shcm:ResourceString Name=ViewPageSettingCopyDeviceIdAction}"
+                                            Command="{Binding CopyDeviceIdCommand}"
+                                            Description="{Binding RuntimeOptions.DeviceId}"
+                                            Header="{shcm:ResourceString Name=ViewPageSettingDeviceIdHeader}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard Description="{Binding IPInformation}" Header="{shcm:ResourceString Name=ViewPageSettingDeviceIpHeader}"/>
+                                        <cwcont:SettingsCard Description="{Binding DynamicHttpProxy.CurrentProxyUri}" Header="{shcm:ResourceString Name=ViewPageFeedbackCurrentProxyHeader}"/>
+                                        <cwcont:SettingsCard
+                                            Command="{Binding EnableLoopbackCommand}"
+                                            Header="{shcm:ResourceString Name=ViewPageFeedbackEnableLoopbackHeader}"
+                                            IsClickEnabled="True"
+                                            IsEnabled="{Binding LoopbackManager.IsLoopbackEnabled, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                            <cwcont:SettingsCard.Description>
+                                                <UserControl Content="{Binding LoopbackManager.IsLoopbackEnabled, Converter={StaticResource BoolToLoopbackDescriptionControlConverter}, Mode=OneWay}"/>
+                                            </cwcont:SettingsCard.Description>
+                                        </cwcont:SettingsCard>
+                                        <cwcont:SettingsCard Description="{Binding RuntimeOptions.WebView2Version}" Header="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
+                                    </cwcont:SettingsExpander.Items>
+                                </cwcont:SettingsExpander>
+                            </Border>
                         </Border>
-                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
-                            <cwcont:SettingsExpander
-                                Description="{shcm:ResourceString Name=ViewPageFeedbackEngageWithUsDescription}"
-                                Header="{shcm:ResourceString Name=ViewPageFeedbackCommonLinksHeader}"
-                                HeaderIcon="{shcm:FontIcon Glyph=&#xE71B;}"
-                                IsExpanded="True">
-                                <cwcont:SettingsExpander.Items>
-                                    <cwcont:SettingsCard
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://github.com/DGP-Studio/Snap.Hutao/issues/new/choose"
-                                        Description="{shcm:ResourceString Name=ViewPageFeedbackGithubIssuesDescription}"
-                                        Header="GitHub Issues"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://github.com/orgs/DGP-Studio/projects/2"
-                                        Description="{shcm:ResourceString Name=ViewPageFeedbackRoadmapDescription}"
-                                        Header="GitHub Projects"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://status.hut.ao"
-                                        Description="{shcm:ResourceString Name=ViewPageFeedbackServerStatusDescription}"
-                                        Header="{shcm:ResourceString Name=ViewPageFeedbackServerStatusHeader}"
-                                        IsClickEnabled="True"/>
-                                </cwcont:SettingsExpander.Items>
-                            </cwcont:SettingsExpander>
+                        <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                            <Border Style="{ThemeResource AcrylicBorderCardStyle}">
+                                <cwcont:SettingsExpander
+                                    Description="{shcm:ResourceString Name=ViewPageFeedbackEngageWithUsDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageFeedbackCommonLinksHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE71B;}"
+                                    IsExpanded="True">
+                                    <cwcont:SettingsExpander.Items>
+                                        <cwcont:SettingsCard
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://github.com/DGP-Studio/Snap.Hutao/issues/new/choose"
+                                            Description="{shcm:ResourceString Name=ViewPageFeedbackGithubIssuesDescription}"
+                                            Header="GitHub Issues"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://github.com/orgs/DGP-Studio/projects/2"
+                                            Description="{shcm:ResourceString Name=ViewPageFeedbackRoadmapDescription}"
+                                            Header="GitHub Projects"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://status.hut.ao"
+                                            Description="{shcm:ResourceString Name=ViewPageFeedbackServerStatusDescription}"
+                                            Header="{shcm:ResourceString Name=ViewPageFeedbackServerStatusHeader}"
+                                            IsClickEnabled="True"/>
+                                    </cwcont:SettingsExpander.Items>
+                                </cwcont:SettingsExpander>
+                            </Border>
                         </Border>
-                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
-                            <cwcont:SettingsExpander
-                                Header="{shcm:ResourceString Name=ViewPageFeedbackFeatureGuideHeader}"
-                                HeaderIcon="{shcm:FontIcon Glyph=&#xF8A5;}"
-                                IsExpanded="True">
-                                <cwcont:SettingsExpander.Items>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/dashboard.html"
-                                        Header="{shcm:ResourceString Name=ViewAnnouncementHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Announcement.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/game-launcher.html"
-                                        Header="{shcm:ResourceString Name=ViewLaunchGameHeader}"
-                                        IsClickEnabled="True">
-                                        <cwcont:SettingsCard.HeaderIcon>
-                                            <!--  This icon is not a square  -->
-                                            <BitmapIcon
-                                                Width="24"
-                                                Height="24"
-                                                ShowAsMonochrome="False"
-                                                UriSource="ms-appx:///Resource/Navigation/LaunchGame.png"/>
-                                        </cwcont:SettingsCard.HeaderIcon>
-                                    </cwcont:SettingsCard>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/wish-export.html"
-                                        Header="{shcm:ResourceString Name=ViewGachaLogHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/GachaLog.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/achievements.html"
-                                        Header="{shcm:ResourceString Name=ViewAchievementHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Achievement.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/real-time-notes.html"
-                                        Header="{shcm:ResourceString Name=ViewDailyNoteHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/DailyNote.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/character-data.html"
-                                        Header="{shcm:ResourceString Name=ViewAvatarPropertyHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/AvatarProperty.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/hutao-API.html"
-                                        Header="{shcm:ResourceString Name=ViewSpiralAbyssHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/SpiralAbyss.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/develop-plan.html"
-                                        Header="{shcm:ResourceString Name=ViewCultivationHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Cultivation.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/character-wiki.html"
-                                        Header="{shcm:ResourceString Name=ViewWikiAvatarHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiAvatar.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/weapon-wiki.html"
-                                        Header="{shcm:ResourceString Name=ViewWikiWeaponHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiWeapon.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/monster-wiki.html"
-                                        Header="{shcm:ResourceString Name=ViewWikiMonsterHeader}"
-                                        HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiMonster.png}"
-                                        IsClickEnabled="True"/>
-                                    <cwcont:SettingsCard
-                                        Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
-                                        Command="{Binding NavigateToUriCommand}"
-                                        CommandParameter="https://hut.ao/features/hutao-settings.html"
-                                        Header="{shcm:ResourceString Name=ViewSettingHeader}"
-                                        HeaderIcon="{shcm:FontIcon Glyph=&#xE713;}"
-                                        IsClickEnabled="True"/>
-                                </cwcont:SettingsExpander.Items>
-                            </cwcont:SettingsExpander>
+                        <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                            <Border Style="{ThemeResource AcrylicBorderCardStyle}">
+                                <cwcont:SettingsExpander
+                                    Header="{shcm:ResourceString Name=ViewPageFeedbackFeatureGuideHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xF8A5;}"
+                                    IsExpanded="True">
+                                    <cwcont:SettingsExpander.Items>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/dashboard.html"
+                                            Header="{shcm:ResourceString Name=ViewAnnouncementHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Announcement.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/game-launcher.html"
+                                            Header="{shcm:ResourceString Name=ViewLaunchGameHeader}"
+                                            IsClickEnabled="True">
+                                            <cwcont:SettingsCard.HeaderIcon>
+                                                <!--  This icon is not a square  -->
+                                                <BitmapIcon
+                                                    Width="24"
+                                                    Height="24"
+                                                    ShowAsMonochrome="False"
+                                                    UriSource="ms-appx:///Resource/Navigation/LaunchGame.png"/>
+                                            </cwcont:SettingsCard.HeaderIcon>
+                                        </cwcont:SettingsCard>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/wish-export.html"
+                                            Header="{shcm:ResourceString Name=ViewGachaLogHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/GachaLog.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/achievements.html"
+                                            Header="{shcm:ResourceString Name=ViewAchievementHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Achievement.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/real-time-notes.html"
+                                            Header="{shcm:ResourceString Name=ViewDailyNoteHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/DailyNote.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/character-data.html"
+                                            Header="{shcm:ResourceString Name=ViewAvatarPropertyHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/AvatarProperty.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/hutao-API.html"
+                                            Header="{shcm:ResourceString Name=ViewSpiralAbyssHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/SpiralAbyss.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/develop-plan.html"
+                                            Header="{shcm:ResourceString Name=ViewCultivationHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/Cultivation.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/character-wiki.html"
+                                            Header="{shcm:ResourceString Name=ViewWikiAvatarHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiAvatar.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/weapon-wiki.html"
+                                            Header="{shcm:ResourceString Name=ViewWikiWeaponHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiWeapon.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/monster-wiki.html"
+                                            Header="{shcm:ResourceString Name=ViewWikiMonsterHeader}"
+                                            HeaderIcon="{shcm:BitmapIcon Source=ms-appx:///Resource/Navigation/WikiMonster.png}"
+                                            IsClickEnabled="True"/>
+                                        <cwcont:SettingsCard
+                                            Padding="{ThemeResource SettingsExpanderItemHasIconPadding}"
+                                            Command="{Binding NavigateToUriCommand}"
+                                            CommandParameter="https://hut.ao/features/hutao-settings.html"
+                                            Header="{shcm:ResourceString Name=ViewSettingHeader}"
+                                            HeaderIcon="{shcm:FontIcon Glyph=&#xE713;}"
+                                            IsClickEnabled="True"/>
+                                    </cwcont:SettingsExpander.Items>
+                                </cwcont:SettingsExpander>
+                            </Border>
                         </Border>
                     </StackPanel>
                 </ScrollViewer>
             </SplitView.Pane>
-            <Grid Margin="16,16,0,16" Style="{ThemeResource AcrylicGridCardStyle}">
-                <Grid
-                    Padding="16"
-                    RowSpacing="8"
-                    Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition/>
-                    </Grid.RowDefinitions>
-                    <AutoSuggestBox
-                        Grid.Row="0"
-                        Height="36"
-                        Margin="0,0,0,8"
-                        HorizontalAlignment="Stretch"
-                        VerticalContentAlignment="Center"
-                        PlaceholderText="{shcm:ResourceString Name=ViewPageFeedbackAutoSuggestBoxPlaceholder}"
-                        QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
-                        Style="{StaticResource DefaultAutoSuggestBoxStyle}"
-                        Text="{Binding SearchText, Mode=TwoWay}">
-                        <mxi:Interaction.Behaviors>
-                            <mxic:EventTriggerBehavior EventName="QuerySubmitted">
-                                <mxic:InvokeCommandAction Command="{Binding SearchDocumentCommand}" CommandParameter="{Binding SearchText}"/>
-                            </mxic:EventTriggerBehavior>
-                        </mxi:Interaction.Behaviors>
-                    </AutoSuggestBox>
-                    <StackPanel
-                        Grid.Row="1"
-                        VerticalAlignment="Center"
-                        Visibility="{Binding SearchResults.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
-                        <shci:CachedImage
-                            Height="120"
-                            MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
-                            EnableLazyLoading="False"
-                            Source="{StaticResource UI_EmotionIcon52}"/>
-                        <TextBlock
-                            Margin="0,5,0,21"
-                            HorizontalAlignment="Center"
-                            Style="{StaticResource SubtitleTextBlockStyle}"
-                            Text="{shcm:ResourceString Name=ViewPageFeedbackSearchResultPlaceholderTitle}"/>
-                    </StackPanel>
-                    <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
-                        <ItemsControl
-                            ItemContainerTransitions="{ThemeResource ListViewLikeThemeTransitions}"
-                            ItemsPanel="{ThemeResource StackPanelSpacing8Template}"
-                            ItemsSource="{Binding SearchResults}">
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <Border Style="{ThemeResource BorderCardStyle}">
-                                        <HyperlinkButton
-                                            HorizontalAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch"
-                                            NavigateUri="{Binding Url}">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition/>
-                                                    <ColumnDefinition Width="auto"/>
-                                                </Grid.ColumnDefinitions>
-                                                <BreadcrumbBar
-                                                    Grid.Column="0"
-                                                    Margin="4,8,8,4"
-                                                    IsHitTestVisible="False"
-                                                    ItemsSource="{Binding Hierarchy.DisplayLevels}"/>
-                                            </Grid>
-                                        </HyperlinkButton>
-                                    </Border>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
-                    </ScrollViewer>
-                </Grid>
+            <Border Margin="16,16,0,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                <Grid Style="{ThemeResource AcrylicGridCardStyle}">
+                    <Grid
+                        Padding="16"
+                        RowSpacing="8"
+                        Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <AutoSuggestBox
+                            Grid.Row="0"
+                            Height="36"
+                            Margin="0,0,0,8"
+                            HorizontalAlignment="Stretch"
+                            VerticalContentAlignment="Center"
+                            PlaceholderText="{shcm:ResourceString Name=ViewPageFeedbackAutoSuggestBoxPlaceholder}"
+                            QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
+                            Style="{StaticResource DefaultAutoSuggestBoxStyle}"
+                            Text="{Binding SearchText, Mode=TwoWay}">
+                            <mxi:Interaction.Behaviors>
+                                <mxic:EventTriggerBehavior EventName="QuerySubmitted">
+                                    <mxic:InvokeCommandAction Command="{Binding SearchDocumentCommand}" CommandParameter="{Binding SearchText}"/>
+                                </mxic:EventTriggerBehavior>
+                            </mxi:Interaction.Behaviors>
+                        </AutoSuggestBox>
+                        <StackPanel
+                            Grid.Row="1"
+                            VerticalAlignment="Center"
+                            Visibility="{Binding SearchResults.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
+                            <shci:CachedImage
+                                Height="120"
+                                MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
+                                EnableLazyLoading="False"
+                                Source="{StaticResource UI_EmotionIcon52}"/>
+                            <TextBlock
+                                Margin="0,5,0,21"
+                                HorizontalAlignment="Center"
+                                Style="{StaticResource SubtitleTextBlockStyle}"
+                                Text="{shcm:ResourceString Name=ViewPageFeedbackSearchResultPlaceholderTitle}"/>
+                        </StackPanel>
+                        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
+                            <ItemsControl
+                                ItemContainerTransitions="{ThemeResource ListViewLikeThemeTransitions}"
+                                ItemsPanel="{ThemeResource StackPanelSpacing8Template}"
+                                ItemsSource="{Binding SearchResults}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border Style="{ThemeResource BorderCardStyle}">
+                                            <HyperlinkButton
+                                                HorizontalAlignment="Stretch"
+                                                HorizontalContentAlignment="Stretch"
+                                                NavigateUri="{Binding Url}">
+                                                <Grid>
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition/>
+                                                        <ColumnDefinition Width="auto"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <BreadcrumbBar
+                                                        Grid.Column="0"
+                                                        Margin="4,8,8,4"
+                                                        IsHitTestVisible="False"
+                                                        ItemsSource="{Binding Hierarchy.DisplayLevels}"/>
+                                                </Grid>
+                                            </HyperlinkButton>
+                                        </Border>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
 
-                <clw:Shimmer IsActive="{Binding IsInitialized, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityRevertConverter}, Mode=OneWay}"/>
-            </Grid>
+                    <clw:Shimmer IsActive="{Binding IsInitialized, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityRevertConverter}, Mode=OneWay}"/>
+                </Grid>
+            </Border>
         </SplitView>
     </Grid>
 </shc:ScopedPage>

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

@@ -12,6 +12,7 @@
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
+    xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
     d:DataContext="{d:DesignInstance shvg:GachaLogViewModel}"
@@ -142,8 +143,8 @@
             <Border Width="40" Style="{StaticResource BorderCardStyle}">
                 <StackPanel>
                     <shvc:ItemIcon
-                        Width="40"
-                        Height="40"
+                        Width="38"
+                        Height="38"
                         Icon="{Binding Icon}"
                         Quality="{Binding Quality}"/>
                     <TextBlock
@@ -182,17 +183,19 @@
                     Text="{Binding TotalCountFormatted}"/>
                 <ItemsControl
                     Grid.Row="1"
+                    MaxWidth="124"
                     Margin="0,6,0,0"
                     HorizontalAlignment="Left"
                     ItemTemplate="{StaticResource HistoryWishItemTemplate}"
-                    ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
+                    ItemsPanel="{StaticResource WrapPanelSpacing2Template}"
                     ItemsSource="{Binding OrangeUpList}"/>
                 <ItemsControl
                     Grid.Row="1"
+                    MaxWidth="252"
                     Margin="0,6,0,0"
                     HorizontalAlignment="Right"
                     ItemTemplate="{StaticResource HistoryWishItemTemplate}"
-                    ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
+                    ItemsPanel="{StaticResource WrapPanelSpacing2Template}"
                     ItemsSource="{Binding PurpleUpList}"/>
                 <TextBlock
                     Grid.Row="2"
@@ -285,26 +288,21 @@
                     </CommandBar>
                 </Pivot.RightHeader>
                 <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotOverview}">
-                    <Grid Margin="0,0,16,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <shvc:StatisticsCard
-                            Grid.Column="0"
-                            Margin="16,16,0,16"
-                            DataContext="{Binding Statistics.AvatarWish}"/>
-                        <shvc:StatisticsCard
-                            Grid.Column="1"
-                            Margin="16,16,0,16"
-                            DataContext="{Binding Statistics.WeaponWish}"/>
-                        <shvc:StatisticsCard
-                            Grid.Column="2"
-                            Margin="16,16,0,16"
-                            DataContext="{Binding Statistics.StandardWish}"
-                            ShowUpPull="False"/>
-                    </Grid>
+                    <ScrollViewer
+                        Margin="16,0"
+                        HorizontalScrollBarVisibility="Auto"
+                        HorizontalScrollMode="Enabled"
+                        VerticalScrollMode="Disabled">
+                        <shcp:HorizontalEqualPanel
+                            Margin="0,16"
+                            MinItemWidth="302"
+                            Spacing="16">
+                            <shvc:StatisticsCard DataContext="{Binding Statistics.AvatarWish}"/>
+                            <shvc:StatisticsCard DataContext="{Binding Statistics.WeaponWish}"/>
+                            <shvc:StatisticsCard DataContext="{Binding Statistics.StandardWish}" ShowUpPull="False"/>
+                            <shvc:StatisticsCard DataContext="{Binding Statistics.ChronicledWish}" ShowUpPull="False"/>
+                        </shcp:HorizontalEqualPanel>
+                    </ScrollViewer>
                 </PivotItem>
                 <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotHistory}">
                     <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
@@ -312,7 +310,7 @@
                             <SplitView
                                 DisplayMode="Inline"
                                 IsPaneOpen="True"
-                                OpenPaneLength="323"
+                                OpenPaneLength="408"
                                 PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
                                 <SplitView.Pane>
                                     <ListView
@@ -379,7 +377,6 @@
                             </SplitView>
                         </Border>
                     </Border>
-
                 </PivotItem>
                 <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotAvatar}">
                     <ScrollViewer>
@@ -487,7 +484,6 @@
                             <shvc:HutaoStatisticsCard Grid.Column="2" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.WeaponEvent}"/>
                         </Grid>
                     </Grid>
-
                 </PivotItem>
             </Pivot>
         </Grid>

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

@@ -314,6 +314,17 @@
                                             SelectedItem="{Binding SelectedBackdropType, Mode=TwoWay}"/>
                                     </shc:SizeRestrictedContentControl>
                                 </cwc:SettingsCard>
+                                <cwc:SettingsCard
+                                    Description="{shcm:ResourceString Name=ViewPageSettingThemeDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingThemeHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE790;}">
+                                    <shc:SizeRestrictedContentControl>
+                                        <ComboBox
+                                            DisplayMemberPath="Name"
+                                            ItemsSource="{Binding AppOptions.LazyElementThemes.Value}"
+                                            SelectedItem="{Binding SelectedElementTheme, Mode=TwoWay}"/>
+                                    </shc:SizeRestrictedContentControl>
+                                </cwc:SettingsCard>
                                 <cwc:SettingsExpander
                                     Description="{shcm:ResourceString Name=ViewPageSettingBackgroundImageDescription}"
                                     Header="{shcm:ResourceString Name=ViewPageSettingBackgroundImageHeader}"
@@ -337,6 +348,7 @@
                                                 </mxic:EventTriggerBehavior>
                                             </mxi:Interaction.Behaviors>
                                         </cwc:SettingsCard>
+                                        <cwc:SettingsCard Header="{shcm:ResourceString Name=ViewPageSettingBackgroundImageLocalFolderCopyrightHeader}" Visibility="{Binding BackgroundImageOptions.Wallpaper, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
                                     </cwc:SettingsExpander.Items>
                                 </cwc:SettingsExpander>
                             </StackPanel>

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

@@ -14,7 +14,6 @@
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
-    xmlns:shcs="using:Snap.Hutao.Control.Segmented"
     xmlns:shct="using:Snap.Hutao.Control.Text"
     xmlns:shvcom="using:Snap.Hutao.ViewModel.Complex"
     xmlns:shvcon="using:Snap.Hutao.View.Control"
@@ -629,7 +628,7 @@
                                             <ColumnDefinition Width="auto"/>
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <shcs:Segmented
+                                        <cwc:Segmented
                                             DisplayMemberPath="Floor"
                                             ItemsSource="{Binding AvatarUsageRanks}"
                                             SelectedItem="{Binding SelectedAvatarUsageRank, Mode=TwoWay}"/>
@@ -663,7 +662,7 @@
                                             <ColumnDefinition Width="auto"/>
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <shcs:Segmented
+                                        <cwc:Segmented
                                             DisplayMemberPath="Floor"
                                             ItemsSource="{Binding AvatarAppearanceRanks}"
                                             SelectedItem="{Binding SelectedAvatarAppearanceRank, Mode=TwoWay}"/>
@@ -692,7 +691,7 @@
                                         <RowDefinition Height="auto"/>
                                         <RowDefinition/>
                                     </Grid.RowDefinitions>
-                                    <shcs:Segmented
+                                    <cwc:Segmented
                                         Grid.Row="0"
                                         Margin="16,16,0,16"
                                         DisplayMemberPath="Floor"

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

@@ -203,19 +203,23 @@
                     </Border>
                 </cwc:Case>
                 <cwc:Case Value="Grid">
-                    <GridView
-                        Padding="16,16,4,4"
-                        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>
+                    <Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
+                            <GridView
+                                Padding="16,16,4,4"
+                                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>
+                        </Border>
+                    </Border>
                 </cwc:Case>
             </cwc:SwitchPresenter>
         </Grid>

src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs

@@ -5,7 +5,6 @@ using Microsoft.Extensions.Primitives;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Web.Hutao.SpiralAbyss;
-using System.Diagnostics;
 using System.Globalization;
 
 namespace Snap.Hutao.ViewModel.Complex;

src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs

@@ -104,10 +104,14 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel
                 ArgumentNullException.ThrowIfNull(gachaLogService.ArchiveCollection);
                 ObservableCollection<GachaArchive> archives = gachaLogService.ArchiveCollection;
 
-                await taskContext.SwitchToMainThreadAsync();
-                Archives = archives;
-                HutaoCloudViewModel.RetrieveCommand = RetrieveFromCloudCommand;
-                await SetSelectedArchiveAndUpdateStatisticsAsync(Archives.SelectedOrDefault(), true).ConfigureAwait(false);
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();
+                    Archives = archives;
+                    HutaoCloudViewModel.RetrieveCommand = RetrieveFromCloudCommand;
+                    await SetSelectedArchiveAndUpdateStatisticsAsync(Archives.SelectedOrDefault(), true).ConfigureAwait(false);
+                }
+
                 return true;
             }
         }

src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/Wish.cs

@@ -21,7 +21,15 @@ internal abstract class Wish
 
     public string TimeSpanFormatted
     {
-        get => $"{From:yyyy.MM.dd} - {To:yyyy.MM.dd}";
+        get
+        {
+            if (From == DateTimeOffset.MaxValue && To == DateTimeOffset.MinValue)
+            {
+                return string.Empty;
+            }
+
+            return $"{From:yyyy.MM.dd} - {To:yyyy.MM.dd}";
+        }
     }
 
     /// <summary>

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

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.AppLifecycle;
 using Snap.Hutao.Core;
@@ -58,6 +59,7 @@ internal sealed partial class SettingViewModel : Abstraction.ViewModel
     private readonly IMessenger messenger;
 
     private NameValue<BackdropType>? selectedBackdropType;
+    private NameValue<ElementTheme>? selectedElementTheme;
     private NameValue<BackgroundImageType>? selectedBackgroundImageType;
     private NameValue<CultureInfo>? selectedCulture;
     private NameValue<Region>? selectedRegion;
@@ -94,6 +96,18 @@ internal sealed partial class SettingViewModel : Abstraction.ViewModel
         }
     }
 
+    public NameValue<ElementTheme>? SelectedElementTheme
+    {
+        get => selectedElementTheme ??= AppOptions.LazyElementThemes.Value.Single(t => t.Value == AppOptions.ElementTheme);
+        set
+        {
+            if (SetProperty(ref selectedElementTheme, value) && value is not null)
+            {
+                AppOptions.ElementTheme = value.Value;
+            }
+        }
+    }
+
     public NameValue<BackgroundImageType>? SelectedBackgroundImageType
     {
         get => selectedBackgroundImageType ??= AppOptions.BackgroundImageTypes.Single(t => t.Value == AppOptions.BackgroundImageType);

src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs

@@ -92,39 +92,49 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
 
     protected override async ValueTask<bool> InitializeUIAsync()
     {
-        if (!await metadataService.InitializeAsync().ConfigureAwait(false))
+        if (await metadataService.InitializeAsync().ConfigureAwait(false))
         {
-            return false;
+            try
+            {
+                levelAvatarCurveMap = await metadataService.GetLevelToAvatarCurveMapAsync().ConfigureAwait(false);
+                promotes = await metadataService.GetAvatarPromoteListAsync().ConfigureAwait(false);
+
+                Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);
+                List<Avatar> avatars = await metadataService.GetAvatarListAsync().ConfigureAwait(false);
+                IOrderedEnumerable<Avatar> sorted = avatars
+                    .OrderByDescending(avatar => avatar.BeginTime)
+                    .ThenByDescending(avatar => avatar.Sort);
+                List<Avatar> list = [.. sorted];
+
+                await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
+
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();
+                    Avatars = new(list, true);
+                    Selected = Avatars.View.ElementAtOrDefault(0);
+                }
+
+                FilterTokens = [];
+
+                availableTokens = FrozenDictionary.ToFrozenDictionary(
+                [
+                    .. avatars.Select(avatar => KeyValuePair.Create(avatar.Name, new SearchToken(SearchTokenKind.Avatar, avatar.Name, sideIconUri: AvatarSideIconConverter.IconNameToUri(avatar.SideIcon)))),
+                    .. IntrinsicFrozen.AssociationTypes.Select(assoc => KeyValuePair.Create(assoc, new SearchToken(SearchTokenKind.AssociationType, assoc, iconUri: AssociationTypeIconConverter.AssociationTypeNameToIconUri(assoc)))),
+                    .. IntrinsicFrozen.BodyTypes.Select(b => KeyValuePair.Create(b, new SearchToken(SearchTokenKind.BodyType, b))),
+                    .. IntrinsicFrozen.ElementNames.Select(e => KeyValuePair.Create(e, new SearchToken(SearchTokenKind.ElementName, e, iconUri: ElementNameIconConverter.ElementNameToIconUri(e)))),
+                    .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
+                    .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
+                ]);
+
+                return true;
+            }
+            catch (OperationCanceledException)
+            {
+            }
         }
 
-        levelAvatarCurveMap = await metadataService.GetLevelToAvatarCurveMapAsync().ConfigureAwait(false);
-        promotes = await metadataService.GetAvatarPromoteListAsync().ConfigureAwait(false);
-
-        Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);
-        List<Avatar> avatars = await metadataService.GetAvatarListAsync().ConfigureAwait(false);
-        IOrderedEnumerable<Avatar> sorted = avatars
-            .OrderByDescending(avatar => avatar.BeginTime)
-            .ThenByDescending(avatar => avatar.Sort);
-        List<Avatar> list = [.. sorted];
-
-        await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
-
-        await taskContext.SwitchToMainThreadAsync();
-        Avatars = new(list, true);
-        Selected = Avatars.View.ElementAtOrDefault(0);
-        FilterTokens = [];
-
-        availableTokens = FrozenDictionary.ToFrozenDictionary(
-        [
-            .. avatars.Select(avatar => KeyValuePair.Create(avatar.Name, new SearchToken(SearchTokenKind.Avatar, avatar.Name, sideIconUri: AvatarSideIconConverter.IconNameToUri(avatar.SideIcon)))),
-            .. IntrinsicFrozen.AssociationTypes.Select(assoc => KeyValuePair.Create(assoc, new SearchToken(SearchTokenKind.AssociationType, assoc, iconUri: AssociationTypeIconConverter.AssociationTypeNameToIconUri(assoc)))),
-            .. IntrinsicFrozen.BodyTypes.Select(b => KeyValuePair.Create(b, new SearchToken(SearchTokenKind.BodyType, b))),
-            .. IntrinsicFrozen.ElementNames.Select(e => KeyValuePair.Create(e, new SearchToken(SearchTokenKind.ElementName, e, iconUri: ElementNameIconConverter.ElementNameToIconUri(e)))),
-            .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
-            .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
-        ]);
-
-        return true;
+        return false;
     }
 
     private async ValueTask CombineComplexDataAsync(List<Avatar> avatars, Dictionary<MaterialId, Material> idMaterialMap)

src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs

@@ -53,21 +53,31 @@ internal sealed partial class WikiMonsterViewModel : Abstraction.ViewModel
     {
         if (await metadataService.InitializeAsync().ConfigureAwait(false))
         {
-            levelMonsterCurveMap = await metadataService.GetLevelToMonsterCurveMapAsync().ConfigureAwait(false);
-
-            List<Monster> monsters = await metadataService.GetMonsterListAsync().ConfigureAwait(false);
-            Dictionary<MaterialId, DisplayItem> idDisplayMap = await metadataService.GetIdToDisplayItemAndMaterialMapAsync().ConfigureAwait(false);
-            foreach (Monster monster in monsters)
+            try
+            {
+                levelMonsterCurveMap = await metadataService.GetLevelToMonsterCurveMapAsync().ConfigureAwait(false);
+
+                List<Monster> monsters = await metadataService.GetMonsterListAsync().ConfigureAwait(false);
+                Dictionary<MaterialId, DisplayItem> idDisplayMap = await metadataService.GetIdToDisplayItemAndMaterialMapAsync().ConfigureAwait(false);
+                foreach (Monster monster in monsters)
+                {
+                    monster.DropsView ??= monster.Drops?.SelectList(i => idDisplayMap.GetValueOrDefault(i, Material.Default));
+                }
+
+                List<Monster> ordered = monsters.SortBy(m => m.RelationshipId.Value);
+
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();
+                    Monsters = new(ordered, true);
+                    Selected = Monsters.View.ElementAtOrDefault(0);
+                }
+
+                return true;
+            }
+            catch (OperationCanceledException)
             {
-                monster.DropsView ??= monster.Drops?.SelectList(i => idDisplayMap.GetValueOrDefault(i, Material.Default));
             }
-
-            List<Monster> ordered = monsters.SortBy(m => m.RelationshipId.Value);
-            await taskContext.SwitchToMainThreadAsync();
-
-            Monsters = new(ordered, true);
-            Selected = Monsters.View.ElementAtOrDefault(0);
-            return true;
         }
 
         return false;

src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs

@@ -92,32 +92,42 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
     {
         if (await metadataService.InitializeAsync().ConfigureAwait(false))
         {
-            levelWeaponCurveMap = await metadataService.GetLevelToWeaponCurveMapAsync().ConfigureAwait(false);
-            promotes = await metadataService.GetWeaponPromoteListAsync().ConfigureAwait(false);
-            Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);
+            try
+            {
+                levelWeaponCurveMap = await metadataService.GetLevelToWeaponCurveMapAsync().ConfigureAwait(false);
+                promotes = await metadataService.GetWeaponPromoteListAsync().ConfigureAwait(false);
+                Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);
 
-            List<Weapon> weapons = await metadataService.GetWeaponListAsync().ConfigureAwait(false);
-            IEnumerable<Weapon> sorted = weapons
-                .OrderByDescending(weapon => weapon.RankLevel)
-                .ThenBy(weapon => weapon.WeaponType)
-                .ThenByDescending(weapon => weapon.Id.Value);
-            List<Weapon> list = [.. sorted];
+                List<Weapon> weapons = await metadataService.GetWeaponListAsync().ConfigureAwait(false);
+                IEnumerable<Weapon> sorted = weapons
+                    .OrderByDescending(weapon => weapon.RankLevel)
+                    .ThenBy(weapon => weapon.WeaponType)
+                    .ThenByDescending(weapon => weapon.Id.Value);
+                List<Weapon> list = [.. sorted];
 
-            await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
+                await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
 
-            await taskContext.SwitchToMainThreadAsync();
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();
 
-            Weapons = new(list, true);
-            Selected = Weapons.View.ElementAtOrDefault(0);
-            FilterTokens = [];
+                    Weapons = new(list, true);
+                    Selected = Weapons.View.ElementAtOrDefault(0);
+                }
 
-            availableTokens = FrozenDictionary.ToFrozenDictionary(
-            [
-                .. weapons.Select(w => KeyValuePair.Create(w.Name, new SearchToken(SearchTokenKind.Weapon, w.Name, sideIconUri: EquipIconConverter.IconNameToUri(w.Icon)))),
-                .. IntrinsicFrozen.FightProperties.Select(f => KeyValuePair.Create(f, new SearchToken(SearchTokenKind.FightProperty, f))),
-                .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
-                .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
-            ]);
+                FilterTokens = [];
+
+                availableTokens = FrozenDictionary.ToFrozenDictionary(
+                [
+                    .. weapons.Select(w => KeyValuePair.Create(w.Name, new SearchToken(SearchTokenKind.Weapon, w.Name, sideIconUri: EquipIconConverter.IconNameToUri(w.Icon)))),
+                    .. IntrinsicFrozen.FightProperties.Select(f => KeyValuePair.Create(f, new SearchToken(SearchTokenKind.FightProperty, f))),
+                    .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
+                    .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
+                ]);
+            }
+            catch (OperationCanceledException)
+            {
+            }
         }
     }
 

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Content/IconLink.cs

@@ -1,16 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
-using Snap.Hutao.Service.Game.Scheme;
-using Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher.Resource;
-using Snap.Hutao.Web.Request.Builder;
-using Snap.Hutao.Web.Request.Builder.Abstraction;
-using Snap.Hutao.Web.Response;
-using System.IO;
-using System.Net.Http;
-using System.Text;
-
 namespace Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher;
 
 internal sealed class IconLink

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/Resource/LatestPackageExtension.cs

@@ -0,0 +1,21 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.Text;
+
+namespace Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher.Resource;
+
+internal static class LatestPackageExtension
+{
+    public static void Patch(this LatestPackage latest)
+    {
+        StringBuilder pathBuilder = new();
+        foreach (PackageSegment segment in latest.Segments)
+        {
+            pathBuilder.AppendLine(segment.Path);
+        }
+
+        latest.Path = pathBuilder.ToStringTrimEndReturn();
+        latest.Name = latest.Segments[0].Path[..^4]; // .00X
+    }
+}

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/SdkStatic/Hk4e/Launcher/ResourceClient.cs

@@ -46,18 +46,16 @@ internal sealed partial class ResourceClient
             .TryCatchSendAsync<Response<GameResource>>(httpClient, logger, token)
             .ConfigureAwait(false);
 
-        // 补全缺失的信息
+        // 最新版完整包
         if (resp is { Data.Game.Latest: LatestPackage latest })
         {
-            StringBuilder pathBuilder = new();
-            foreach (PackageSegment segment in latest.Segments)
-            {
-                pathBuilder.AppendLine(segment.Path);
-            }
+            latest.Patch();
+        }
 
-            latest.Path = pathBuilder.ToStringTrimEndReturn();
-            string path = latest.Segments[0].Path[..^4]; // .00X
-            latest.Name = Path.GetFileName(path);
+        // 预下载完整包
+        if (resp is { Data.PreDownloadGame.Latest: LatestPackage preDownloadLatest })
+        {
+            preDownloadLatest.Patch();
         }
 
         return Response.Response.DefaultIfNull(resp);