optimize welcome page

Scighost · Dec 31, 2023 · ae7e025 · ae7e025
1 parent 65679e9
commit ae7e025
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/src/Starward.Language/Lang.Designer.cs b/src/Starward.Language/Lang.Designer.cs
diff --git a/src/Starward.Language/Lang.resx b/src/Starward.Language/Lang.resx
@@ -1250,4 +1250,7 @@ Do you accept the risk and continue to use it?</value>
   <data name="SelectLanguagePage_AreYouAbleToReceiveUpdatesForStarward" xml:space="preserve">
     <value>Are you able to receive updates for Starward?</value>
   </data>
+  <data name="SelectDirectoryPage_PleaseSelectAFolderToStoreYourPersonalData" xml:space="preserve">
+    <value>Please select a folder to store your personal data, it is very important!</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.zh-CN.resx b/src/Starward.Language/Lang.zh-CN.resx
@@ -190,7 +190,7 @@
     <value>好的</value>
   </data>
   <data name="SelectDirectoryPage_ChooseAnother" xml:space="preserve">
-    <value>自己选</value>
+    <value>选择其他</value>
   </data>
   <data name="SelectDirectoryPage_Cancel" xml:space="preserve">
     <value>不想选</value>
@@ -1249,4 +1249,7 @@
   <data name="SelectLanguagePage_NetworkTest" xml:space="preserve">
     <value>网络测试</value>
   </data>
+  <data name="SelectDirectoryPage_PleaseSelectAFolderToStoreYourPersonalData" xml:space="preserve">
+    <value>请选择一个文件夹存储您的个人数据，它很重要！</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.zh-TW.resx b/src/Starward.Language/Lang.zh-TW.resx
@@ -190,7 +190,7 @@
     <value>好的</value>
   </data>
   <data name="SelectDirectoryPage_ChooseAnother" xml:space="preserve">
-    <value>自己選</value>
+    <value>選擇其他</value>
   </data>
   <data name="SelectDirectoryPage_Cancel" xml:space="preserve">
     <value>不想選</value>

diff --git a/src/Starward/Pages/Welcome/SelectDirectoryPage.xaml b/src/Starward/Pages/Welcome/SelectDirectoryPage.xaml
@@ -20,8 +20,8 @@
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition />
+            <ColumnDefinition Width="3*" />
+            <ColumnDefinition Width="4*" />
         </Grid.ColumnDefinitions>
 
 
@@ -45,19 +45,15 @@
             <TextBlock FontSize="24"
                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
                        Text="{x:Bind lang:Lang.SelectDirectoryPage_NiceToMeetYou}" />
-            <!--  这似乎是你第一次使用 Starward，在开始之前，请选择一个文件夹保存应用数据。  -->
-            <TextBlock Name="TextBlock_FirstUse"
-                       FontSize="20"
+            <!--  请选择一个文件夹存储您的个人数据，它很重要！  -->
+            <TextBlock FontSize="20"
+                       Text="{x:Bind lang:Lang.SelectDirectoryPage_PleaseSelectAFolderToStoreYourPersonalData}"
                        TextWrapping="Wrap" />
-            <TextBlock Margin="0,-20,0,0"
-                       FontSize="20"
-                       Text="{x:Bind lang:Lang.SelectDirectoryPage_ToStart}"
-                       TextWrapping="Wrap" />
-            <Button Height="36"
+            <Button Height="40"
                     Margin="0,20,0,0"
                     BorderThickness="0"
                     Command="{x:Bind SelectDirectoryCommand}"
-                    CornerRadius="18"
+                    CornerRadius="8,20,20,8"
                     Style="{ThemeResource AccentButtonStyle}">
                 <StackPanel Margin="8,0,8,0"
                             Orientation="Horizontal"

diff --git a/src/Starward/Pages/Welcome/SelectDirectoryPage.xaml.cs b/src/Starward/Pages/Welcome/SelectDirectoryPage.xaml.cs
@@ -32,16 +32,10 @@ public sealed partial class SelectDirectoryPage : PageBase
     public SelectDirectoryPage()
     {
         this.InitializeComponent();
-        InitializeFirstUse();
     }
 
 
 
-    private void InitializeFirstUse()
-    {
-        TextBlockHelper.Inlines(TextBlock_FirstUse.Inlines, Lang.SelectDirectoryPage_FirstUse, ("{Starward}", null));
-    }
-
 
 
     [ObservableProperty]
@@ -81,7 +75,7 @@ private async Task SelectDirectoryAsync()
                 DefaultButton = ContentDialogButton.Primary,
                 // 好的
                 PrimaryButtonText = Lang.SelectDirectoryPage_OK,
-                // 自己选
+                // 选择其他
                 SecondaryButtonText = Lang.SelectDirectoryPage_ChooseAnother,
                 // 取消
                 CloseButtonText = Lang.Common_Cancel,

diff --git a/src/Starward/Pages/Welcome/SelectGamePage.xaml b/src/Starward/Pages/Welcome/SelectGamePage.xaml
@@ -9,7 +9,6 @@
              xmlns:sc="using:Starward.Controls"
              xmlns:sp="using:Starward.Pages"
              x:DefaultBindMode="OneWay"
-             Loading="Page_Loading"
              mc:Ignorable="d">
 
     <Page.Resources>
@@ -95,7 +94,7 @@
 
         <!--  select game  -->
         <StackPanel Name="StackPanel_SelectGame"
-                    Margin="48,48,48,96"
+                    Margin="48,48,0,96"
                     VerticalAlignment="Center"
                     Spacing="20">
             <StackPanel.OpacityTransition>

diff --git a/src/Starward/Pages/Welcome/SelectGamePage.xaml.cs b/src/Starward/Pages/Welcome/SelectGamePage.xaml.cs
@@ -4,7 +4,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Starward.Core;
@@ -43,7 +42,6 @@ public SelectGamePage()
 
 
 
-
     private void InitializeSomeGame()
     {
         TextBlockHelper.Inlines(TextBlock_SomeGame.Inlines, Lang.SelectGamePage_SomeGame, ("{Starward}", null), ("{miHoYo/HoYoverse}", null));
@@ -56,14 +54,12 @@ private void InitializeSomeGame()
 
 
 
-
-    private async void Page_Loading(FrameworkElement sender, object args)
+    protected override void OnLoaded()
     {
         try
         {
-            await Task.Delay(16);
             InitializeGameComboBox();
-            LoadGameInfo();
+            _ = LoadGameInfoAsync();
         }
         catch (HttpRequestException ex)
         {
@@ -77,14 +73,14 @@ private async void Page_Loading(FrameworkElement sender, object args)
 
 
 
-    private void LoadGameInfo()
+    private async Task LoadGameInfoAsync()
     {
         try
         {
             var file = Path.Combine(AppContext.BaseDirectory, @"Assets\game_info.json");
             if (File.Exists(file))
             {
-                var str = File.ReadAllText(file);
+                var str = await File.ReadAllTextAsync(file);
                 games = JsonSerializer.Deserialize<List<GameInfo>>(str)!;
             }
         }