From 2e58da7c2a24076913646db039dc93c83f260398 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 21 May 2024 10:54:19 +0800
Subject: [PATCH] ux: use `SystemAccentColor` and `SystemListLowColor`

---
 src/Resources/Styles.axaml | 22 +++++++++++-----------
 src/Resources/Themes.axaml | 11 ++---------
 src/Views/About.axaml      | 10 +++++-----
 src/Views/Launcher.axaml   |  2 +-
 src/Views/SelfUpdate.axaml |  2 +-
 src/Views/Statistics.axaml |  2 +-
 6 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index afac434c..b8bb4e6c 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -133,12 +133,12 @@
     </Setter>
   </Style>
   <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
-    <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent1}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
     <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
   </Style>
   <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
     <Setter Property="BorderThickness" Value="1"/>
-    <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent1}"/>
+    <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
     <Setter Property="Background" Value="{DynamicResource Brush.Contents}"/>
   </Style>
   <Style Selector="TextBox:disabled /template/ Border#PART_BorderElement">
@@ -734,7 +734,7 @@
       <Setter Property="VerticalOffset" Value="2"/>
     </Style>
     <Style Selector="^:pointerover /template/ Border#Background">
-      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent1}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
     </Style>
     <Style Selector="^:disabled">
       <Setter Property="Opacity" Value=".6"/>
@@ -758,7 +758,7 @@
           </Grid.ColumnDefinitions>
 
           <Border x:Name="Border" Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" BorderBrush="{DynamicResource Brush.Border1}" BorderThickness="1" Background="Transparent" CornerRadius="2">
-            <Path x:Name="Icon" Height="12" Width="12" Data="{DynamicResource Icons.Check}" Fill="{DynamicResource Brush.Accent1}" IsVisible="False" Margin="0,2,0,0"/>
+            <Path x:Name="Icon" Height="12" Width="12" Data="{DynamicResource Icons.Check}" Fill="{DynamicResource Brush.Accent}" IsVisible="False" Margin="0,2,0,0"/>
           </Border>
 
           <ContentPresenter x:Name="ContentPresenter"
@@ -773,7 +773,7 @@
     </Setter>
 
     <Style Selector="^:pointerover /template/ Border#Border">
-      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent1}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}"/>
     </Style>
     <Style Selector="^:checked /template/ Path#Icon">
       <Setter Property="IsVisible" Value="True"/>
@@ -817,10 +817,10 @@
     </Setter>
 
     <Style Selector="^:pointerover /template/ Ellipse#Border">
-      <Setter Property="Stroke" Value="{DynamicResource Brush.Accent1}"/>
+      <Setter Property="Stroke" Value="{DynamicResource Brush.Accent}"/>
     </Style>
     <Style Selector="^:checked /template/ Ellipse#Dot">
-      <Setter Property="Fill" Value="{DynamicResource Brush.Accent1}"/>
+      <Setter Property="Fill" Value="{DynamicResource Brush.Accent}"/>
     </Style>
   </Style>
 
@@ -897,7 +897,7 @@
     <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
   </Style>
   <Style Selector="ToggleButton.filter:pointerover /template/ Path#PART_IndicatorIcon">
-    <Setter Property="Stroke" Value="{DynamicResource Brush.Accent2}"/>
+    <Setter Property="Stroke" Value="{DynamicResource Brush.AccentHovered}"/>
   </Style>
   <Style Selector="ToggleButton.tree_expander">
     <Setter Property="Margin" Value="0" />
@@ -964,7 +964,7 @@
     <Setter Property="Background" Value="Transparent"/>
   </Style>
   <Style Selector="ToggleButton.line_path:checked Path">
-    <Setter Property="Fill" Value="{DynamicResource Brush.Accent1}"/>
+    <Setter Property="Fill" Value="{DynamicResource Brush.Accent}"/>
   </Style>
 
   <Style Selector="ToggleButton.toggle_untracked">
@@ -1075,11 +1075,11 @@
     </Setter>
 
     <Style Selector="^ /template/ Border#PART_LayoutRoot:pointerover">
-      <Setter Property="Background" Value="{DynamicResource Brush.Accent2}" />
+      <Setter Property="Background" Value="{DynamicResource Brush.AccentHovered}" />
     </Style>
 
     <Style Selector="^:selected /template/ Border#PART_LayoutRoot">
-      <Setter Property="Background" Value="{DynamicResource Brush.Accent1}" />
+      <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
     </Style>
   </Style>
   <Style Selector="TreeViewItem[IsExpanded=True] Path.folder_icon">
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 88f38d8c..02b24f09 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -27,9 +27,6 @@
       <Color x:Key="Color.FG1">#FF1F1F1F</Color>
       <Color x:Key="Color.FG2">#FF6F6F6F</Color>
       <Color x:Key="Color.FG3">#FFFFFFFF</Color>
-      <Color x:Key="Color.Accent1">#FF4295FF</Color>
-      <Color x:Key="Color.Accent1Hovered">#FF529DFB</Color>
-      <Color x:Key="Color.Accent2">#4C007ACC</Color>
     </ResourceDictionary>
 
     <ResourceDictionary x:Key="Dark">
@@ -58,9 +55,6 @@
       <Color x:Key="Color.FG1">#FFF1F1F1</Color>
       <Color x:Key="Color.FG2">#40F1F1F1</Color>
       <Color x:Key="Color.FG3">#FF252525</Color>
-      <Color x:Key="Color.Accent1">#FF007ACC</Color>
-      <Color x:Key="Color.Accent1Hovered">#FF006BBE</Color>
-      <Color x:Key="Color.Accent2">#8C007ACC</Color>
     </ResourceDictionary>
   </ResourceDictionary.ThemeDictionaries>
 
