refresh ui for team appearance

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

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

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

@@ -6,11 +6,8 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources/>
-                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.TokenizingTextBox/TokenizingTextBox.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Loading.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Image/CachedImage.xaml"/>
-                <ResourceDictionary Source="ms-appx:///Control/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"/>

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

@@ -1,67 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Controls;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Snap.Hutao.Control.Extension;
-
-namespace Snap.Hutao.Control.AutoSuggestBox;
-
-[DependencyProperty("FilterCommand", typeof(ICommand))]
-[DependencyProperty("FilterCommandParameter", typeof(object))]
-[DependencyProperty("AvailableTokens", typeof(IReadOnlyDictionary<string, SearchToken>))]
-internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
-{
-    public AutoSuggestTokenBox()
-    {
-        DefaultStyleKey = typeof(TokenizingTextBox);
-        TextChanged += OnFilterSuggestionRequested;
-        QuerySubmitted += OnQuerySubmitted;
-        TokenItemAdding += OnTokenItemAdding;
-        TokenItemAdded += OnTokenItemModified;
-        TokenItemRemoved += OnTokenItemModified;
-    }
-
-    private void OnFilterSuggestionRequested(Microsoft.UI.Xaml.Controls.AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
-    {
-        if (string.IsNullOrWhiteSpace(Text))
-        {
-            return;
-        }
-
-        if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
-        {
-            sender.ItemsSource = AvailableTokens.Values.Where(q => q.Value.Contains(Text, StringComparison.OrdinalIgnoreCase));
-
-            // TODO: CornerRadius
-            // Popup? popup = this.FindDescendant("SuggestionsPopup") as Popup;
-        }
-    }
-
-    private void OnQuerySubmitted(Microsoft.UI.Xaml.Controls.AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
-    {
-        if (args.ChosenSuggestion is not null)
-        {
-            return;
-        }
-
-        CommandExtension.TryExecute(FilterCommand, FilterCommandParameter);
-    }
-
-    private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
-    {
-        if (string.IsNullOrWhiteSpace(args.TokenText))
-        {
-            return;
-        }
-
-        args.Item = AvailableTokens.GetValueOrDefault(args.TokenText) ?? new SearchToken(SearchTokenKind.None, args.TokenText);
-    }
-
-    private void OnTokenItemModified(TokenizingTextBox sender, object args)
-    {
-        CommandExtension.TryExecute(FilterCommand, FilterCommandParameter);
-    }
-}

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

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

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

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

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

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

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

@@ -3,7 +3,6 @@
 
 using CommunityToolkit.WinUI.Behaviors;
 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.Control.Behavior;
 
@@ -50,7 +49,10 @@ internal sealed partial class PeriodicInvokeCommandOrOnActualThemeChangedBehavio
             return;
         }
 
-        Command.TryExecute(CommandParameter);
+        if (Command is not null && Command.CanExecute(CommandParameter))
+        {
+            Command.Execute(CommandParameter);
+        }
     }
 
     private async ValueTask RunCoreAsync()

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

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

src/Snap.Hutao/Snap.Hutao/Control/Helper/UIElementHelper.cs

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

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

@@ -1,21 +1,20 @@
-<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,10 +1,9 @@
 // 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;
 
 namespace Snap.Hutao.Control.Panel;
 
@@ -15,16 +14,16 @@ 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);
 
-    private static readonly FrozenDictionary<int, string> IndexTypeMap = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(0, List),
-        KeyValuePair.Create(1, Grid),
-    ]);
+    private static readonly Dictionary<int, string> IndexTypeMap = new()
+    {
+        [0] = List,
+        [1] = Grid,
+    };
 
     private readonly RoutedEventHandler loadedEventHandler;
     private readonly RoutedEventHandler unloadedEventHandler;

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

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

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/Segmented.xaml

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

src/Snap.Hutao/Snap.Hutao/Control/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/ItemsPanelTemplate.xaml

@@ -17,9 +17,6 @@
     <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing2Template">
         <StackPanel Orientation="Horizontal" Spacing="2"/>
     </ItemsPanelTemplate>
-    <ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing4Template">
-        <StackPanel Orientation="Horizontal" Spacing="4"/>
-    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="StackPanelSpacing4Template">
         <StackPanel Spacing="4"/>
     </ItemsPanelTemplate>

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

@@ -11,6 +11,4 @@ internal static class KnownColors
     public static readonly Color Orange = StructMarshal.Color(0xFFBC6932);
     public static readonly Color Purple = StructMarshal.Color(0xFFA156E0);
     public static readonly Color Blue = StructMarshal.Color(0xFF5180CB);
-    public static readonly Color Green = StructMarshal.Color(0xFF2A8F72);
-    public static readonly Color White = StructMarshal.Color(0xFF72778B);
 }

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

@@ -26,12 +26,12 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
 {
     private const string CacheFolderName = nameof(ImageCache);
 
-    private readonly FrozenDictionary<int, TimeSpan> retryCountToDelay = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(0, TimeSpan.FromSeconds(4)),
-        KeyValuePair.Create(1, TimeSpan.FromSeconds(16)),
-        KeyValuePair.Create(2, TimeSpan.FromSeconds(64)),
-    ]);
+    private readonly FrozenDictionary<int, TimeSpan> retryCountToDelay = new Dictionary<int, TimeSpan>()
+    {
+        [0] = TimeSpan.FromSeconds(4),
+        [1] = TimeSpan.FromSeconds(16),
+        [2] = TimeSpan.FromSeconds(64),
+    }.ToFrozenDictionary();
 
     private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();
 

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
@@ -39,10 +37,4 @@ internal sealed class HutaoException : Exception
         string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
         throw new HutaoException(HutaoExceptionKind.ServiceTypeCastFailed, message, innerException);
     }
-
-    public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
-    {
-        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
-        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
-    }
 }

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

@@ -9,5 +9,4 @@ internal enum HutaoExceptionKind
     ServiceTypeCastFailed,
     FileSystemCreateFileInsufficientPermissions,
     PrivateNamedPipeContentHashIncorrect,
-    GachaStatisticsInvalidItemId,
 }

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

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

src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs

@@ -15,12 +15,6 @@ namespace Snap.Hutao.Extension;
 [HighQuality]
 internal static partial class EnumerableExtension
 {
-    public static void Deconstruct<TKey, TElement>(this IGrouping<TKey, TElement> grouping, out TKey key, out IEnumerable<TElement> elements)
-    {
-        key = grouping.Key;
-        elements = grouping;
-    }
-
     public static TElement? ElementAtOrLastOrDefault<TElement>(this IEnumerable<TElement> source, int index)
     {
         return source.ElementAtOrDefault(index) ?? source.LastOrDefault();

src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaItem.cs

@@ -42,14 +42,14 @@ internal sealed partial class GachaItem
     /// <summary>
     /// 祈愿记录分类
     /// </summary>
-    public GachaType GachaType { get; set; }
+    public GachaConfigType GachaType { get; set; }
 
     /// <summary>
     /// 祈愿记录查询分类
     /// 合并保底的卡池使用此属性
     /// 仅4种（不含400）
     /// </summary>
-    public GachaType QueryType { get; set; }
+    public GachaConfigType QueryType { get; set; }
 
     /// <summary>
     /// 物品Id

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

@@ -20,7 +20,7 @@ internal sealed class UIGFItem : GachaLogItem, IMappingFrom<UIGFItem, GachaItem,
     /// </summary>
     [JsonPropertyName("uigf_gacha_type")]
     [JsonEnum(JsonSerializeType.NumberString)]
-    public GachaType UIGFGachaType { get; set; } = default!;
+    public GachaConfigType UIGFGachaType { get; set; } = default!;
 
     public static UIGFItem From(GachaItem item, INameQuality nameQuality)
     {

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs

@@ -1,55 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Control;
-using Snap.Hutao.Model.Intrinsic;
-using System.Collections.Frozen;
-
-namespace Snap.Hutao.Model.Metadata.Converter;
-
-internal sealed class AssociationTypeIconConverter : ValueConverter<AssociationType, Uri?>
-{
-    private static readonly FrozenDictionary<string, AssociationType> LocalizedNameToAssociationType = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeMondstadt, AssociationType.ASSOC_TYPE_MONDSTADT),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeLiyue, AssociationType.ASSOC_TYPE_LIYUE),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeFatui, AssociationType.ASSOC_TYPE_FATUI),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeInazuma, AssociationType.ASSOC_TYPE_INAZUMA),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeRanger, AssociationType.ASSOC_TYPE_RANGER),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeSumeru, AssociationType.ASSOC_TYPE_SUMERU),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeFontaine, AssociationType.ASSOC_TYPE_FONTAINE),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeNatlan, AssociationType.ASSOC_TYPE_NATLAN),
-        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeSnezhnaya, AssociationType.ASSOC_TYPE_SNEZHNAYA),
-    ]);
-
-    public static Uri? AssociationTypeNameToIconUri(string associationTypeName)
-    {
-        return AssociationTypeToIconUri(LocalizedNameToAssociationType.GetValueOrDefault(associationTypeName));
-    }
-
-    public static Uri? AssociationTypeToIconUri(AssociationType type)
-    {
-        string? association = type switch
-        {
-            AssociationType.ASSOC_TYPE_MONDSTADT => "Mengde",
-            AssociationType.ASSOC_TYPE_LIYUE => "Liyue",
-            AssociationType.ASSOC_TYPE_FATUI => default,
-            AssociationType.ASSOC_TYPE_INAZUMA => "Inazuma",
-            AssociationType.ASSOC_TYPE_RANGER => default,
-            AssociationType.ASSOC_TYPE_SUMERU => "Sumeru",
-            AssociationType.ASSOC_TYPE_FONTAINE => "Fontaine",
-            AssociationType.ASSOC_TYPE_NATLAN => default,
-            AssociationType.ASSOC_TYPE_SNEZHNAYA => default,
-            _ => throw Must.NeverHappen(),
-        };
-
-        return association is null
-            ? default
-            : Web.HutaoEndpoints.StaticRaw("ChapterIcon", $"UI_ChapterIcon_{association}.png").ToUri();
-    }
-
-    public override Uri? Convert(AssociationType from)
-    {
-        return AssociationTypeToIconUri(from);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs

@@ -3,7 +3,6 @@
 
 using Snap.Hutao.Control;
 using Snap.Hutao.Model.Intrinsic;
-using System.Collections.Frozen;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
@@ -13,27 +12,27 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 [HighQuality]
 internal sealed class ElementNameIconConverter : ValueConverter<string, Uri>
 {
-    private static readonly FrozenDictionary<string, string> LocalizedNameToElementIconName = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameElec, "Electric"),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameFire, "Fire"),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameGrass, "Grass"),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameIce, "Ice"),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameRock, "Rock"),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameWater, "Water"),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameWind, "Wind"),
-    ]);
+    private static readonly Dictionary<string, string> LocalizedNameToElementIconName = new()
+    {
+        [SH.ModelIntrinsicElementNameElec] = "Electric",
+        [SH.ModelIntrinsicElementNameFire] = "Fire",
+        [SH.ModelIntrinsicElementNameGrass] = "Grass",
+        [SH.ModelIntrinsicElementNameIce] = "Ice",
+        [SH.ModelIntrinsicElementNameRock] = "Rock",
+        [SH.ModelIntrinsicElementNameWater] = "Water",
+        [SH.ModelIntrinsicElementNameWind] = "Wind",
+    };
 
-    private static readonly FrozenDictionary<string, ElementType> LocalizedNameToElementType = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameElec, ElementType.Electric),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameFire, ElementType.Fire),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameGrass, ElementType.Grass),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameIce, ElementType.Ice),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameRock, ElementType.Rock),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameWater, ElementType.Water),
-        KeyValuePair.Create(SH.ModelIntrinsicElementNameWind, ElementType.Wind),
-    ]);
+    private static readonly Dictionary<string, ElementType> LocalizedNameToElementType = new()
+    {
+        [SH.ModelIntrinsicElementNameElec] = ElementType.Electric,
+        [SH.ModelIntrinsicElementNameFire] = ElementType.Fire,
+        [SH.ModelIntrinsicElementNameGrass] = ElementType.Grass,
+        [SH.ModelIntrinsicElementNameIce] = ElementType.Ice,
+        [SH.ModelIntrinsicElementNameRock] = ElementType.Rock,
+        [SH.ModelIntrinsicElementNameWater] = ElementType.Water,
+        [SH.ModelIntrinsicElementNameWind] = ElementType.Wind,
+    };
 
     /// <summary>
     /// 将中文元素名称转换为图标链接

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs

@@ -3,9 +3,8 @@
 
 using Microsoft.UI;
 using Snap.Hutao.Control;
-using Snap.Hutao.Control.Theme;
 using Snap.Hutao.Model.Intrinsic;
-using System.Collections.Frozen;
+using Snap.Hutao.Win32;
 using Windows.UI;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
@@ -16,39 +15,17 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 [HighQuality]
 internal sealed class QualityColorConverter : ValueConverter<QualityType, Color>
 {
-    private static readonly FrozenDictionary<string, QualityType> LocalizedNameToQualityType = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(SH.ModelIntrinsicItemQualityWhite, QualityType.QUALITY_WHITE),
-        KeyValuePair.Create(SH.ModelIntrinsicItemQualityGreen, QualityType.QUALITY_GREEN),
-        KeyValuePair.Create(SH.ModelIntrinsicItemQualityBlue, QualityType.QUALITY_BLUE),
-        KeyValuePair.Create(SH.ModelIntrinsicItemQualityPurple, QualityType.QUALITY_PURPLE),
-        KeyValuePair.Create(SH.ModelIntrinsicItemQualityOrange, QualityType.QUALITY_ORANGE),
-        KeyValuePair.Create(SH.ModelIntrinsicItemQualityRed, QualityType.QUALITY_ORANGE_SP),
-    ]);
-
-    private static readonly FrozenDictionary<QualityType, Color> QualityTypeToColor = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(QualityType.QUALITY_WHITE, KnownColors.White),
-        KeyValuePair.Create(QualityType.QUALITY_GREEN, KnownColors.Green),
-        KeyValuePair.Create(QualityType.QUALITY_BLUE, KnownColors.Blue),
-        KeyValuePair.Create(QualityType.QUALITY_PURPLE, KnownColors.Purple),
-        KeyValuePair.Create(QualityType.QUALITY_ORANGE, KnownColors.Orange),
-        KeyValuePair.Create(QualityType.QUALITY_ORANGE_SP, KnownColors.Orange),
-    ]);
-
-    public static Color QualityNameToColor(string qualityName)
-    {
-        return QualityToColor(LocalizedNameToQualityType.GetValueOrDefault(qualityName));
-    }
-
-    public static Color QualityToColor(QualityType quality)
-    {
-        return QualityTypeToColor.GetValueOrDefault(quality, Colors.Transparent);
-    }
-
     /// <inheritdoc/>
     public override Color Convert(QualityType from)
     {
-        return QualityToColor(from);
+        return from switch
+        {
+            QualityType.QUALITY_WHITE => StructMarshal.Color(0xFF72778B),
+            QualityType.QUALITY_GREEN => StructMarshal.Color(0xFF2A8F72),
+            QualityType.QUALITY_BLUE => StructMarshal.Color(0xFF5180CB),
+            QualityType.QUALITY_PURPLE => StructMarshal.Color(0xFFA156E0),
+            QualityType.QUALITY_ORANGE or QualityType.QUALITY_ORANGE_SP => StructMarshal.Color(0xFFBC6932),
+            _ => Colors.Transparent,
+        };
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs

@@ -3,7 +3,6 @@
 
 using Snap.Hutao.Control;
 using Snap.Hutao.Model.Intrinsic;
-using System.Collections.Frozen;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
@@ -13,20 +12,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 [HighQuality]
 internal sealed class WeaponTypeIconConverter : ValueConverter<WeaponType, Uri>
 {
-    private static readonly FrozenDictionary<string, WeaponType> LocalizedNameToWeaponType = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(SH.ModelIntrinsicWeaponTypeSwordOneHand, WeaponType.WEAPON_SWORD_ONE_HAND),
-        KeyValuePair.Create(SH.ModelIntrinsicWeaponTypeBow, WeaponType.WEAPON_BOW),
-        KeyValuePair.Create(SH.ModelIntrinsicWeaponTypePole, WeaponType.WEAPON_POLE),
-        KeyValuePair.Create(SH.ModelIntrinsicWeaponTypeClaymore, WeaponType.WEAPON_CLAYMORE),
-        KeyValuePair.Create(SH.ModelIntrinsicWeaponTypeCatalyst, WeaponType.WEAPON_CATALYST),
-    ]);
-
-    public static Uri WeaponTypeNameToIconUri(string weaponTypeName)
-    {
-        return WeaponTypeToIconUri(LocalizedNameToWeaponType.GetValueOrDefault(weaponTypeName));
-    }
-
     /// <summary>
     /// 将武器类型转换为图标链接
     /// </summary>

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

