From 9665876d522df08358c31a453dff89ccedca080c Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Sat, 6 Jan 2024 23:38:26 +0800
Subject: [PATCH] code style 2

---
 .../Control/Theme/SettingsStyle.xaml          |  5 ++
 .../Snap.Hutao/Core/Threading/Delay.cs        |  8 +--
 .../Service/GachaLog/GachaLogService.cs       |  4 +-
 .../Snap.Hutao/Service/Game/LaunchOptions.cs  |  3 +-
 .../Snap.Hutao/View/Page/LaunchGamePage.xaml  | 53 ++++++++++---------
 .../ViewModel/Game/LaunchGameViewModel.cs     |  1 -
 6 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
index ab5cb42f..4e3c9fac 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/SettingsStyle.xaml
@@ -6,6 +6,11 @@
     <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
 
     <x:Double x:Key="SettingsCardContentControlMinWidth">120</x:Double>
+    <x:Double x:Key="SettingsCardContentControlMinWidth2">160</x:Double>
+
+    <x:Double x:Key="SettingsCardContentControlSpacing">10</x:Double>
+
+    <Thickness x:Key="SettingsCardAlignSettingsExpanderPadding">16,16,44,16</Thickness>
 
     <Style
         x:Key="SettingsSectionHeaderTextBlockStyle"
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs
index ac3c1d4e..8c171260 100644
--- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs
@@ -8,12 +8,12 @@ internal readonly struct Delay
     /// <summary>
     /// 随机延迟
     /// </summary>
-    /// <param name="minMilliSeconds">最小，闭</param>
-    /// <param name="maxMilliSeconds">最小，开</param>
+    /// <param name="min">最小，闭</param>
+    /// <param name="max">最小，开</param>
     /// <returns>任务</returns>
-    public static ValueTask Random(int minMilliSeconds, int maxMilliSeconds)
+    public static ValueTask RandomMilliSeconds(int min, int max)
     {
-        return Task.Delay((int)(System.Random.Shared.NextDouble() * (maxMilliSeconds - minMilliSeconds)) + minMilliSeconds).AsValueTask();
+        return Task.Delay((int)(System.Random.Shared.NextDouble() * (max - min)) + min).AsValueTask();
     }
 
     public static ValueTask FromSeconds(int seconds)
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogService.cs b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogService.cs
index 403046ce..0f2416e8 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogService.cs
@@ -226,7 +226,7 @@ internal sealed partial class GachaLogService : IGachaLogService
                     break;
                 }
 
-                await Delay.Random(1000, 2000).ConfigureAwait(false);
+                await Delay.RandomMilliSeconds(1000, 2000).ConfigureAwait(false);
             }
             while (true);
 
@@ -238,7 +238,7 @@ internal sealed partial class GachaLogService : IGachaLogService
             // save items for each queryType
             token.ThrowIfCancellationRequested();
             fetchContext.SaveItems();
-            await Delay.Random(1000, 2000).ConfigureAwait(false);
+            await Delay.RandomMilliSeconds(1000, 2000).ConfigureAwait(false);
         }
 
         return new(!fetchContext.FetchStatus.AuthKeyTimeout, fetchContext.TargetArchive);
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs
index 2b17a2e6..95deb042 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs
@@ -218,8 +218,7 @@ internal sealed class LaunchOptions : DbStoreOptions
         {
             if (SetProperty(ref selectedAspectRatio, value) && value is AspectRatio aspectRatio)
             {
-                ScreenWidth = (int)aspectRatio.Width;
-                ScreenHeight = (int)aspectRatio.Height;
+                (ScreenWidth, ScreenHeight) = ((int)aspectRatio.Width, (int)aspectRatio.Height);
             }
         }
     }
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index 0d1252a2..e7426348 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -171,8 +171,8 @@
                                                 Text="{shcm:ResourceString Name=ViewPageLaunchGameSwitchSchemeWarning}"/>
                                         </StackPanel>
                                     </cwc:SettingsCard.Description>
-                                    <StackPanel Orientation="Horizontal">
-                                        <shvc:Elevation Margin="0,0,36,0" Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                    <StackPanel Orientation="Horizontal" Spacing="{ThemeResource SettingsCardContentControlSpacing}">
+                                        <shvc:Elevation Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
                                         <shc:SizeRestrictedContentControl>
                                             <shccs:ComboBox2
                                                 DisplayMemberPath="DisplayName"
