refresh view

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

@@ -0,0 +1,32 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+// Some part of this file came from:
+// https://github.com/xunkong/desktop/tree/main/src/Desktop/Desktop/Pages/CharacterInfoPage.xaml.cs
+
+namespace Snap.Hutao.Control.Media;
+
+/// <summary>
+/// Defines a color in Hue/Saturation/Lightness (HSL) space.
+/// </summary>
+internal struct Hsl32
+{
+    /// <summary>
+    /// The Hue in 0..360 range.
+    /// </summary>
+    public double H;
+
+    /// <summary>
+    /// The Saturation in 0..1 range.
+    /// </summary>
+    public double S;
+
+    /// <summary>
+    /// The Lightness in 0..1 range.
+    /// </summary>
+    public double L;
+
+    /// <summary>
+    /// The Alpha/opacity in 0..1 range.
+    /// </summary>
+    public double A;
+}

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

@@ -86,7 +86,7 @@ internal struct Rgba32
     /// </summary>
     /// <param name="hsl">HSL 颜色</param>
     /// <returns>RGBA8颜色</returns>
-    public static Rgba32 FromHsl(HslColor hsl)
+    public static Rgba32 FromHsl(Hsl32 hsl)
     {
         double chroma = (1 - Math.Abs((2 * hsl.L) - 1)) * hsl.S;
         double h1 = hsl.H / 60;
@@ -143,7 +143,7 @@ internal struct Rgba32
     /// 转换到 HSL 颜色
     /// </summary>
     /// <returns>HSL 颜色</returns>
-    public readonly HslColor ToHsl()
+    public readonly Hsl32 ToHsl()
     {
         const double toDouble = 1.0 / 255;
         double r = toDouble * R;
@@ -176,7 +176,7 @@ internal struct Rgba32
         double lightness = 0.5 * (max + min);
         double saturation = chroma == 0 ? 0 : chroma / (1 - Math.Abs((2 * lightness) - 1));
 
-        HslColor ret;
+        Hsl32 ret;
         ret.H = 60 * h1;
         ret.S = saturation;
         ret.L = lightness;

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

@@ -1,30 +1,20 @@
-<SplitButton
+<clw: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:clw="using:CommunityToolkit.Labs.WinUI"
     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"
-    Padding="0,6"
     mc:Ignorable="d">
 
-    <SplitButton.Content>
-        <FontIcon Name="IconPresenter" Glyph="&#xE8FD;"/>
-    </SplitButton.Content>
+    <clw:SegmentedItem
+        Icon="{shcm:FontIcon Glyph=&#xE8FD;}"
+        Tag="List"
+        ToolTipService.ToolTip="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownListName}"/>
+    <clw:SegmentedItem
+        Icon="{shcm:FontIcon Glyph=&#xF0E2;}"
+        Tag="Grid"
+        ToolTipService.ToolTip="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownGridName}"/>
 
-    <SplitButton.Flyout>
-        <MenuFlyout>
-            <RadioMenuFlyoutItem
-                Click="OnMenuItemClick"
-                Icon="{shcm:FontIcon Glyph=&#xE8FD;}"
-                Tag="List"
-                Text="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownListName}"/>
-            <RadioMenuFlyoutItem
-                Click="OnMenuItemClick"
-                Icon="{shcm:FontIcon Glyph=&#xF0E2;}"
-                Tag="Grid"
-                Text="{shcm:ResourceString Name=ControlPanelPanelSelectorDropdownGridName}"/>
-        </MenuFlyout>
-    </SplitButton.Flyout>
-
-</SplitButton>
+</clw:Segmented>

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

@@ -1,9 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.Labs.WinUI;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;
 
@@ -11,15 +10,21 @@ namespace Snap.Hutao.Control.Panel;
 /// 面板选择器
 /// </summary>
 [HighQuality]
-[DependencyProperty("Current", typeof(string), List, nameof(OnCurrentChanged))]
-internal sealed partial class PanelSelector : SplitButton
+[DependencyProperty("Current", typeof(string), List)]
+internal sealed partial class PanelSelector : Segmented
 {
     private const string List = nameof(List);
+    private const string Grid = nameof(Grid);
+
+    private static readonly Dictionary<int, string> IndexTypeMap = new()
+    {
+        [0] = List,
+        [1] = Grid,
+    };
 
     private readonly RoutedEventHandler loadedEventHandler;
     private readonly RoutedEventHandler unloadedEventHandler;
-    private readonly TypedEventHandler<SplitButton, SplitButtonClickEventArgs> clickEventHandler;
-    private readonly RoutedEventHandler menuItemClickEventHandler;
+    private readonly long selectedIndexChangedCallbackToken;
 
     /// <summary>
     /// 构造一个新的面板选择器
@@ -31,85 +36,27 @@ internal sealed partial class PanelSelector : SplitButton
         loadedEventHandler = OnRootLoaded;
         Loaded += loadedEventHandler;
 
-        clickEventHandler = OnRootClick;
-        Click += clickEventHandler;
-
-        menuItemClickEventHandler = OnMenuItemClick;
-
         unloadedEventHandler = OnRootUnload;
         Unloaded += unloadedEventHandler;
+
+        selectedIndexChangedCallbackToken = RegisterPropertyChangedCallback(SelectedIndexProperty, OnSelectedIndexChanged);
     }
 
-    private static void InitializeItems(PanelSelector selector)
+    private void OnSelectedIndexChanged(DependencyObject sender, DependencyProperty dp)
     {
-        MenuFlyout menuFlyout = (MenuFlyout)selector.Flyout;
-        int hash = selector.GetHashCode();
-        foreach (RadioMenuFlyoutItem item in menuFlyout.Items.Cast<RadioMenuFlyoutItem>())
-        {
-            item.GroupName = $"{nameof(PanelSelector)}GroupOf@{hash}";
-            item.Click += selector.menuItemClickEventHandler;
-        }
-    }
-
-    private static void OnCurrentChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        UpdateRootGlyphAndItemIsCheck((PanelSelector)obj, (string)args.NewValue);
-    }
-
-    private static void UpdateRootGlyphAndItemIsCheck(PanelSelector sender, string current)
-    {
-        RadioMenuFlyoutItem targetItem = (RadioMenuFlyoutItem)((MenuFlyout)sender.Flyout).Items
-            .Single(i => (string)i.Tag == current);
-
-        targetItem.IsChecked = true;
-        sender.IconPresenter.Glyph = ((FontIcon)targetItem.Icon).Glyph;
+        Current = IndexTypeMap[(int)GetValue(dp)];
     }
 
     private void OnRootLoaded(object sender, RoutedEventArgs e)
     {
-        // because the GroupName shares in global
-        // we have to implement a control scoped GroupName.
         PanelSelector selector = (PanelSelector)sender;
-        InitializeItems(selector);
-        UpdateRootGlyphAndItemIsCheck(selector, Current);
+        selector.SelectedItem = selector.Items.Cast<SegmentedItem>().Single(item => (string)item.Tag == Current);
     }
 
     private void OnRootUnload(object sender, RoutedEventArgs e)
     {
+        UnregisterPropertyChangedCallback(SelectedIndexProperty, selectedIndexChangedCallbackToken);
         Loaded -= loadedEventHandler;
-        Click -= clickEventHandler;
-
-        foreach (MenuFlyoutItemBase item in ((MenuFlyout)((PanelSelector)sender).Flyout).Items)
-        {
-            ((RadioMenuFlyoutItem)item).Click -= menuItemClickEventHandler;
-        }
-
         Unloaded -= unloadedEventHandler;
     }
-
-    private void OnRootClick(SplitButton sender, SplitButtonClickEventArgs args)
-    {
-        MenuFlyout menuFlyout = (MenuFlyout)sender.Flyout;
-
-        int i = 0;
-        for (; i < menuFlyout.Items.Count; i++)
-        {
-            if ((string)menuFlyout.Items[i].Tag == Current)
-            {
-                break;
-            }
-        }
-
-        ++i;
-        i %= menuFlyout.Items.Count; // move the count index to 0
-
-        RadioMenuFlyoutItem item = (RadioMenuFlyoutItem)menuFlyout.Items[i];
-        item.IsChecked = true;
-        Current = (string)item.Tag;
-    }
-
-    private void OnMenuItemClick(object sender, RoutedEventArgs e)
-    {
-        Current = (string)((FrameworkElement)sender).Tag;
-    }
 }

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

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

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