@@ -49,7 +49,7 @@ internal sealed class GachaEvent
     /// <summary>
     /// 卡池类型
     /// </summary>
-    public GachaType Type { get; set; }
+    public GachaConfigType Type { get; set; }
 
     /// <summary>
     /// 五星列表

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.resx

@@ -860,9 +860,6 @@
   <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>
@@ -2636,12 +2633,6 @@
   <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>
@@ -3056,9 +3047,6 @@
   <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/Cultivation/CultivationService.cs

@@ -39,7 +39,7 @@ internal sealed partial class CultivationService : ICultivationService
             List<InventoryItem> entities = cultivationDbService.GetInventoryItemListByProjectId(projectId);
 
             List<InventoryItemView> results = [];
-            foreach (Material meta in context.EnumerateInventoryMaterial())
+            foreach (Material meta in context.EnumerateInventroyMaterial())
             {
                 InventoryItem entity = entities.SingleOrDefault(e => e.ItemId == meta.Id) ?? InventoryItem.From(projectId, meta.Id);
                 results.Add(new(entity, meta, saveCommand));

src/Snap.Hutao/Snap.Hutao/Service/Discord/DiscordService.cs

@@ -41,33 +41,39 @@ internal sealed partial class DiscordService : IDiscordService, IDisposable
 
     private bool IsSupported()
     {
-        // Actually requires a discord client to be running on Windows platform.
-        // If not, discord core creation code will throw.
-        Process[] discordProcesses = Process.GetProcessesByName("Discord");
-
-        if (discordProcesses.Length <= 0)
+        try
         {
-            return false;
-        }
+            // Actually requires a discord client to be running on Windows platform.
+            // If not, discord core creation code will throw.
+            Process[] discordProcesses = Process.GetProcessesByName("Discord");
 
-        foreach (Process process in discordProcesses)
-        {
-            try
+            if (discordProcesses.Length <= 0)
             {
-                _ = process.Handle;
-            }
-            catch (Exception)
-            {
-                if (!isInitialized)
-                {
-                    isInitialized = true;
-                    infoBarService.Warning(SH.ServiceDiscordActivityElevationRequiredHint);
-                }
-
                 return false;
             }
-        }
 
-        return true;
+            foreach (Process process in discordProcesses)
+            {
+                try
+                {
+                    _ = process.Handle;
+                }
+                catch (Exception)
+                {
+                    if (!isInitialized)
+                    {
+                        infoBarService.Warning(SH.ServiceDiscordActivityElevationRequiredHint);
+                    }
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        finally
+        {
+            isInitialized = true;
+        }
     }
 }

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

@@ -0,0 +1,41 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
+using System.Collections.Frozen;
+using System.Runtime.CompilerServices;
+
+namespace Snap.Hutao.Service.GachaLog.Factory;
+
+/// <summary>
+/// 祈愿配置类型比较器
+/// </summary>
+internal sealed class GachaConfigTypeComparer : IComparer<GachaConfigType>
+{
+    private static readonly Lazy<GachaConfigTypeComparer> LazyShared = new(() => new());
+    private static readonly FrozenDictionary<GachaConfigType, int> OrderMap = new Dictionary<GachaConfigType, int>()
+    {
+        [GachaConfigType.AvatarEventWish] = 0,
+        [GachaConfigType.AvatarEventWish2] = 1,
+        [GachaConfigType.WeaponEventWish] = 2,
+        [GachaConfigType.StandardWish] = 3,
+        [GachaConfigType.NoviceWish] = 4,
+    }.ToFrozenDictionary();
+
+    /// <summary>
+    /// 共享的比较器
+    /// </summary>
+    public static GachaConfigTypeComparer Shared { get => LazyShared.Value; }
+
+    /// <inheritdoc/>
+    public int Compare(GachaConfigType x, GachaConfigType y)
+    {
+        return OrderOf(x) - OrderOf(y);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int OrderOf(GachaConfigType type)
+    {
+        return OrderMap.GetValueOrDefault(type, 0);
+    }
+}

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

@@ -3,7 +3,6 @@
 
 using Snap.Hutao.Model.Metadata.Abstraction;
 using Snap.Hutao.ViewModel.GachaLog;
-using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 using Windows.UI;
@@ -26,7 +25,7 @@ internal static class GachaStatisticsExtension
         bool isPreviousUp = true;
 
         // mark the IsGuarantee
-        foreach (ref readonly SummaryItem item in CollectionsMarshal.AsSpan(summaryItems))
+        foreach (SummaryItem item in summaryItems)
         {
             if (item.IsUp && (!isPreviousUp))
             {
@@ -63,4 +62,4 @@ internal static class GachaStatisticsExtension
         ReadOnlySpan<byte> codes = MD5.HashData(Encoding.UTF8.GetBytes(name));
         return Color.FromArgb(255, codes.Slice(0, 5).Average(), codes.Slice(5, 5).Average(), codes.Slice(10, 5).Average());
     }
-}
+}

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

@@ -7,7 +7,6 @@ using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Metadata.Weapon;
 using Snap.Hutao.Service.Metadata;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.ViewModel.GachaLog;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 using Snap.Hutao.Web.Hutao.GachaLog;
@@ -32,8 +31,9 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
     public async ValueTask<GachaStatistics> CreateAsync(List<Model.Entity.GachaItem> items, GachaLogServiceMetadataContext context)
     {
         await taskContext.SwitchToBackgroundAsync();
+        List<GachaEvent> gachaEvents = await metadataService.GetGachaEventListAsync().ConfigureAwait(false);
+        List<HistoryWishBuilder> historyWishBuilders = gachaEvents.SelectList(gachaEvent => new HistoryWishBuilder(gachaEvent, context));
 
-        List<HistoryWishBuilder> historyWishBuilders = context.GachaEvents.SelectList(gachaEvent => new HistoryWishBuilder(gachaEvent, context));
         return CreateCore(taskContext, homaGachaLogClient, items, historyWishBuilders, context, options.IsEmptyHistoryWishVisible);
     }
 
@@ -54,9 +54,6 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         TypedWishSummaryBuilderContext weaponContext = TypedWishSummaryBuilderContext.WeaponEventWish(taskContext, gachaLogClient);
         TypedWishSummaryBuilder weaponWishBuilder = new(weaponContext);
 
-        TypedWishSummaryBuilderContext chronicledContext = TypedWishSummaryBuilderContext.ChronicledWish(taskContext, gachaLogClient);
-        TypedWishSummaryBuilder chronicledWishBuilder = new(chronicledContext);
-
         Dictionary<Avatar, int> orangeAvatarCounter = [];
         Dictionary<Avatar, int> purpleAvatarCounter = [];
         Dictionary<Weapon, int> orangeWeaponCounter = [];
@@ -64,25 +61,24 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         Dictionary<Weapon, int> blueWeaponCounter = [];
 
         // Pre group builders
-        Dictionary<GachaType, List<HistoryWishBuilder>> historyWishBuilderMap = historyWishBuilders
+        Dictionary<GachaConfigType, List<HistoryWishBuilder>> historyWishBuilderMap = historyWishBuilders
             .GroupBy(b => b.ConfigType)
             .ToDictionary(g => g.Key, g => g.ToList().SortBy(b => b.From));
 
         // Items are ordered by precise time, first is oldest
         // 'ref' is not allowed here because we have lambda below
-        foreach (ref readonly Model.Entity.GachaItem item in CollectionsMarshal.AsSpan(items))
+        foreach (Model.Entity.GachaItem item in CollectionsMarshal.AsSpan(items))
         {
-            // Find target history wish to operate. // banner.From <= item.Time <= banner.To
-            Model.Entity.GachaItem pinned = item;
-            HistoryWishBuilder? targetHistoryWishBuilder = item.GachaType is not (GachaType.Standard or GachaType.NewBie)
-                ? historyWishBuilderMap[item.GachaType].BinarySearch(banner => pinned.Time < banner.From ? -1 : pinned.Time > banner.To ? 1 : 0)
+            // Find target history wish to operate. // w.From <= item.Time <= w.To
+            HistoryWishBuilder? targetHistoryWishBuilder = item.GachaType is not (GachaConfigType.StandardWish or GachaConfigType.NoviceWish)
+                ? historyWishBuilderMap[item.GachaType].BinarySearch(w => item.Time < w.From ? -1 : item.Time > w.To ? 1 : 0)
                 : default;
 
             switch (item.ItemId.StringLength())
             {
                 case 8U:
                     {
-                        Avatar avatar = context.GetAvatar(item.ItemId);
+                        Avatar avatar = context.IdAvatarMap[item.ItemId];
 
                         bool isUp = false;
                         switch (avatar.Quality)
@@ -102,7 +98,6 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
                         standardWishBuilder.Track(item, avatar, isUp);
                         avatarWishBuilder.Track(item, avatar, isUp);
                         weaponWishBuilder.Track(item, avatar, isUp);
-                        chronicledWishBuilder.Track(item, avatar, isUp);
                         break;
                     }
 
@@ -132,18 +127,17 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
                         standardWishBuilder.Track(item, weapon, isUp);
                         avatarWishBuilder.Track(item, weapon, isUp);
                         weaponWishBuilder.Track(item, weapon, isUp);
-                        chronicledWishBuilder.Track(item, weapon, isUp);
                         break;
                     }
 
                 default:
                     // ItemId string length not correct.
-                    HutaoException.GachaStatisticsInvalidItemId(item.ItemId);
+                    ThrowHelper.UserdataCorrupted(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(item.ItemId), default!);
                     break;
             }
         }
 
-        AsyncBarrier barrier = new(4);
+        AsyncBarrier barrier = new(3);
 
         return new()
         {
@@ -151,7 +145,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
             HistoryWishes = historyWishBuilders
                 .Where(b => isEmptyHistoryWishVisible || (!b.IsEmpty))
                 .OrderByDescending(builder => builder.From)
-                .ThenBy(builder => builder.ConfigType, GachaTypeComparer.Shared)
+                .ThenBy(builder => builder.ConfigType, GachaConfigTypeComparer.Shared)
                 .Select(builder => builder.ToHistoryWish())
                 .ToList(),
 
@@ -168,7 +162,6 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
             StandardWish = standardWishBuilder.ToTypedWishSummary(barrier),
             AvatarWish = avatarWishBuilder.ToTypedWishSummary(barrier),
             WeaponWish = weaponWishBuilder.ToTypedWishSummary(barrier),
-            ChronicledWish = chronicledWishBuilder.ToTypedWishSummary(barrier),
         };
     }
 }

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

@@ -62,29 +62,22 @@ internal sealed partial class GachaStatisticsSlimFactory : IGachaStatisticsSlimF
         int weaponPurpleTracker = 0;
         TypedWishSummarySlim weaponWish = new(SH.ServiceGachaLogFactoryWeaponWishName, 80, 10);
 
