hide next step when no verify code provided

DGP-Studio · Jan 9, 2025 · e8f9004 · e8f9004
1 parent 1d018d7
commit e8f9004
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 97 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Converter.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Converter.xaml
@@ -37,5 +37,6 @@
     <shuxdc:Int32ToVisibilityRevertConverter x:Key="Int32ToVisibilityRevertConverter"/>
     <shuxdc:Int32ToBoolConverter x:Key="Int32ToBoolConverter"/>
     <shuxdc:Int32ToBoolRevertConverter x:Key="Int32ToBoolRevertConverter"/>
-    <shuxdc:StringBoolConverter x:Key="StringBoolConverter"/>
+    <shuxdc:EmptyStringToBoolConverter x:Key="EmptyStringToBoolConverter"/>
+    <shuxdc:EmptyStringToVisibilityConverter x:Key="EmptyStringToVisibilityConverter"/>
 </ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyStringToBoolConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyStringToBoolConverter.cs
@@ -0,0 +1,15 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using CommunityToolkit.WinUI.Converters;
+
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
+
+internal sealed partial class EmptyStringToBoolConverter : EmptyStringToObjectConverter
+{
+    public EmptyStringToBoolConverter()
+    {
+        EmptyValue = false;
+        NotEmptyValue = true;
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyStringToVisibilityConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/EmptyStringToVisibilityConverter.cs
@@ -0,0 +1,16 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using CommunityToolkit.WinUI.Converters;
+using Microsoft.UI.Xaml;
+
+namespace Snap.Hutao.UI.Xaml.Data.Converter;
+
+internal sealed partial class EmptyStringToVisibilityConverter : EmptyStringToObjectConverter
+{
+    public EmptyStringToVisibilityConverter()
+    {
+        EmptyValue = Visibility.Collapsed;
+        NotEmptyValue = Visibility.Visible;
+    }
+}
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/StringBoolConverter.cs b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Data/Converter/StringBoolConverter.cs
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportLoginDialog.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportLoginDialog.xaml
@@ -12,7 +12,7 @@
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
-    <StackPanel Margin="0,8,0,0">
+    <StackPanel Margin="0,8,0,0" Spacing="16">
         <TextBox
             InputScope="EmailSmtpAddress"
             IsSpellCheckEnabled="False"
@@ -21,7 +21,6 @@
         <PasswordBox
             Width="360"
             MaxWidth="360"
-            Margin="0,16,0,0"
             Password="{x:Bind Password, Mode=TwoWay}"
             PasswordChar="*"
             PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>

diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportRegisterDialog.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportRegisterDialog.xaml
@@ -12,36 +12,39 @@
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
-    <StackPanel Margin="0,8,0,0">
+    <StackPanel Margin="0,8,0,0" Spacing="16">
         <TextBox
             InputScope="EmailSmtpAddress"
             IsSpellCheckEnabled="False"
             PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
             Text="{x:Bind UserName, Mode=TwoWay}"/>
-        <Grid Margin="0,16,0,0" ColumnSpacing="16">
+        <Grid ColumnSpacing="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}" Text="{x:Bind VerifyCode, Mode=TwoWay}"/>
+            <TextBox
+                Grid.Column="0"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}"
+                Text="{x:Bind VerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
             <Button
                 Grid.Column="1"
                 VerticalAlignment="Stretch"
                 Command="{x:Bind VerifyCommand}"
                 Content="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeAction}"/>
         </Grid>
-        <PasswordBox
-            Width="360"
-            MaxWidth="360"
-            Margin="0,16,0,0"
-            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
-            Password="{x:Bind Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-            PasswordChar="*"
-            PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
-        <TextBlock
-            Margin="0,4,0,0"
-            Opacity="0.7"
-            Style="{StaticResource CaptionTextBlockStyle}"
-            Text="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordRequirementHint}"/>
+        <StackPanel Spacing="4" Visibility="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToVisibilityConverter}}">
+            <PasswordBox
+                Width="360"
+                MaxWidth="360"
+                IsEnabled="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToBoolConverter}, Mode=OneWay}"
+                Password="{x:Bind Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                PasswordChar="*"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
+            <TextBlock
+                Opacity="0.7"
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Text="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordRequirementHint}"/>
+        </StackPanel>
     </StackPanel>
 </ContentDialog>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportResetPasswordDialog.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportResetPasswordDialog.xaml
@@ -12,37 +12,41 @@
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
-    <StackPanel>
+    <StackPanel Margin="0,8,0,0" Spacing="16">
         <TextBox
             x:Name="UserNameTextBox"
             InputScope="EmailSmtpAddress"
             IsSpellCheckEnabled="False"
             PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
             Text="{x:Bind UserName, Mode=TwoWay}"/>
-        <Grid Margin="0,16,0,0" ColumnSpacing="16">
+        <Grid ColumnSpacing="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}" Text="{x:Bind VerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+            <TextBox
+                Grid.Column="0"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}"
+                Text="{x:Bind VerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
             <Button
                 Grid.Column="1"
                 VerticalAlignment="Stretch"
                 Command="{x:Bind VerifyCommand}"
                 Content="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeAction}"/>
         </Grid>