@@ -203,7 +203,7 @@
                                     Description="{shcm:ResourceString Name=ViewPageLaunchGameWindowsHDRDescription}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameWindowsHDRHeader}"
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xE7F7;}">
-                                    <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsWindowsHDREnabled, Mode=TwoWay}"/>
+                                    <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsWindowsHDREnabled, Mode=TwoWay}"/>
                                 </cwc:SettingsCard>
 
                                 <!--  进程  -->
@@ -213,85 +213,88 @@
                                     Description="{shcm:ResourceString Name=ViewPageLaunchGameArgumentsDescription}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameArgumentsHeader}"
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xE943;}">
-                                    <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsEnabled, Mode=TwoWay}"/>
+                                    <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsEnabled, Mode=TwoWay}"/>
                                     <cwc:SettingsExpander.Items>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceExclusiveDescription}" Header="-window-mode exclusive">
-                                            <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsExclusive, Mode=TwoWay}"/>
+                                            <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsExclusive, Mode=TwoWay}"/>
                                         </cwc:SettingsCard>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceFullscreenDescription}" Header="-screen-fullscreen">
-                                            <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsFullScreen, Mode=TwoWay}"/>
+                                            <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsFullScreen, Mode=TwoWay}"/>
                                         </cwc:SettingsCard>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceBorderlessDescription}" Header="-popupwindow">
-                                            <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsBorderless, Mode=TwoWay}"/>
+                                            <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsBorderless, Mode=TwoWay}"/>
                                         </cwc:SettingsCard>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceCloudThirdPartyMobileDescription}" Header="-platform_type CLOUD_THIRD_PARTY_MOBILE">
-                                            <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsUseCloudThirdPartyMobile, Mode=TwoWay}"/>
+                                            <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsUseCloudThirdPartyMobile, Mode=TwoWay}"/>
                                         </cwc:SettingsCard>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceAspectRatioDescription}" Header="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceAspectRatioHeader}">
-                                            <shc:SizeRestrictedContentControl Margin="0,0,136,0" VerticalAlignment="Center">
+                                            <shc:SizeRestrictedContentControl Margin="0,0,130,0" VerticalAlignment="Center">
                                                 <ComboBox
+                                                    MinWidth="{ThemeResource SettingsCardContentControlMinWidth2}"
                                                     ItemsSource="{Binding LaunchOptions.AspectRatios}"
                                                     PlaceholderText="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceAspectRatioPlaceHolder}"
                                                     SelectedItem="{Binding LaunchOptions.SelectedAspectRatio, Mode=TwoWay}"/>
                                             </shc:SizeRestrictedContentControl>
                                         </cwc:SettingsCard>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenWidthDescription}" Header="-screen-width">
-                                            <StackPanel Orientation="Horizontal" Spacing="16">
+                                            <StackPanel Orientation="Horizontal" Spacing="10">
                                                 <NumberBox
-                                                    Width="156"
+                                                    MinWidth="{ThemeResource SettingsCardContentControlMinWidth2}"
                                                     Padding="12,6,0,0"
                                                     VerticalAlignment="Center"
                                                     IsEnabled="{Binding LaunchOptions.IsScreenWidthEnabled}"
                                                     Value="{Binding LaunchOptions.ScreenWidth, Mode=TwoWay}"/>
-                                                <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsScreenWidthEnabled, Mode=TwoWay}"/>
+                                                <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsScreenWidthEnabled, Mode=TwoWay}"/>
                                             </StackPanel>
                                         </cwc:SettingsCard>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenHeightDescription}" Header="-screen-height">
-                                            <StackPanel Orientation="Horizontal" Spacing="16">
+                                            <StackPanel Orientation="Horizontal" Spacing="10">
                                                 <NumberBox
-                                                    Width="156"
+                                                    MinWidth="{ThemeResource SettingsCardContentControlMinWidth2}"
                                                     Padding="12,6,0,0"
                                                     VerticalAlignment="Center"
                                                     IsEnabled="{Binding LaunchOptions.IsScreenHeightEnabled}"
                                                     Value="{Binding LaunchOptions.ScreenHeight, Mode=TwoWay}"/>
-                                                <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsScreenHeightEnabled, Mode=TwoWay}"/>
+                                                <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsScreenHeightEnabled, Mode=TwoWay}"/>
                                             </StackPanel>
                                         </cwc:SettingsCard>
                                         <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameMonitorsDescription}" Header="-monitor">