-        int chronicledOrangeTracker = 0;
-        int chronicledPurpleTracker = 0;
-        TypedWishSummarySlim chronicledWish = new(SH.ServiceGachaLogFactoryChronicledWishName, 90, 10);
-
         // O(n) operation
         foreach (ref readonly GachaItem item in CollectionsMarshal.AsSpan(items))
         {
             INameQuality nameQuality = context.GetNameQualityByItemId(item.ItemId);
             switch (item.QueryType)
             {
-                case GachaType.Standard:
+                case GachaConfigType.StandardWish:
                     Track(nameQuality, ref standardOrangeTracker, ref standardPurpleTracker);
                     break;
-                case GachaType.ActivityAvatar:
-                case GachaType.SpecialActivityAvatar:
+                case GachaConfigType.AvatarEventWish:
+                case GachaConfigType.AvatarEventWish2:
                     Track(nameQuality, ref avatarOrangeTracker, ref avatarPurpleTracker);
                     break;
-                case GachaType.ActivityWeapon:
+                case GachaConfigType.WeaponEventWish:
                     Track(nameQuality, ref weaponOrangeTracker, ref weaponPurpleTracker);
                     break;
-                case GachaType.ActivityCity:
-                    Track(nameQuality, ref chronicledOrangeTracker, ref chronicledPurpleTracker);
-                    break;
                 default:
                     break;
             }
@@ -92,16 +85,11 @@ internal sealed partial class GachaStatisticsSlimFactory : IGachaStatisticsSlimF
 
         standardWish.LastOrangePull = standardOrangeTracker;
         standardWish.LastPurplePull = standardPurpleTracker;
-
         avatarWish.LastOrangePull = avatarOrangeTracker;
         avatarWish.LastPurplePull = avatarPurpleTracker;
-
         weaponWish.LastOrangePull = weaponOrangeTracker;
         weaponWish.LastPurplePull = weaponPurpleTracker;
 
-        chronicledWish.LastOrangePull = chronicledOrangeTracker;
-        chronicledWish.LastPurplePull = chronicledPurpleTracker;
-
         return new()
         {
             Uid = uid,

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

@@ -1,42 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
-using System.Collections.Frozen;
-using System.Runtime.CompilerServices;
-
-namespace Snap.Hutao.Service.GachaLog.Factory;
-
-/// <summary>
-/// 祈愿配置类型比较器
-/// </summary>
-internal sealed class GachaTypeComparer : IComparer<GachaType>
-{
-    private static readonly Lazy<GachaTypeComparer> LazyShared = new(() => new());
-    private static readonly FrozenDictionary<GachaType, int> OrderMap = FrozenDictionary.ToFrozenDictionary(
-    [
-        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),
-    ]);
-
-    /// <summary>
-    /// 共享的比较器
-    /// </summary>
-    public static GachaTypeComparer Shared { get => LazyShared.Value; }
-
-    /// <inheritdoc/>
-    public int Compare(GachaType x, GachaType y)
-    {
-        return OrderOf(x) - OrderOf(y);
-    }
-
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static int OrderOf(GachaType type)
-    {
-        return OrderMap.GetValueOrDefault(type, 0);
-    }
-}

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

@@ -29,6 +29,7 @@ internal sealed class HistoryWishBuilder
     /// </summary>
     /// <param name="gachaEvent">卡池配置</param>
     /// <param name="context">祈愿记录上下文</param>
+    [SuppressMessage("", "SH002")]
     public HistoryWishBuilder(GachaEvent gachaEvent, GachaLogServiceMetadataContext context)
     {
         this.gachaEvent = gachaEvent;
@@ -36,27 +37,21 @@ internal sealed class HistoryWishBuilder
 
         switch (ConfigType)
         {
-            case GachaType.ActivityAvatar or GachaType.SpecialActivityAvatar:
+            case GachaConfigType.AvatarEventWish or GachaConfigType.AvatarEventWish2:
                 orangeUpCounter = gachaEvent.UpOrangeList.Select(id => context.IdAvatarMap[id]).ToDictionary(a => (IStatisticsItemSource)a, a => 0);
                 purpleUpCounter = gachaEvent.UpPurpleList.Select(id => context.IdAvatarMap[id]).ToDictionary(a => (IStatisticsItemSource)a, a => 0);
                 break;
-            case GachaType.ActivityWeapon:
+            case GachaConfigType.WeaponEventWish:
                 orangeUpCounter = gachaEvent.UpOrangeList.Select(id => context.IdWeaponMap[id]).ToDictionary(w => (IStatisticsItemSource)w, w => 0);
                 purpleUpCounter = gachaEvent.UpPurpleList.Select(id => context.IdWeaponMap[id]).ToDictionary(w => (IStatisticsItemSource)w, w => 0);
                 break;
-            case GachaType.ActivityCity:
-
-                // Avatars are less than weapons, so we try to get the value from avatar map first
-                orangeUpCounter = gachaEvent.UpOrangeList.Select(id => (IStatisticsItemSource?)context.IdAvatarMap.GetValueOrDefault(id) ?? context.IdWeaponMap[id]).ToDictionary(c => c, c => 0);
-                purpleUpCounter = gachaEvent.UpPurpleList.Select(id => (IStatisticsItemSource?)context.IdAvatarMap.GetValueOrDefault(id) ?? context.IdWeaponMap[id]).ToDictionary(c => c, c => 0);
-                break;
         }
     }
 
     /// <summary>
     /// 祈愿配置类型
     /// </summary>
-    public GachaType ConfigType { get; }
+    public GachaConfigType ConfigType { get; }
 
     /// <inheritdoc cref="GachaEvent.From"/>
     public DateTimeOffset From { get => gachaEvent.From; }
@@ -111,13 +106,13 @@ internal sealed class HistoryWishBuilder
     {
         HistoryWish historyWish = new()
         {
-            // Base
+            // base
             Name = gachaEvent.Name,
             From = gachaEvent.From,
             To = gachaEvent.To,
             TotalCount = totalCountTracker,
 
-            // Fill
+            // fill
             Version = gachaEvent.Version,
             BannerImage = gachaEvent.Banner,
             OrangeUpList = orangeUpCounter.ToStatisticsList(),

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

@@ -5,7 +5,6 @@ using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Model.Metadata.Abstraction;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.ViewModel.GachaLog;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 using Snap.Hutao.Web.Hutao.GachaLog;
@@ -19,20 +18,18 @@ internal sealed class HutaoStatisticsFactory
     private readonly GachaEvent avatarEvent;
     private readonly GachaEvent avatarEvent2;
     private readonly GachaEvent weaponEvent;
-    private readonly GachaEvent chronicledEvent;
 
     public HutaoStatisticsFactory(in HutaoStatisticsFactoryMetadataContext context)
     {
         this.context = context;
 
-        // when in new verion
+        // TODO: when in new verion
         // due to lack of newer metadata
         // this can crash
         DateTimeOffset now = DateTimeOffset.UtcNow;
-        avatarEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityAvatar);
-        avatarEvent2 = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.SpecialActivityAvatar);
-        weaponEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityWeapon);
-        chronicledEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityCity);
+        avatarEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaConfigType.AvatarEventWish);
+        avatarEvent2 = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaConfigType.AvatarEventWish2);
+        weaponEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaConfigType.WeaponEventWish);
     }
 
     public HutaoStatistics Create(GachaEventStatistics raw)
@@ -41,8 +38,7 @@ internal sealed class HutaoStatisticsFactory
         {
             AvatarEvent = CreateWishSummary(avatarEvent, raw.AvatarEvent),
             AvatarEvent2 = CreateWishSummary(avatarEvent2, raw.AvatarEvent2),
-            WeaponEvent = CreateWishSummary(weaponEvent, raw.WeaponEvent),
-            Chronicled = CreateWishSummary(chronicledEvent, raw.Chronicled),
+            WeaponWish = CreateWishSummary(weaponEvent, raw.WeaponEvent),
         };
     }
 
@@ -57,13 +53,12 @@ internal sealed class HutaoStatisticsFactory
         {
             IStatisticsItemSource source = item.Item.StringLength() switch
             {
-                8U => context.GetAvatar(item.Item),
-                5U => context.GetWeapon(item.Item),
-                _ => throw HutaoException.GachaStatisticsInvalidItemId(item.Item),
+                8U => context.IdAvatarMap[item.Item],
+                5U => context.IdWeaponMap[item.Item],
+                _ => throw ThrowHelper.UserdataCorrupted(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(item.Item), default!),
             };
             StatisticsItem statisticsItem = source.ToStatisticsItem(unchecked((int)item.Count));
 
-            // Put UP items to a separate list
             if (gachaEvent.UpOrangeList.Contains(item.Item) || gachaEvent.UpPurpleList.Contains(item.Item))
             {
                 upItems.Add(statisticsItem);

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

@@ -5,18 +5,19 @@ 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.Metadata.ContextAbstraction;
 
 namespace Snap.Hutao.Service.GachaLog.Factory;
 
-internal sealed class HutaoStatisticsFactoryMetadataContext : IMetadataContext,
-    IMetadataDictionaryIdAvatarSource,
-    IMetadataDictionaryIdWeaponSource,
-    IMetadataListGachaEventSource
+internal readonly struct HutaoStatisticsFactoryMetadataContext
 {
-    public Dictionary<AvatarId, Avatar> IdAvatarMap { get; set; } = default!;
+    public readonly Dictionary<AvatarId, Avatar> IdAvatarMap;
+    public readonly Dictionary<WeaponId, Weapon> IdWeaponMap;
+    public readonly List<GachaEvent> GachaEvents;
 
-    public Dictionary<WeaponId, Weapon> IdWeaponMap { get; set; } = default!;
-
-    public List<GachaEvent> GachaEvents { get; set; } = default!;
+    public HutaoStatisticsFactoryMetadataContext(Dictionary<AvatarId, Avatar> idAvatarMap, Dictionary<WeaponId, Weapon> idWeaponMap, List<GachaEvent> gachaEvents)
+    {
+        IdAvatarMap = idAvatarMap;
+        IdWeaponMap = idWeaponMap;
+        GachaEvents = gachaEvents;
+    }
 }

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

@@ -15,6 +15,21 @@ namespace Snap.Hutao.Service.GachaLog.Factory;
 [HighQuality]
 internal sealed class TypedWishSummaryBuilder
 {
+    /// <summary>
+    /// 常驻祈愿
+    /// </summary>
+    public static readonly Func<GachaConfigType, bool> IsStandardWish = type => type is GachaConfigType.StandardWish;
+
+    /// <summary>
+    /// 角色活动
+    /// </summary>
+    public static readonly Func<GachaConfigType, bool> IsAvatarEventWish = type => type is GachaConfigType.AvatarEventWish or GachaConfigType.AvatarEventWish2;
+
+    /// <summary>
+    /// 武器活动
+    /// </summary>
+    public static readonly Func<GachaConfigType, bool> IsWeaponEventWish = type => type is GachaConfigType.WeaponEventWish;
+
     private readonly TypedWishSummaryBuilderContext context;
 
     private readonly List<int> averageOrangePullTracker = [];
@@ -47,54 +62,52 @@ internal sealed class TypedWishSummaryBuilder
     /// <param name="isUp">是否为Up物品</param>
     public void Track(GachaItem item, ISummaryItemSource source, bool isUp)
     {
-        if (!context.TypeEvaluator(item.GachaType))
+        if (context.TypeEvaluator(item.GachaType))
         {
-            return;
-        }
+            ++lastOrangePullTracker;
+            ++lastPurplePullTracker;
+            ++lastUpOrangePullTracker;
 
-        ++lastOrangePullTracker;
-        ++lastPurplePullTracker;
-        ++lastUpOrangePullTracker;
+            // track total pulls
+            ++totalCountTracker;
+            TrackFromToTime(item.Time);
 
-        // track total pulls
-        ++totalCountTracker;
-        TrackFromToTime(item.Time);
-
-        switch (source.Quality)
-        {
-            case QualityType.QUALITY_ORANGE:
-                {
-                    TrackMinMaxOrangePull(lastOrangePullTracker);
-                    averageOrangePullTracker.Add(lastOrangePullTracker);
-
-                    if (isUp)
+            switch (source.Quality)
+            {
+                case QualityType.QUALITY_ORANGE:
                     {
-                        averageUpOrangePullTracker.Add(lastUpOrangePullTracker);
-                        lastUpOrangePullTracker = 0;
+                        TrackMinMaxOrangePull(lastOrangePullTracker);
+                        averageOrangePullTracker.Add(lastOrangePullTracker);
+
+                        if (isUp)
+                        {
+                            averageUpOrangePullTracker.Add(lastUpOrangePullTracker);
+                            lastUpOrangePullTracker = 0;
+                        }
+
+                        summaryItems.Add(source.ToSummaryItem(lastOrangePullTracker, item.Time, isUp));
+
+                        lastOrangePullTracker = 0;
+                        ++totalOrangePullTracker;
+                        break;
                     }
 
-                    summaryItems.Add(source.ToSummaryItem(lastOrangePullTracker, item.Time, isUp));
+                case QualityType.QUALITY_PURPLE:
+                    {
+                        lastPurplePullTracker = 0;
+                        ++totalPurplePullTracker;
+                        break;
+                    }
 
-                    lastOrangePullTracker = 0;
-                    ++totalOrangePullTracker;
+                case QualityType.QUALITY_BLUE:
+                    {
+                        ++totalBluePullTracker;
+                        break;
+                    }
+
+                default:
                     break;
-                }
-
-            case QualityType.QUALITY_PURPLE:
-                {
-                    lastPurplePullTracker = 0;
-                    ++totalPurplePullTracker;
-                    break;
-                }
-
-            case QualityType.QUALITY_BLUE:
-                {
-                    ++totalBluePullTracker;
-                    break;
-                }
-
-            default:
-                break;
+            }
         }
     }
 

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

@@ -14,13 +14,12 @@ internal readonly struct TypedWishSummaryBuilderContext
     public readonly string Name;
     public readonly int GuaranteeOrangeThreshold;
     public readonly int GuaranteePurpleThreshold;
-    public readonly Func<GachaType, bool> TypeEvaluator;
+    public readonly Func<GachaConfigType, bool> TypeEvaluator;
     public readonly GachaDistributionType DistributionType;
 
-    private static readonly Func<GachaType, bool> IsStandardWish = type => type is GachaType.Standard;
-    private static readonly Func<GachaType, bool> IsAvatarEventWish = type => type is GachaType.ActivityAvatar or GachaType.SpecialActivityAvatar;
-    private static readonly Func<GachaType, bool> IsWeaponEventWish = type => type is GachaType.ActivityWeapon;
-    private static readonly Func<GachaType, bool> IsChronicledWish = type => type is GachaType.ActivityCity;
+    private static readonly Func<GachaConfigType, bool> IsStandardWish = type => type is GachaConfigType.StandardWish;
+    private static readonly Func<GachaConfigType, bool> IsAvatarEventWish = type => type is GachaConfigType.AvatarEventWish or GachaConfigType.AvatarEventWish2;
+    private static readonly Func<GachaConfigType, bool> IsWeaponEventWish = type => type is GachaConfigType.WeaponEventWish;
 
     public TypedWishSummaryBuilderContext(
         ITaskContext taskContext,
@@ -28,7 +27,7 @@ internal readonly struct TypedWishSummaryBuilderContext
         string name,
         int guaranteeOrangeThreshold,
         int guaranteePurpleThreshold,
-        Func<GachaType, bool> typeEvaluator,
+        Func<GachaConfigType, bool> typeEvaluator,
         GachaDistributionType distributionType)
     {
         TaskContext = taskContext;
@@ -55,11 +54,6 @@ internal readonly struct TypedWishSummaryBuilderContext
         return new(taskContext, gachaLogClient, SH.ServiceGachaLogFactoryWeaponWishName, 80, 10, IsWeaponEventWish, GachaDistributionType.WeaponEvent);
     }
 
-    public static TypedWishSummaryBuilderContext ChronicledWish(ITaskContext taskContext, HomaGachaLogClient gachaLogClient)
-    {
-        return new(taskContext, gachaLogClient, SH.ServiceGachaLogFactoryChronicledWishName, 90, 10, IsChronicledWish, GachaDistributionType.Chronicled);
-    }
-
     public ValueTask<HutaoResponse<GachaDistribution>> GetGachaDistributionAsync()
     {
         return GachaLogClient.GetGachaDistributionAsync(DistributionType);

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

@@ -15,14 +15,12 @@ internal static class GachaArchiveOperation
     {
         archive = archives.SingleOrDefault(a => a.Uid == uid);
 
-        if (archive is not null)
+        if (archive is null)
         {
-            return;
+            GachaArchive created = GachaArchive.From(uid);
+            gachaLogDbService.AddGachaArchive(created);
+            taskContext.InvokeOnMainThread(() => archives.Add(created));
+            archive = created;
         }
-
-        GachaArchive created = GachaArchive.From(uid);
-        gachaLogDbService.AddGachaArchive(created);
-        taskContext.InvokeOnMainThread(() => archives.Add(created));
-        archive = created;
     }
 }

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

@@ -0,0 +1,58 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Entity;
+using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
+
+namespace Snap.Hutao.Service.GachaLog;
+
+/// <summary>
+/// 祈愿物品保存上下文
+/// </summary>
+internal readonly struct GachaItemSaveContext
+{
+    /// <summary>
+    /// 待添加物品
+    /// </summary>
+    public readonly List<GachaItem> ItemsToAdd;
+
+    /// <summary>
+    /// 是否懒惰
+    /// </summary>
+    public readonly bool IsLazy;
+
+    public readonly GachaConfigType QueryType;
+
+    /// <summary>
+    /// 结尾 Id
+    /// </summary>
+    public readonly long EndId;
+
+    /// <summary>
+    /// 数据集
+    /// </summary>
+    public readonly IGachaLogDbService GachaLogDbService;
+
+    public GachaItemSaveContext(List<GachaItem> itemsToAdd, bool isLazy, GachaConfigType queryType, long endId, IGachaLogDbService gachaLogDbService)
+    {
+        ItemsToAdd = itemsToAdd;
+        IsLazy = isLazy;
+        QueryType = queryType;
+        EndId = endId;
+        GachaLogDbService = gachaLogDbService;
+    }
+
+    public void SaveItems(GachaArchive archive)
+    {
+        if (ItemsToAdd.Count > 0)
+        {
+            // 全量刷新
+            if (!IsLazy)
+            {
+                GachaLogDbService.RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndId(archive.InnerId, QueryType, EndId);
+            }
+
+            GachaLogDbService.AddGachaItemRange(ItemsToAdd);
+        }
+    }
+}

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

@@ -14,12 +14,11 @@ internal static class GachaLog
     /// <summary>
     /// 查询类型
     /// </summary>
-    public static readonly FrozenSet<GachaType> QueryTypes = FrozenSet.ToFrozenSet(
+    public static readonly FrozenSet<GachaConfigType> QueryTypes = FrozenSet.ToFrozenSet(
     [
-        GachaType.NewBie,
-        GachaType.Standard,
-        GachaType.ActivityAvatar,
-        GachaType.ActivityWeapon,
-        GachaType.ActivityCity,
+        GachaConfigType.NoviceWish,
+        GachaConfigType.StandardWish,
+        GachaConfigType.AvatarEventWish,
+        GachaConfigType.WeaponEventWish,
     ]);
 }

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

@@ -73,7 +73,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         }
     }
 
-    public async ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaType queryType, CancellationToken token)
+    public async ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaConfigType queryType, CancellationToken token)
     {
         GachaItem? item = null;
 
@@ -103,7 +103,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         return item?.Id ?? 0L;
     }
 