@@ -89,7 +83,6 @@
   <SolidColorBrush x:Key="Brush.FG1" Color="{DynamicResource Color.FG1}"/>
   <SolidColorBrush x:Key="Brush.FG2" Color="{DynamicResource Color.FG2}"/>
   <SolidColorBrush x:Key="Brush.FG3" Color="{DynamicResource Color.FG3}"/>
-  <SolidColorBrush x:Key="Brush.Accent1" Color="{DynamicResource Color.Accent1}"/>
-  <SolidColorBrush x:Key="Brush.Accent1Hovered" Color="{DynamicResource Color.Accent1Hovered}"/>
-  <SolidColorBrush x:Key="Brush.Accent2" Color="{DynamicResource Color.Accent2}"/>
+  <SolidColorBrush x:Key="Brush.Accent" Color="{DynamicResource SystemAccentColor}"/>
+  <SolidColorBrush x:Key="Brush.AccentHovered" Color="{DynamicResource SystemListLowColor}"/>
 </ResourceDictionary>
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 97d7c46f..98ba444b 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -70,7 +70,7 @@
       <StackPanel Grid.Column="1" Orientation="Vertical" Margin="0,8,32,8">        
         <StackPanel Height="48" Orientation="Horizontal">
           <TextBlock Classes="bold" Text="SourceGit" FontSize="32" />
-          <Border Margin="12,0,0,0" Height="20" CornerRadius="10" Background="{DynamicResource Brush.Accent1}" Effect="drop-shadow(0 0 6 #40000000)">
+          <Border Margin="12,0,0,0" Height="20" CornerRadius="10" Background="{DynamicResource Brush.Accent}" Effect="drop-shadow(0 0 6 #40000000)">
             <TextBlock Classes="monospace" Margin="8,0" Text="{Binding Version}" FontSize="12" Foreground="White"/>
           </Border>
         </StackPanel>
@@ -82,19 +82,19 @@
         <StackPanel Orientation="Vertical" Margin="0,24,0,0">
           <StackPanel Orientation="Horizontal" Height="18">
             <TextBlock Text="{DynamicResource Text.About.BuildWith}" />
-            <TextBlock Text="Avalonia UI" Cursor="Hand" Foreground="{DynamicResource Brush.Accent1}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaUI"/>
+            <TextBlock Text="Avalonia UI" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaUI"/>
             <TextBlock Text=" &amp; " />
-            <TextBlock Text="AvaloniaEdit" Cursor="Hand" Foreground="{DynamicResource Brush.Accent1}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaEdit"/>
+            <TextBlock Text="AvaloniaEdit" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitAvaloniaEdit"/>
           </StackPanel>
 
           <StackPanel Orientation="Horizontal" Height="18" Margin="0,2,0,0">
             <TextBlock Text="{DynamicResource Text.About.Fonts}" />
-            <TextBlock Text="JetBrains Mono" Cursor="Hand" Foreground="{DynamicResource Brush.Accent1}" TextDecorations="Underline" PointerPressed="OnVisitJetBrainsMonoFont"/>
+            <TextBlock Text="JetBrains Mono" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitJetBrainsMonoFont"/>
           </StackPanel>
           
           <StackPanel Orientation="Horizontal" Height="18" Margin="0,2,0,0">
             <TextBlock Text="{DynamicResource Text.About.SourceCode}" />
-            <TextBlock Text="Github" Cursor="Hand" Foreground="{DynamicResource Brush.Accent1}" TextDecorations="Underline" PointerPressed="OnVisitSourceCode"/>
+            <TextBlock Text="Github" Cursor="Hand" Foreground="{DynamicResource Brush.Accent}" TextDecorations="Underline" PointerPressed="OnVisitSourceCode"/>
           </StackPanel>
         </StackPanel>
       </StackPanel>
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 957777ae..637bbb3a 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -321,7 +321,7 @@
                     <ProgressBar Margin="0,8,0,0"
                                  HorizontalAlignment="Stretch"
                                  IsIndeterminate="True"
-                                 Background="{DynamicResource Brush.FG2}" Foreground="{DynamicResource Brush.Accent1}"
+                                 Background="{DynamicResource Brush.FG2}" Foreground="{DynamicResource Brush.Accent}"
                                  Minimum="0" Maximum="100"/>
                   </StackPanel>
                 </StackPanel>
diff --git a/src/Views/SelfUpdate.axaml b/src/Views/SelfUpdate.axaml
index f29da5b5..a83895fb 100644
--- a/src/Views/SelfUpdate.axaml
+++ b/src/Views/SelfUpdate.axaml
@@ -69,7 +69,7 @@
               <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8">
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
                 <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.SelfUpdate.Available}"/>
-                <Border Margin="4,0,0,0" Height="20" CornerRadius="10" Background="{DynamicResource Brush.Accent1}" Effect="drop-shadow(0 0 6 #40000000)">
+                <Border Margin="4,0,0,0" Height="20" CornerRadius="10" Background="{DynamicResource Brush.Accent}" Effect="drop-shadow(0 0 6 #40000000)">
                   <TextBlock Classes="monospace" Margin="8,0" Text="{Binding TagName}" FontSize="12" Foreground="White"/>
                 </Border>
               </StackPanel>
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index 2caa1d02..b0d73bec 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -172,7 +172,7 @@
             <v:Chart Grid.Column="1"
                      Margin="16,0,0,0"
                      LineBrush="{DynamicResource Brush.Border1}"
-                     ShapeBrush="{DynamicResource Brush.Accent1}"
+                     ShapeBrush="{DynamicResource Brush.Accent}"
                      Samples="{Binding Samples}"/>            
           </Grid>
         </DataTemplate>