-        <PasswordBox
-            Width="360"
-            MaxWidth="360"
-            Margin="0,16,0,0"
-            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
-            Password="{x:Bind Password, Mode=TwoWay}"
-            PasswordChar="*"
-            PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
-        <TextBlock
-            Margin="0,4,0,0"
-            Opacity="0.7"
-            Style="{StaticResource CaptionTextBlockStyle}"
-            Text="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordRequirementHint}"/>
+        <StackPanel Spacing="4" Visibility="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToVisibilityConverter}}">
+            <PasswordBox
+                Width="360"
+                MaxWidth="360"
+                IsEnabled="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToBoolConverter}, Mode=OneWay}"
+                Password="{x:Bind Password, Mode=TwoWay}"
+                PasswordChar="*"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
+            <TextBlock
+                Margin="0,4,0,0"
+                Opacity="0.7"
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Text="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordRequirementHint}"/>
+        </StackPanel>
     </StackPanel>
 </ContentDialog>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportResetUsernameDialog.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportResetUsernameDialog.xaml
@@ -12,47 +12,52 @@
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
-    <StackPanel>
+    <StackPanel Margin="0,8,0,0" Spacing="16">
         <TextBox
             x:Name="UserNameTextBox"
             InputScope="EmailSmtpAddress"
             IsSpellCheckEnabled="False"
             PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
             Text="{x:Bind UserName, Mode=TwoWay}"/>
-        <Grid Margin="0,16,0,0" ColumnSpacing="16">
+        <Grid ColumnSpacing="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}" Text="{x:Bind VerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+            <TextBox
+                Grid.Column="0"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}"
+                Text="{x:Bind VerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
             <Button
                 Grid.Column="1"
                 VerticalAlignment="Stretch"
                 Command="{x:Bind VerifyOldCommand}"
                 Content="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeAction}"/>
         </Grid>
-        <TextBox
-            Margin="0,16,0,0"
-            InputScope="EmailSmtpAddress"
-            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
-            IsSpellCheckEnabled="False"
-            PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportNewUserNameHint}"
-            Text="{x:Bind NewUserName, Mode=TwoWay}"/>
-        <Grid Margin="0,16,0,0" ColumnSpacing="16">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="auto"/>
-            </Grid.ColumnDefinitions>
+        <StackPanel Spacing="16" Visibility="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToVisibilityConverter}}">
             <TextBox
