From 37b7d827f126b91aba3bb6a3931362735c98ba6d Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 30 Apr 2025 01:08:26 +0800
Subject: [PATCH] feat: replace SolidColorBrush with StaticResource references
 in XAML files.

---
 src/Ursa.Themes.Semi/Themes/Dark/Avatar.axaml | 34 +++++++++----------
 .../Themes/Dark/ButtonGroup.axaml             |  5 +--
 src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml  |  4 +--
 .../Themes/Dark/DatePicker.axaml              |  4 +--
 .../Themes/Dark/Divider.axaml                 |  2 +-
 .../Themes/Dark/DualBadge.axaml               |  6 ++--
 .../Themes/Dark/NotificationShared.axaml      |  2 +-
 .../Themes/Dark/PopConfirm.axaml              |  4 +--
 src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml |  2 +-
 .../Themes/Dark/SelectionList.axaml           |  2 +-
 .../Themes/Dark/TagInput.axaml                |  2 +-
 .../Themes/Dark/Timeline.axaml                |  4 +--
 12 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Avatar.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Avatar.axaml
index 53516aa..acf2611 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Avatar.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Avatar.axaml
@@ -1,19 +1,19 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="AvatarForeground" Color="White" />
-    <SolidColorBrush x:Key="AvatarRedBackground" Color="#D73324" />
-    <SolidColorBrush x:Key="AvatarPinkBackground" Color="#C72261" />
-    <SolidColorBrush x:Key="AvatarPurpleBackground" Color="#89289F" />
-    <SolidColorBrush x:Key="AvatarVioletBackground" Color="#6439B5" />
-    <SolidColorBrush x:Key="AvatarIndigoBackground" Color="#3444A3" />
-    <SolidColorBrush x:Key="AvatarBlueBackground" Color="#1D75DB" />
-    <SolidColorBrush x:Key="AvatarLightBlueBackground" Color="#0A81CC" />
-    <SolidColorBrush x:Key="AvatarCyanBackground" Color="#0E8999" />
-    <SolidColorBrush x:Key="AvatarTealBackground" Color="#0A9588" />
-    <SolidColorBrush x:Key="AvatarGreenBackground" Color="#32953D" />
-    <SolidColorBrush x:Key="AvatarLightGreenBackground" Color="#679934" />
-    <SolidColorBrush x:Key="AvatarLimeBackground" Color="#84B00C" />
-    <SolidColorBrush x:Key="AvatarYellowBackground" Color="#D2AF0F" />
-    <SolidColorBrush x:Key="AvatarAmberBackground" Color="#CA8F1E" />
-    <SolidColorBrush x:Key="AvatarOrangeBackground" Color="#D56F0F" />
-    <SolidColorBrush x:Key="AvatarGreyBackground" Color="#555B61" />
+    <StaticResource x:Key="AvatarForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="AvatarRedBackground" ResourceKey="SemiRed3" />
+    <StaticResource x:Key="AvatarPinkBackground" ResourceKey="SemiPink3" />
+    <StaticResource x:Key="AvatarPurpleBackground" ResourceKey="SemiPurple3" />
+    <StaticResource x:Key="AvatarVioletBackground" ResourceKey="SemiViolet3" />
+    <StaticResource x:Key="AvatarIndigoBackground" ResourceKey="SemiIndigo3" />
+    <StaticResource x:Key="AvatarBlueBackground" ResourceKey="SemiBlue3" />
+    <StaticResource x:Key="AvatarLightBlueBackground" ResourceKey="SemiLightBlue3" />
+    <StaticResource x:Key="AvatarCyanBackground" ResourceKey="SemiCyan3" />
+    <StaticResource x:Key="AvatarTealBackground" ResourceKey="SemiTeal3" />
+    <StaticResource x:Key="AvatarGreenBackground" ResourceKey="SemiGreen3" />
+    <StaticResource x:Key="AvatarLightGreenBackground" ResourceKey="SemiLightGreen3" />
+    <StaticResource x:Key="AvatarLimeBackground" ResourceKey="SemiLime3" />
+    <StaticResource x:Key="AvatarYellowBackground" ResourceKey="SemiYellow3" />
+    <StaticResource x:Key="AvatarAmberBackground" ResourceKey="SemiAmber3" />
+    <StaticResource x:Key="AvatarOrangeBackground" ResourceKey="SemiOrange3" />
+    <StaticResource x:Key="AvatarGreyBackground" ResourceKey="SemiGrey3" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml b/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml
index e5cd78f..9f42474 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/ButtonGroup.axaml
@@ -18,8 +18,7 @@
     <SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="Transparent" />
     <!--  end Light  -->
     <!--  Solid  -->
