From 896711a5eb52a177cc3d91f31f7e2630c0dbba99 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Mon, 8 Apr 2024 10:06:00 +0800
Subject: [PATCH] feat: uncertain resources.

---
 .../Default/Dark/HyperlinkButton.axaml        | 20 +++++++------------
 .../Themes/Schemes/Default/Dark/Label.axaml   |  2 +-
 .../Themes/Schemes/Default/Dark/ListBox.axaml |  2 +-
 .../Schemes/Default/Dark/RadioButton.axaml    |  2 +-
 .../Themes/Schemes/Default/Light/Button.axaml |  6 +++---
 .../Default/Light/CalendarDatePicker.axaml    |  2 +-
 .../Default/Light/DateTimePickerShared.axaml  |  4 ++--
 .../Themes/Schemes/Default/Light/Label.axaml  |  6 +++---
 .../Default/Light/ManagedFileChooser.axaml    |  2 +-
 .../Themes/Schemes/Default/Light/Menu.axaml   |  2 +-
 .../Themes/Schemes/Default/Light/Slider.axaml |  4 ++--
 .../Schemes/Default/Light/TextBlock.axaml     |  6 +++---
 .../Schemes/Default/Light/ToggleButton.axaml  |  2 +-
 .../Schemes/Default/Light/Tooltip.axaml       |  2 +-
 14 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/HyperlinkButton.axaml
index f49e412..bca4002 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/HyperlinkButton.axaml
@@ -1,13 +1,7 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
-    <SolidColorBrush Color="#F9F9F9" x:Key="HyperlinkButtonForeground" />
-    <SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
-    <SolidColorBrush Color="#54A9FF" x:Key="HyperlinkButtonOverForeground" />
-    <SolidColorBrush
-        Color="#F9F9F9"
-        Opacity="0.35"
-        x:Key="HyperlinkButtonDisabledForeground" />
-
-    <SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
-</ResourceDictionary>
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="HyperlinkButtonForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="HyperlinkButtonDefaultBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="HyperlinkButtonOverForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="HyperlinkButtonDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="HyperlinkButtonVisitedForeground" Color="#681DA8" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Label.axaml
index 1a9c36f..53bbec0 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/Label.axaml
@@ -32,9 +32,9 @@
     <SolidColorBrush x:Key="LabelTagLightOrangeBackground" Opacity="0.15" Color="#FFAE43" />
     <SolidColorBrush x:Key="LabelTagLightGreyForeground" Color="#E6E8EA" />
     <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="#888D92" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#F9F9F9" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Color="#4F5159" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#41464C" />
-    <SolidColorBrush x:Key="LabelTagLightWhiteForeground" Color="#F9F9F9" />
 
     <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="#FB4932" />
     <SolidColorBrush x:Key="LabelTagGhostRedForeground" Color="#FC725A" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/ListBox.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/ListBox.axaml
index 5d0bd41..d4a4682 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/ListBox.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/ListBox.axaml
@@ -43,8 +43,8 @@
     <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedForeground" Opacity="0.8" Color="#F9F9F9" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonUncheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedBackground" Color="#43444A" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedBackground" Color="#43444A" />
     <SolidColorBrush x:Key="ListBoxItemRadioGroupButtonCheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <!-- CardRadioGroupListBox -->
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/RadioButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/RadioButton.axaml
index d4f2811..23a8e11 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Dark/RadioButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Dark/RadioButton.axaml
@@ -33,8 +33,8 @@
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedForeground" Opacity="0.8" Color="#F9F9F9" />
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedPointeroverBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="RadioButtonButtonUncheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="#43444A" />
     <SolidColorBrush x:Key="RadioButtonButtonCheckedForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="RadioButtonButtonCheckedBackground" Color="#43444A" />
     <SolidColorBrush x:Key="RadioButtonButtonCheckedDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
 
     <!-- CardRadioButton -->
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
index c487eb6..b466843 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Button.axaml
@@ -71,7 +71,7 @@
     <StaticResource x:Key="ButtonSolidDangerPressedBorderBrush" ResourceKey="SemiColorDangerPressed" />
     <!--  end Solid  -->
 