-                IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
-                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}"
-                Text="{x:Bind NewVerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-            <Button
-                Grid.Column="1"
-                VerticalAlignment="Stretch"
-                Command="{x:Bind VerifyNewCommand}"
-                Content="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeAction}"
-                IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"/>
-        </Grid>
+                InputScope="EmailSmtpAddress"
+                IsEnabled="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToBoolConverter}, Mode=OneWay}"
+                IsSpellCheckEnabled="False"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportNewUserNameHint}"
+                Text="{x:Bind NewUserName, Mode=TwoWay}"/>
+            <Grid ColumnSpacing="16">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBox
+                    Grid.Column="0"
+                    IsEnabled="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToBoolConverter}, Mode=OneWay}"
+                    PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}"
+                    Text="{x:Bind NewVerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                <Button
+                    Grid.Column="1"
+                    VerticalAlignment="Stretch"
+                    Command="{x:Bind VerifyNewCommand}"
+                    Content="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeAction}"
+                    IsEnabled="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToBoolConverter}, Mode=OneWay}"/>
+            </Grid>
+        </StackPanel>
     </StackPanel>
 </ContentDialog>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportUnregisterDialog.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportUnregisterDialog.xaml
@@ -12,7 +12,7 @@
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
-    <StackPanel Margin="0,8,0,0">
+    <StackPanel Margin="0,8,0,0" Spacing="16">
         <InfoBar
             Title="{shuxm:ResourceString Name=ViewPageHutaoPassportUnregisterHint}"
             IsClosable="False"
@@ -25,25 +25,29 @@
             IsSpellCheckEnabled="False"
             PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportUserNameHint}"
             Text="{x:Bind UserName, Mode=TwoWay}"/>
-        <Grid Margin="0,16,0,0" ColumnSpacing="16">
+        <Grid ColumnSpacing="16">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}" Text="{x:Bind VerifyCode, Mode=TwoWay}"/>
+            <TextBox
+                Grid.Column="0"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeHint}"
+                Text="{x:Bind VerifyCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
             <Button
                 Grid.Column="1"
                 VerticalAlignment="Stretch"
                 Command="{x:Bind VerifyCommand}"
                 Content="{shuxm:ResourceString Name=ViewPageHutaoPassportVerifyCodeAction}"/>
         </Grid>
-        <PasswordBox
-            Width="360"
-            MaxWidth="360"
-            Margin="0,16,0,0"
-            IsEnabled="{x:Bind VerifyCode, Converter={StaticResource StringBoolConverter}, Mode=OneWay}"
-            Password="{x:Bind Password, Mode=TwoWay}"
-            PasswordChar="*"
-            PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
+        <StackPanel Spacing="16" Visibility="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToVisibilityConverter}}">
+            <PasswordBox
+                Width="360"
+                MaxWidth="360"
+                IsEnabled="{x:Bind VerifyCode, Converter={StaticResource EmptyStringToBoolConverter}, Mode=OneWay}"
+                Password="{x:Bind Password, Mode=TwoWay}"
+                PasswordChar="*"
+                PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportPasswordHint}"/>
+        </StackPanel>
     </StackPanel>
 </ContentDialog>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportUseRedeemCodeDialog.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Dialog/HutaoPassportUseRedeemCodeDialog.xaml
@@ -12,8 +12,10 @@
     Style="{StaticResource DefaultContentDialogStyle}"
     mc:Ignorable="d">
 
-    <TextBox
-        IsSpellCheckEnabled="False"
-        PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportRedeemCodeHint}"
-        Text="{x:Bind RedeemCode, Mode=TwoWay}"/>
+    <StackPanel Margin="0,8,0,0" Spacing="16">
+        <TextBox
+            IsSpellCheckEnabled="False"
+            PlaceholderText="{shuxm:ResourceString Name=ViewPageHutaoPassportRedeemCodeHint}"
+            Text="{x:Bind RedeemCode, Mode=TwoWay}"/>
+    </StackPanel>
 </ContentDialog>
diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AnnouncementPage.xaml
@@ -174,7 +174,7 @@
                     <HyperlinkButton
                         Content="{shuxm:ResourceString Name=ViewPageAnnouncementViewDetails}"
                         NavigateUri="{Binding Link}"
-                        Visibility="{Binding Link, Converter={StaticResource StringBoolConverter}}"/>
+                        Visibility="{Binding Link, Converter={StaticResource EmptyStringToBoolConverter}}"/>
                     <TextBlock
                         Margin="8,0,0,2"
                         VerticalAlignment="Center"