From efb7578ff98c0f100162ed768cd22364e48c9cfb Mon Sep 17 00:00:00 2001
From: rmbgame <rmb@rmbgame.net>
Date: Thu, 20 May 2021 22:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E7=99=BB=E5=BD=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Windows/LoginOrRegisterWindow.axaml | 63 ++++++++++++++++++-
 .../UI/Resx/AppResources.Designer.cs          | 45 +++++++++++++
 .../UI/Resx/AppResources.resx                 | 15 +++++
 .../EncryptionAuthWindowViewModel.cs          |  2 +-
 4 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml
index 44a05b61b..cc28a0b22 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LoginOrRegisterWindow.axaml
@@ -34,10 +34,17 @@
           <ia:DataTriggerBehavior Binding="{Binding LoginState}" ComparisonCondition="Equal" Value="0">
             <ia:ChangePropertyAction TargetObject="{ReflectionBinding #SteamLogin}" PropertyName="IsVisible" Value="True"/>
             <ia:ChangePropertyAction TargetObject="{ReflectionBinding #PhoneLogin}" PropertyName="IsVisible" Value="False"/>
+            <ia:ChangePropertyAction TargetObject="{ReflectionBinding #FastLogin}" PropertyName="IsVisible" Value="False"/>
           </ia:DataTriggerBehavior>
           <ia:DataTriggerBehavior Binding="{Binding LoginState}" ComparisonCondition="Equal" Value="1">
             <ia:ChangePropertyAction TargetObject="{ReflectionBinding #PhoneLogin}" PropertyName="IsVisible" Value="True"/>
             <ia:ChangePropertyAction TargetObject="{ReflectionBinding #SteamLogin}" PropertyName="IsVisible" Value="False"/>
+            <ia:ChangePropertyAction TargetObject="{ReflectionBinding #FastLogin}" PropertyName="IsVisible" Value="False"/>
+          </ia:DataTriggerBehavior>
+          <ia:DataTriggerBehavior Binding="{Binding LoginState}" ComparisonCondition="Equal" Value="2">
+            <ia:ChangePropertyAction TargetObject="{ReflectionBinding #FastLogin}" PropertyName="IsVisible" Value="True"/>
+            <ia:ChangePropertyAction TargetObject="{ReflectionBinding #SteamLogin}" PropertyName="IsVisible" Value="False"/>
+            <ia:ChangePropertyAction TargetObject="{ReflectionBinding #PhoneLogin}" PropertyName="IsVisible" Value="False"/>
           </ia:DataTriggerBehavior>
         </i:Interaction.Behaviors>
 
@@ -118,9 +125,55 @@
 
             <TextBlock HorizontalAlignment="Center" Text="{ReflectionBinding Source={x:Static service:SteamConnectService.Current},Path=CurrentSteamUser.SteamNickName}" Classes="h5 bold"></TextBlock>
           </StackPanel>
+
+          <StackPanel x:Name="FastLogin"  Spacing="8">
+            <TextBlock Text="{ReflectionBinding Path=Res.User_FastLoginTip,Mode=OneWay,Source={x:Static resx:R.Current}}"></TextBlock>
+            <ListBox Background="Transparent">
+              <ListBox.Styles>
+                <Style Selector="ListBoxItem">
+                  <Setter Property="MinHeight" Value="50"></Setter>
+                  <Setter Property="Margin" Value="0 5"></Setter>
+                  <Setter Property="Background" Value="{StaticResource ThemeBrushKey}"></Setter>
+                </Style>
+                <Style Selector="PathIcon">
+                  <Setter Property="Height" Value="20"></Setter>
+                  <Setter Property="Width" Value="20"></Setter>
+                </Style>
+              </ListBox.Styles>
+              <ListBoxItem>
+                <DockPanel>
+                  <Panel DockPanel.Dock="Left">
+                    <PathIcon Data="{StaticResource QQ}"></PathIcon>
+                  </Panel>
+                  <Panel DockPanel.Dock="Right" Margin="10 0 0 0">
+                    <TextBlock Text="{ReflectionBinding Path=Res.User_QQLogin,Mode=OneWay,Source={x:Static resx:R.Current}}" VerticalAlignment="Center"></TextBlock>
+                  </Panel>
+                </DockPanel>
+              </ListBoxItem>
+              <ListBoxItem>
+                <DockPanel>
+                  <Panel DockPanel.Dock="Left">
+                    <PathIcon Data="{StaticResource Microsoft}"></PathIcon>
+                  </Panel>
+                  <Panel DockPanel.Dock="Right" Margin="10 0 0 0">
+                    <TextBlock Text="{ReflectionBinding Path=Res.User_MicroSoftLogin,Mode=OneWay,Source={x:Static resx:R.Current}}" VerticalAlignment="Center"></TextBlock>
+                  </Panel>
+                </DockPanel>
+              </ListBoxItem>
+              <ListBoxItem>
+                <DockPanel>
+                  <Panel DockPanel.Dock="Left">
+                    <PathIcon Data="{StaticResource Apple}" VerticalAlignment="Center"></PathIcon>
+                  </Panel>
+                  <Panel DockPanel.Dock="Right" Margin="10 0 0 0">
+                    <TextBlock Text="{ReflectionBinding Path=Res.User_AppleLogin,Mode=OneWay,Source={x:Static resx:R.Current}}" VerticalAlignment="Center"></TextBlock>
+                  </Panel>
+                </DockPanel>
+              </ListBoxItem>
+            </ListBox>
+          </StackPanel>
+
         </Panel>