-    public long GetNewestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaType queryType)
+    public long GetNewestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaConfigType queryType)
     {
         GachaItem? item = null;
 
@@ -132,7 +132,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         return item?.Id ?? 0L;
     }
 
-    public async ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaType queryType)
+    public async ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaConfigType queryType)
     {
         GachaItem? item = null;
 
@@ -205,7 +205,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         return item?.Id ?? long.MaxValue;
     }
 
-    public long GetOldestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaType queryType)
+    public long GetOldestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaConfigType queryType)
     {
         GachaItem? item = null;
 
@@ -226,7 +226,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         return item?.Id ?? long.MaxValue;
     }
 
-    public async ValueTask<long> GetOldestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaType queryType, CancellationToken token)
+    public async ValueTask<long> GetOldestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaConfigType queryType, CancellationToken token)
     {
         GachaItem? item = null;
 
@@ -266,7 +266,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         }
     }
 
-    public List<Web.Hutao.GachaLog.GachaItem> GetHutaoGachaItemList(Guid archiveId, GachaType queryType, long endId)
+    public List<Web.Hutao.GachaLog.GachaItem> GetHutaoGachaItemList(Guid archiveId, GachaConfigType queryType, long endId)
     {
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
@@ -291,7 +291,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         }
     }
 
-    public async ValueTask<List<Web.Hutao.GachaLog.GachaItem>> GetHutaoGachaItemListAsync(Guid archiveId, GachaType queryType, long endId)
+    public async ValueTask<List<Web.Hutao.GachaLog.GachaItem>> GetHutaoGachaItemListAsync(Guid archiveId, GachaConfigType queryType, long endId)
     {
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
@@ -368,7 +368,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         }
     }
 
-    public void RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndId(Guid archiveId, GachaType queryType, long endId)
+    public void RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndId(Guid archiveId, GachaConfigType queryType, long endId)
     {
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
@@ -381,7 +381,7 @@ internal sealed partial class GachaLogDbService : IGachaLogDbService
         }
     }
 
-    public async ValueTask RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndIdAsync(Guid archiveId, GachaType queryType, long endId)
+    public async ValueTask RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndIdAsync(Guid archiveId, GachaConfigType queryType, long endId)
     {
         using (IServiceScope scope = serviceProvider.CreateScope())
         {

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

@@ -46,14 +46,14 @@ internal struct GachaLogFetchContext
     /// <summary>
     /// 当前类型
     /// </summary>
-    public GachaType CurrentType;
+    public GachaConfigType CurrentType;
 
     private readonly GachaLogServiceMetadataContext serviceContext;
     private readonly IGachaLogDbService gachaLogDbService;
     private readonly ITaskContext taskContext;
     private readonly bool isLazy;
 
-    public GachaLogFetchContext(IGachaLogDbService gachaLogDbService, ITaskContext taskContext, GachaLogServiceMetadataContext serviceContext, bool isLazy)
+    public GachaLogFetchContext(IGachaLogDbService gachaLogDbService, ITaskContext taskContext, in GachaLogServiceMetadataContext serviceContext, bool isLazy)
     {
         this.gachaLogDbService = gachaLogDbService;
         this.taskContext = taskContext;
@@ -66,7 +66,7 @@ internal struct GachaLogFetchContext
     /// </summary>
     /// <param name="configType">卡池类型</param>
     /// <param name="query">查询</param>
-    public void ResetForProcessingType(GachaType configType, in GachaLogQuery query)
+    public void ResetForProcessingType(GachaConfigType configType, in GachaLogQuery query)
     {
         DbEndId = null;
         CurrentType = configType;
@@ -140,18 +140,8 @@ internal struct GachaLogFetchContext
         // While no item is fetched, archive can be null.
         if (TargetArchive is not null)
         {
-            if (ItemsToAdd.Count <= 0)
-            {
-                return;
-            }
-
-            // 全量刷新
-            if (!isLazy)
-            {
-                gachaLogDbService.RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndId(TargetArchive.InnerId, QueryOptions.Type, QueryOptions.EndId);
-            }
-
-            gachaLogDbService.AddGachaItemRange(ItemsToAdd);
+            GachaItemSaveContext saveContext = new(ItemsToAdd, isLazy, QueryOptions.Type, QueryOptions.EndId, gachaLogDbService);
+            saveContext.SaveItems(TargetArchive);
         }
     }
 

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

@@ -6,17 +6,33 @@ using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 
 namespace Snap.Hutao.Service.GachaLog;
 
+/// <summary>
+/// 祈愿记录获取状态
+/// </summary>
 internal sealed class GachaLogFetchStatus
 {
-    public GachaLogFetchStatus(GachaType configType)
+    /// <summary>
+    /// 构造一个新的祈愿记录获取状态
+    /// </summary>
+    /// <param name="configType">卡池类型</param>
+    public GachaLogFetchStatus(GachaConfigType configType)
     {
         ConfigType = configType;
     }
 
+    /// <summary>
+    /// 验证密钥是否过期
+    /// </summary>
     public bool AuthKeyTimeout { get; set; }
 
-    public GachaType ConfigType { get; set; }
+    /// <summary>
+    /// 卡池类型
+    /// </summary>
+    public GachaConfigType ConfigType { get; set; }
 
+    /// <summary>
+    /// 当前获取的物品
+    /// </summary>
     public List<Item> Items { get; set; } = new(20);
 
     public string Header

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

@@ -8,7 +8,6 @@ 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;
 using Snap.Hutao.ViewModel.GachaLog;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 using Snap.Hutao.Web.Hutao.GachaLog;
@@ -41,7 +40,7 @@ internal sealed partial class GachaLogHutaoCloudService : IGachaLogHutaoCloudSer
         if (await GetEndIdsFromCloudAsync(uid, token).ConfigureAwait(false) is { } endIds)
         {
             List<Web.Hutao.GachaLog.GachaItem> items = [];
-            foreach ((GachaType type, long endId) in endIds)
+            foreach ((GachaConfigType type, long endId) in endIds)
             {
                 List<Web.Hutao.GachaLog.GachaItem> part = await gachaLogDbService
                     .GetHutaoGachaItemListAsync(gachaArchive.InnerId, type, endId)
@@ -56,16 +55,14 @@ internal sealed partial class GachaLogHutaoCloudService : IGachaLogHutaoCloudSer
     }
 
     /// <inheritdoc/>
-    public async ValueTask<ValueResult<bool, Guid>> RetrieveGachaArchiveIdAsync(string uid, CancellationToken token = default)
+    public async ValueTask<ValueResult<bool, Guid>> RetrieveGachaItemsAsync(string uid, CancellationToken token = default)
     {
         GachaArchive? archive = await gachaLogDbService
                 .GetGachaArchiveByUidAsync(uid, token)
                 .ConfigureAwait(false);
 
         EndIds endIds = await CreateEndIdsAsync(archive, token).ConfigureAwait(false);
-        Response<List<Web.Hutao.GachaLog.GachaItem>> resp = await homaGachaLogClient
-            .RetrieveGachaItemsAsync(uid, endIds, token)
-            .ConfigureAwait(false);
+        Response<List<Web.Hutao.GachaLog.GachaItem>> resp = await homaGachaLogClient.RetrieveGachaItemsAsync(uid, endIds, token).ConfigureAwait(false);
 
         if (!resp.IsOk())
         {
@@ -78,8 +75,7 @@ internal sealed partial class GachaLogHutaoCloudService : IGachaLogHutaoCloudSer
             await gachaLogDbService.AddGachaArchiveAsync(archive).ConfigureAwait(false);
         }
 
-        Guid archiveId = archive.InnerId;
-        List<Model.Entity.GachaItem> gachaItems = resp.Data.SelectList(i => Model.Entity.GachaItem.From(archiveId, i));
+        List<Model.Entity.GachaItem> gachaItems = resp.Data.SelectList(i => Model.Entity.GachaItem.From(archive.InnerId, i));
         await gachaLogDbService.AddGachaItemsAsync(gachaItems).ConfigureAwait(false);
         return new(true, archive.InnerId);
     }
@@ -98,9 +94,10 @@ internal sealed partial class GachaLogHutaoCloudService : IGachaLogHutaoCloudSer
         {
             if (await metadataService.InitializeAsync().ConfigureAwait(false))
             {
-                HutaoStatisticsFactoryMetadataContext context = await metadataService
-                    .GetContextAsync<HutaoStatisticsFactoryMetadataContext>(token)
-                    .ConfigureAwait(false);
+                Dictionary<AvatarId, Avatar> idAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false);
+                Dictionary<WeaponId, Weapon> idWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false);
+                List<GachaEvent> gachaEvents = await metadataService.GetGachaEventListAsync(token).ConfigureAwait(false);
+                HutaoStatisticsFactoryMetadataContext context = new(idAvatarMap, idWeaponMap, gachaEvents);
 
                 GachaEventStatistics raw = response.Data;
                 try
@@ -129,7 +126,7 @@ internal sealed partial class GachaLogHutaoCloudService : IGachaLogHutaoCloudSer
     private async ValueTask<EndIds> CreateEndIdsAsync(GachaArchive? archive, CancellationToken token)
     {
         EndIds endIds = new();
-        foreach (GachaType type in GachaLog.QueryTypes)
+        foreach (GachaConfigType type in GachaLog.QueryTypes)
         {
             if (archive is not null)
             {

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

@@ -9,7 +9,6 @@ using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Service.GachaLog.Factory;
 using Snap.Hutao.Service.GachaLog.QueryProvider;
 using Snap.Hutao.Service.Metadata;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.ViewModel.GachaLog;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 using Snap.Hutao.Web.Response;
@@ -56,14 +55,20 @@ internal sealed partial class GachaLogService : IGachaLogService
     /// <inheritdoc/>
     public async ValueTask<bool> InitializeAsync(CancellationToken token = default)
     {
-        if (context is { IsInitialized: true })
+        if (context.IsInitialized)
         {
             return true;
         }
 
         if (await metadataService.InitializeAsync().ConfigureAwait(false))
         {
-            context = await metadataService.GetContextAsync<GachaLogServiceMetadataContext>(token).ConfigureAwait(false);
+            Dictionary<AvatarId, Model.Metadata.Avatar.Avatar> idAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false);
+            Dictionary<WeaponId, Model.Metadata.Weapon.Weapon> idWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false);
+
+            Dictionary<string, Model.Metadata.Avatar.Avatar> nameAvatarMap = await metadataService.GetNameToAvatarMapAsync(token).ConfigureAwait(false);
+            Dictionary<string, Model.Metadata.Weapon.Weapon> nameWeaponMap = await metadataService.GetNameToWeaponMapAsync(token).ConfigureAwait(false);
+            context = new(idAvatarMap, idWeaponMap, nameAvatarMap, nameWeaponMap);
+
             ArchiveCollection = gachaLogDbService.GetGachaArchiveCollection();
             return true;
         }
@@ -177,7 +182,7 @@ internal sealed partial class GachaLogService : IGachaLogService
         ArgumentNullException.ThrowIfNull(ArchiveCollection);
         GachaLogFetchContext fetchContext = new(gachaLogDbService, taskContext, context, isLazy);
 
-        foreach (GachaType configType in GachaLog.QueryTypes)
+        foreach (GachaConfigType configType in GachaLog.QueryTypes)
         {
             fetchContext.ResetForProcessingType(configType, query);
 

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

@@ -2,12 +2,10 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Model;
-using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Model.Metadata.Abstraction;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Metadata.Weapon;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 
 namespace Snap.Hutao.Service.GachaLog;
@@ -15,28 +13,65 @@ namespace Snap.Hutao.Service.GachaLog;
 /// <summary>
 /// 祈愿记录服务上下文
 /// </summary>
-internal sealed class GachaLogServiceMetadataContext : IMetadataContext,
-    IMetadataSupportInitialization,
-    IMetadataListGachaEventSource,
-    IMetadataDictionaryIdAvatarSource,
-    IMetadataDictionaryIdWeaponSource,
-    IMetadataDictionaryNameAvatarSource,
-    IMetadataDictionaryNameWeaponSource
+internal readonly struct GachaLogServiceMetadataContext
 {
-    public Dictionary<string, Item> ItemCache { get; set; } = [];
+    /// <summary>
+    /// 物品缓存
+    /// </summary>
+    public readonly Dictionary<string, Item> ItemCache = [];
 
-    public List<GachaEvent> GachaEvents { get; set; } = default!;
+    /// <summary>
+    /// Id 角色 映射
+    /// </summary>
+    public readonly Dictionary<AvatarId, Avatar> IdAvatarMap;
 
-    public Dictionary<AvatarId, Avatar> IdAvatarMap { get; set; } = default!;
+    /// <summary>
+    /// Id 武器 映射
+    /// </summary>
+    public readonly Dictionary<WeaponId, Weapon> IdWeaponMap;
 
-    public Dictionary<WeaponId, Weapon> IdWeaponMap { get; set; } = default!;
+    /// <summary>
+    /// 名称 角色 映射
+    /// </summary>
+    public readonly Dictionary<string, Avatar> NameAvatarMap;
 
-    public Dictionary<string, Avatar> NameAvatarMap { get; set; } = default!;
+    /// <summary>
+    /// 名称 武器 映射
+    /// </summary>
+    public readonly Dictionary<string, Weapon> NameWeaponMap;
 
-    public Dictionary<string, Weapon> NameWeaponMap { get; set; } = default!;
+    /// <summary>
+    /// 是否初始化完成
+    /// </summary>
+    public readonly bool IsInitialized;
 
-    public bool IsInitialized { get; set; }
+    /// <summary>
+    /// 构造一个新的祈愿记录服务上下文
+    /// </summary>
+    /// <param name="idAvatarMap">Id 角色 映射</param>
+    /// <param name="idWeaponMap">Id 武器 映射</param>
+    /// <param name="nameAvatarMap">名称 角色 映射</param>
+    /// <param name="nameWeaponMap">名称 武器 映射</param>
+    public GachaLogServiceMetadataContext(
+        Dictionary<AvatarId, Avatar> idAvatarMap,
+        Dictionary<WeaponId, Weapon> idWeaponMap,
+        Dictionary<string, Avatar> nameAvatarMap,
+        Dictionary<string, Weapon> nameWeaponMap)
+    {
+        IdAvatarMap = idAvatarMap;
+        IdWeaponMap = idWeaponMap;
+        NameAvatarMap = nameAvatarMap;
+        NameWeaponMap = nameWeaponMap;
 
+        IsInitialized = true;
+    }
+
+    /// <summary>
+    /// 按名称获取物品
+    /// </summary>
+    /// <param name="name">名称</param>
+    /// <param name="type">类型</param>
+    /// <returns>物品</returns>
     public Item GetItemByNameAndType(string name, string type)
     {
         if (!ItemCache.TryGetValue(name, out Item? result))
@@ -58,6 +93,11 @@ internal sealed class GachaLogServiceMetadataContext : IMetadataContext,
         return result;
     }
 
+    /// <summary>
+    /// 按物品 Id 获取名称星级
+    /// </summary>
+    /// <param name="id">Id</param>
+    /// <returns>名称星级</returns>
     public INameQuality GetNameQualityByItemId(uint id)
     {
         uint place = id.StringLength();
@@ -69,6 +109,12 @@ internal sealed class GachaLogServiceMetadataContext : IMetadataContext,
         };
     }
 
+    /// <summary>
+    /// 获取物品 Id
+    /// O(1)
+    /// </summary>
+    /// <param name="item">祈愿物品</param>
+    /// <returns>物品 Id</returns>
     public uint GetItemId(GachaLogItem item)
     {
         if (item.ItemType == SH.ModelInterchangeUIGFItemTypeAvatar)

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

@@ -19,7 +19,7 @@ internal interface IGachaLogDbService
 
     ValueTask RemoveGachaArchiveByIdAsync(Guid archiveId);
 
-    void RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndId(Guid archiveId, GachaType queryType, long endId);
+    void RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndId(Guid archiveId, GachaConfigType queryType, long endId);
 
     ValueTask<GachaArchive?> GetGachaArchiveByIdAsync(Guid archiveId, CancellationToken token);
 
@@ -31,25 +31,25 @@ internal interface IGachaLogDbService
 
     ValueTask<List<GachaItem>> GetGachaItemListByArchiveIdAsync(Guid archiveId);
 
-    List<Web.Hutao.GachaLog.GachaItem> GetHutaoGachaItemList(Guid archiveId, GachaType queryType, long endId);
+    List<Web.Hutao.GachaLog.GachaItem> GetHutaoGachaItemList(Guid archiveId, GachaConfigType queryType, long endId);
 
-    long GetNewestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaType queryType);
+    long GetNewestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaConfigType queryType);
 
-    ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaType queryType, CancellationToken token);
+    ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaConfigType queryType, CancellationToken token);
 
     long GetOldestGachaItemIdByArchiveId(Guid archiveId);
 
-    long GetOldestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaType queryType);
+    long GetOldestGachaItemIdByArchiveIdAndQueryType(Guid archiveId, GachaConfigType queryType);
 
-    ValueTask<long> GetOldestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaType queryType, CancellationToken token);
+    ValueTask<long> GetOldestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaConfigType queryType, CancellationToken token);
 
-    ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaType queryType);
+    ValueTask<long> GetNewestGachaItemIdByArchiveIdAndQueryTypeAsync(Guid archiveId, GachaConfigType queryType);
 
     ValueTask<long> GetOldestGachaItemIdByArchiveIdAsync(Guid archiveId);
 
-    ValueTask<List<Web.Hutao.GachaLog.GachaItem>> GetHutaoGachaItemListAsync(Guid archiveId, GachaType queryType, long endId);
+    ValueTask<List<Web.Hutao.GachaLog.GachaItem>> GetHutaoGachaItemListAsync(Guid archiveId, GachaConfigType queryType, long endId);
 
     ValueTask AddGachaItemRangeAsync(List<GachaItem> items);
 
-    ValueTask RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndIdAsync(Guid archiveId, GachaType queryType, long endId);
+    ValueTask RemoveNewerGachaItemRangeByArchiveIdQueryTypeAndEndIdAsync(Guid archiveId, GachaConfigType queryType, long endId);
 }

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

