Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #1072

Browse Source
This commit is contained in:
Lightczx
2023-11-06 13:46:59 +08:00
parent 43007d8fb4
commit b8886c5cd3
1 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
View File

@@ -94,63 +94,68 @@
<cwc:SettingsCard Description="{Binding HutaoOptions.WebView2Version}" Header="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
</cwc:SettingsExpander.Items>
</cwc:SettingsExpander>
<cwc:SettingsExpander
Description="{Binding UserOptions.UserName}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE716;}"
IsExpanded="True">
<StackPanel Orientation="Horizontal" Spacing="16">
<Button
Command="{Binding Passport.LoginCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLoginAction}"
Style="{ThemeResource SettingButtonStyle}"
Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
<Button
Command="{Binding Passport.RegisterCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRegisterAction}"
Style="{ThemeResource SettingButtonStyle}"
Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
<Button
Command="{Binding Passport.LogoutCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLogoutAction}"
Style="{ThemeResource SettingButtonStyle}"
Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"/>
</StackPanel>
<cwc:SettingsExpander.Items>
<cwc:SettingsCard
Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperHeader}"
Visibility="{Binding UserOptions.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}"/>
<cwc:SettingsCard
Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerHeader}"
Visibility="{Binding UserOptions.IsMaintainer, Converter={StaticResource BoolToVisibilityConverter}}"/>
<cwc:SettingsCard Description="{Binding UserOptions.GachaLogExpireAtSlim}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportGachaLogExpiredAtHeader}"/>
<cwc:SettingsCard
Command="{Binding Passport.OpenRedeemWebsiteCommand}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeHeader}"
IsClickEnabled="True"/>
<cwc:SettingsCard
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneHeader}">
<StackPanel Orientation="Horizontal" Spacing="16">
<Button
Command="{Binding Passport.ResetPasswordCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportResetPasswordAction}"
Style="{ThemeResource SettingButtonStyle}"/>
<Button
Command="{Binding Passport.UnregisterCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportUnregisterAction}"
Style="{ThemeResource SettingButtonStyle}"/>
</StackPanel>
</cwc:SettingsCard>
</cwc:SettingsExpander.Items>
</cwc:SettingsExpander>
<!--
https://github.com/DGP-Studio/Snap.Hutao/issues/1072
ItemsRepeater will behave abnormal is no direct scrollhost wrapping it
-->
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Disabled">
<cwc:SettingsExpander
Description="{Binding UserOptions.UserName}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportHeader}"
HeaderIcon="{shcm:FontIcon Glyph=&#xE716;}"
IsExpanded="True">
<StackPanel Orientation="Horizontal" Spacing="16">
<Button
Command="{Binding Passport.LoginCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLoginAction}"
Style="{ThemeResource SettingButtonStyle}"
Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
<Button
Command="{Binding Passport.RegisterCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRegisterAction}"
Style="{ThemeResource SettingButtonStyle}"
Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
<Button
Command="{Binding Passport.LogoutCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLogoutAction}"
Style="{ThemeResource SettingButtonStyle}"
Visibility="{Binding UserOptions.IsLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"/>
</StackPanel>
<cwc:SettingsExpander.Items>
<cwc:SettingsCard
Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportLicensedDeveloperHeader}"
Visibility="{Binding UserOptions.IsLicensedDeveloper, Converter={StaticResource BoolToVisibilityConverter}}"/>
<cwc:SettingsCard
Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportMaintainerHeader}"
Visibility="{Binding UserOptions.IsMaintainer, Converter={StaticResource BoolToVisibilityConverter}}"/>
<cwc:SettingsCard Description="{Binding UserOptions.GachaLogExpireAtSlim}" Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportGachaLogExpiredAtHeader}"/>
<cwc:SettingsCard
Command="{Binding Passport.OpenRedeemWebsiteCommand}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportRedeemCodeHeader}"
IsClickEnabled="True"/>
<cwc:SettingsCard
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
Description="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneDescription}"
Header="{shcm:ResourceString Name=ViewPageSettingHutaoPassportDangerZoneHeader}">
<StackPanel Orientation="Horizontal" Spacing="16">
<Button
Command="{Binding Passport.ResetPasswordCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportResetPasswordAction}"
Style="{ThemeResource SettingButtonStyle}"/>
<Button
Command="{Binding Passport.UnregisterCommand}"
Content="{shcm:ResourceString Name=ViewPageSettingHutaoPassportUnregisterAction}"
Style="{ThemeResource SettingButtonStyle}"/>
</StackPanel>
</cwc:SettingsCard>
</cwc:SettingsExpander.Items>
</cwc:SettingsExpander>
</ScrollViewer>
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingGeetestVerificationHeader}"/>
<cwc:SettingsCard
ActionIcon="{shcm:FontIcon Glyph=&#xF32A;}"