change welcome page procedure #8

Scighost · Jul 17, 2023 · 192ec2b · 192ec2b
1 parent 3c7b118
commit 192ec2b
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 23 deletions.
diff --git a/Starward/Pages/Welcome/SelectLanguagePage.xaml b/Starward/Pages/Welcome/SelectLanguagePage.xaml
@@ -36,11 +36,9 @@
  Padding="24,12,24,12"
  HorizontalAlignment="Left"
  VerticalAlignment="Center"
- Background="{ThemeResource CustomAcrylicBrush}"
- CornerRadius="8"
- Shadow="{ThemeResource ThemeShadow}"
- Translation="0,0,16">
- <StackPanel Spacing="12">
+ Background="{ThemeResource CustomOverlayAcrylicBrush}"
+ CornerRadius="8">
+ <StackPanel Spacing="8">
  <TextBlock FontSize="20"
  FontWeight="SemiBold"
  Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
@@ -57,7 +55,9 @@
  FontWeight="SemiBold"
  Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
  Text="Windows Size" />
- <StackPanel Orientation="Horizontal" Spacing="16">
+ <StackPanel Margin="0,-4,0,0"
+ Orientation="Horizontal"
+ Spacing="16">
  <RadioButton Name="RadioButton_WindowSize_Normal"
  Click="RadioButton_WindowSize_Click"
  GroupName="WindowSize"
@@ -87,7 +87,7 @@
  Text="{x:Bind lang:Lang.SettingPage_CloudFlareConnectProperly}"
  TextWrapping="Wrap" />
 
- <RadioButtons Margin="0,-8,0,0">
+ <RadioButtons Margin="0,-4,0,0">
  <RadioButton Name="RadioButton_CF"
  Click="RadioButton_CDN_Click"
  Tag="cf">
@@ -105,6 +105,7 @@
  </StackPanel>
  </RadioButton>
  <RadioButton Name="RadioButton_GH"
+ Margin="0,-4,0,0"
  Click="RadioButton_CDN_Click"
  Tag="gh">
  <StackPanel Orientation="Horizontal">
@@ -121,6 +122,7 @@
  </StackPanel>
  </RadioButton>
  <RadioButton Name="RadioButton_JD"
+ Margin="0,-8,0,0"
  Click="RadioButton_CDN_Click"
  Tag="jd">
  <StackPanel Orientation="Horizontal">

diff --git a/Starward/Pages/Welcome/SelectLanguagePage.xaml.cs b/Starward/Pages/Welcome/SelectLanguagePage.xaml.cs
@@ -39,6 +39,15 @@ public SelectLanguagePage()
  this.InitializeComponent();
  WelcomePage.Current.TextLanguage = null!;
  CultureInfo.CurrentUICulture = CultureInfo.InstalledUICulture;
+ }
+
+
+
+
+
+ private async void Page_Loaded(object sender, RoutedEventArgs e)
+ {
+ await Task.Delay(16);
  InitializeLanguageComboBox();
  switch (AppConfig.ApiCDNIndex)
  {
@@ -51,19 +60,12 @@ public SelectLanguagePage()
  case 1: RadioButton_WindowSize_Small.IsChecked = true; break;
  default: RadioButton_WindowSize_Normal.IsChecked = true; break;
  }
- }
-
-
-
-
-
- private async void Page_Loaded(object sender, RoutedEventArgs e)
- {
- await Task.Delay(100);
  TestCDNCommand.Execute(null);
  }
 
 
+ private bool enableSelectionChanged = false;
+
 
  private void InitializeLanguageComboBox()
  {
@@ -75,7 +77,6 @@ private void InitializeLanguageComboBox()
  Content = Lang.SettingPage_FollowSystem,
  Tag = "",
  });
- ComboBox_Language.SelectedIndex = 0;
  foreach (var (Title, LangCode) in Localization.LanguageList)
  {
  ComboBox_Language.Items.Add(new ComboBoxItem
@@ -84,8 +85,13 @@ private void InitializeLanguageComboBox()
  Tag = LangCode,
  });
  }
+ ComboBox_Language.SelectedIndex = 0;
  }
  catch { }
+ finally
+ {
+ enableSelectionChanged = true;
+ }
  }
 
 
@@ -150,7 +156,7 @@ private async Task TestCDNAsync()
  }
  catch (HttpRequestException)
  {
- TextBlock_TestCND_CF.Text = "Network Error";
+ TextBlock_TestCND_CF.Text = Lang.Common_NetworkError;
  }
  finally
  {
@@ -167,7 +173,7 @@ private async Task TestCDNAsync()
  }
  catch (HttpRequestException)
  {
- TextBlock_TestCDN_GH.Text = "Network Error";
+ TextBlock_TestCDN_GH.Text = Lang.Common_NetworkError;
  }
  finally
  {
@@ -184,7 +190,7 @@ private async Task TestCDNAsync()
  }
  catch (HttpRequestException)
  {
- TextBlock_TestCDN_JD.Text = "Network Error";
+ TextBlock_TestCDN_JD.Text = Lang.Common_NetworkError;
  }
  finally
  {
@@ -225,7 +231,7 @@ private void ComboBox_Language_SelectionChanged(object sender, SelectionChangedE
  {
  if (ComboBox_Language.SelectedItem is ComboBoxItem item)
  {
- if (this.IsLoaded)
+ if (enableSelectionChanged)
  {
  var lang = item.Tag as string;
  _logger.LogInformation("Language change to {lang}", lang);

diff --git a/Starward/Pages/Welcome/WelcomePage.xaml b/Starward/Pages/Welcome/WelcomePage.xaml
@@ -7,6 +7,7 @@
  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
  xmlns:local="using:Starward.Pages"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ Loaded="Page_Loaded"
  mc:Ignorable="d">
 
  <Grid>

diff --git a/Starward/Pages/Welcome/WelcomePage.xaml.cs b/Starward/Pages/Welcome/WelcomePage.xaml.cs
@@ -33,7 +33,6 @@ public WelcomePage()
  Current = this;
  this.InitializeComponent();
  MainWindow.Current.ChangeAccentColor(null);
- frame.Navigate(typeof(SelectDirectoryPage));
  }
 
 
@@ -42,6 +41,16 @@ public WelcomePage(bool first)
  Current = this;
  this.InitializeComponent();
  MainWindow.Current.ChangeAccentColor(null);
+ this.first = first;
+
+ }
+
+
+ bool first;
+
+
+ private void Page_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+ {
  if (first)
  {
  frame.Navigate(typeof(SelectLanguagePage));
@@ -67,5 +76,5 @@ public void ApplySetting()
  AppConfig.ApiCDNIndex = ApiCDNIndex;
  }
 
-
+ 
 }