-
-
         <StackPanel HorizontalAlignment="Center" Grid.Row="1" Margin="0 0 0 10" Orientation="Horizontal" Spacing="10">
           <!--<Button HorizontalContentAlignment="Center"
                   Background="Transparent"
@@ -143,6 +196,12 @@
             <!--</WrapPanel>-->
           </Button>
           <Separator Classes="Separator" Height="{ReflectionBinding $parent.Height}" Width="0.88"></Separator>
+          <Button Classes="plain"
+         HorizontalContentAlignment="Center"
+         Command="{ReflectionBinding ChangeLoginState}" CommandParameter="2">
+            <TextBlock Text="{ReflectionBinding Path=Res.User_OtherFastLogin,Mode=OneWay,Source={x:Static resx:R.Current}}"></TextBlock>
+          </Button>
+          <Separator Classes="Separator" Height="{ReflectionBinding $parent.Height}" Width="0.88"></Separator>
           <Button Classes="plain"
                   HorizontalContentAlignment="Center"
                   Command="{ReflectionBinding ChangeLoginState}" CommandParameter="1">
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
index 50b6d1bfd..6c513e99e 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -3052,6 +3052,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 使用 Apple 登录 的本地化字符串。
+        /// </summary>
+        public static string User_AppleLogin {
+            get {
+                return ResourceManager.GetString("User_AppleLogin", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 绑定手机 的本地化字符串。
         /// </summary>
@@ -3097,6 +3106,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 选择如何登录您的 Steam++ 帐户 的本地化字符串。
+        /// </summary>
+        public static string User_FastLoginTip {
+            get {
+                return ResourceManager.GetString("User_FastLoginTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 获取验证码 的本地化字符串。
         /// </summary>
@@ -3178,6 +3196,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 使用 Microsoft 登录 的本地化字符串。
+        /// </summary>
+        public static string User_MicroSoftLogin {
+            get {
+                return ResourceManager.GetString("User_MicroSoftLogin", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 新手机号码 的本地化字符串。
         /// </summary>
@@ -3187,6 +3214,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 其它快速登录 的本地化字符串。
+        /// </summary>
+        public static string User_OtherFastLogin {
+            get {
+                return ResourceManager.GetString("User_OtherFastLogin", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 手机号码 的本地化字符串。
         /// </summary>
@@ -3214,6 +3250,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 使用 QQ 登录 的本地化字符串。
+        /// </summary>
+        public static string User_QQLogin {
+            get {
+                return ResourceManager.GetString("User_QQLogin", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 注册 的本地化字符串。
         /// </summary>
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
index a50410fd5..c5d094f85 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
@@ -1173,6 +1173,9 @@
   <data name="User_Agreement" xml:space="preserve">
     <value>用户协议</value>
   </data>
+  <data name="User_AppleLogin" xml:space="preserve">
+    <value>使用 Apple 登录</value>
+  </data>
   <data name="User_BindPhoneNum" xml:space="preserve">
     <value>绑定手机</value>
   </data>
@@ -1186,6 +1189,9 @@
   <data name="User_FastLogin" xml:space="preserve">
     <value>快速登录</value>
   </data>
+  <data name="User_FastLoginTip" xml:space="preserve">
+    <value>选择如何登录您的 Steam++ 帐户</value>
+  </data>
   <data name="User_FastLogin_" xml:space="preserve">
     <value>{0} 快速登录</value>
   </data>
@@ -1217,9 +1223,15 @@
   <data name="User_LoiginSuccess" xml:space="preserve">
     <value>登录成功</value>
   </data>
+  <data name="User_MicroSoftLogin" xml:space="preserve">
+    <value>使用 Microsoft 登录</value>
+  </data>
   <data name="User_NewPhone" xml:space="preserve">
     <value>新手机号码</value>
   </data>
+  <data name="User_OtherFastLogin" xml:space="preserve">
+    <value>其它快速登录</value>
+  </data>
   <data name="User_Phone" xml:space="preserve">
     <value>手机号码</value>
   </data>
@@ -1229,6 +1241,9 @@
   <data name="User_Privacy" xml:space="preserve">
     <value>隐私政策</value>
   </data>
+  <data name="User_QQLogin" xml:space="preserve">
+    <value>使用 QQ 登录</value>
+  </data>
   <data name="User_Register" xml:space="preserve">
     <value>注册</value>
   </data>
diff --git a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs
index db5fcf1ef..8f03f33ec 100644
--- a/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs
+++ b/src/ST.Client.Desktop/UI/ViewModels/Windows/LocalAuthPage/EncryptionAuthWindowViewModel.cs
@@ -93,7 +93,7 @@ namespace System.Application.UI.ViewModels
                 }
                 else
                 {
-                    Toast.Show(AppResources.LocalAuth_ProtectionAuth_VerifyPasswordErrorTip); 
+                    Toast.Show(AppResources.LocalAuth_ProtectionAuth_VerifyPasswordErrorTip);
                     return;
                 }
             }