Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

maybe code style

Browse Source
This commit is contained in:
qhy040404
2024-03-04 00:01:52 +08:00
parent e35c03ac90
commit 03c1bacfe9
17 changed files with 172 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs
View File

@@ -41,14 +41,12 @@ internal class ScopedPage : Page
/// 应当在 InitializeComponent() 前调用
/// </summary>
/// <typeparam name="TViewModel">视图模型类型</typeparam>
protected TViewModel InitializeWith<TViewModel>()
protected void InitializeWith<TViewModel>()
where TViewModel : class, IViewModel
{
IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
viewModel.CancellationToken = viewCancellationTokenSource.Token;
DataContext = viewModel;
return (TViewModel)viewModel;
}
/// <inheritdoc/>

82
src/Snap.Hutao/Snap.Hutao/Control/SuggestBox/AutoSuggestTokenBox.cs Normal file
View File

@@ -0,0 +1,82 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml.Controls;
using Snap.Hutao.Control.SuggestBox;
namespace Snap.Hutao.View.Control;
[DependencyProperty("FilterCommand", typeof(ICommand))]
[DependencyProperty("ITokenizableItemsSource", typeof(IEnumerable<ITokenizable>))]
internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
{
public AutoSuggestTokenBox()
{
TextChanged += OnFilterSuggestionRequested;
QuerySubmitted += OnQuerySubmitted;
TokenItemAdding += OnTokenItemAdding;
TokenItemAdded += OnTokenItemModified;
TokenItemRemoved += OnTokenItemModified;
}
private void OnFilterSuggestionRequested(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
{
if (SuggestedItemsSource is not IEnumerable<string> availableQueries)
{
return;
}
if (string.IsNullOrWhiteSpace(Text))
{
return;
}
if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
{
sender.ItemsSource = availableQueries.Where(q => q.Contains(Text, StringComparison.OrdinalIgnoreCase));
}
}
private void OnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
{
if (args.ChosenSuggestion is not null)
{
return;
}
if (FilterCommand.CanExecute(null))
{
FilterCommand.Execute(null);
}
}
private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
{
if (string.IsNullOrWhiteSpace(args.TokenText))
{
return;
}
if (ITokenizableItemsSource is null)
{
return;
}
if (ITokenizableItemsSource.SingleOrDefault(i => i.Name == args.TokenText) is { } item)
{
args.Item = item.Tokenize();
return;
}
args.Item = new SearchToken(args.TokenText);
}
private void OnTokenItemModified(TokenizingTextBox sender, object args)
{
if (FilterCommand.CanExecute(null))
{
FilterCommand.Execute(null);
}
}
}

9
src/Snap.Hutao/Snap.Hutao/Control/SuggestBox/ISearchToken.cs Normal file
View File

@@ -0,0 +1,9 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
namespace Snap.Hutao.Control.SuggestBox;
internal interface ISearchToken
{
string Value { get; set; }
}

11
src/Snap.Hutao/Snap.Hutao/Control/SuggestBox/ITokenizable.cs Normal file
View File

@@ -0,0 +1,11 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
namespace Snap.Hutao.Control.SuggestBox;
internal interface ITokenizable
{
string Name { get; }
ISearchToken Tokenize();
}

42
src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/SearchToken.cs → src/Snap.Hutao/Snap.Hutao/Control/SuggestBox/SearchToken.Wiki.cs
View File

@@ -2,38 +2,23 @@
// Licensed under the MIT license.
using Snap.Hutao.Model.Intrinsic.Frozen;
using Snap.Hutao.Model.Metadata.Avatar;
using Snap.Hutao.Model.Metadata.Converter;
using Snap.Hutao.Model.Metadata.Weapon;
using Windows.UI;
namespace Snap.Hutao.ViewModel.Wiki;
namespace Snap.Hutao.Control.SuggestBox;
internal class SearchToken
internal partial class SearchToken
{
private SearchTokenKind kind;
private bool isKindInitialized;
private object isKindInitializedLock = new();
public SearchToken(string value)
public SearchToken(string value, Uri? sideIconUri)
: this(value)
{
Value = value;
SideIconUri = sideIconUri;
}
public SearchToken(Avatar avatar)
{
Value = avatar.Name;
SideIconUri = AvatarSideIconConverter.IconNameToUri(avatar.SideIcon);
}
public SearchToken(Weapon weapon)
{
Value = weapon.Name;
SideIconUri = EquipIconConverter.IconNameToUri(weapon.Icon);
}
public string Value { get; }
public Uri? SideIconUri { get; }
public Uri? IconUri
@@ -98,21 +83,4 @@ internal class SearchToken
}
}
}
public override string ToString()
{
return Value;
}
}
[SuppressMessage("", "SA1201")]
internal enum SearchTokenKind
{
AssociationTypes,
BodyTypes,
ElementNames,
FightProperties,
ItemQualities,
Other, // Include avatar and weapon
WeaponTypes,
}

