From 3784df67a39c6a57f0d77f9fa75a85999c21c0ec Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Sat, 23 Dec 2023 19:15:04 +0800
Subject: [PATCH] adjust launch page ui

---
 src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml      |  1 +
 .../Snap.Hutao/Resource/Localization/SH.resx          |  3 +++
 .../Snap.Hutao/Service/User/UserCollectionService.cs  |  4 ++--
 .../Snap.Hutao/View/Page/LaunchGamePage.xaml          | 11 +++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
index 4237308b..5ee6d30c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
@@ -31,4 +31,5 @@
     <x:String x:Key="UI_EmotionIcon250">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon250.png</x:String>
     <x:String x:Key="UI_EmotionIcon272">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon272.png</x:String>
     <x:String x:Key="UI_EmotionIcon293">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon293.png</x:String>
+    <x:String x:Key="UI_EmotionIcon445">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon445.png</x:String>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
index 5b3a21e5..b81f3242 100644
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -2144,6 +2144,9 @@
   <data name="ViewPageLaunchGameResourcePreDownloadHeader" xml:space="preserve">
     <value>预下载</value>
   </data>
+  <data name="ViewPageLaunchGameSelectGamePath" xml:space="preserve">
+    <value>选择游戏路径</value>
+  </data>
   <data name="ViewPageLaunchGameSwitchAccountAttachUidNull" xml:space="preserve">
     <value>该账号尚未绑定实时便笺通知 UID</value>
   </data>
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs
index bce34ac7..76c6f72c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs
@@ -38,8 +38,8 @@ internal sealed partial class UserCollectionService : IUserCollectionService, ID
 
     public async ValueTask<ObservableCollection<BindingUser>> GetUserCollectionAsync()
     {
-        // Force run in background thread
-        await taskContext.SwitchToBackgroundAsync();
+        // Force run in background thread, otherwise will cause reentrance
+        await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
         using (await throttler.EnterAsync().ConfigureAwait(false))
         {
             if (userCollection is null)
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
index f5c5bd18..f552da5f 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -13,6 +13,7 @@
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shccs="using:Snap.Hutao.Control.Collection.Selector"
     xmlns:shch="using:Snap.Hutao.Control.Helper"
+    xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     xmlns:shvg="using:Snap.Hutao.ViewModel.Game"
@@ -350,6 +351,16 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Spacing="3">
+                <shci:CachedImage
+                    Width="120"
+                    Height="120"
+                    EnableLazyLoading="False"
+                    Source="{StaticResource UI_EmotionIcon445}"/>
+                <TextBlock
+                    Margin="0,5,0,21"
+                    HorizontalAlignment="Center"
+                    Style="{StaticResource SubtitleTextBlockStyle}"
+                    Text="{shcm:ResourceString Name=ViewPageLaunchGameSelectGamePath}"/>
                 <Border Style="{ThemeResource BorderCardStyle}">
                     <ListView
                         ItemTemplate="{StaticResource GamePathEntryListTemplate}"