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

remove unnecessary converters

Browse Source
This commit is contained in:
DismissedLight
2023-01-20 17:30:16 +08:00
parent ee70205245
commit c810ffa625
14 changed files with 37 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Snap.Hutao/Snap.Hutao/App.xaml
View File

@@ -78,10 +78,6 @@
<shmmc:QualityColorConverter x:Key="QualityColorConverter"/>
<shmmc:WeaponTypeIconConverter x:Key="WeaponTypeIconConverter"/>
<shvc:BoolToVisibilityRevertConverter x:Key="BoolToVisibilityRevertConverter"/>
<shvc:EmptyCollectionToBoolConverter x:Key="EmptyCollectionToBoolConverter"/>
<shvc:EmptyCollectionToBoolRevertConverter x:Key="EmptyCollectionToBoolRevertConverter"/>
<shvc:EmptyCollectionToVisibilityConverter x:Key="EmptyCollectionToVisibilityConverter"/>
<shvc:EmptyCollectionToVisibilityRevertConverter x:Key="EmptyCollectionToVisibilityRevertConverter"/>
<shvc:EmptyObjectToBoolConverter x:Key="EmptyObjectToBoolConverter"/>
<shvc:EmptyObjectToBoolRevertConverter x:Key="EmptyObjectToBoolRevertConverter"/>
<shvc:EmptyObjectToVisibilityConverter x:Key="EmptyObjectToVisibilityConverter"/>

2
src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs
View File

