From c810ffa6254724432b675a2bd89ff306bf9a0c10 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Fri, 20 Jan 2023 17:30:16 +0800
Subject: [PATCH] remove unnecessary converters

---
 src/Snap.Hutao/Snap.Hutao/App.xaml            |  4 ---
 .../Service/DailyNote/DailyNoteService.cs     |  2 +-
 .../EmptyCollectionToBoolConverter.cs         | 21 -------------
 .../EmptyCollectionToBoolRevertConverter.cs   | 21 -------------
 .../EmptyCollectionToVisibilityConverter.cs   | 22 -------------
 ...tyCollectionToVisibilityRevertConverter.cs | 22 -------------
 .../Converter/Int32ToVisibilityConverter.cs   |  2 +-
 .../View/Page/AnnouncementPage.xaml           | 10 +++---
 .../Snap.Hutao/View/Page/CultivationPage.xaml |  4 +--
 .../Snap.Hutao/View/Page/GachaLogPage.xaml    |  6 ++--
 .../Snap.Hutao/View/Page/SettingPage.xaml     | 31 +++++++++++++------
 .../Snap.Hutao/View/Page/WikiAvatarPage.xaml  |  4 +--
 .../Snap.Hutao/View/Page/WikiWeaponPage.xaml  |  4 +--
 src/Snap.Hutao/Snap.Hutao/View/UserView.xaml  |  2 +-
 14 files changed, 37 insertions(+), 118 deletions(-)
 delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolConverter.cs
 delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolRevertConverter.cs
 delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityConverter.cs
 delete mode 100644 src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityRevertConverter.cs

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index ab3ce5f4..fb2bbf25 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -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"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs
index d2efc73e..33815bd2 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs
@@ -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;
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolConverter.cs
deleted file mode 100644
index ce75c022..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolConverter.cs
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolRevertConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolRevertConverter.cs
deleted file mode 100644
index 3a7393bc..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToBoolRevertConverter.cs
+++ /dev/null
@@ -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;
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityConverter.cs
deleted file mode 100644
index b9b24b1c..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityConverter.cs
+++ /dev/null
@@ -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;
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityRevertConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityRevertConverter.cs
deleted file mode 100644
index 617a42a2..00000000
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/EmptyCollectionToVisibilityRevertConverter.cs
+++ /dev/null
@@ -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;
-    }
-}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs b/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs
index 3ea768b6..961783e1 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/View/Converter/Int32ToVisibilityConverter.cs
@@ -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/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index de69a28a..796c80c0 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -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}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
index 193ab960..0167cf40 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -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="添加任意角色到养成计划"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
index bfbbea10..8856eb2e 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
@@ -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>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index 780e8869..a6e06630 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -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="删除注册的计划任务，卸载前务必点击此项"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 629beb23..096fd6ea 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -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>
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index c5d2f83b..4bfe17a4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -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>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
index 9031a831..c80b5603 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
@@ -217,4 +217,4 @@
         </Button>
         <NavigationViewItemSeparator/>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file