@@ -32,7 +32,7 @@ internal sealed partial class DescriptionsParametersDescriptor : ValueConverter<
     public override List<LevelParameters<string, ParameterDescription>> Convert(DescriptionsParameters from)
     {
         List<LevelParameters<string, ParameterDescription>> parameters = from.Parameters
-            .SelectList(param => new LevelParameters<string, ParameterDescription>($"Lv.{param.Level}", GetParameterDescription(from.Descriptions, param.Parameters)));
+            .SelectList(param => new LevelParameters<string, ParameterDescription>($"Lv.{param.Level.Value}", GetParameterDescription(from.Descriptions, param.Parameters)));
 
         return parameters;
     }

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

@@ -2,24 +2,101 @@
     x:Class="Snap.Hutao.View.Control.LoadingView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:clw="using:CommunityToolkit.Labs.WinUI"
     xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
+    HorizontalContentAlignment="Stretch"
+    VerticalContentAlignment="Stretch"
     mc:Ignorable="d">
+    <cwuc:Loading.Style>
+        <Style TargetType="cwuc:Loading">
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Stretch"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="cwuc:Loading">
+                        <Border
+                            x:Name="RootGrid"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Opacity="0"
+                            Visibility="Collapsed">
+                            <Grid>
+                                <clw:Shimmer IsActive="{x:Bind IsLoading, Mode=OneWay}" Duration="0:0:1"/>
+                                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                    <shci:CachedImage
+                                        Width="120"
+                                        Height="120"
+                                        EnableLazyLoading="False"
+                                        Source="{StaticResource UI_EmotionIcon272}"/>
+                                    <TextBlock
+                                        Margin="0,16,0,0"
+                                        HorizontalAlignment="Center"
+                                        Style="{StaticResource SubtitleTextBlockStyle}"
+                                        Text="{shcm:ResourceString Name=ViewControlLoadingText}"/>
+                                </StackPanel>
+                            </Grid>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="LoadingIn">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Opacity">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0" Value="0">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="1">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Visible</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="LoadingOut">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Opacity">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0" Value="1">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="0">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0.3">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Collapsed</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </cwuc:Loading.Style>
 