19
src/Snap.Hutao/Snap.Hutao/Control/SuggestBox/SearchToken.cs Normal file
View File

@@ -0,0 +1,19 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
namespace Snap.Hutao.Control.SuggestBox;
internal sealed partial class SearchToken : ISearchToken
{
public SearchToken(string value)
{
Value = value;
}
public string Value { get; set; } = default!;
public override string ToString()
{
return Value;
}
}

15
src/Snap.Hutao/Snap.Hutao/Control/SuggestBox/SearchTokenKind.Wiki.cs Normal file
View File

@@ -0,0 +1,15 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
namespace Snap.Hutao.Control.SuggestBox;
internal enum SearchTokenKind
{
AssociationTypes,
BodyTypes,
ElementNames,
FightProperties,
ItemQualities,
Other, // Include avatar and weapon
WeaponTypes,
}

8
src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/Avatar.Implementation.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Snap.Hutao.Control.SuggestBox;
using Snap.Hutao.Model.Calculable;
using Snap.Hutao.Model.Metadata.Abstraction;
using Snap.Hutao.Model.Metadata.Converter;
@@ -14,7 +15,7 @@ namespace Snap.Hutao.Model.Metadata.Avatar;
/// <summary>
/// 角色的接口实现部分
/// </summary>
internal partial class Avatar : IStatisticsItemSource, ISummaryItemSource, IItemSource, INameQuality, ICalculableSource<ICalculableAvatar>
internal partial class Avatar : IStatisticsItemSource, ISummaryItemSource, IItemSource, INameQuality, ICalculableSource<ICalculableAvatar>, ITokenizable
{
/// <summary>
/// [非元数据] 搭配数据
@@ -96,4 +97,9 @@ internal partial class Avatar : IStatisticsItemSource, ISummaryItemSource, IItem
IsUp = isUp,
};
}
public ISearchToken Tokenize()
{
return new SearchToken(Name, AvatarSideIconConverter.IconNameToUri(SideIcon));
}
}

8
src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.Implementation.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Snap.Hutao.Control.SuggestBox;
using Snap.Hutao.Model.Calculable;
using Snap.Hutao.Model.Intrinsic;
using Snap.Hutao.Model.Metadata.Abstraction;
@@ -14,7 +15,7 @@ namespace Snap.Hutao.Model.Metadata.Weapon;
/// <summary>
/// 武器的接口实现
/// </summary>
internal sealed partial class Weapon : IStatisticsItemSource, ISummaryItemSource, IItemSource, INameQuality, ICalculableSource<ICalculableWeapon>
internal sealed partial class Weapon : IStatisticsItemSource, ISummaryItemSource, IItemSource, INameQuality, ICalculableSource<ICalculableWeapon>, ITokenizable
{
/// <summary>
/// [非元数据] 搭配数据
@@ -104,4 +105,9 @@ internal sealed partial class Weapon : IStatisticsItemSource, ISummaryItemSource
IsUp = isUp,
};
}
public ISearchToken Tokenize()
{
return new SearchToken(Name, EquipIconConverter.IconNameToUri(Icon));
}
}

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

@@ -305,13 +305,15 @@
</CommandBar.Content>
<!--<AppBarButton Icon="{shcm:FontIcon Glyph=&#xE946;}" Label="搜索提示"/>-->
<AppBarElementContainer>
<cwc:TokenizingTextBox
<shvcont:AutoSuggestTokenBox
x:Name="AvatarSuggestBox"
Width="600"
Height="44"
Margin="6,-2,6,6"
HorizontalAlignment="Stretch"
VerticalContentAlignment="Center"
FilterCommand="{Binding FilterCommand}"
ITokenizableItemsSource="{Binding Avatars.SourceCollection}"
ItemsSource="{Binding FilterTokens, Mode=TwoWay}"
MaximumTokens="5"
PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiAvatarAutoSuggestBoxPlaceHolder}"