@@ -36,7 +36,7 @@ internal interface IGachaLogHutaoCloudService
     /// <param name="uid">uid</param>
     /// <param name="token">取消令牌</param>
     /// <returns>是否获取成功</returns>
-    ValueTask<ValueResult<bool, Guid>> RetrieveGachaArchiveIdAsync(string uid, CancellationToken token = default);
+    ValueTask<ValueResult<bool, Guid>> RetrieveGachaItemsAsync(string uid, CancellationToken token = default);
 
     /// <summary>
     /// 异步上传祈愿记录

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

@@ -62,7 +62,7 @@ internal sealed partial class UIGFImportService : IUIGFImportService
         Guid archiveId = archive.InnerId;
 
         List<GachaItem> fullItems = [];
-        foreach (GachaType queryType in GachaLog.QueryTypes)
+        foreach (GachaConfigType queryType in GachaLog.QueryTypes)
         {
             long trimId = gachaLogDbService.GetOldestGachaItemIdByArchiveIdAndQueryType(archiveId, queryType);
             logger.LogInformation("Last Id to trim with: [{Id}]", trimId);

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

@@ -23,15 +23,8 @@ internal sealed class LaunchExecutionBetterGenshinImpactAutomationHandlder : ILa
         Uri betterGenshinImpactUri = "bettergi://start".ToUri();
         if (await Launcher.QueryUriSupportAsync(betterGenshinImpactUri, LaunchQuerySupportType.Uri) is LaunchQuerySupportStatus.Available)
         {
-            try
-            {
-                context.Logger.LogInformation("Waiting game window to be ready");
-                context.Process.WaitForInputIdle();
-            }
-            catch (InvalidOperationException)
-            {
-                return;
-            }
+            context.Logger.LogInformation("Waiting game window to be ready");
+            context.Process.WaitForInputIdle();
 
             context.Logger.LogInformation("Launching BetterGI");
             await Launcher.LaunchUriAsync(betterGenshinImpactUri);

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryNameAvatarSource.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryNameAvatarSource
-{
-    public Dictionary<string, Model.Metadata.Avatar.Avatar> NameAvatarMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryNameWeaponSource.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryNameWeaponSource
-{
-    public Dictionary<string, Model.Metadata.Weapon.Weapon> NameWeaponMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataListGachaEventSource.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataListGachaEventSource
-{
-    public List<GachaEvent> GachaEvents { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataSupportInitialization.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataSupportInitialization
-{
-    bool IsInitialized { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs

@@ -21,51 +21,31 @@ internal static class MetadataServiceContextExtension
             {
                 listMaterialSource.Materials = await metadataService.GetMaterialListAsync(token).ConfigureAwait(false);
             }
-
-            if (context is IMetadataListGachaEventSource listGachaEventSource)
-            {
-                listGachaEventSource.GachaEvents = await metadataService.GetGachaEventListAsync(token).ConfigureAwait(false);
-            }
         }
 
         // Dictionary
         {
-            if (context is IMetadataDictionaryIdAvatarSource dictionaryIdAvatarSource)
+            if (context is IMetadataDictionaryIdAvatarSource dictionaryAvatarSource)
             {
-                dictionaryIdAvatarSource.IdAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false);
+                dictionaryAvatarSource.IdAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false);
             }
 
-            if (context is IMetadataDictionaryIdMaterialSource dictionaryIdMaterialSource)
+            if (context is IMetadataDictionaryIdMaterialSource dictionaryMaterialSource)
             {
-                dictionaryIdMaterialSource.IdMaterialMap = await metadataService.GetIdToMaterialMapAsync(token).ConfigureAwait(false);
+                dictionaryMaterialSource.IdMaterialMap = await metadataService.GetIdToMaterialMapAsync(token).ConfigureAwait(false);
             }
 
-            if (context is IMetadataDictionaryIdWeaponSource dictionaryIdWeaponSource)
+            if (context is IMetadataDictionaryIdWeaponSource dictionaryWeaponSource)
             {
-                dictionaryIdWeaponSource.IdWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false);
+                dictionaryWeaponSource.IdWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false);
             }
-
-            if (context is IMetadataDictionaryNameAvatarSource dictionaryNameAvatarSource)
-            {
-                dictionaryNameAvatarSource.NameAvatarMap = await metadataService.GetNameToAvatarMapAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataDictionaryNameWeaponSource dictionaryNameWeaponSource)
-            {
-                dictionaryNameWeaponSource.NameWeaponMap = await metadataService.GetNameToWeaponMapAsync(token).ConfigureAwait(false);
-            }
-        }
-
-        if (context is IMetadataSupportInitialization supportInitialization)
-        {
-            supportInitialization.IsInitialized = true;
         }
 
         return context;
     }
 
 #pragma warning disable SH002
-    public static IEnumerable<Material> EnumerateInventoryMaterial(this IMetadataListMaterialSource context)
+    public static IEnumerable<Material> EnumerateInventroyMaterial(this IMetadataListMaterialSource context)
     {
         return context.Materials.Where(m => m.IsInventoryItem()).OrderBy(m => m.Id.Value);
     }
@@ -75,11 +55,6 @@ internal static class MetadataServiceContextExtension
         return context.IdAvatarMap[id];
     }
 
-    public static Avatar GetAvatar(this IMetadataDictionaryNameAvatarSource context, string name)
-    {
-        return context.NameAvatarMap[name];
-    }
-
     public static Material GetMaterial(this IMetadataDictionaryIdMaterialSource context, MaterialId id)
     {
         return context.IdMaterialMap[id];
@@ -89,10 +64,5 @@ internal static class MetadataServiceContextExtension
     {
         return context.IdWeaponMap[id];
     }
-
-    public static Weapon GetWeapon(this IMetadataDictionaryNameWeaponSource context, string name)
-    {
-        return context.NameWeaponMap[name];
-    }
 #pragma warning restore SH002
 }

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

@@ -296,8 +296,8 @@
     <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" />
     <PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.2" />

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

@@ -7,7 +7,6 @@ using Microsoft.Web.WebView2.Core;
 using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Control.Theme;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
-using System.Collections.Frozen;
 using System.Text;
 using System.Text.RegularExpressions;
 using Windows.Foundation;
@@ -30,17 +29,17 @@ internal sealed partial class AnnouncementContentViewer : UserControl
         }
         """;
 
-    private static readonly FrozenDictionary<string, string> DarkLightReverts = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create("color:rgba(0,0,0,1)", "color:rgba(255,255,255,1)"),
-        KeyValuePair.Create("color:rgba(17,17,17,1)", "color:rgba(238,238,238,1)"),
-        KeyValuePair.Create("color:rgba(51,51,51,1)", "color:rgba(204,204,204,1)"),
-        KeyValuePair.Create("color:rgba(57,59,64,1)", "color:rgba(198,196,191,1)"),
-        KeyValuePair.Create("color:rgba(85,85,85,1)", "color:rgba(170,170,170,1)"),
-        KeyValuePair.Create("background-color: rgb(255, 215, 185)", "background-color: rgb(0,40,70)"),
-        KeyValuePair.Create("background-color: rgb(254, 245, 231)", "background-color: rgb(1,40,70)"),
-        KeyValuePair.Create("background-color:rgb(244, 244, 245)", "background-color:rgba(11, 11, 10)"),
-    ]);
+    private static readonly Dictionary<string, string> DarkLightReverts = new()
+    {
+        { "color:rgba(0,0,0,1)", "color:rgba(255,255,255,1)" },
+        { "color:rgba(17,17,17,1)", "color:rgba(238,238,238,1)" },
+        { "color:rgba(51,51,51,1)", "color:rgba(204,204,204,1)" },
+        { "color:rgba(57,59,64,1)", "color:rgba(198,196,191,1)" },
+        { "color:rgba(85,85,85,1)", "color:rgba(170,170,170,1)" },
+        { "background-color: rgb(255, 215, 185)", "background-color: rgb(0,40,70)" },
+        { "background-color: rgb(254, 245, 231)", "background-color: rgb(1,40,70)" },
+        { "background-color:rgb(244, 244, 245)", "background-color:rgba(11, 11, 10)" },
+    };
 
     private readonly RoutedEventHandler loadEventHandler;
     private readonly RoutedEventHandler unloadEventHandler;

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/StatisticsSegmented.xaml

@@ -1,14 +1,13 @@
-<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/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

@@ -243,11 +243,6 @@
                                 PlaceholderText="{shcm:ResourceString Name=ViewPageAchievementSearchPlaceholder}"
                                 QueryIcon="{shcm:FontIcon Glyph=}"
                                 Text="{Binding SearchText, Mode=TwoWay}">
-                                <AutoSuggestBox.TextBoxStyle>
-                                    <Style BasedOn="{StaticResource AutoSuggestBoxTextBoxStyle}" TargetType="TextBox">
-                                        <Setter Property="IsSpellCheckEnabled" Value="False"/>
-                                    </Style>
-                                </AutoSuggestBox.TextBoxStyle>
                                 <mxi:Interaction.Behaviors>
                                     <mxic:EventTriggerBehavior EventName="QuerySubmitted">
                                         <mxic:InvokeCommandAction Command="{Binding SearchAchievementCommand}" CommandParameter="{Binding SearchText}"/>

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

@@ -484,7 +484,7 @@
                             </Grid.ColumnDefinitions>
                             <shvc:HutaoStatisticsCard Grid.Column="0" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.AvatarEvent}"/>
                             <shvc:HutaoStatisticsCard Grid.Column="1" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.AvatarEvent2}"/>
-                            <shvc:HutaoStatisticsCard Grid.Column="2" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.WeaponEvent}"/>
+                            <shvc:HutaoStatisticsCard Grid.Column="2" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.WeaponWish}"/>
                         </Grid>
                     </Grid>
 

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

@@ -10,11 +10,9 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shc="using:Snap.Hutao.Control"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
-    xmlns:shch="using:Snap.Hutao.Control.Helper"
     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"
@@ -505,58 +503,36 @@
                     </mxi:Interaction.Behaviors>
 
                     <Grid.Resources>
-                        <DataTemplate x:Key="AvatarViewTemplate" d:DataType="shvcom:AvatarView">
-                            <shvcon:ItemIcon
-                                Width="40"
-                                Height="40"
-                                shch:UIElementHelper.OpacityObject="{Binding Icon}"
-                                Icon="{Binding Icon}"
-                                Opacity="0"
-                                Quality="{Binding Quality}"/>
-                        </DataTemplate>
-
                         <DataTemplate x:Key="TeamItemTemplate" d:DataType="shvcom:Team">
-                            <Border Style="{StaticResource BorderCardStyle}">
-                                <Grid>
+                            <Border Margin="0,0,16,8" Style="{StaticResource BorderCardStyle}">
+                                <Grid Margin="6">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="auto"/>
-                                        <RowDefinition Height="auto"/>
+                                        <RowDefinition Height="36"/>
                                     </Grid.RowDefinitions>
                                     <Viewbox Stretch="Uniform">
-                                        <ItemsControl
-                                            Margin="4"
-                                            HorizontalAlignment="Left"
-                                            ItemTemplate="{StaticResource AvatarViewTemplate}"
-                                            ItemsPanel="{ThemeResource HorizontalStackPanelSpacing4Template}"
-                                            ItemsSource="{Binding}"/>
+                                        <ItemsControl HorizontalAlignment="Left" ItemsSource="{Binding}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <StackPanel Orientation="Horizontal" Spacing="6"/>
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <shvcon:ItemIcon
+                                                        Width="40"
+                                                        Height="40"
+                                                        Icon="{Binding Icon}"
+                                                        Quality="{Binding Quality}"/>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
                                     </Viewbox>
-                                    <Border
+                                    <TextBlock
                                         Grid.Row="1"
-                                        Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
-                                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                                        BorderThickness="0,1,0,0"
-                                        CornerRadius="{ThemeResource ControlCornerRadiusBottom}"
-                                        Opacity="0.7"/>
-                                    <Grid Grid.Row="1">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="1*"/>
-                                            <ColumnDefinition Width="auto"/>
-                                            <ColumnDefinition Width="5*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            Margin="4"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding Rank}"/>
-                                        <AppBarSeparator Grid.Column="1" Margin="-64,-2"/>
-                                        <TextBlock
-                                            Grid.Column="2"
-                                            Margin="4"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding Rate}"/>
-                                    </Grid>
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding Rate}"/>
                                 </Grid>
                             </Border>
                         </DataTemplate>
@@ -629,7 +605,7 @@
                                             <ColumnDefinition Width="auto"/>
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <shcs:Segmented
+                                        <cwc:Segmented
                                             DisplayMemberPath="Floor"
                                             ItemsSource="{Binding AvatarUsageRanks}"
                                             SelectedItem="{Binding SelectedAvatarUsageRank, Mode=TwoWay}"/>
@@ -663,7 +639,7 @@
                                             <ColumnDefinition Width="auto"/>
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <shcs:Segmented
+                                        <cwc:Segmented
                                             DisplayMemberPath="Floor"
                                             ItemsSource="{Binding AvatarAppearanceRanks}"
                                             SelectedItem="{Binding SelectedAvatarAppearanceRank, Mode=TwoWay}"/>
@@ -692,7 +668,7 @@
                                         <RowDefinition Height="auto"/>
                                         <RowDefinition/>
                                     </Grid.RowDefinitions>
-                                    <shcs:Segmented
+                                    <cwc:Segmented
                                         Grid.Row="0"
                                         Margin="16,16,0,16"
                                         DisplayMemberPath="Floor"
@@ -708,59 +684,32 @@
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <cwc:HeaderedContentControl Grid.Column="0">
-                                            <cwc:HeaderedContentControl.Header>
-                                                <Border Margin="0,0,16,0" Style="{ThemeResource BorderCardStyle}">
-                                                    <TextBlock
-                                                        Margin="0,8"
-                                                        HorizontalAlignment="Center"
-                                                        Text="{shcm:ResourceString Name=ViewPageSpiralAbyssTeamAppearanceUpHeader}"/>
-                                                </Border>
-                                            </cwc:HeaderedContentControl.Header>
-                                            <ListView
-                                                Padding="0"
-                                                ItemContainerStyle="{ThemeResource NoneSelectionListViewItemStyle}"
-                                                ItemTemplate="{StaticResource TeamItemTemplate}"
-                                                ItemsSource="{Binding Up}"
-                                                SelectionMode="None">
-                                                <ListView.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <shcp:UniformPanel
-                                                            Padding="0,0,16,0"
-                                                            ColumnSpacing="6"
-                                                            MinItemWidth="240"
-                                                            RowSpacing="2"/>
-                                                    </ItemsPanelTemplate>
-                                                </ListView.ItemsPanel>
-                                            </ListView>
-                                        </cwc:HeaderedContentControl>
-
-                                        <cwc:HeaderedContentControl Grid.Column="1">
-                                            <cwc:HeaderedContentControl.Header>
-                                                <Border Margin="0,0,16,0" Style="{ThemeResource BorderCardStyle}">
-                                                    <TextBlock
-                                                        Margin="0,8"
-                                                        HorizontalAlignment="Center"
-                                                        Text="{shcm:ResourceString Name=ViewPageSpiralAbyssTeamAppearanceDownHeader}"/>
-                                                </Border>
-                                            </cwc:HeaderedContentControl.Header>
-                                            <ListView
-                                                Padding="0"
-                                                ItemContainerStyle="{ThemeResource NoneSelectionListViewItemStyle}"
-                                                ItemTemplate="{StaticResource TeamItemTemplate}"
-                                                ItemsSource="{Binding Down}"
-                                                SelectionMode="None">
-                                                <ListView.ItemsPanel>
-                                                    <ItemsPanelTemplate>
-                                                        <shcp:UniformPanel
-                                                            Padding="0,0,16,0"
-                                                            ColumnSpacing="6"
-                                                            MinItemWidth="240"
-                                                            RowSpacing="2"/>
-                                                    </ItemsPanelTemplate>
-                                                </ListView.ItemsPanel>
-                                            </ListView>
-                                        </cwc:HeaderedContentControl>
+                                        <ListView
+                                            Grid.Column="0"
+                                            Padding="0,0,0,0"
+                                            ItemContainerStyle="{ThemeResource NoneSelectionListViewItemStyle}"
+                                            ItemTemplate="{StaticResource TeamItemTemplate}"
+                                            ItemsSource="{Binding Up}"
+                                            SelectionMode="None">
+                                            <ListView.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <shcp:UniformPanel MinItemWidth="240"/>
+                                                </ItemsPanelTemplate>
+                                            </ListView.ItemsPanel>
+                                        </ListView>
+                                        <ListView
+                                            Grid.Column="1"
+                                            Padding="0,0,0,0"
+                                            ItemContainerStyle="{ThemeResource NoneSelectionListViewItemStyle}"
+                                            ItemTemplate="{StaticResource TeamItemTemplate}"
+                                            ItemsSource="{Binding Down}"
+                                            SelectionMode="None">
+                                            <ListView.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <shcp:UniformPanel MinItemWidth="240"/>
+                                                </ItemsPanelTemplate>
+                                            </ListView.ItemsPanel>
+                                        </ListView>
                                     </Grid>
                                 </Grid>
                             </Border>

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

@@ -7,8 +7,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
+    xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shca="using:Snap.Hutao.Control.AutoSuggestBox"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
@@ -73,47 +73,6 @@
             </shct:DescriptionTextBlock>
         </DataTemplate>
 
-        <DataTemplate x:Key="TokenTemplate">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <Rectangle
-                    Grid.Column="0"
-                    Width="4"
-                    Height="22"
-                    Margin="0,0,8,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Stretch"
-                    RadiusX="2"
-                    RadiusY="2"
-                    Visibility="{Binding Quality, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
-                    <Rectangle.Fill>
-                        <SolidColorBrush Color="{Binding Quality}"/>
-                    </Rectangle.Fill>
-                </Rectangle>
-                <shci:MonoChrome
-                    Grid.Column="0"
-                    Width="22"
-                    Height="22"
-                    Margin="0,0,4,0"
-                    Source="{Binding IconUri, Mode=OneWay}"
-                    Visibility="{Binding IconUri, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
-                <shci:CachedImage
-                    Grid.Column="0"
-                    Width="22"
-                    Height="22"
-                    Margin="-4,-2,8,2"
-                    Source="{Binding SideIconUri, Mode=OneWay}"
-                    Visibility="{Binding SideIconUri, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
-                <TextBlock
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Text="{Binding Value}"/>
-            </Grid>
-        </DataTemplate>
-
         <DataTemplate x:Key="AvatarListTemplate">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -304,33 +263,24 @@
                                 Margin="8,8,0,0"
                                 LocalSettingKeySuffixForCurrent="WikiAvatarPage.Avatars"/>
                         </CommandBar.Content>
+                        <!--<AppBarButton Icon="{shcm:FontIcon Glyph=&#xE946;}" Label="搜索提示"/>-->
                         <AppBarElementContainer>
-                            <shca:AutoSuggestTokenBox
-                                Width="600"
-                                Height="44"
-                                Margin="6,-2,6,6"
-                                HorizontalAlignment="Right"
+                            <AutoSuggestBox
+                                Width="240"
+                                Height="36"
+                                Margin="6,6,6,0"
+                                HorizontalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
-                                AvailableTokens="{Binding AvailableTokens}"
-                                FilterCommand="{Binding FilterCommand}"
-                                ItemsSource="{Binding FilterTokens, Mode=TwoWay}"
-                                MaximumTokens="5"
                                 PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiAvatarAutoSuggestBoxPlaceHolder}"
-                                QueryIcon="{cw:FontIconSource Glyph=&#xE721;}"
-                                Style="{StaticResource DefaultTokenizingTextBoxStyle}"
-                                SuggestedItemTemplate="{StaticResource TokenTemplate}"
-                                SuggestedItemsSource="{Binding AvailableTokens.Values}"
-                                Text="{Binding FilterToken, Mode=TwoWay}"
-                                TokenItemTemplate="{StaticResource TokenTemplate}">
-                                <shca:AutoSuggestTokenBox.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <cwc:WrapPanel
-                                            cw:FrameworkElementExtensions.AncestorType="shca:AutoSuggestTokenBox"
-                                            HorizontalSpacing="2"
-                                            StretchChild="Last"/>
-                                    </ItemsPanelTemplate>
-                                </shca:AutoSuggestTokenBox.ItemsPanel>
-                            </shca:AutoSuggestTokenBox>
+                                QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
+                                Style="{StaticResource DefaultAutoSuggestBoxStyle}"
+                                Text="{Binding FilterText, Mode=TwoWay}">
+                                <mxi:Interaction.Behaviors>
+                                    <mxic:EventTriggerBehavior EventName="QuerySubmitted">
+                                        <mxic:InvokeCommandAction Command="{Binding FilterCommand}" CommandParameter="{Binding FilterText}"/>
+                                    </mxic:EventTriggerBehavior>
+                                </mxi:Interaction.Behaviors>
+                            </AutoSuggestBox>
                         </AppBarElementContainer>
                         <AppBarButton
                             Command="{Binding CultivateCommand}"

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

@@ -9,7 +9,6 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:mxic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:shc="using:Snap.Hutao.Control"
-    xmlns:shca="using:Snap.Hutao.Control.AutoSuggestBox"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
@@ -33,47 +32,6 @@
                 Source="{Binding Converter={StaticResource PropertyDescriptor}}"/>
         </DataTemplate>
 
-        <DataTemplate x:Key="TokenTemplate">
-            <Grid VerticalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <Rectangle
-                    Grid.Column="0"
-                    Width="4"
-                    Height="22"
-                    Margin="0,0,8,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Stretch"
-                    RadiusX="2"
-                    RadiusY="2"
-                    Visibility="{Binding Quality, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
-                    <Rectangle.Fill>
-                        <SolidColorBrush Color="{Binding Quality}"/>
-                    </Rectangle.Fill>
-                </Rectangle>
-                <shci:MonoChrome
-                    Grid.Column="0"
-                    Width="22"
-                    Height="22"
-                    Margin="0,0,4,0"
-                    Source="{Binding IconUri, Mode=OneWay}"
-                    Visibility="{Binding IconUri, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
-                <shci:CachedImage
-                    Grid.Column="0"
-                    Width="22"
-                    Height="22"
-                    Margin="0,0,4,0"
-                    Source="{Binding SideIconUri, Mode=OneWay}"
-                    Visibility="{Binding SideIconUri, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
-                <TextBlock
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Text="{Binding Value}"/>
-            </Grid>
-        </DataTemplate>
-
         <DataTemplate x:Key="WeaponListTemplate">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -173,32 +131,21 @@
                                 LocalSettingKeySuffixForCurrent="WikiWeaponPage.Weapons"/>
                         </CommandBar.Content>
                         <AppBarElementContainer>
-                            <shca:AutoSuggestTokenBox
-                                x:Name="WeaponSuggestBox"
-                                Width="600"
-                                Height="44"
-                                Margin="6,-2,6,6"
+                            <AutoSuggestBox
+                                Width="240"
+                                Height="36"
+                                Margin="16,6,6,0"
                                 HorizontalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
-                                AvailableTokens="{Binding AvailableTokens}"
-                                FilterCommand="{Binding FilterCommand}"
-                                ItemsSource="{Binding FilterTokens, Mode=TwoWay}"
-                                MaximumTokens="5"
                                 PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiWeaponAutoSuggestBoxPlaceHolder}"
-                                QueryIcon="{cw:FontIconSource Glyph=&#xE721;}"
-                                SuggestedItemTemplate="{StaticResource TokenTemplate}"
-                                SuggestedItemsSource="{Binding AvailableTokens.Values}"
-                                Text="{Binding FilterToken, Mode=TwoWay}"
-                                TokenItemTemplate="{StaticResource TokenTemplate}">
-                                <shca:AutoSuggestTokenBox.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <cwc:WrapPanel
-                                            cw:FrameworkElementExtensions.AncestorType="shca:AutoSuggestTokenBox"
-                                            HorizontalSpacing="2"
-                                            StretchChild="Last"/>
-                                    </ItemsPanelTemplate>
-                                </shca:AutoSuggestTokenBox.ItemsPanel>
-                            </shca:AutoSuggestTokenBox>
+                                QueryIcon="{shcm:FontIcon Glyph=&#xE721;}"
+                                Text="{Binding FilterText, Mode=TwoWay}">
+                                <mxi:Interaction.Behaviors>
+                                    <mxic:EventTriggerBehavior EventName="QuerySubmitted">
+                                        <mxic:InvokeCommandAction Command="{Binding FilterCommand}" CommandParameter="{Binding FilterText}"/>
+                                    </mxic:EventTriggerBehavior>
+                                </mxi:Interaction.Behaviors>
+                            </AutoSuggestBox>
                         </AppBarElementContainer>
                         <AppBarButton
                             Command="{Binding CultivateCommand}"

src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarProperty.cs

@@ -16,27 +16,27 @@ namespace Snap.Hutao.ViewModel.AvatarProperty;
 [HighQuality]
 internal sealed class AvatarProperty : ObservableObject, INameIcon, IAlternatingItem
 {
-    private static readonly FrozenDictionary<FightProperty, Uri> PropertyIcons = FrozenDictionary.ToFrozenDictionary(
-    [
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_SKILL_CD_MINUS_RATIO, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_CDReduce.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_ChargeEfficiency.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_CRITICAL, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Critical.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_CRITICAL_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Critical_Hurt.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_CUR_ATTACK, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_CurAttack.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_CUR_DEFENSE, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_CurDefense.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_ELEMENT_MASTERY, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_ELEC_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Electric.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_FIRE_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Fire.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_GRASS_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Grass.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_ICE_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Ice.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_ROCK_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Rock.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_WATER_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Water.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_WIND_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Wind.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_HEAL_ADD, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Heal.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_MAX_HP, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_MaxHp.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_PHYSICAL_ADD_HURT, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_PhysicalAttackUp.png").ToUri()),
-        KeyValuePair.Create(FightProperty.FIGHT_PROP_SHIELD_COST_MINUS_RATIO, Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_ShieldCostMinus.png").ToUri()),
-    ]);
+    private static readonly FrozenDictionary<FightProperty, Uri> PropertyIcons = new Dictionary<FightProperty, Uri>()
+    {
+        [FightProperty.FIGHT_PROP_SKILL_CD_MINUS_RATIO] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_CDReduce.png").ToUri(),
+        [FightProperty.FIGHT_PROP_CHARGE_EFFICIENCY] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_ChargeEfficiency.png").ToUri(),
+        [FightProperty.FIGHT_PROP_CRITICAL] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Critical.png").ToUri(),
+        [FightProperty.FIGHT_PROP_CRITICAL_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Critical_Hurt.png").ToUri(),
+        [FightProperty.FIGHT_PROP_CUR_ATTACK] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_CurAttack.png").ToUri(),
+        [FightProperty.FIGHT_PROP_CUR_DEFENSE] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_CurDefense.png").ToUri(),
+        [FightProperty.FIGHT_PROP_ELEMENT_MASTERY] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element.png").ToUri(),
+        [FightProperty.FIGHT_PROP_ELEC_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Electric.png").ToUri(),
+        [FightProperty.FIGHT_PROP_FIRE_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Fire.png").ToUri(),
+        [FightProperty.FIGHT_PROP_GRASS_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Grass.png").ToUri(),
+        [FightProperty.FIGHT_PROP_ICE_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Ice.png").ToUri(),
+        [FightProperty.FIGHT_PROP_ROCK_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Rock.png").ToUri(),
+        [FightProperty.FIGHT_PROP_WATER_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Water.png").ToUri(),
+        [FightProperty.FIGHT_PROP_WIND_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Element_Wind.png").ToUri(),
+        [FightProperty.FIGHT_PROP_HEAL_ADD] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_Heal.png").ToUri(),
+        [FightProperty.FIGHT_PROP_MAX_HP] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_MaxHp.png").ToUri(),
+        [FightProperty.FIGHT_PROP_PHYSICAL_ADD_HURT] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_PhysicalAttackUp.png").ToUri(),
+        [FightProperty.FIGHT_PROP_SHIELD_COST_MINUS_RATIO] = Web.HutaoEndpoints.StaticRaw("Property", "UI_Icon_ShieldCostMinus.png").ToUri(),
+    }.ToFrozenDictionary();
 
     private Brush? background;
 

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;
@@ -21,7 +20,7 @@ internal sealed class Team : List<AvatarView>
     /// </summary>
     /// <param name="team">队伍</param>
     /// <param name="idAvatarMap">映射</param>
-    public Team(ItemRate<string, int> team, Dictionary<AvatarId, Avatar> idAvatarMap, int rank)
+    public Team(ItemRate<string, int> team, Dictionary<AvatarId, Avatar> idAvatarMap)
         : base(4)
     {
         foreach (StringSegment item in new StringTokenizer(team.Item, [',']))
@@ -33,13 +32,10 @@ internal sealed class Team : List<AvatarView>
         AddRange(new AvatarView[4 - Count]);
 
         Rate = SH.FormatModelBindingHutaoTeamUpCountFormat(team.Rate);
-        Rank = rank;
     }
 
     /// <summary>
     /// 上场次数
     /// </summary>
     public string Rate { get; }
-
-    public int Rank { get; set; }
 }

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

@@ -21,8 +21,8 @@ internal sealed class TeamAppearanceView
     public TeamAppearanceView(TeamAppearance teamRank, Dictionary<AvatarId, Avatar> idAvatarMap)
     {
         Floor = SH.FormatModelBindingHutaoComplexRankFloor(teamRank.Floor);
-        Up = teamRank.Up.SelectList((teamRate, index) => new Team(teamRate, idAvatarMap, index + 1));
-        Down = teamRank.Down.SelectList((teamRate, index) => new Team(teamRate, idAvatarMap, index + 1));
+        Up = teamRank.Up.SelectList(teamRate => new Team(teamRate, idAvatarMap));
+        Down = teamRank.Down.SelectList(teamRate => new Team(teamRate, idAvatarMap));
     }
 
     /// <summary>

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

@@ -19,11 +19,6 @@ internal sealed class GachaStatistics
     /// </summary>
     public TypedWishSummary WeaponWish { get; set; } = default!;
 
-    /// <summary>
-    /// 集录祈愿
-    /// </summary>
-    public TypedWishSummary ChronicledWish { get; set; } = default!;
-
     /// <summary>
     /// 奔行世间
     /// </summary>

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

@@ -60,7 +60,7 @@ internal sealed partial class HutaoCloudViewModel : Abstraction.ViewModel
 
         using (await dialog.BlockAsync(taskContext).ConfigureAwait(false))
         {
-            return await hutaoCloudService.RetrieveGachaArchiveIdAsync(uid).ConfigureAwait(false);
+            return await hutaoCloudService.RetrieveGachaItemsAsync(uid).ConfigureAwait(false);
         }
     }
 

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

@@ -21,10 +21,5 @@ internal sealed class HutaoStatistics
     /// <summary>
     /// 神铸赋形
     /// </summary>
-    public HutaoWishSummary WeaponEvent { get; set; } = default!;
-
-    /// <summary>
-    /// 集录祈愿
-    /// </summary>
-    public HutaoWishSummary Chronicled { get; set; } = default!;
+    public HutaoWishSummary WeaponWish { get; set; } = default!;
 }

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

@@ -1,10 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.AutoSuggestBox;
+using Microsoft.Extensions.Primitives;
 using Snap.Hutao.Model.Intrinsic.Frozen;
 using Snap.Hutao.Model.Metadata.Avatar;
-using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.ViewModel.Wiki;
 
@@ -18,61 +17,55 @@ internal static class AvatarFilter
     /// </summary>
     /// <param name="input">输入</param>
     /// <returns>筛选操作</returns>
-    public static Predicate<Avatar> Compile(ObservableCollection<SearchToken> input)
+    public static Predicate<Avatar> Compile(string input)
     {
         return (Avatar avatar) => DoFilter(input, avatar);
     }
 
-    private static bool DoFilter(ObservableCollection<SearchToken> input, Avatar avatar)
+    private static bool DoFilter(string input, Avatar avatar)
     {
         List<bool> matches = [];
-
-        foreach ((SearchTokenKind kind, IEnumerable<string> tokens) in input.GroupBy(token => token.Kind, token => token.Value))
+        foreach (StringSegment segment in new StringTokenizer(input, [' ']))
         {
-            switch (kind)
+            string value = segment.ToString();
+
+            if (avatar.Name == value)
             {
-                case SearchTokenKind.ElementName:
-                    if (IntrinsicFrozen.ElementNames.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(avatar.FetterInfo.VisionBefore));
-                    }
-
-                    break;
-                case SearchTokenKind.AssociationType:
-                    if (IntrinsicFrozen.AssociationTypes.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(avatar.FetterInfo.Association.GetLocalizedDescriptionOrDefault()));
-                    }
-
-                    break;
-                case SearchTokenKind.WeaponType:
-                    if (IntrinsicFrozen.WeaponTypes.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(avatar.Weapon.GetLocalizedDescriptionOrDefault()));
-                    }
-
-                    break;
-                case SearchTokenKind.ItemQuality:
-                    if (IntrinsicFrozen.ItemQualities.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(avatar.Quality.GetLocalizedDescriptionOrDefault()));
-                    }
-
-                    break;
-                case SearchTokenKind.BodyType:
-                    if (IntrinsicFrozen.BodyTypes.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(avatar.Body.GetLocalizedDescriptionOrDefault()));
-                    }
-
-                    break;
-                case SearchTokenKind.Avatar:
-                    matches.Add(tokens.Contains(avatar.Name));
-                    break;
-                default:
-                    matches.Add(false);
-                    break;
+                matches.Add(true);
+                continue;
             }
+
+            if (IntrinsicFrozen.ElementNames.Contains(value))
+            {
+                matches.Add(avatar.FetterInfo.VisionBefore == value);
+                continue;
+            }
+
+            if (IntrinsicFrozen.AssociationTypes.Contains(value))
+            {
+                matches.Add(avatar.FetterInfo.Association.GetLocalizedDescriptionOrDefault() == value);
+                continue;
+            }
+
+            if (IntrinsicFrozen.WeaponTypes.Contains(value))
+            {
+                matches.Add(avatar.Weapon.GetLocalizedDescriptionOrDefault() == value);
+                continue;
+            }
+
+            if (IntrinsicFrozen.ItemQualities.Contains(value))
+            {
+                matches.Add(avatar.Quality.GetLocalizedDescriptionOrDefault() == value);
+                continue;
+            }
+
+            if (IntrinsicFrozen.BodyTypes.Contains(value))
+            {
+                matches.Add(avatar.Body.GetLocalizedDescriptionOrDefault() == value);
+                continue;
+            }
+
+            matches.Add(false);
         }
 
         return matches.Count > 0 && matches.Aggregate((a, b) => a && b);

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

@@ -1,10 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.AutoSuggestBox;
+using Microsoft.Extensions.Primitives;
 using Snap.Hutao.Model.Intrinsic.Frozen;
 using Snap.Hutao.Model.Metadata.Weapon;
-using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.ViewModel.Wiki;
 
@@ -18,46 +17,41 @@ internal static class WeaponFilter
     /// </summary>
     /// <param name="input">输入</param>
     /// <returns>筛选操作</returns>
-    public static Predicate<Weapon> Compile(ObservableCollection<SearchToken> input)
+    public static Predicate<Weapon> Compile(string input)
     {
         return (Weapon weapon) => DoFilter(input, weapon);
     }
 
-    private static bool DoFilter(ObservableCollection<SearchToken> input, Weapon weapon)
+    private static bool DoFilter(string input, Weapon weapon)
     {
         List<bool> matches = [];
 
-        foreach ((SearchTokenKind kind, IEnumerable<string> tokens) in input.GroupBy(token => token.Kind, token => token.Value))
+        foreach (StringSegment segment in new StringTokenizer(input, [' ']))
         {
-            switch (kind)
+            string value = segment.ToString();
+
+            if (weapon.Name == value)
             {
-                case SearchTokenKind.WeaponType:
-                    if (IntrinsicFrozen.WeaponTypes.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(weapon.WeaponType.GetLocalizedDescriptionOrDefault()));
-                    }
+                matches.Add(true);
+                continue;
+            }
 
-                    break;
-                case SearchTokenKind.ItemQuality:
-                    if (IntrinsicFrozen.ItemQualities.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(weapon.Quality.GetLocalizedDescriptionOrDefault()));
-                    }
+            if (IntrinsicFrozen.WeaponTypes.Contains(value))
+            {
+                matches.Add(weapon.WeaponType.GetLocalizedDescriptionOrDefault() == value);
+                continue;
+            }
 
-                    break;
-                case SearchTokenKind.FightProperty:
-                    if (IntrinsicFrozen.FightProperties.Overlaps(tokens))
-                    {
-                        matches.Add(tokens.Contains(weapon.GrowCurves.ElementAtOrDefault(1)?.Type.GetLocalizedDescriptionOrDefault()));
-                    }
+            if (IntrinsicFrozen.ItemQualities.Contains(value))
+            {
+                matches.Add(weapon.Quality.GetLocalizedDescriptionOrDefault() == value);
+                continue;
+            }
 
-                    break;
-                case SearchTokenKind.Weapon:
-                    matches.Add(tokens.Contains(weapon.Name));
-                    break;
-                default:
-                    matches.Add(false);
-                    break;
+            if (IntrinsicFrozen.FightProperties.Contains(value))
+            {
+                matches.Add(weapon.GrowCurves.ElementAtOrDefault(1)?.Type.GetLocalizedDescriptionOrDefault() == value);
+                continue;
             }
         }
 

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

@@ -1,16 +1,13 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.AutoSuggestBox;
 using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Calculable;
 using Snap.Hutao.Model.Entity.Primitive;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Intrinsic.Frozen;
 using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Model.Metadata.Avatar;
-using Snap.Hutao.Model.Metadata.Converter;
 using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Service.Cultivation;
@@ -20,8 +17,6 @@ using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.Web.Response;
-using System.Collections.Frozen;
-using System.Collections.ObjectModel;
 using System.Runtime.InteropServices;
 using CalculateAvatarPromotionDelta = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.AvatarPromotionDelta;
 using CalculateClient = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.CalculateClient;
@@ -50,12 +45,10 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
 
     private AdvancedCollectionView<Avatar>? avatars;
     private Avatar? selected;
-    private ObservableCollection<SearchToken>? filterTokens;
-    private string? filterToken;
+    private string? filterText;
     private BaseValueInfo? baseValueInfo;
     private Dictionary<Level, Dictionary<GrowCurveType, float>>? levelAvatarCurveMap;
     private List<Promote>? promotes;
-    private FrozenDictionary<string, SearchToken> availableTokens;
 
     /// <summary>
     /// 角色列表
@@ -82,13 +75,9 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
     public BaseValueInfo? BaseValueInfo { get => baseValueInfo; set => SetProperty(ref baseValueInfo, value); }
 
     /// <summary>
-    /// 保存的筛选标志
+    /// 筛选文本
     /// </summary>
-    public ObservableCollection<SearchToken>? FilterTokens { get => filterTokens; set => SetProperty(ref filterTokens, value); }
-
-    public string? FilterToken { get => filterToken; set => SetProperty(ref filterToken, value); }
-
-    public FrozenDictionary<string, SearchToken>? AvailableTokens { get => availableTokens; }
+    public string? FilterText { get => filterText; set => SetProperty(ref filterText, value); }
 
     protected override async ValueTask<bool> InitializeUIAsync()
     {
@@ -112,18 +101,6 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
         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;
     }
 
@@ -226,20 +203,20 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
     }
 
     [Command("FilterCommand")]
-    private void ApplyFilter()
+    private void ApplyFilter(string? input)
     {
         if (Avatars is null)
         {
             return;
         }
 
-        if (FilterTokens.IsNullOrEmpty())
+        if (string.IsNullOrWhiteSpace(input))
         {
             Avatars.Filter = default!;
             return;
         }
 
-        Avatars.Filter = AvatarFilter.Compile(FilterTokens);
+        Avatars.Filter = AvatarFilter.Compile(input);
 
         if (Selected is not null && Avatars.Contains(Selected))
         {

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

@@ -1,15 +1,12 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Control.AutoSuggestBox;
 using Snap.Hutao.Control.Collection.AdvancedCollectionView;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Calculable;
 using Snap.Hutao.Model.Entity.Primitive;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Intrinsic.Frozen;
 using Snap.Hutao.Model.Metadata;
-using Snap.Hutao.Model.Metadata.Converter;
 using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Metadata.Weapon;
 using Snap.Hutao.Model.Primitive;
@@ -20,8 +17,6 @@ using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.View.Dialog;
 using Snap.Hutao.Web.Response;
-using System.Collections.Frozen;
-using System.Collections.ObjectModel;
 using System.Runtime.InteropServices;
 using CalculateAvatarPromotionDelta = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.AvatarPromotionDelta;
 using CalculateClient = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.CalculateClient;
@@ -47,12 +42,10 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
 
     private AdvancedCollectionView<Weapon>? weapons;
     private Weapon? selected;
-    private ObservableCollection<SearchToken>? filterTokens;
-    private string? filterToken;
+    private string? filterText;
     private BaseValueInfo? baseValueInfo;
     private Dictionary<Level, Dictionary<GrowCurveType, float>>? levelWeaponCurveMap;
     private List<Promote>? promotes;
-    private FrozenDictionary<string, SearchToken> availableTokens;
 
     /// <summary>
     /// 角色列表
@@ -79,13 +72,9 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
     public BaseValueInfo? BaseValueInfo { get => baseValueInfo; set => SetProperty(ref baseValueInfo, value); }
 
     /// <summary>
-    /// 保存的筛选标志
+    /// 筛选文本
     /// </summary>
-    public ObservableCollection<SearchToken>? FilterTokens { get => filterTokens; set => SetProperty(ref filterTokens, value); }
-
-    public string? FilterToken { get => filterToken; set => SetProperty(ref filterToken, value); }
-
-    public FrozenDictionary<string, SearchToken>? AvailableTokens { get => availableTokens; }
+    public string? FilterText { get => filterText; set => SetProperty(ref filterText, value); }
 
     /// <inheritdoc/>
     protected override async Task OpenUIAsync()
@@ -109,15 +98,6 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
 
             Weapons = new(list, true);
             Selected = Weapons.View.ElementAtOrDefault(0);
-            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)))),
-            ]);
         }
     }
 
@@ -208,20 +188,20 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
     }
 
     [Command("FilterCommand")]
-    private void ApplyFilter()
+    private void ApplyFilter(string? input)
     {
         if (Weapons is null)
         {
             return;
         }
 
-        if (FilterTokens.IsNullOrEmpty())
+        if (string.IsNullOrWhiteSpace(input))
         {
             Weapons.Filter = default!;
             return;
         }
 
-        Weapons.Filter = WeaponFilter.Compile(FilterTokens);
+        Weapons.Filter = WeaponFilter.Compile(input);
 
         if (Selected is not null && Weapons.Contains(Selected))
         {

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Event/GachaInfo/GachaConfigType.cs

@@ -4,45 +4,44 @@
 namespace Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 
 /// <summary>
-/// 祈愿类型
+/// 祈愿配置类型
 /// </summary>
 [HighQuality]
 [Localization]
-internal enum GachaType
+internal enum GachaConfigType
 {
     /// <summary>
     /// 新手池
     /// </summary>
+    [Description("新手祈愿")]
     [LocalizationKey(nameof(SH.WebGachaConfigTypeNoviceWish))]
-    NewBie = 100,
+    NoviceWish = 100,
 
     /// <summary>
     /// 常驻池
     /// </summary>
+    [Description("常驻祈愿")]
     [LocalizationKey(nameof(SH.WebGachaConfigTypePermanentWish))]
-    Standard = 200,
+    StandardWish = 200,
 
     /// <summary>
     /// 角色1池
     /// </summary>
+    [Description("角色活动祈愿")]
     [LocalizationKey(nameof(SH.WebGachaConfigTypeAvatarEventWish))]
-    ActivityAvatar = 301,
+    AvatarEventWish = 301,
 
     /// <summary>
     /// 武器池
     /// </summary>
+    [Description("武器活动祈愿")]
     [LocalizationKey(nameof(SH.WebGachaConfigTypeWeaponEventWish))]
-    ActivityWeapon = 302,
+    WeaponEventWish = 302,
 
     /// <summary>
     /// 角色2池
     /// </summary>
+    [Description("角色活动祈愿-2")]
     [LocalizationKey(nameof(SH.WebGachaConfigTypeAvatarEventWish2))]
-    SpecialActivityAvatar = 400,
-
-    /// <summary>
-    /// 集录池
-    /// </summary>
-    [LocalizationKey(nameof(SH.WebGachaConfigTypeChronicledWish))]
-    ActivityCity = 500,
+    AvatarEventWish2 = 400,
 }

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Event/GachaInfo/GachaConfigTypeExtension.cs

@@ -10,11 +10,11 @@ internal static class GachaConfigTypeExtension
     /// </summary>
     /// <param name="configType">配置类型</param>
     /// <returns>祈愿查询类型</returns>
-    public static GachaType ToQueryType(this GachaType configType)
+    public static GachaConfigType ToQueryType(this GachaConfigType configType)
     {
         return configType switch
         {
-            GachaType.SpecialActivityAvatar => GachaType.ActivityAvatar,
+            GachaConfigType.AvatarEventWish2 => GachaConfigType.AvatarEventWish,
             _ => configType,
         };
     }

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Event/GachaInfo/GachaLogItem.cs

@@ -23,7 +23,7 @@ internal class GachaLogItem
     /// </summary>
     [JsonPropertyName("gacha_type")]
     [JsonEnum(JsonSerializeType.NumberString)]
-    public GachaType GachaType { get; set; } = default!;
+    public GachaConfigType GachaType { get; set; } = default!;
 
     /// <summary>
     /// 总为 <see cref="string.Empty"/>

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Event/GachaInfo/GachaLogQueryOptions.cs

@@ -31,7 +31,7 @@ internal struct GachaLogQueryOptions
     /// </summary>
     public long EndId;
 
-    public GachaType Type;
+    public GachaConfigType Type;
 
     /// <summary>
     /// Keys required:
@@ -53,7 +53,7 @@ internal struct GachaLogQueryOptions
     /// <param name="query">原始查询字符串</param>
     /// <param name="queryType">祈愿类型</param>
     /// <param name="endId">终止Id</param>
-    public GachaLogQueryOptions(in GachaLogQuery query, GachaType queryType)
+    public GachaLogQueryOptions(in GachaLogQuery query, GachaConfigType queryType)
     {
         IsOversea = query.IsOversea;
 

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/HoyolabOptions.cs

@@ -47,22 +47,21 @@ internal static class HoyolabOptions
     /// <summary>
     /// 盐
     /// </summary>
-    public static FrozenDictionary<SaltType, string> Salts { get; } = FrozenDictionary.ToFrozenDictionary(
-    [
-
+    public static FrozenDictionary<SaltType, string> Salts { get; } = new Dictionary<SaltType, string>()
+    {
         // Chinese
-        KeyValuePair.Create(SaltType.K2, SaltConstants.CNK2),
-        KeyValuePair.Create(SaltType.LK2, SaltConstants.CNLK2),
-        KeyValuePair.Create(SaltType.X4, "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs"),
-        KeyValuePair.Create(SaltType.X6, "t0qEgfub6cvueAPgR5m9aQWWVciEer7v"),
-        KeyValuePair.Create(SaltType.PROD, "JwYDpKvLj6MrMqqYU6jTKF17KNO2PXoS"),
+        [SaltType.K2] = SaltConstants.CNK2,
+        [SaltType.LK2] = SaltConstants.CNLK2,
+        [SaltType.X4] = "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs",
+        [SaltType.X6] = "t0qEgfub6cvueAPgR5m9aQWWVciEer7v",
+        [SaltType.PROD] = "JwYDpKvLj6MrMqqYU6jTKF17KNO2PXoS",
 
         // Oversea
-        KeyValuePair.Create(SaltType.OSK2, SaltConstants.OSK2),
-        KeyValuePair.Create(SaltType.OSLK2, SaltConstants.OSLK2),
-        KeyValuePair.Create(SaltType.OSX4, "h4c1d6ywfq5bsbnbhm1bzq7bxzzv6srt"),
-        KeyValuePair.Create(SaltType.OSX6, "okr4obncj8bw5a65hbnn5oo6ixjc3l9w"),
-    ]);
+        [SaltType.OSK2] = SaltConstants.OSK2,
+        [SaltType.OSLK2] = SaltConstants.OSLK2,
+        [SaltType.OSX4] = "h4c1d6ywfq5bsbnbhm1bzq7bxzzv6srt",
+        [SaltType.OSX6] = "okr4obncj8bw5a65hbnn5oo6ixjc3l9w",
+    }.ToFrozenDictionary();
 
     [SuppressMessage("", "CA1308")]
     private static string GenerateDeviceId40()

src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/EndIds.cs

@@ -34,28 +34,21 @@ internal sealed class EndIds
     [JsonPropertyName("302")]
     public long WeaponEventWish { get; set; }
 
-    /// <summary>
-    /// 集录祈愿
-    /// </summary>
-    [JsonPropertyName("500")]
-    public long ChronicledWish { get; set; }
-
     /// <summary>
     /// 获取 Last Id
     /// </summary>
     /// <param name="type">类型</param>
     /// <returns>Last Id</returns>
-    public long this[GachaType type]
+    public long this[GachaConfigType type]
     {
         get
         {
             return type switch
             {
-                GachaType.NewBie => NoviceWish,
-                GachaType.Standard => StandardWish,
-                GachaType.ActivityAvatar => AvatarEventWish,
-                GachaType.ActivityWeapon => WeaponEventWish,
-                GachaType.ActivityCity => ChronicledWish,
+                GachaConfigType.NoviceWish => NoviceWish,
+                GachaConfigType.StandardWish => StandardWish,
+                GachaConfigType.AvatarEventWish => AvatarEventWish,
+                GachaConfigType.WeaponEventWish => WeaponEventWish,
                 _ => 0,
             };
         }
@@ -64,21 +57,18 @@ internal sealed class EndIds
         {
             switch (type)
             {
-                case GachaType.NewBie:
+                case GachaConfigType.NoviceWish:
                     NoviceWish = value;
                     break;
-                case GachaType.Standard:
+                case GachaConfigType.StandardWish:
                     StandardWish = value;
                     break;
-                case GachaType.ActivityAvatar:
+                case GachaConfigType.AvatarEventWish:
                     AvatarEventWish = value;
                     break;
-                case GachaType.ActivityWeapon:
+                case GachaConfigType.WeaponEventWish:
                     WeaponEventWish = value;
                     break;
-                case GachaType.ActivityCity:
-                    ChronicledWish = value;
-                    break;
             }
         }
     }
@@ -87,12 +77,11 @@ internal sealed class EndIds
     /// 获取枚举器
     /// </summary>
     /// <returns>枚举器</returns>
-    public IEnumerator<KeyValuePair<GachaType, long>> GetEnumerator()
+    public IEnumerator<KeyValuePair<GachaConfigType, long>> GetEnumerator()
     {
-        yield return new(GachaType.NewBie, NoviceWish);
-        yield return new(GachaType.Standard, StandardWish);
-        yield return new(GachaType.ActivityAvatar, AvatarEventWish);
-        yield return new(GachaType.ActivityWeapon, WeaponEventWish);
-        yield return new(GachaType.ActivityCity, ChronicledWish);
+        yield return new(GachaConfigType.NoviceWish, NoviceWish);
+        yield return new(GachaConfigType.StandardWish, StandardWish);
+        yield return new(GachaConfigType.AvatarEventWish, AvatarEventWish);
+        yield return new(GachaConfigType.WeaponEventWish, WeaponEventWish);
     }
 }

src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/GachaDistributionType.cs

@@ -18,11 +18,6 @@ internal enum GachaDistributionType
     /// </summary>
     WeaponEvent,
 
-    /// <summary>
-    /// 集录
-    /// </summary>
-    Chronicled,
-
     /// <summary>
     /// 常驻
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/GachaEntry.cs

@@ -10,11 +10,6 @@ internal sealed class GachaEntry
     /// </summary>
     public string Uid { get; set; } = default!;
 
-    /// <summary>
-    /// 是否被排除出了全球统计
-    /// </summary>
-    public bool Excluded { get; set; }
-
     /// <summary>
     /// 物品个数
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/GachaEventStatistics.cs

@@ -22,9 +22,4 @@ internal sealed class GachaEventStatistics
     /// 武器活动
     /// </summary>
     public List<ItemCount> WeaponEvent { get; set; } = default!;
-
-    /// <summary>
-    /// 集录祈愿
-    /// </summary>
-    public List<ItemCount> Chronicled { get; set; } = default!;
 }

src/Snap.Hutao/Snap.Hutao/Web/Hutao/GachaLog/GachaItem.cs

@@ -13,14 +13,14 @@ internal sealed class GachaItem
     /// <summary>
     /// 祈愿记录分类
     /// </summary>
-    public GachaType GachaType { get; set; }
+    public GachaConfigType GachaType { get; set; }
 
     /// <summary>
     /// 祈愿记录查询分类
     /// 合并保底的卡池使用此属性
     /// 仅4种（不含400）
     /// </summary>
-    public GachaType QueryType { get; set; }
+    public GachaConfigType QueryType { get; set; }
 
     /// <summary>
     /// 物品Id