-    <StaticResource x:Key="ButtonInputInnerForeground" ResourceKey="SemiGrey5" />
-    <StaticResource x:Key="ButtonInputInnerPointeroverForeground" ResourceKey="SemiGrey6" />
-    <StaticResource x:Key="ButtonInputInnerPressedForeground" ResourceKey="SemiGrey7" />
+    <SolidColorBrush x:Key="ButtonInputInnerForeground" Color="{StaticResource SemiGrey5Color}" />
+    <SolidColorBrush x:Key="ButtonInputInnerPointeroverForeground" Color="{StaticResource SemiGrey6Color}" />
+    <SolidColorBrush x:Key="ButtonInputInnerPressedForeground" Color="{StaticResource SemiGrey7Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
index e68a6ed..31eca76 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/CalendarDatePicker.axaml
@@ -6,7 +6,7 @@
     <StaticResource x:Key="CalendarDatePickerPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="CalendarDatePickerFocusBorderBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="CalendarDatePickerDisabledBackground" ResourceKey="SemiColorDisabledFill" />
-    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalendarDatePickerDisabledIconForeground" Opacity="0.4" Color="{StaticResource SemiGrey8Color}" />
     <BoxShadows x:Key="CalendarDatePickerPopupBoxShadows">0 0 8 0 #1A000000</BoxShadows>
 
     <SolidColorBrush x:Key="CalendarDatePickerBorderedDefaultBackground" Color="Transparent" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
index 11f8968..304adf2 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/DateTimePickerShared.axaml
@@ -17,10 +17,10 @@
     <StaticResource x:Key="DateTimePickerButtonForeground" ResourceKey="SemiColorText0" />
 
     <StaticResource x:Key="DateTimePickerIconForeground" ResourceKey="SemiColorText2" />
-    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="#1C1F23" />
+    <SolidColorBrush x:Key="DateTimePickerEmptyForeground" Opacity="0.5" Color="{StaticResource SemiGrey9Color}" />
 
     <StaticResource x:Key="DateTimePickerButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
     <SolidColorBrush x:Key="DateTimePickerButtonDisabledBorderBrush" Color="Transparent" />
     <StaticResource x:Key="DateTimePickerButtonDisabledBackground" ResourceKey="SemiColorDisabledFill" />
-    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="#2E3238" />
+    <SolidColorBrush x:Key="DateTimePickerButtonDisabledIconForeground" Opacity="0.4" Color="{StaticResource SemiGrey8Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml
index fc45923..d14abe8 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Label.axaml
@@ -34,7 +34,7 @@
     <SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="{StaticResource SemiGrey5Color}" />
     <StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="SemiColorText0" />
     <SolidColorBrush x:Key="LabelTagLightWhiteBackground" Opacity="0.15" Color="White" />
-    <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="#C6CACD" />
+    <SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Color="{StaticResource SemiGrey2Color}" />
 
     <SolidColorBrush x:Key="LabelTagGhostRedBorderBrush" Color="{StaticResource SemiRed4Color}" />
     <SolidColorBrush x:Key="LabelTagGhostRedForeground" Color="{StaticResource SemiRed5Color}" />
@@ -68,7 +68,7 @@
     <SolidColorBrush x:Key="LabelTagGhostOrangeForeground" Color="{StaticResource SemiOrange5Color}" />
     <SolidColorBrush x:Key="LabelTagGhostGreyBorderBrush" Color="{StaticResource SemiGrey4Color}" />
     <SolidColorBrush x:Key="LabelTagGhostGreyForeground" Color="{StaticResource SemiGrey5Color}" />
-    <SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="#C6CACD" />
+    <SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Color="{StaticResource SemiGrey2Color}" />
     <StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="SemiColorText0" />
 
     <SolidColorBrush x:Key="LabelTagSolidForeground" Color="White" />
@@ -90,6 +90,6 @@
     <SolidColorBrush x:Key="LabelTagSolidGreyBackground" Color="{StaticResource SemiGrey5Color}" />
 
     <StaticResource x:Key="LabelTagSolidWhiteBackground" ResourceKey="SemiColorBackground4" />
-    <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="#C6CACD" />
+    <SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Color="{StaticResource SemiGrey2Color}" />
     <StaticResource x:Key="LabelTagSolidWhiteForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml
index 8f62b7b..aa317a9 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ManagedFileChooser.axaml
@@ -1,4 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ManagedFileChooserIconForeground" Opacity="0.65" Color="{StaticResource SemiGrey9Color}" />
     <StaticResource x:Key="ManagedFileChooserTextForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