16
src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml.cs
View File

@@ -1,8 +1,6 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml.Controls;
using Snap.Hutao.Control;
using Snap.Hutao.ViewModel.Wiki;
@@ -19,19 +17,7 @@ internal sealed partial class WikiAvatarPage : ScopedPage
/// </summary>
public WikiAvatarPage()
{
WikiAvatarViewModel viewModel = InitializeWith<WikiAvatarViewModel>();
InitializeWith<WikiAvatarViewModel>();
InitializeComponent();
viewModel.Initialize(new TokenizingTextBoxAccessor(AvatarSuggestBox));
}
private class TokenizingTextBoxAccessor : ITokenizingTextBoxAccessor
{
public TokenizingTextBoxAccessor(TokenizingTextBox tokenizingTextBox)
{
TokenizingTextBox = tokenizingTextBox;
}
public TokenizingTextBox TokenizingTextBox { get; private set; }
}
}

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

@@ -172,13 +172,15 @@
LocalSettingKeySuffixForCurrent="WikiWeaponPage.Weapons"/>
</CommandBar.Content>
<AppBarElementContainer>
<cwc:TokenizingTextBox
<shvc:AutoSuggestTokenBox
x:Name="WeaponSuggestBox"
Width="600"
Height="44"
Margin="6,-2,6,6"
HorizontalAlignment="Stretch"
VerticalContentAlignment="Center"
FilterCommand="{Binding FilterCommand}"
ITokenizableItemsSource="{Binding Weapons.SourceCollection}"
ItemsSource="{Binding FilterTokens, Mode=TwoWay}"
MaximumTokens="5"
PlaceholderText="{shcm:ResourceString Name=ViewPageWiKiWeaponAutoSuggestBoxPlaceHolder}"

15
src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml.cs
View File

@@ -1,7 +1,6 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.Controls;
using Snap.Hutao.Control;
using Snap.Hutao.ViewModel.Wiki;
@@ -18,19 +17,7 @@ internal sealed partial class WikiWeaponPage : ScopedPage
/// </summary>
public WikiWeaponPage()
{
WikiWeaponViewModel viewModel = InitializeWith<WikiWeaponViewModel>();
InitializeWith<WikiWeaponViewModel>();
InitializeComponent();
viewModel.Initialize(new TokenizingTextBoxAccessor(WeaponSuggestBox));
}
private class TokenizingTextBoxAccessor : ITokenizingTextBoxAccessor
{
public TokenizingTextBoxAccessor(TokenizingTextBox tokenizingTextBox)
{
TokenizingTextBox = tokenizingTextBox;
}
public TokenizingTextBox TokenizingTextBox { get; private set; }
}
}

1
src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/AvatarFilter.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Snap.Hutao.Control.SuggestBox;
using Snap.Hutao.Model.Intrinsic.Frozen;
using Snap.Hutao.Model.Metadata.Avatar;
using System.Collections.ObjectModel;

1
src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WeaponFilter.cs
View File

@@ -1,6 +1,7 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using Snap.Hutao.Control.SuggestBox;
using Snap.Hutao.Model.Intrinsic.Frozen;
using Snap.Hutao.Model.Metadata.Weapon;
using System.Collections.ObjectModel;

69
src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
View File

