Merge pull request DGP-Studio#1517 from DGP-Studio/develop

ND6 · Mar 29, 2024 · 241122e · 241122e
2 parents db3a611 + 4e27d40
commit 241122e
Show file tree

Hide file tree

Showing 92 changed files with 1,699 additions and 1,269 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj b/src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
     <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -29,6 +29,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/TransitionCollection.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Uri.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/WindowOverride.xaml"/>
+                <ResourceDictionary Source="ms-appx:///View/Card/Primitive/CardProgressBar.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <Style

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml.cs b/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
@@ -7,8 +7,11 @@
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.LifeCycle;
 using Snap.Hutao.Core.LifeCycle.InterProcess;
+using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Core.Shell;
 using System.Diagnostics;
+using System.Text;
+using static Snap.Hutao.Core.Logging.ConsoleVirtualTerminalSequences;
 
 namespace Snap.Hutao;
 
@@ -21,17 +24,17 @@ namespace Snap.Hutao;
 [SuppressMessage("", "SH001")]
 public sealed partial class App : Application
 {
-    private const string ConsoleBanner = """
+    private const string ConsoleBanner = $"""
         ----------------------------------------------------------------
-          _____                         _    _         _                
-         / ____|                       | |  | |       | |               
-        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___  
-         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \ 
+          _____                         _    _         _ 
+         / ____|                       | |  | |       | |
+        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___
+         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \
          ____) || | | || (_| || |_) |_ | |  | || |_| || |_| (_| || (_) |
-        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/ 
-                              | |                                       
-                              |_| 
-                              
+        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/
+                              | |
+                              |_|
+
         Snap.Hutao is a open source software developed by DGP Studio.
         Copyright (C) 2022 - 2024 DGP Studio, All Rights Reserved.
         ----------------------------------------------------------------
@@ -69,7 +72,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
                 return;
             }
 
-            logger.LogInformation(ConsoleBanner);
+            logger.LogColorizedInformation((ConsoleBanner, ConsoleColor.DarkYellow));
             LogDiagnosticInformation();
 
             // manually invoke
@@ -89,8 +92,8 @@ private void LogDiagnosticInformation()
     {
         RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
 
-        logger.LogInformation("FamilyName: {name}", runtimeOptions.FamilyName);
-        logger.LogInformation("Version: {version}", runtimeOptions.Version);
-        logger.LogInformation("LocalCache: {folder}", runtimeOptions.LocalCache);
+        logger.LogColorizedInformation(("FamilyName: {Name}", ConsoleColor.Blue), (runtimeOptions.FamilyName, ConsoleColor.Cyan));
+        logger.LogColorizedInformation(("Version: {Version}", ConsoleColor.Blue), (runtimeOptions.Version, ConsoleColor.Cyan));
+        logger.LogColorizedInformation(("LocalCache: {Path}", ConsoleColor.Blue), (runtimeOptions.LocalCache, ConsoleColor.Cyan));
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/AutoSuggestTokenBox.cs b/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/AutoSuggestTokenBox.cs
@@ -1,9 +1,13 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Snap.Hutao.Control.Extension;
+using System.Collections;
 
 namespace Snap.Hutao.Control.AutoSuggestBox;
 
@@ -18,23 +22,44 @@ public AutoSuggestTokenBox()
         TextChanged += OnFilterSuggestionRequested;
         QuerySubmitted += OnQuerySubmitted;
         TokenItemAdding += OnTokenItemAdding;
-        TokenItemAdded += OnTokenItemModified;
-        TokenItemRemoved += OnTokenItemModified;
+        TokenItemAdded += OnTokenItemCollectionChanged;
+        TokenItemRemoved += OnTokenItemCollectionChanged;
+        Loaded += OnLoaded;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        if (this.FindDescendant("SuggestionsPopup") is Popup { Child: Border { Child: ListView listView } border })
+        {
+            IAppResourceProvider appResourceProvider = this.ServiceProvider().GetRequiredService<IAppResourceProvider>();
+
+            listView.Background = null;
+            listView.Margin = appResourceProvider.GetResource<Thickness>("AutoSuggestListPadding");
+
+            border.Background = appResourceProvider.GetResource<Microsoft.UI.Xaml.Media.Brush>("AutoSuggestBoxSuggestionsListBackground");
+            CornerRadius overlayCornerRadius = appResourceProvider.GetResource<CornerRadius>("OverlayCornerRadius");
+            CornerRadiusFilterConverter cornerRadiusFilterConverter = new() { Filter = CornerRadiusFilterKind.Bottom };
+            border.CornerRadius = (CornerRadius)cornerRadiusFilterConverter.Convert(overlayCornerRadius, typeof(CornerRadius), default, default);
+        }
     }
 
     private void OnFilterSuggestionRequested(Microsoft.UI.Xaml.Controls.AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
     {
         if (string.IsNullOrWhiteSpace(Text))
         {
-            return;
+            sender.ItemsSource = AvailableTokens
+                .OrderBy(kvp => kvp.Value.Kind)
+                .Select(kvp => kvp.Value);
         }
 
         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;
+            sender.ItemsSource = AvailableTokens
+                .Where(kvp => kvp.Value.Value.Contains(Text, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(kvp => kvp.Value.Kind)
+                .ThenBy(kvp => kvp.Value.Order)
+                .Select(kvp => kvp.Value)
+                .DefaultIfEmpty(SearchToken.NotFound);
         }
     }
 
@@ -45,7 +70,7 @@ private void OnQuerySubmitted(Microsoft.UI.Xaml.Controls.AutoSuggestBox sender,
             return;
         }
 
-        CommandExtension.TryExecute(FilterCommand, FilterCommandParameter);
+        CommandInvocation.TryExecute(FilterCommand, FilterCommandParameter);
     }
 
     private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
@@ -55,11 +80,23 @@ private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArg
             return;
         }
 