-    <SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="White" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="Gray" />
+    <StaticResource x:Key="ButtonGroupSolidForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="ButtonGroupSolidPrimaryBackground" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
     <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBackground" ResourceKey="SemiColorPrimaryActive" />
@@ -38,7 +37,6 @@
     <StaticResource x:Key="ButtonGroupSolidDangerBackground" ResourceKey="SemiColorDanger" />
     <StaticResource x:Key="ButtonGroupSolidDangerPointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
     <StaticResource x:Key="ButtonGroupSolidDangerPressedBackground" ResourceKey="SemiColorDangerActive" />
-    <SolidColorBrush x:Key="ButtonGroupSolidDisabledBackground" Color="Gray" />
     <StaticResource x:Key="ButtonGroupSolidPrimaryBorderBrush" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
     <StaticResource x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />
@@ -57,6 +55,5 @@
     <StaticResource x:Key="ButtonGroupSolidDangerBorderBrush" ResourceKey="SemiColorDanger" />
     <StaticResource x:Key="ButtonGroupSolidDangerPointeroverBorderBrush" ResourceKey="SemiColorDangerPointerover" />
     <StaticResource x:Key="ButtonGroupSolidDangerPressedBorderBrush" ResourceKey="SemiColorDangerActive" />
-    <StaticResource x:Key="ButtonGroupSolidDisabledBorderBrush" ResourceKey="SemiColorDisabledBackground" />
     <!--  end Solid  -->
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
index 8a8052b..18bb75a 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Clock.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="ClockHandBrush" ResourceKey="SemiColorTertiaryPointerover" />
     <StaticResource x:Key="ClockHourTickForeground" ResourceKey="SemiColorTertiaryPointerover" />
-    <SolidColorBrush x:Key="ClockMinuteTickForeground" Color="#6B7075" />
-    <SolidColorBrush x:Key="ClockArborFill" Color="White" />
+    <StaticResource x:Key="ClockMinuteTickForeground" ResourceKey="SemiGrey4" />
+    <StaticResource x:Key="ClockArborFill" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="ClockArborStroke" ResourceKey="SemiColorPrimary" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
index 14a6144..38075ea 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -9,7 +9,7 @@
     <StaticResource x:Key="CalenderDayPointeroverBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="CalenderDayPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CalenderDaySelectedBackground" ResourceKey="SemiColorPrimary" />
-    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
+    <StaticResource x:Key="CalenderDaySelectedForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="CalenderDaySelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
     <StaticResource x:Key="CalenderDaySelectedPressedBackground" ResourceKey="SemiColorPrimaryActive" />
     <StaticResource x:Key="CalendarDayInRangeForeground" ResourceKey="SemiColorText0" />
@@ -29,7 +29,7 @@
     <StaticResource x:Key="CalenderYearPointeroverBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="CalenderYearPressedBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CalenderYearSelectedBackground" ResourceKey="SemiColorPrimary" />
-    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
+    <StaticResource x:Key="CalenderYearSelectedForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="CalenderYearSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
     <!--CalenderView-->
     <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml
index a7ce647..37ff4b8 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DividerBorderBrush" Opacity="0.20" Color="White" />
+    <StaticResource x:Key="DividerBorderBrush" ResourceKey="SemiColorFill2" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml
index 4919f48..18d9881 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DualBadge.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="DualBadgeDefaultIconForeground">White</SolidColorBrush>
-    <SolidColorBrush x:Key="DualBadgeDefaultHeaderForeground">White</SolidColorBrush>
-    <SolidColorBrush x:Key="DualBadgeDefaultForeground">White</SolidColorBrush>
+    <StaticResource x:Key="DualBadgeDefaultIconForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="DualBadgeDefaultHeaderForeground" ResourceKey="SemiColorWhite" />
+    <StaticResource x:Key="DualBadgeDefaultForeground" ResourceKey="SemiColorWhite" />
     <LinearGradientBrush x:Key="DualBadgeDefaultHeaderBackground" StartPoint="0%,0%" EndPoint="0%,100%">
         <GradientStop Color="#555B61" Offset="0" />
         <GradientStop Color="#41464C" Offset="1" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml b/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml
index a10f618..d5a2c84 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/NotificationShared.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <BoxShadows x:Key="NotificationCardBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
+    <StaticResource x:Key="NotificationCardBoxShadows" ResourceKey="SemiShadowElevated" />
     <StaticResource x:Key="NotificationCardLightBackground" ResourceKey="SemiColorBackground0" />
     <StaticResource x:Key="NotificationCardLightInformationBorderBrush" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="NotificationCardLightInformationBackground" ResourceKey="SemiColorPrimaryLight" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml b/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml
index 3a34612..444a21e 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/PopConfirm.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="PopConfirmBackground">#43444A</SolidColorBrush>
+    <StaticResource x:Key="PopConfirmBackground" ResourceKey="SemiColorBackground3" />
     <StaticResource x:Key="PopConfirmBorderBrush" ResourceKey="SemiColorBorder" />
     <StaticResource x:Key="PopConfirmContentForeground" ResourceKey="SemiColorText2" />
-    <BoxShadows x:Key="PopConfirmBorderBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
+    <StaticResource x:Key="PopConfirmBorderBoxShadows" ResourceKey="SemiShadowElevated" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml
index 77a5044..dcbbe13 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Rating.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="RatingCharacterForeground" Color="#FDDE43" />
+    <StaticResource x:Key="RatingCharacterForeground" ResourceKey="SemiYellow5" />
     <StaticResource x:Key="RatingCharacterBackground" ResourceKey="SemiColorFill0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml b/src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml
index 8bba683..232122a 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/SelectionList.axaml
@@ -1,3 +1,3 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="SelectionListIndicatorBackground" Color="#0A4694" />
+    <StaticResource x:Key="SelectionListIndicatorBackground" ResourceKey="SemiBlue1" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
index 8158162..4a6482a 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/TagInput.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="ClosableTagBackground" ResourceKey="SemiColorTertiary" />
-    <SolidColorBrush x:Key="ClosableTagForeground" Color="#E6E8EA" />
+    <StaticResource x:Key="ClosableTagForeground" ResourceKey="SemiGrey8" />
     <StaticResource x:Key="ClosableTagBorder" ResourceKey="SemiColorBorder" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
index 68b52e4..ede09ca 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Timeline.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="TimelineHeaderForeground" ResourceKey="SemiColorText0" />
-    <SolidColorBrush x:Key="DefaultTimelineIconForeground" Opacity="0.20" Color="White" />
+    <StaticResource x:Key="DefaultTimelineIconForeground" ResourceKey="SemiColorFill2" />
     <StaticResource x:Key="OngoingTimelineIconForeground" ResourceKey="SemiColorPrimary" />
     <StaticResource x:Key="SuccessTimelineIconForeground" ResourceKey="SemiColorSuccess" />
     <StaticResource x:Key="WarningTimelineIconForeground" ResourceKey="SemiColorWarning" />
     <StaticResource x:Key="ErrorTimelineIconForeground" ResourceKey="SemiColorDanger" />
-    <SolidColorBrush x:Key="TimelineLineBrush" Opacity="0.20" Color="White" />
+    <StaticResource x:Key="TimelineLineBrush" ResourceKey="SemiColorFill2" />
 </ResourceDictionary>
\ No newline at end of file