@@ -1,9 +1,8 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml.Controls;
using Snap.Hutao.Control.Collection.AdvancedCollectionView;
using Snap.Hutao.Control.SuggestBox;
using Snap.Hutao.Factory.ContentDialog;
using Snap.Hutao.Model.Calculable;
using Snap.Hutao.Model.Entity.Primitive;
@@ -37,7 +36,7 @@ namespace Snap.Hutao.ViewModel.Wiki;
[HighQuality]
[ConstructorGenerated]
[Injection(InjectAs.Scoped)]
internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel, IWikiViewModelInitialization
internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
{
private readonly IContentDialogFactory contentDialogFactory;
private readonly ICultivationService cultivationService;
@@ -90,15 +89,6 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel, IWiki
public FrozenSet<string>? AvailableQueries { get => availableQueries; }
public void Initialize(ITokenizingTextBoxAccessor accessor)
{
accessor.TokenizingTextBox.TextChanged += OnFilterSuggestionRequested;
accessor.TokenizingTextBox.QuerySubmitted += OnQuerySubmitted;
accessor.TokenizingTextBox.TokenItemAdding += OnTokenItemAdding;
accessor.TokenizingTextBox.TokenItemAdded += OnTokenItemModified;
accessor.TokenizingTextBox.TokenItemRemoved += OnTokenItemModified;
}
protected override async ValueTask<bool> InitializeUIAsync()
{
if (!await metadataService.InitializeAsync().ConfigureAwait(false))
@@ -234,60 +224,7 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel, IWiki
BaseValueInfo = new(avatar.MaxLevel, propertyCurveValues, levelAvatarCurveMap, avatarPromoteMap);
}
private void OnFilterSuggestionRequested(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
{
if (Avatars is null)
{
return;
}
if (string.IsNullOrWhiteSpace(FilterToken))
{
return;
}
if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
{
sender.ItemsSource = availableQueries.Where(q => q.Contains(FilterToken, StringComparison.OrdinalIgnoreCase));
}
}
private void OnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
{
if (args.ChosenSuggestion is not null)
{
return;
}
ApplyFilter();
}
private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
{
if (string.IsNullOrWhiteSpace(args.TokenText))
{
return;
}
if (Avatars is null)
{
return;
}
if (Avatars.SourceCollection.SingleOrDefault(a => a.Name == args.TokenText) is { } avatar)
{
args.Item = new SearchToken(avatar);
return;
}
args.Item = new SearchToken(args.TokenText);
}
private void OnTokenItemModified(TokenizingTextBox sender, object args)
{
ApplyFilter();
}
[Command("FilterCommand")]
private void ApplyFilter()
{
if (Avatars is null)

69
src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
View File

@@ -1,9 +1,8 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml.Controls;
using Snap.Hutao.Control.Collection.AdvancedCollectionView;
using Snap.Hutao.Control.SuggestBox;
using Snap.Hutao.Factory.ContentDialog;
using Snap.Hutao.Model.Calculable;
using Snap.Hutao.Model.Entity.Primitive;
@@ -34,7 +33,7 @@ namespace Snap.Hutao.ViewModel.Wiki;
/// </summary>
[ConstructorGenerated]
[Injection(InjectAs.Scoped)]
internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel, IWikiViewModelInitialization
internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
{
private readonly IContentDialogFactory contentDialogFactory;
private readonly CalculateClient calculateClient;
@@ -87,15 +86,6 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel, IWiki
public FrozenSet<string> AvailableQueries { get => availableQueries; }
public void Initialize(ITokenizingTextBoxAccessor accessor)
{
accessor.TokenizingTextBox.TextChanged += OnFilterSuggestionRequested;
accessor.TokenizingTextBox.QuerySubmitted += OnQuerySubmitted;
accessor.TokenizingTextBox.TokenItemAdding += OnTokenItemAdding;
accessor.TokenizingTextBox.TokenItemAdded += OnTokenItemModified;
accessor.TokenizingTextBox.TokenItemRemoved += OnTokenItemModified;
}
/// <inheritdoc/>
protected override async Task OpenUIAsync()
{
@@ -216,60 +206,7 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel, IWiki
BaseValueInfo = new(weapon.MaxLevel, propertyCurveValues, levelWeaponCurveMap, weaponPromoteMap);
}
private void OnFilterSuggestionRequested(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
{
if (Weapons is null)
{
return;
}
if (string.IsNullOrWhiteSpace(FilterToken))
{
return;
}
if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
{
sender.ItemsSource = availableQueries.Where(q => q.Contains(FilterToken, StringComparison.OrdinalIgnoreCase));
}
}
private void OnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
{
if (args.ChosenSuggestion is not null)
{
return;
}
ApplyFilter();
}
private void OnTokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
{
if (string.IsNullOrWhiteSpace(args.TokenText))
{
return;
}
if (Weapons is null)
{
return;
}
if (Weapons.SourceCollection.SingleOrDefault(w => w.Name == args.TokenText) is { } weapon)
{
args.Item = new SearchToken(weapon);
return;
}
args.Item = new SearchToken(args.TokenText);
}
private void OnTokenItemModified(TokenizingTextBox sender, object args)
{
ApplyFilter();
}
[Command("FilterCommand")]
private void ApplyFilter()
{
if (Weapons is null)