-    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-        <shci:CachedImage
-            Width="120"
-            Height="120"
-            EnableLazyLoading="False"
-            Source="{StaticResource UI_EmotionIcon272}"/>
-        <TextBlock
-            Margin="0,16,0,0"
-            HorizontalAlignment="Center"
-            Style="{StaticResource SubtitleTextBlockStyle}"
-            Text="{shcm:ResourceString Name=ViewControlLoadingText}"/>
-        <ProgressRing Margin="0,16,0,0" IsActive="True"/>
-    </StackPanel>
 </cwuc:Loading>

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

@@ -2,16 +2,85 @@
     x:Class="Snap.Hutao.View.Control.LoadingViewSlim"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:clw="using:CommunityToolkit.Labs.WinUI"
     xmlns:cwuc="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Height="{StaticResource HomeAdaptiveCardHeight}"
-    HorizontalAlignment="Stretch"
-    VerticalAlignment="Stretch"
-    Background="{ThemeResource AccentAcrylicInAppFillColorDefaultBrush}"
+    HorizontalContentAlignment="Stretch"
+    VerticalContentAlignment="Stretch"
     mc:Ignorable="d">
-
-    <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-        <ProgressRing IsActive="True"/>
-    </StackPanel>
+    <cwuc:Loading.Style>
+        <Style TargetType="cwuc:Loading">
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Stretch"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="cwuc:Loading">
+                        <Border
+                            x:Name="RootGrid"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Opacity="0"
+                            Visibility="Collapsed">
+                            <clw:Shimmer IsActive="{x:Bind IsLoading}" Duration="0:0:0.5"/>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="LoadingIn">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Opacity">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0" Value="0">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="1">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Visible</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="LoadingOut">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Opacity">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0" Value="1">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                                <EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="0">
+                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                                        <QuadraticEase EasingMode="EaseInOut"/>
+                                                    </EasingDoubleKeyFrame.EasingFunction>
+                                                </EasingDoubleKeyFrame>
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0.3">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Collapsed</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </cwuc:Loading.Style>
 </cwuc:Loading>

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

@@ -21,8 +21,8 @@ internal sealed partial class Int32ToGradientColorConverter : DependencyValueCon
 {
     public Int32ToGradientColorConverter()
     {
-        Minimum = StructMarshal.Color(0xFFFF4949);
-        Maximum = StructMarshal.Color(0xFF48FF7A);
+        Maximum = StructMarshal.Color(0xFFFF4949);
+        Minimum = StructMarshal.Color(0xFF48FF7A);
     }
 
     public override Color Convert(int from)

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

@@ -300,7 +300,7 @@
                                         <TextBlock
                                             Margin="16,32,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
-                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
+                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTanlentHeader}"/>
                                         <shvc:SkillPivot
                                             Margin="16,16,0,0"
                                             ItemTemplate="{StaticResource SkillDataTemplate}"

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClient.cs

@@ -15,7 +15,7 @@ namespace Snap.Hutao.Web.Hoyolab.Passport;
 /// </summary>
 [HighQuality]
 [UseDynamicSecret]
-[ConstructorGenerated]
+[ConstructorGenerated(ResolveHttpClient = true)]
 [HttpClient(HttpClientConfiguration.XRpc2)]
 internal sealed partial class PassportClient : IPassportClient
 {