-        args.Item = AvailableTokens.GetValueOrDefault(args.TokenText) ?? new SearchToken(SearchTokenKind.None, args.TokenText);
+        if (AvailableTokens.GetValueOrDefault(args.TokenText) is { } token)
+        {
+            args.Item = token;
+        }
+        else
+        {
+            args.Cancel = true;
+        }
     }
 
-    private void OnTokenItemModified(TokenizingTextBox sender, object args)
+    private void OnTokenItemCollectionChanged(TokenizingTextBox sender, object args)
     {
-        CommandExtension.TryExecute(FilterCommand, FilterCommandParameter);
+        if (args is SearchToken { Kind: SearchTokenKind.None } token)
+        {
+            ((IList)sender.ItemsSource).Remove(token);
+        }
+
+        FilterCommand.TryExecute(FilterCommandParameter);
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchToken.cs b/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchToken.cs
@@ -7,13 +7,16 @@ namespace Snap.Hutao.Control.AutoSuggestBox;
 
 internal sealed class SearchToken
 {
-    public SearchToken(SearchTokenKind kind, string value, Uri? iconUri = null, Uri? sideIconUri = null, Color? quality = null)
+    public static readonly SearchToken NotFound = new(SearchTokenKind.None, SH.ControlAutoSuggestBoxNotFoundValue, 0);
+
+    public SearchToken(SearchTokenKind kind, string value, int order, Uri? iconUri = null, Uri? sideIconUri = null, Color? quality = null)
     {
         Value = value;
         Kind = kind;
         IconUri = iconUri;
         SideIconUri = sideIconUri;
         Quality = quality;
+        Order = order;
     }
 
     public SearchTokenKind Kind { get; }
@@ -26,6 +29,8 @@ public SearchToken(SearchTokenKind kind, string value, Uri? iconUri = null, Uri?
 
     public Color? Quality { get; }
 
+    public int Order { get; }
+
     public override string ToString()
     {
         return Value;

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchTokenKind.cs b/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchTokenKind.cs
@@ -6,12 +6,12 @@ namespace Snap.Hutao.Control.AutoSuggestBox;
 internal enum SearchTokenKind
 {
     None,
+    ItemQuality,
+    WeaponType,
+    FightProperty,
+    ElementName,
     AssociationType,
-    Avatar,
     BodyType,
-    ElementName,
-    FightProperty,
-    ItemQuality,
+    Avatar,
     Weapon,
-    WeaponType,
 }
diff --git a/....Hutao/Snap.Hutao/Control/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs b/....Hutao/Snap.Hutao/Control/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs
@@ -33,6 +33,7 @@ protected override void OnAssociatedObjectLoaded()
 
     protected override bool Uninitialize()
     {
+        periodicTimerCancellationTokenSource.Cancel();
         AssociatedObject.ActualThemeChanged -= OnActualThemeChanged;
         return true;
     }

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs b/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs
@@ -13,6 +13,4 @@ namespace Snap.Hutao.Control;
 /// </summary>
 [HighQuality]
 [DependencyProperty("DataContext", typeof(object))]
-internal sealed partial class BindingProxy : DependencyObject
-{
-}
+internal sealed partial class BindingProxy : DependencyObject;
diff --git a/...Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs b/...Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs
@@ -30,7 +30,7 @@ internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, IN
     private WeakEventListener<AdvancedCollectionView<T>, object?, NotifyCollectionChangedEventArgs>? sourceWeakEventListener;
 
     public AdvancedCollectionView()
-        : this(new List<T>(0))
+        : this([])
     {
     }
 

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/AlternatingItemsControl.cs b/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/AlternatingItemsControl.cs
@@ -6,6 +6,7 @@
 
 namespace Snap.Hutao.Control.Collection.Alternating;
 
+[Obsolete("Use SettingsCard instead")]
 [DependencyProperty("ItemAlternateBackground", typeof(Microsoft.UI.Xaml.Media.Brush))]
 internal sealed partial class AlternatingItemsControl : ItemsControl
 {

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/IAlternatingItem.cs b/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/IAlternatingItem.cs
@@ -3,6 +3,7 @@
 
 namespace Snap.Hutao.Control.Collection.Alternating;
 
+[Obsolete("Use SettingsCard instead")]
 internal interface IAlternatingItem
 {
     public Microsoft.UI.Xaml.Media.Brush? Background { get; set; }

diff --git a/...tao/Control/Extension/CommandExtension.cs → ...ao/Control/Extension/CommandInvocation.cs b/...tao/Control/Extension/CommandExtension.cs → ...ao/Control/Extension/CommandInvocation.cs
@@ -3,7 +3,7 @@
 
 namespace Snap.Hutao.Control.Extension;
 
-internal static class CommandExtension
+internal static class CommandInvocation
 {
     public static bool TryExecute(this ICommand? command, object? parameter = null)
     {

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Extension/DependencyObjectExtension.cs b/src/Snap.Hutao/Snap.Hutao/Control/Extension/DependencyObjectExtension.cs
@@ -2,11 +2,13 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using System.Runtime.CompilerServices;
 
 namespace Snap.Hutao.Control.Extension;
 
 internal static class DependencyObjectExtension
 {
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IServiceProvider ServiceProvider(this DependencyObject obj)
     {
         return Ioc.Default;

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
@@ -3,7 +3,9 @@
 
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
+using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Caching;
+using Snap.Hutao.Core.ExceptionService;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Control.Image;
@@ -19,19 +21,21 @@ internal sealed class CachedImage : Implementation.ImageEx
     /// </summary>
     public CachedImage()
     {
+        DefaultStyleKey = typeof(CachedImage);
+        DefaultStyleResourceUri = "ms-appx:///Control/Image/CachedImage.xaml".ToUri();
+
         IsCacheEnabled = true;
         EnableLazyLoading = false;
     }
 
     /// <inheritdoc/>
     protected override async Task<ImageSource?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
-        // We can only use Ioc to retrieve IImageCache, no IServiceProvider is available.
-        IImageCache imageCache = Ioc.Default.GetRequiredService<IImageCache>();
+        IImageCache imageCache = this.ServiceProvider().GetRequiredService<IImageCache>();
 
         try
         {
-            Verify.Operation(!string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
+            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
             string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
             token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
             return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageEx.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/Implementation/ImageEx.cs
@@ -7,21 +7,14 @@
 
 namespace Snap.Hutao.Control.Image.Implementation;
 
-internal class ImageEx : ImageExBase
+[DependencyProperty("NineGrid", typeof(Thickness))]
+internal partial class ImageEx : ImageExBase
 {
-    private static readonly DependencyProperty NineGridProperty = DependencyProperty.Register(nameof(NineGrid), typeof(Thickness), typeof(ImageEx), new PropertyMetadata(default(Thickness)));
-
     public ImageEx()
         : base()
     {
     }
 
-    public Thickness NineGrid
-    {
-        get => (Thickness)GetValue(NineGridProperty);
-        set => SetValue(NineGridProperty, value);
-    }
-
     public override CompositionBrush GetAlphaMask()
     {
         if (IsInitialized && Image is Microsoft.UI.Xaml.Controls.Image image)