index 738974a..f82cea3 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Menu.axaml
@@ -19,6 +19,6 @@
     <StaticResource x:Key="MenuItemExpandIconOpenForeground" ResourceKey="SemiColorText0" />
 
     <StaticResource x:Key="MenuItemDisabledForeground" ResourceKey="SemiColorDisabledText" />
-    <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="#1C1F23" />
+    <SolidColorBrush x:Key="MenuItemDisabledInputGestureTextForeground" Opacity="0.2" Color="{StaticResource SemiGrey9Color}" />
     <StaticResource x:Key="MenuItemDisabledExpandIconForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml
index 9b5eef3..35e3c35 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Slider.axaml
@@ -2,13 +2,13 @@
     <StaticResource x:Key="SliderTrackForeground" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="SliderTrackBackground" ResourceKey="SemiColorFill0" />
 
-    <SolidColorBrush x:Key="SliderTickForeground" Color="#C6CACD" />
+    <SolidColorBrush x:Key="SliderTickForeground" Color="{StaticResource SemiGrey2Color}" />
     <SolidColorBrush x:Key="SliderThumbBackground" Color="White" />
     <StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="SemiColorInformation" />
     <StaticResource x:Key="SliderThumbPointeroverBorderBrush" ResourceKey="SemiColorInformationPointerover" />
     <StaticResource x:Key="SliderThumbPressedBorderBrush" ResourceKey="SemiColorInformationPressed" />
 
-    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="#C6CACD" />
+    <SolidColorBrush x:Key="SliderTrackDisabledForeground" Color="{StaticResource SemiGrey2Color}" />
     <StaticResource x:Key="SliderThumbDisabledBorderBrush" ResourceKey="SemiBlue1" />
     <StaticResource x:Key="SliderTrackDisabledBackground" ResourceKey="SemiGrey0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
index 678ab18..e8b58af 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/TextBlock.axaml
@@ -7,10 +7,10 @@
     <StaticResource x:Key="TextBlockWarningForeground" ResourceKey="SemiColorWarning" />
     <StaticResource x:Key="TextBlockDangerForeground" ResourceKey="SemiColorDanger" />
     <StaticResource x:Key="TextBlockDisabledForeground" ResourceKey="SemiColorDisabledText" />
-    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#1C1F23" />
+    <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="{StaticResource SemiGrey9Color}" />
     <StaticResource x:Key="TextBlockMarkBackground" ResourceKey="SemiColorInformationLight" />
-    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.1" Color="#2E3238" />
-    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.2" Color="#2E3238" />
+    <SolidColorBrush x:Key="TextBlockCodeBackground" Opacity="0.1" Color="{StaticResource SemiGrey8Color}" />
+    <SolidColorBrush x:Key="TextBlockCodeBorderBrush" Opacity="0.2" Color="{StaticResource SemiGrey8Color}" />
 
     <SolidColorBrush x:Key="TextBlockSelectionBackground" Opacity="0.2" Color="{StaticResource SemiBlue5Color}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml
index 2338cd7..18f060b 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/ToggleButton.axaml
@@ -2,7 +2,7 @@
     <StaticResource x:Key="ToggleButtonDefaultBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="ToggleButtonDefaultPointeroverBackground" ResourceKey="SemiColorFill1" />
     <StaticResource x:Key="ToggleButtonDefaultPressedBackground" ResourceKey="SemiColorFill2" />
-    <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBackground" Color="#E6E8EA" />
+    <StaticResource x:Key="ToggleButtonDefaultDisabledBackground" ResourceKey="SemiColorDisabledBackground" />
     <SolidColorBrush x:Key="ToggleButtonDefaultDisabledBorderBrush" Color="Transparent" />
     <StaticResource x:Key="ToggleButtonDefaultDisabledForeground" ResourceKey="SemiColorDisabledText" />
 
diff --git a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Tooltip.axaml b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Tooltip.axaml
index ae8b4e4..d214bd6 100644
--- a/src/Semi.Avalonia/Themes/Schemes/Default/Light/Tooltip.axaml
+++ b/src/Semi.Avalonia/Themes/Schemes/Default/Light/Tooltip.axaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="ToolTipBackground" ResourceKey="SemiGrey7" />
+    <SolidColorBrush x:Key="ToolTipBackground" Color="{DynamicResource SemiGrey7Color}" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="White" />
     <SolidColorBrush x:Key="ToolTipBorderBrush" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file