-                                            <StackPanel Orientation="Horizontal" Spacing="16">
+                                            <StackPanel Orientation="Horizontal" Spacing="10">
                                                 <Button
-                                                    Width="120"
+                                                    MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
                                                     Command="{Binding IdentifyMonitorsCommand}"
                                                     Content="{shcm:ResourceString Name=ViewModelLaunchGameIdentifyMonitorsAction}"/>
                                                 <shc:SizeRestrictedContentControl VerticalAlignment="Center">
                                                     <ComboBox
+                                                        MinWidth="{ThemeResource SettingsCardContentControlMinWidth2}"
                                                         DisplayMemberPath="Name"
                                                         IsEnabled="{Binding LaunchOptions.IsMonitorEnabled}"
                                                         ItemsSource="{Binding LaunchOptions.Monitors}"
                                                         SelectedItem="{Binding LaunchOptions.Monitor, Mode=TwoWay}"/>
                                                 </shc:SizeRestrictedContentControl>
-                                                <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.IsMonitorEnabled, Mode=TwoWay}"/>
+                                                <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.IsMonitorEnabled, Mode=TwoWay}"/>
                                             </StackPanel>
                                         </cwc:SettingsCard>
                                     </cwc:SettingsExpander.Items>
                                 </cwc:SettingsExpander>
                                 <cwc:SettingsCard
+                                    Padding="{ThemeResource SettingsCardAlignSettingsExpanderPadding}"
                                     Description="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsDescription}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsHeader}"
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xE785;}"
                                     IsEnabled="{Binding RuntimeOptions.IsElevated}"
                                     Visibility="{Binding LaunchOptions.IsAdvancedLaunchOptionsEnabled, Converter={StaticResource BoolToVisibilityConverter}}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <shvc:Elevation Margin="0,0,36,0" Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                    <StackPanel Orientation="Horizontal" Spacing="10">
+                                        <shvc:Elevation Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
                                         <NumberBox
-                                            MinWidth="156"
+                                            MinWidth="{ThemeResource SettingsCardContentControlMinWidth2}"
                                             Padding="10,8,0,0"
                                             Maximum="720"
                                             Minimum="60"
                                             SpinButtonPlacementMode="Inline"
                                             Value="{Binding LaunchOptions.TargetFps, Mode=TwoWay}"/>
                                         <ToggleSwitch
-                                            Width="120"
+                                            MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
                                             IsOn="{Binding LaunchOptions.UnlockFps, Mode=TwoWay}"
                                             OffContent="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsOff}"
                                             OnContent="{shcm:ResourceString Name=ViewPageLaunchGameUnlockFpsOn}"/>
@@ -304,13 +307,13 @@
                                     Description="{shcm:ResourceString Name=ViewPageLaunchGamePlayTimeDescription}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGamePlayTimeHeader}"
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xEC92;}">
-                                    <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.UseStarwardPlayTimeStatistics, Mode=TwoWay}"/>
+                                    <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.UseStarwardPlayTimeStatistics, Mode=TwoWay}"/>
                                 </cwc:SettingsCard>
                                 <cwc:SettingsCard
                                     Description="{shcm:ResourceString Name=ViewPageLaunchGameDiscordActivityDescription}"
                                     Header="{shcm:ResourceString Name=ViewPageLaunchGameDiscordActivityHeader}"
                                     HeaderIcon="{shcm:FontIcon Glyph=&#xE8CF;}">
-                                    <ToggleSwitch Width="120" IsOn="{Binding LaunchOptions.SetDiscordActivityWhenPlaying, Mode=TwoWay}"/>
+                                    <ToggleSwitch MinWidth="{ThemeResource SettingsCardContentControlMinWidth}" IsOn="{Binding LaunchOptions.SetDiscordActivityWhenPlaying, Mode=TwoWay}"/>
                                 </cwc:SettingsCard>
                             </StackPanel>
                         </Grid>
@@ -359,8 +362,8 @@
                 VerticalAlignment="Center"
                 Spacing="3">
                 <shci:CachedImage
-                    Width="120"
                     Height="120"
+                    MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
                     EnableLazyLoading="False"
                     Source="{StaticResource UI_EmotionIcon445}"/>
                 <TextBlock
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
index 8ec0efe9..8378e5f0 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
@@ -20,7 +20,6 @@ using Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher;
 using System.Collections.Immutable;
 using System.Collections.ObjectModel;
 using System.IO;
-using Windows.Graphics;
 
 namespace Snap.Hutao.ViewModel.Game;