@@ -111,7 +111,7 @@ internal class DailyNoteService : IDailyNoteService, IRecipient<UserRemovedMessa
GameRecordClient gameRecordClient = scope.ServiceProvider.GetRequiredService<GameRecordClient>();
if (appDbContext.Settings.SingleOrAdd(SettingEntry.DailyNoteSilentWhenPlayingGame, SettingEntryHelper.FalseString).GetBoolean()
&& Ioc.Default.GetRequiredService<IGameService>().IsGameRunning())
&& scope.ServiceProvider.GetRequiredService<IGameService>().IsGameRunning())
{
// Prevent notify when we are in silent mode.
notify = false;

21
src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolConverter.cs
View File

@@ -1,21 +0,0 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Converters;
namespace Snap.Hutao.View.Converter;
/// <summary>
/// This class converts a collection size into a boolean value.
/// </summary>
public class EmptyCollectionToBoolConverter : EmptyCollectionToObjectConverter
{
/// <summary>
/// Initializes a new instance of the <see cref="EmptyCollectionToVisibilityConverter"/> class.
/// </summary>
public EmptyCollectionToBoolConverter()
{
EmptyValue = false;
NotEmptyValue = true;
}
}

21
src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolRevertConverter.cs
View File

@@ -1,21 +0,0 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Converters;
namespace Snap.Hutao.View.Converter;
/// <summary>
/// This class converts a collection size into a boolean value in reverse.
/// </summary>
public class EmptyCollectionToBoolRevertConverter : EmptyCollectionToObjectConverter
{
/// <summary>
/// Initializes a new instance of the <see cref="EmptyCollectionToVisibilityConverter"/> class.
/// </summary>
public EmptyCollectionToBoolRevertConverter()
{
EmptyValue = true;
NotEmptyValue = false;
}
}

22
src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityConverter.cs
View File

@@ -1,22 +0,0 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Converters;
using Microsoft.UI.Xaml;
namespace Snap.Hutao.View.Converter;
/// <summary>
/// This class converts a collection size into a Visibility enumeration.
/// </summary>
public class EmptyCollectionToVisibilityConverter : EmptyCollectionToObjectConverter
{
/// <summary>
/// Initializes a new instance of the <see cref="EmptyCollectionToVisibilityConverter"/> class.
/// </summary>
public EmptyCollectionToVisibilityConverter()
{
EmptyValue = Visibility.Collapsed;
NotEmptyValue = Visibility.Visible;
}
}

22
src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityRevertConverter.cs
View File

@@ -1,22 +0,0 @@
// Copyright (c) DGP Studio. All rights reserved.
// Licensed under the MIT license.
using CommunityToolkit.WinUI.UI.Converters;
using Microsoft.UI.Xaml;
namespace Snap.Hutao.View.Converter;
/// <summary>
/// This class converts a collection size into a Visibility enumeration in reverse.
/// </summary>
public class EmptyCollectionToVisibilityRevertConverter : EmptyCollectionToObjectConverter
{
/// <summary>
/// Initializes a new instance of the <see cref="EmptyCollectionToVisibilityRevertConverter"/> class.
/// </summary>
public EmptyCollectionToVisibilityRevertConverter()
{
EmptyValue = Visibility.Visible;
NotEmptyValue = Visibility.Collapsed;
}
}

2
src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs
View File

@@ -14,7 +14,7 @@ public class Int32ToVisibilityConverter : IValueConverter
/// <inheritdoc/>
public object Convert(object value, Type targetType, object parameter, string language)
{
return (int)value == 0 ? Visibility.Collapsed : Visibility.Visible;
return value != null && ((int)value != 0) ? Visibility.Visible : Visibility.Collapsed;
}
/// <inheritdoc/>

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

@@ -36,10 +36,7 @@
SelectionMode="None">
<cwucont:AdaptiveGridView.ItemTemplate>
<DataTemplate>
<Border
cwu:UIElementExtensions.ClipToBounds="True"
Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
CornerRadius="{StaticResource CompatCornerRadius}">
<Border cwu:UIElementExtensions.ClipToBounds="True" Style="{StaticResource BorderCardStyle}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition/>
@@ -48,10 +45,11 @@
<!-- Image Layer -->
<Border cwu:UIElementExtensions.ClipToBounds="True">
<Border VerticalAlignment="Top" cwu:VisualExtensions.NormalizedCenterPoint="0.5">
<shci:CachedImage Source="{Binding Banner}" Stretch="UniformToFill"/>
<mxi:Interaction.Behaviors>
<shcb:AutoHeightBehavior TargetHeight="390" TargetWidth="1080"/>
</mxi:Interaction.Behaviors>
<shci:CachedImage Source="{Binding Banner}" Stretch="UniformToFill"/>
<cwua:Explicit.Animations>
<cwua:AnimationSet x:Name="ImageZoomInAnimation">
<shca:ImageZoomInAnimation/>
@@ -129,7 +127,7 @@
<Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
<Setter Property="Padding" Value="0"/>
<Setter Property="CornerRadius" Value="0"/>
<Setter Property="MaxWidth" Value="560"/>
<Setter Property="MaxWidth" Value="640"/>
</Style>
</Flyout.FlyoutPresenterStyle>
<shvc:AnnouncementContentViewer Announcement="{Binding}"/>

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

@@ -134,7 +134,7 @@
ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
ItemsSource="{Binding CultivateEntries}"
SelectionMode="None"
Visibility="{Binding CultivateEntries, Converter={StaticResource EmptyCollectionToVisibilityConverter}}">
Visibility="{Binding CultivateEntries.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
<cwucont:AdaptiveGridView.ItemTemplate>
<DataTemplate>
<Border Style="{StaticResource BorderCardStyle}">
@@ -273,7 +273,7 @@
<StackPanel
HorizontalAlignment="Center"
VerticalAlignment="Center"
Visibility="{Binding CultivateEntries, Converter={StaticResource EmptyCollectionToVisibilityRevertConverter}}">
Visibility="{Binding CultivateEntries.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
<wsc:SettingsGroup Margin="0,-36,0,0" HorizontalAlignment="Center">
<wsc:Setting
Description="添加任意角色到养成计划"

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

@@ -238,7 +238,7 @@
Margin="0,16,0,8"
Style="{StaticResource BaseTextBlockStyle}"
Text="五星"
Visibility="{Binding SelectedHistoryWish.OrangeList, Converter={StaticResource EmptyCollectionToVisibilityConverter}}"/>
Visibility="{Binding SelectedHistoryWish.OrangeList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
<GridView ItemsSource="{Binding SelectedHistoryWish.OrangeList}" SelectionMode="None">
<GridView.ItemTemplate>
<DataTemplate>
@@ -266,7 +266,7 @@
Margin="0,0,0,8"
Style="{StaticResource BaseTextBlockStyle}"
Text="四星"
Visibility="{Binding SelectedHistoryWish.PurpleList, Converter={StaticResource EmptyCollectionToVisibilityConverter}}"/>
Visibility="{Binding SelectedHistoryWish.PurpleList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
<GridView ItemsSource="{Binding SelectedHistoryWish.PurpleList}" SelectionMode="None">
<GridView.ItemTemplate>
<DataTemplate>
@@ -294,7 +294,7 @@
Margin="0,0,0,8"
Style="{StaticResource BaseTextBlockStyle}"
Text="三星"
Visibility="{Binding SelectedHistoryWish.BlueList, Converter={StaticResource EmptyCollectionToVisibilityConverter}}"/>
Visibility="{Binding SelectedHistoryWish.BlueList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
<GridView ItemsSource="{Binding SelectedHistoryWish.BlueList}" SelectionMode="None">
<GridView.ItemTemplate>
<DataTemplate>

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

@@ -127,16 +127,15 @@
</wsc:SettingsGroup>
<wsc:SettingsGroup Header="游戏">
<wsc:Setting Header="游戏路径" Icon="&#xE7FC;">
<wsc:Setting.Description>
<StackPanel>
<TextBlock
Foreground="{StaticResource SystemFillColorCautionBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="请选择游戏本体而不是启动器！"/>
<TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{Binding GamePath}"/>
</StackPanel>
</wsc:Setting.Description>
<InfoBar
IsClosable="False"
IsOpen="True"
Message="设置游戏路径时，请选择游戏本体（YuanShen.exe 或 Genshin Impact.exe）而不是启动器（launcher.exe）"
Severity="Informational"/>
<wsc:Setting
Description="{Binding GamePath}"
Header="游戏路径"
Icon="&#xE7FC;">
<wsc:Setting.ActionContent>
<Button Command="{Binding SetGamePathCommand}" Content="设置路径"/>
</wsc:Setting.ActionContent>
@@ -152,6 +151,12 @@
</wsc:SettingsGroup>
<wsc:SettingsGroup Header="测试功能">
<InfoBar
IsClosable="False"
IsOpen="True"
Message="测试功能是尚未完善，仅用于 Pollyfill 的功能，未来可能会存在更合理的位置放置这些功能"
Severity="Warning"/>
<wsc:Setting
Description="用户数据/日志/元数据在此处存放"
Header="打开 数据 文件夹"
@@ -181,6 +186,12 @@
</wsc:SettingsGroup>
<wsc:SettingsGroup Foreground="{StaticResource SystemFillColorCriticalBrush}" Header="危险功能">
<InfoBar
IsClosable="False"
IsOpen="True"
Message="除非开发人员明确要求你这么做，否则不应尝试执行下方的操作！"
Severity="Error"/>
<wsc:Setting
Background="{StaticResource SystemFillColorCriticalBackgroundBrush}"
Description="删除注册的计划任务，卸载前务必点击此项"

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

@@ -59,7 +59,7 @@
</Page.Resources>
<Grid>
<Grid Visibility="{Binding Avatars, Converter={StaticResource EmptyCollectionToVisibilityConverter}}">
<Grid Visibility="{Binding Avatars, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition/>
@@ -600,6 +600,6 @@
</SplitView.Content>
</SplitView>
</Grid>
<shvc:LoadingView IsLoading="{Binding Avatars, Converter={StaticResource EmptyCollectionToBoolRevertConverter}}"/>
<shvc:LoadingView IsLoading="{Binding Avatars, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
</Grid>
</Page>

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

@@ -32,7 +32,7 @@
</Page.Resources>
<Grid>
<Grid Visibility="{Binding Weapons, Converter={StaticResource EmptyCollectionToVisibilityConverter}}">
<Grid Visibility="{Binding Weapons, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition/>
@@ -242,6 +242,6 @@
</SplitView.Content>
</SplitView>
</Grid>
<shvc:LoadingView IsLoading="{Binding Weapons, Converter={StaticResource EmptyCollectionToBoolRevertConverter}}"/>
<shvc:LoadingView IsLoading="{Binding Weapons, Converter={StaticResource EmptyObjectToBoolRevertConverter}}"/>
</Grid>
</shc:ScopedPage>

2
src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
View File

@@ -217,4 +217,4 @@
</Button>
<NavigationViewItemSeparator/>
</StackPanel>
</UserControl>
</UserControl>