From 740144aaa2ed8be54c8d671dc39b3ea56f4b5bdc Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Tue, 8 Aug 2023 01:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20Misc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/Styling/Controls/Button.axaml          | 92 ++++++++++++-------
 .../UI/Styling/Icons.axaml                    |  1 +
 .../UI/Views/Pages/About/AboutPage.axaml      |  8 +-
 .../UI/Views/Controls/AuthenticatorItem.axaml | 22 ++++-
 4 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml b/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml
index d4c2683d8..94a839905 100644
--- a/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml
+++ b/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls/Button.axaml
@@ -7,12 +7,69 @@
             <!--  Add Controls for Previewer Here  -->
             <StackPanel Spacing="10">
                 <ui:HyperlinkButton Content="更新日志" />
-                <Button Classes="Hyperlink" Content="更新日志" />
+                <Button Content="更新日志" Theme="{StaticResource HyperlinkButton}" />
+                <Button
+                    Content="更新日志"
+                    IsEnabled="False"
+                    Theme="{StaticResource HyperlinkButton}" />
                 <Button Classes="Plain" Content="Code Font Family" />
                 <Button Content="Code Font Family" Theme="{StaticResource TransparentButton}" />
             </StackPanel>
         </Border>
     </Design.PreviewWith>
+    <Styles.Resources>
+        <ControlTheme x:Key="HyperlinkButton" TargetType="Button">
+            <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrush}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource HyperlinkButtonBorderThemeThickness}" />
+            <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+            <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <ContentPresenter
+                        Name="ContentPresenter"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        Foreground="{TemplateBinding Foreground}">
+                        <!--<ContentPresenter.Styles>
+                            <Style Selector="TextBlock">
+                                <Setter Property="TextDecorations" Value="Underline" />
+                            </Style>
+                        </ContentPresenter.Styles>-->
+                    </ContentPresenter>
+                </ControlTemplate>
+            </Setter>
+
+            <Style Selector="^:pointerover /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPointerOver}" />
+                <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPointerOver}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrushPointerOver}" />
+            </Style>
+            <Style Selector="^:pressed /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPressed}" />
+                <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPressed}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrushPressed}" />
+            </Style>
+            <Style Selector="^:disabled /template/ ContentPresenter#ContentPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundDisabled}" />
+                <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundDisabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrushDisabled}" />
+            </Style>
+        </ControlTheme>
+    </Styles.Resources>
 
     <!--  Add Styles Here  -->
     <Style Selector="Button.Plain">
@@ -31,37 +88,4 @@
     <Style Selector="Button.Plain:pointerover /template/ ContentPresenter">
         <Setter Property="Background" Value="Transparent" />
     </Style>
-
-
-    <Style Selector="Button.Hyperlink">
-        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackground}" />
-        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{DynamicResource HyperlinkButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{DynamicResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    </Style>
-
-    <Style Selector="Button.Hyperlink:pointerover /template/ ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPointerOver}" />
-        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPointerOver}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrushPointerOver}" />
-    </Style>
-
-    <Style Selector="Button.Hyperlink:pressed /template/ ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundPressed}" />
-        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPressed}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrushPressed}" />
-    </Style>
-
-    <Style Selector="Button.Hyperlink:disabled /template/ ContentPresenter">
-        <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForegroundDisabled}" />
-        <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundDisabled}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrushDisabled}" />
-    </Style>
 </Styles>
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Styling/Icons.axaml b/src/BD.WTTS.Client.Avalonia/UI/Styling/Icons.axaml
index 30aebc1d6..0880beba6 100644
--- a/src/BD.WTTS.Client.Avalonia/UI/Styling/Icons.axaml
+++ b/src/BD.WTTS.Client.Avalonia/UI/Styling/Icons.axaml
@@ -32,6 +32,7 @@
     <x:String x:Key="Contact">&#xE77B;</x:String>
     <x:String x:Key="OpenFile">&#xE8E5;</x:String>
     <x:String x:Key="Close">&#xE8BB;</x:String>
+    <x:String x:Key="RedEye">&#xE7B3;</x:String>
     <x:String x:Key="Hide">&#xED1A;</x:String>
     <x:String x:Key="Back">&#xE112;</x:String>
 
diff --git a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml
index 9fa3ad109..e5b844020 100644
--- a/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml
+++ b/src/BD.WTTS.Client.Avalonia/UI/Views/Pages/About/AboutPage.axaml
@@ -56,10 +56,10 @@
                         <ItemsRepeater.ItemTemplate>
                             <DataTemplate x:DataType="spp:HyperlinkModel">
                                 <Button
-                                    Classes="Hyperlink"
                                     Command="{Binding Command, Mode=OneWay}"
                                     Content="{Binding Text, Mode=OneWay}"
-                                    Cursor="Hand" />
+                                    Cursor="Hand"
+                                    Theme="{StaticResource HyperlinkButton}" />
                             </DataTemplate>
                         </ItemsRepeater.ItemTemplate>
                     </ItemsRepeater>
@@ -81,10 +81,10 @@
                         <ItemsRepeater.ItemTemplate>
                             <DataTemplate x:DataType="spp:HyperlinkModel">
                                 <Button
-                                    Classes="Hyperlink"
                                     Command="{Binding Command, Mode=OneWay}"
                                     Content="{Binding Text, Mode=OneWay}"
-                                    Cursor="Hand" />
+                                    Cursor="Hand"
+                                    Theme="{StaticResource HyperlinkButton}" />
                             </DataTemplate>
                         </ItemsRepeater.ItemTemplate>
                     </ItemsRepeater>
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Controls/AuthenticatorItem.axaml b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Controls/AuthenticatorItem.axaml
index 9a19c7459..4432c0c2a 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Controls/AuthenticatorItem.axaml
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Controls/AuthenticatorItem.axaml
@@ -64,9 +64,27 @@
             </StackPanel>
         </spp:AppItem.ActionButton>
         <spp:AppItem.Status>
-            <Border Classes="Status" IsVisible="{Binding IsSelected}">
-                <TextBlock Text="展示中" />
+            <Border Classes="Status">
+                <!--<TextBlock Text="展示中" />-->
+                <Border.Styles>
+                    <Style Selector="ui|FontIcon.Eye">
+                        <Setter Property="Glyph" Value="{StaticResource RedEye}" />
+                    </Style>
+                    <Style Selector="ui|FontIcon.Hide">
+                        <Setter Property="Glyph" Value="{StaticResource Hide}" />
+                    </Style>
+                </Border.Styles>
+                <ui:FontIcon
+                    Classes.Eye="{Binding IsSelected}"
+                    Classes.Hide="{Binding !IsSelected}"
+                    FontFamily="{StaticResource SymbolThemeFontFamily}" />
             </Border>
+            <!--<ToggleButton IsChecked="{Binding IsSelected}">
+                <ui:FontIcon
+                    Classes.Eye="{Binding IsSelected}"
+                    Classes.Hide="{Binding !IsSelected}"
+                    FontFamily="{StaticResource SymbolThemeFontFamily}" />
+            </ToggleButton>-->
         </spp:AppItem.Status>
         <spp:AppItem.Image>
             <Panel Width="100" Margin="10">