From 8a5b13eb00309840caf3023de029405117bbf6c5 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 26 Jun 2024 18:37:53 +0800
Subject: [PATCH 1/7] feat: OnPointerPressed -> OnPointerReleased.

---
 src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml      | 2 ++
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml          | 6 +++---
 src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml     | 2 ++
 src/Ursa.Themes.Semi/Themes/Light/_index.axaml         | 6 +++---
 src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml    | 6 ++----
 src/Ursa.Themes.Semi/Themes/Shared/_index.axaml        | 5 ++---
 src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs  | 4 ++--
 src/Ursa/Controls/DateTimePicker/CalendarYearButton.cs | 4 ++--
 8 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml

diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index 7f6bc9c..e620005 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="DatePicker.axaml" />
         <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
@@ -15,6 +15,6 @@
         <MergeResourceInclude Source="TagInput.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
         <MergeResourceInclude Source="Skeleton.axaml" />
-        <MergeResourceInclude Source="TimeBox.axaml"/>
+        <MergeResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
new file mode 100644
index 0000000..d1981be
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
@@ -0,0 +1,2 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index 7f6bc9c..e620005 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -1,9 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
         <MergeResourceInclude Source="ButtonGroup.axaml" />
+        <MergeResourceInclude Source="DatePicker.axaml" />
         <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
@@ -15,6 +15,6 @@
         <MergeResourceInclude Source="TagInput.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
         <MergeResourceInclude Source="Skeleton.axaml" />
-        <MergeResourceInclude Source="TimeBox.axaml"/>
+        <MergeResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
index 1a1d32f..fe185a3 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
@@ -1,6 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StreamGeometry x:Key="CalendarViewFastForwardGlyph">M12.6185 4.39653C13.1272 4.92524 13.1272 5.78245 12.6185 6.31116L7.14483 12L12.6185 17.6888C13.1272 18.2176 13.1272 19.0748 12.6185 19.6035C12.1098 20.1322 11.285 20.1322 10.7763 19.6035L4.38153 12.9573C3.87282 12.4286 3.87282 11.5714 4.38153 11.0427L10.7763 4.39653C11.285 3.86782 12.1098 3.86782 12.6185 4.39653Z M19.6185 4.39653C20.1272 4.92524 20.1272 5.78245 19.6185 6.31116L14.1448 12L19.6185 17.6888C20.1272 18.2176 20.1272 19.0748 19.6185 19.6035C19.1098 20.1322 18.285 20.1322 17.7763 19.6035L11.3815 12.9573C10.8728 12.4286 10.8728 11.5714 11.3815 11.0427L17.7763 4.39653C18.285 3.86782 19.1098 3.86782 19.6185 4.39653Z</StreamGeometry>
     <StreamGeometry x:Key="CalendarViewFastBackwardGlyph">M4.38153 4.39653C4.89024 3.86782 5.71502 3.86782 6.22373 4.39653L12.6185 11.0427C13.1272 11.5714 13.1272 12.4286 12.6185 12.9573L6.22373 19.6035C5.71502 20.1322 4.89024 20.1322 4.38153 19.6035C3.87282 19.0748 3.87282 18.2176 4.38153 17.6888L9.85517 12L4.38153 6.31116C3.87282 5.78245 3.87282 4.92524 4.38153 4.39653Z M11.3815 4.39653C11.8902 3.86782 12.715 3.86782 13.2237 4.39653L19.6185 11.0427C20.1272 11.5714 20.1272 12.4286 19.6185 12.9573L13.2237 19.6035C12.715 20.1322 11.8902 20.1322 11.3815 19.6035C10.8728 19.0748 10.8728 18.2176 11.3815 17.6888L16.8552 12L11.3815 6.31116C10.8728 5.78245 10.8728 4.92524 11.3815 4.39653Z</StreamGeometry>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index 63174ae..9bdeb13 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -1,5 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
         <MergeResourceInclude Source="Badge.axaml" />
         <MergeResourceInclude Source="Banner.axaml" />
@@ -19,6 +18,6 @@
         <MergeResourceInclude Source="Skeleton.axaml" />
         <MergeResourceInclude Source="ThemeSelector.axaml" />
         <MergeResourceInclude Source="ToolBar.axaml" />
-        <MergeResourceInclude Source="TimeBox.axaml"/>
+        <MergeResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs b/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs
index d031745..cec8c74 100644
--- a/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs
+++ b/src/Ursa/Controls/DateTimePicker/CalendarDayButton.cs
@@ -169,9 +169,9 @@ public class CalendarDayButton : ContentControl
         remove => RemoveHandler(DateSelectedEvent, value);
     }
 
-    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    protected override void OnPointerReleased(PointerReleasedEventArgs e)
     {
-        base.OnPointerPressed(e);
+        base.OnPointerReleased(e);
         if (DataContext is DateTime d)
             RaiseEvent(new CalendarDayButtonEventArgs(d) { RoutedEvent = DateSelectedEvent, Source = this });
     }
diff --git a/src/Ursa/Controls/DateTimePicker/CalendarYearButton.cs b/src/Ursa/Controls/DateTimePicker/CalendarYearButton.cs
index daea445..0ed4282 100644
--- a/src/Ursa/Controls/DateTimePicker/CalendarYearButton.cs
+++ b/src/Ursa/Controls/DateTimePicker/CalendarYearButton.cs
@@ -59,9 +59,9 @@ public class CalendarYearButton : ContentControl
         IsEnabled = Content != null;
     }
 
-    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    protected override void OnPointerReleased(PointerReleasedEventArgs e)
     {
-        base.OnPointerPressed(e);
+        base.OnPointerReleased(e);
         RaiseEvent(new CalendarYearButtonEventArgs(Mode, this.CalendarContext.Clone())
             { RoutedEvent = ItemSelectedEvent, Source = this });
     }

From c05572b0ad24f20fbff07804dcb5149250269984 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 26 Jun 2024 18:51:09 +0800
Subject: [PATCH 2/7] feat: replace colors.

---
 src/Ursa.Themes.Semi/Controls/Calendar.axaml | 100 ++++++++++++-------
 1 file changed, 62 insertions(+), 38 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 2fe6a6f..7a5a499 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -3,11 +3,13 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
     <Design.PreviewWith>
-        <StackPanel Margin="20" Spacing="5">
-            <u:CalendarView />
-        </StackPanel>
+        <ThemeVariantScope RequestedThemeVariant="Dark">
+            <StackPanel Width="600" Height="400">
+                <u:DatePicker HorizontalAlignment="Stretch" />
+                <u:DateRangePicker />
+            </StackPanel>
+        </ThemeVariantScope>
     </Design.PreviewWith>
-    <!--  Add Resources Here  -->
     <ControlTheme x:Key="{x:Type u:CalendarDayButton}" TargetType="u:CalendarDayButton">
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
@@ -38,15 +40,18 @@
         </Setter>
 
         <Style Selector="^:in-range">
-            <Setter Property="Background" Value="{DynamicResource SemiBlue1}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLight}" />
             <Setter Property="CornerRadius" Value="0" />
             <Setter Property="BorderThickness" Value="0" />
         </Style>
 
         <Style Selector="^:today">
-            <Setter Property="Background" Value="{DynamicResource SemiGrey1}" />
-            <Setter Property="Foreground" Value="{DynamicResource SemiBlue5}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiColorPrimary}" />
             <Setter Property="Cursor" Value="Hand" />
+            <Style Selector="^:in-range">
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLight}" />
+            </Style>
         </Style>
 
         <Style Selector="^:not-current-month">
@@ -54,69 +59,85 @@
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource SemiGrey1}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
 
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource SemiColorFill1}" />
+        </Style>
+
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource SemiBlue5}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiBlue6}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPressed}" />
             </Style>
         </Style>
 
 
         <Style Selector="^:start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource SemiBlue5}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiBlue5}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimary}" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiBlue6}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPressed}" />
+            </Style>
+            <Style Selector="^:in-range">
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimaryPressed}" />
+                <Setter Property="BorderThickness" Value="1" />
             </Style>
-        </Style>
-        <Style Selector="^:start-date:in-range">
-            <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource SemiBlue5}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiGrey5}" />
-            <Setter Property="BorderThickness" Value="1" />
         </Style>
 
         <Style Selector="^:end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource SemiBlue5}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiBlue5}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimary}" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiBlue6}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
+            </Style>
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPressed}" />
+            </Style>
+            <Style Selector="^:in-range">
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimaryPressed}" />
+                <Setter Property="BorderThickness" Value="1" />
             </Style>
-        </Style>
-
-        <Style Selector="^:end-date:in-range">
-            <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource SemiBlue5}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiGrey5}" />
-            <Setter Property="BorderThickness" Value="1" />
         </Style>
 
         <Style Selector="^:preview-start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource SemiBlue2}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiBlue2}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightPointerover}" />
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightActive}" />
+            </Style>
         </Style>
 
         <Style Selector="^:preview-end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource SemiBlue2}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiBlue2}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightPointerover}" />
+            <Style Selector="^:pressed">
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightActive}" />
+            </Style>
         </Style>
 
         <Style Selector="^:blackout">
-            <Setter Property="Foreground" Value="{DynamicResource SemiGrey3}" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorDisabledFill}" />
             <Setter Property="Cursor" Value="No" />
+            <Style Selector="^:today">
+                <Setter Property="Foreground" Value="{DynamicResource SemiColorPrimaryDisabled}" />
+            </Style>
         </Style>
     </ControlTheme>
 
@@ -148,16 +169,19 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource SemiGrey1}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource SemiColorFill1}" />
+        </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource SemiBlue5}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiBlue6}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -264,4 +288,4 @@
         </Setter>
     </ControlTheme>
 
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file

From fdb382d03b31293ca8cea8d0f0701b5314b4b15c Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 26 Jun 2024 21:16:31 +0800
Subject: [PATCH 3/7] feat: extract semi resources.

---
 src/Ursa.Themes.Semi/Controls/Calendar.axaml  | 62 +++++++++----------
 .../Themes/Dark/DatePicker.axaml              | 30 +++++++++
 .../Themes/Light/DatePicker.axaml             | 30 +++++++++
 3 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 7a5a499..d1b3b33 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -40,103 +40,103 @@
         </Setter>
 
         <Style Selector="^:in-range">
-            <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLight}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayInRangeBackground}" />
             <Setter Property="CornerRadius" Value="0" />
             <Setter Property="BorderThickness" Value="0" />
         </Style>
 
         <Style Selector="^:today">
-            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
-            <Setter Property="Foreground" Value="{DynamicResource SemiColorPrimary}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayTodayBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayTodayForeground}" />
             <Setter Property="Cursor" Value="Hand" />
             <Style Selector="^:in-range">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLight}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDayInRangeBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:not-current-month">
-            <Setter Property="Foreground" Value="{DynamicResource SemiGrey3}" />
+            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayNotCurrentMonthForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayPointeroverBackground}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource SemiColorFill1}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayPressedBackground}" />
         </Style>
 
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPressed}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedPressedBackground}" />
             </Style>
         </Style>
 
 
         <Style Selector="^:start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimary}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPressed}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePressedBackground}" />
             </Style>
             <Style Selector="^:in-range">
-                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimaryPressed}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateInRangeBackground}" />
                 <Setter Property="BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimary}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPressed}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePressedBackground}" />
             </Style>
             <Style Selector="^:in-range">
-                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorPrimaryPressed}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateInRangeBackground}" />
                 <Setter Property="BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightPointerover}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightActive}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDatePressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightPointerover}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryLightActive}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDatePressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:blackout">
-            <Setter Property="Foreground" Value="{DynamicResource SemiColorDisabledText}" />
-            <Setter Property="Background" Value="{DynamicResource SemiColorDisabledFill}" />
+            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayBlackoutForeground}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerDayBlackoutBackground}" />
             <Setter Property="Cursor" Value="No" />
             <Style Selector="^:today">
-                <Setter Property="Foreground" Value="{DynamicResource SemiColorPrimaryDisabled}" />
+                <Setter Property="Foreground" Value="{DynamicResource DatePickerDayBlackoutTodayBackground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -169,19 +169,19 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource SemiColorFill0}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerYearPointeroverBackground}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource SemiColorFill1}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerYearPressedBackground}" />
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource SemiColorPrimary}" />
+            <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Foreground" Value="White" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource SemiColorPrimaryPointerover}" />
+                <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedPointeroverBackground}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
index d1981be..2e67cf7 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -1,2 +1,32 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--CalenderDayButton-->
+    <StaticResource x:Key="DatePickerDayInRangeBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="DatePickerDayTodayBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DatePickerDayTodayForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDayNotCurrentMonthForeground" ResourceKey="SemiGrey3" />
+    <StaticResource x:Key="DatePickerDayPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DatePickerDayPressedBackground" ResourceKey="SemiColorFill1" />
+
+    <StaticResource x:Key="DatePickerDaySelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDaySelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="DatePickerDaySelectedPressedBackground" ResourceKey="SemiColorPrimaryPressed" />
+
+    <StaticResource x:Key="DatePickerDayStartEndDateBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDayStartEndDateBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDayStartEndDatePointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="DatePickerDayStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryPressed" />
+    <StaticResource x:Key="DatePickerDayStartEndDateInRangeBackground" ResourceKey="SemiColorPrimaryPressed" />
+
+    <StaticResource x:Key="DatePickerDayPreviewStartEndDateBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="DatePickerDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+
+    <StaticResource x:Key="DatePickerDayBlackoutForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="DatePickerDayBlackoutBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="DatePickerDayBlackoutTodayBackground" ResourceKey="SemiColorPrimaryDisabled" />
+
+    <!--CalenderYearButton-->
+    <StaticResource x:Key="DatePickerYearPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DatePickerYearPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="DatePickerYearSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerYearSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
index d1981be..2e67cf7 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
@@ -1,2 +1,32 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--CalenderDayButton-->
+    <StaticResource x:Key="DatePickerDayInRangeBackground" ResourceKey="SemiColorPrimaryLight" />
+    <StaticResource x:Key="DatePickerDayTodayBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DatePickerDayTodayForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDayNotCurrentMonthForeground" ResourceKey="SemiGrey3" />
+    <StaticResource x:Key="DatePickerDayPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DatePickerDayPressedBackground" ResourceKey="SemiColorFill1" />
+
+    <StaticResource x:Key="DatePickerDaySelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDaySelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="DatePickerDaySelectedPressedBackground" ResourceKey="SemiColorPrimaryPressed" />
+
+    <StaticResource x:Key="DatePickerDayStartEndDateBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDayStartEndDateBorderBrush" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerDayStartEndDatePointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <StaticResource x:Key="DatePickerDayStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryPressed" />
+    <StaticResource x:Key="DatePickerDayStartEndDateInRangeBackground" ResourceKey="SemiColorPrimaryPressed" />
+
+    <StaticResource x:Key="DatePickerDayPreviewStartEndDateBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
+    <StaticResource x:Key="DatePickerDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+
+    <StaticResource x:Key="DatePickerDayBlackoutForeground" ResourceKey="SemiColorDisabledText" />
+    <StaticResource x:Key="DatePickerDayBlackoutBackground" ResourceKey="SemiColorDisabledFill" />
+    <StaticResource x:Key="DatePickerDayBlackoutTodayBackground" ResourceKey="SemiColorPrimaryDisabled" />
+
+    <!--CalenderYearButton-->
+    <StaticResource x:Key="DatePickerYearPointeroverBackground" ResourceKey="SemiColorFill0" />
+    <StaticResource x:Key="DatePickerYearPressedBackground" ResourceKey="SemiColorFill1" />
+    <StaticResource x:Key="DatePickerYearSelectedBackground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="DatePickerYearSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
 </ResourceDictionary>
\ No newline at end of file

From 69f660faadde38b32a06a115d3c1a9e1d74579a0 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 26 Jun 2024 22:25:59 +0800
Subject: [PATCH 4/7] feat: specify colors.

---
 .../Themes/Dark/DatePicker.axaml              | 46 +++++++++----------
 .../Themes/Light/DatePicker.axaml             | 46 +++++++++----------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
index 2e67cf7..d3355f8 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -1,32 +1,32 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
-    <StaticResource x:Key="DatePickerDayInRangeBackground" ResourceKey="SemiColorPrimaryLight" />
-    <StaticResource x:Key="DatePickerDayTodayBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="DatePickerDayTodayForeground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDayNotCurrentMonthForeground" ResourceKey="SemiGrey3" />
-    <StaticResource x:Key="DatePickerDayPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="DatePickerDayPressedBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerDayNotCurrentMonthForeground" Color="#555B61" />
+    <SolidColorBrush x:Key="DatePickerDayPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.16" Color="White" />
 
-    <StaticResource x:Key="DatePickerDaySelectedBackground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDaySelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
-    <StaticResource x:Key="DatePickerDaySelectedPressedBackground" ResourceKey="SemiColorPrimaryPressed" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#A9D7FF" />
 
-    <StaticResource x:Key="DatePickerDayStartEndDateBackground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDayStartEndDateBorderBrush" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDayStartEndDatePointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
-    <StaticResource x:Key="DatePickerDayStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryPressed" />
-    <StaticResource x:Key="DatePickerDayStartEndDateInRangeBackground" ResourceKey="SemiColorPrimaryPressed" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDateBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDateBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDatePointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDatePressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDateInRangeBackground" Color="#A9D7FF" />
 
-    <StaticResource x:Key="DatePickerDayPreviewStartEndDateBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
-    <StaticResource x:Key="DatePickerDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDateBackground" Opacity="0.3" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDatePressedBackground" Opacity="0.4" Color="#54A9FF" />
 
-    <StaticResource x:Key="DatePickerDayBlackoutForeground" ResourceKey="SemiColorDisabledText" />
-    <StaticResource x:Key="DatePickerDayBlackoutBackground" ResourceKey="SemiColorDisabledFill" />
-    <StaticResource x:Key="DatePickerDayBlackoutTodayBackground" ResourceKey="SemiColorPrimaryDisabled" />
+    <SolidColorBrush x:Key="DatePickerDayBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="DatePickerDayBlackoutBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#135CB8" />
 
     <!--CalenderYearButton-->
-    <StaticResource x:Key="DatePickerYearPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="DatePickerYearPressedBackground" ResourceKey="SemiColorFill1" />
-    <StaticResource x:Key="DatePickerYearSelectedBackground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerYearSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#7FC1FF" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
index 2e67cf7..ea95af3 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
@@ -1,32 +1,32 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
-    <StaticResource x:Key="DatePickerDayInRangeBackground" ResourceKey="SemiColorPrimaryLight" />
-    <StaticResource x:Key="DatePickerDayTodayBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="DatePickerDayTodayForeground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDayNotCurrentMonthForeground" ResourceKey="SemiGrey3" />
-    <StaticResource x:Key="DatePickerDayPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="DatePickerDayPressedBackground" ResourceKey="SemiColorFill1" />
+    <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="DatePickerDayNotCurrentMonthForeground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="DatePickerDayPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.09" Color="#2E3238" />
 
-    <StaticResource x:Key="DatePickerDaySelectedBackground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDaySelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
-    <StaticResource x:Key="DatePickerDaySelectedPressedBackground" ResourceKey="SemiColorPrimaryPressed" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#004FB3" />
 
-    <StaticResource x:Key="DatePickerDayStartEndDateBackground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDayStartEndDateBorderBrush" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerDayStartEndDatePointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
-    <StaticResource x:Key="DatePickerDayStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryPressed" />
-    <StaticResource x:Key="DatePickerDayStartEndDateInRangeBackground" ResourceKey="SemiColorPrimaryPressed" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDateBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDateBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDatePointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDatePressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="DatePickerDayStartEndDateInRangeBackground" Color="#004FB3" />
 
-    <StaticResource x:Key="DatePickerDayPreviewStartEndDateBackground" ResourceKey="SemiColorPrimaryLightPointerover" />
-    <StaticResource x:Key="DatePickerDayPreviewStartEndDatePressedBackground" ResourceKey="SemiColorPrimaryLightActive" />
+    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDateBackground" Color="#CBE7FE" />
+    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDatePressedBackground" Color="#98CDFD" />
 
-    <StaticResource x:Key="DatePickerDayBlackoutForeground" ResourceKey="SemiColorDisabledText" />
-    <StaticResource x:Key="DatePickerDayBlackoutBackground" ResourceKey="SemiColorDisabledFill" />
-    <StaticResource x:Key="DatePickerDayBlackoutTodayBackground" ResourceKey="SemiColorPrimaryDisabled" />
+    <SolidColorBrush x:Key="DatePickerDayBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="DatePickerDayBlackoutBackground" Opacity="0.02" Color="#2E3238" />
+    <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#98CDFD" />
 
     <!--CalenderYearButton-->
-    <StaticResource x:Key="DatePickerYearPointeroverBackground" ResourceKey="SemiColorFill0" />
-    <StaticResource x:Key="DatePickerYearPressedBackground" ResourceKey="SemiColorFill1" />
-    <StaticResource x:Key="DatePickerYearSelectedBackground" ResourceKey="SemiColorPrimary" />
-    <StaticResource x:Key="DatePickerYearSelectedPointeroverBackground" ResourceKey="SemiColorPrimaryPointerover" />
+    <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#0062D6" />
 </ResourceDictionary>
\ No newline at end of file

From c78bb5e7aaa0f9037529b6f67c4b6a7a7ff9c48e Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 26 Jun 2024 22:33:32 +0800
Subject: [PATCH 5/7] feat: white & transparent color.

---
 src/Ursa.Themes.Semi/Controls/Calendar.axaml   | 18 +++++++++---------
 .../Themes/Dark/DatePicker.axaml               |  9 +++++++++
 .../Themes/Light/DatePicker.axaml              |  9 +++++++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index d1b3b33..4f17593 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -14,8 +14,8 @@
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Margin" Value="0 2" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Background" Value="{DynamicResource DatePickerDayBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="CornerRadius" Value="3" />
@@ -71,7 +71,7 @@
             <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Foreground" Value="White" />
+            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedPointeroverBackground}" />
             </Style>
@@ -85,7 +85,7 @@
             <Setter Property="CornerRadius" Value="3 0 0 3" />
             <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
-            <Setter Property="Foreground" Value="White" />
+            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
             </Style>
@@ -102,7 +102,7 @@
             <Setter Property="CornerRadius" Value="0 3 3 0" />
             <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
-            <Setter Property="Foreground" Value="White" />
+            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
             </Style>
@@ -145,8 +145,8 @@
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Margin" Value="0 2" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Background" Value="{DynamicResource DatePickerYearBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerYearBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Template">
@@ -179,7 +179,7 @@
             <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Foreground" Value="White" />
+            <Setter Property="Foreground" Value="{DynamicResource DatePickerYearSelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedPointeroverBackground}" />
             </Style>
@@ -189,7 +189,7 @@
     <ControlTheme x:Key="{x:Type u:CalendarView}" TargetType="u:CalendarView">
         <Setter Property="MinHeight" Value="260" />
         <Setter Property="MinWidth" Value="260" />
-        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Background" Value="{DynamicResource DatePickerViewBackground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarView">
                 <Grid Background="{TemplateBinding Background}" RowDefinitions="Auto, *">
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
index d3355f8..047db10 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -1,5 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
+    <SolidColorBrush x:Key="DatePickerDayBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DatePickerDayBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
     <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#54A9FF" />
@@ -8,6 +10,7 @@
     <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.16" Color="White" />
 
     <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedForeground" Color="White" />
     <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#7FC1FF" />
     <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#A9D7FF" />
 
@@ -25,8 +28,14 @@
     <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#135CB8" />
 
     <!--CalenderYearButton-->
+    <SolidColorBrush x:Key="DatePickerYearBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DatePickerYearBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.12" Color="White" />
     <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.16" Color="White" />
     <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="DatePickerYearSelectedForeground" Color="White" />
     <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#7FC1FF" />
+
+    <!--CalenderView-->
+    <SolidColorBrush x:Key="DatePickerViewBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
index ea95af3..6c309f6 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
@@ -1,5 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
+    <SolidColorBrush x:Key="DatePickerDayBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DatePickerDayBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Color="#EAF5FF" />
     <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#0077FA" />
@@ -8,6 +10,7 @@
     <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.09" Color="#2E3238" />
 
     <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="DatePickerDaySelectedForeground" Color="White" />
     <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#0062D6" />
     <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#004FB3" />
 
@@ -25,8 +28,14 @@
     <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#98CDFD" />
 
     <!--CalenderYearButton-->
+    <SolidColorBrush x:Key="DatePickerYearBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="DatePickerYearBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.05" Color="#2E3238" />
     <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.09" Color="#2E3238" />
     <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="DatePickerYearSelectedForeground" Color="White" />
     <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#0062D6" />
+
+    <!--CalenderView-->
+    <SolidColorBrush x:Key="DatePickerViewBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file

From ad0b5419e0602a1cee6a0a7efe66e25e27acd14c Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:01:29 +0800
Subject: [PATCH 6/7] misc: rename resource key.

---
 src/Ursa.Themes.Semi/Controls/Calendar.axaml  | 78 +++++++++----------
 .../Themes/Dark/DatePicker.axaml              | 60 +++++++-------
 .../Themes/Light/DatePicker.axaml             | 60 +++++++-------
 3 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 4f17593..9ac66b4 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -14,8 +14,8 @@
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Margin" Value="0 2" />
-        <Setter Property="Background" Value="{DynamicResource DatePickerDayBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="CornerRadius" Value="3" />
@@ -40,103 +40,103 @@
         </Setter>
 
         <Style Selector="^:in-range">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayInRangeBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
             <Setter Property="CornerRadius" Value="0" />
             <Setter Property="BorderThickness" Value="0" />
         </Style>
 
         <Style Selector="^:today">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayTodayBackground}" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayTodayForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayTodayBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDayTodayForeground}" />
             <Setter Property="Cursor" Value="Hand" />
             <Style Selector="^:in-range">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayInRangeBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:not-current-month">
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayNotCurrentMonthForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDayNotCurrentMonthForeground}" />
         </Style>
 
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPointeroverBackground}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
 
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPressedBackground}" />
         </Style>
 
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedPointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDaySelectedPressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedPressedBackground}" />
             </Style>
         </Style>
 
 
         <Style Selector="^:start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePressedBackground}" />
             </Style>
             <Style Selector="^:in-range">
-                <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateInRangeBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
                 <Setter Property="BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDateBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateBorderBrush}" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDaySelectedForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePointeroverBackground}" />
             </Style>
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDatePressedBackground}" />
             </Style>
             <Style Selector="^:in-range">
-                <Setter Property="BorderBrush" Value="{DynamicResource DatePickerDayStartEndDateInRangeBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
                 <Setter Property="BorderThickness" Value="1" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-start-date">
             <Setter Property="CornerRadius" Value="3 0 0 3" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDateBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-end-date">
             <Setter Property="CornerRadius" Value="0 3 3 0" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDateBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
-                <Setter Property="Background" Value="{DynamicResource DatePickerDayPreviewStartEndDatePressedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:blackout">
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerDayBlackoutForeground}" />
-            <Setter Property="Background" Value="{DynamicResource DatePickerDayBlackoutBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderDayBlackoutForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderDayBlackoutBackground}" />
             <Setter Property="Cursor" Value="No" />
             <Style Selector="^:today">
-                <Setter Property="Foreground" Value="{DynamicResource DatePickerDayBlackoutTodayBackground}" />
+                <Setter Property="Foreground" Value="{DynamicResource CalenderDayBlackoutTodayBackground}" />
             </Style>
         </Style>
     </ControlTheme>
@@ -145,8 +145,8 @@
         <Setter Property="MinWidth" Value="32" />
         <Setter Property="MinHeight" Value="32" />
         <Setter Property="Margin" Value="0 2" />
-        <Setter Property="Background" Value="{DynamicResource DatePickerYearBackground}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource DatePickerYearBorderBrush}" />
+        <Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="CornerRadius" Value="3" />
         <Setter Property="Template">
@@ -169,19 +169,19 @@
             </ControlTemplate>
         </Setter>
         <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource DatePickerYearPointeroverBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderYearPointeroverBackground}" />
             <Setter Property="Cursor" Value="Hand" />
         </Style>
         <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource DatePickerYearPressedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderYearPressedBackground}" />
         </Style>
         <Style Selector="^:selected">
-            <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedBackground}" />
+            <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedBackground}" />
             <Setter Property="CornerRadius" Value="3" />
             <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Foreground" Value="{DynamicResource DatePickerYearSelectedForeground}" />
+            <Setter Property="Foreground" Value="{DynamicResource CalenderYearSelectedForeground}" />
             <Style Selector="^:pointerover">
-                <Setter Property="Background" Value="{DynamicResource DatePickerYearSelectedPointeroverBackground}" />
+                <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedPointeroverBackground}" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
index 047db10..663edbd 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/DatePicker.axaml
@@ -1,41 +1,41 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
-    <SolidColorBrush x:Key="DatePickerDayBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayNotCurrentMonthForeground" Color="#555B61" />
-    <SolidColorBrush x:Key="DatePickerDayPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Opacity="0.2" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayTodayBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="#555B61" />
+    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CalenderDayPressedBackground" Opacity="0.16" Color="White" />
 
-    <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePointeroverBackground" Color="#7FC1FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePressedBackground" Color="#A9D7FF" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateInRangeBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="#A9D7FF" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="#A9D7FF" />
 
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDateBackground" Opacity="0.3" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDatePressedBackground" Opacity="0.4" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Opacity="0.3" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Opacity="0.4" Color="#54A9FF" />
 
-    <SolidColorBrush x:Key="DatePickerDayBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutBackground" Opacity="0.04" Color="#E6E8EA" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#135CB8" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Opacity="0.35" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Opacity="0.04" Color="#E6E8EA" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="#135CB8" />
 
     <!--CalenderYearButton-->
-    <SolidColorBrush x:Key="DatePickerYearBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.12" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.16" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#54A9FF" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#7FC1FF" />
+    <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Opacity="0.12" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearPressedBackground" Opacity="0.16" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="#54A9FF" />
+    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="#7FC1FF" />
 
     <!--CalenderView-->
-    <SolidColorBrush x:Key="DatePickerViewBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
index 6c309f6..23fad7a 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/DatePicker.axaml
@@ -1,41 +1,41 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--CalenderDayButton-->
-    <SolidColorBrush x:Key="DatePickerDayBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerDayInRangeBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="DatePickerDayTodayBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerDayTodayForeground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDayNotCurrentMonthForeground" Color="#A7ABB0" />
-    <SolidColorBrush x:Key="DatePickerDayPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerDayPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="CalenderDayTodayBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayTodayForeground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="#A7ABB0" />
+    <SolidColorBrush x:Key="CalenderDayPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayPressedBackground" Opacity="0.09" Color="#2E3238" />
 
-    <SolidColorBrush x:Key="DatePickerDaySelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="DatePickerDaySelectedPressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePointeroverBackground" Color="#0062D6" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDatePressedBackground" Color="#004FB3" />
-    <SolidColorBrush x:Key="DatePickerDayStartEndDateInRangeBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="#004FB3" />
+    <SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="#004FB3" />
 
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDateBackground" Color="#CBE7FE" />
-    <SolidColorBrush x:Key="DatePickerDayPreviewStartEndDatePressedBackground" Color="#98CDFD" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="#CBE7FE" />
+    <SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="#98CDFD" />
 
-    <SolidColorBrush x:Key="DatePickerDayBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutBackground" Opacity="0.02" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerDayBlackoutTodayBackground" Color="#98CDFD" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutForeground" Opacity="0.35" Color="#1C1F23" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutBackground" Opacity="0.02" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="#98CDFD" />
 
     <!--CalenderYearButton-->
-    <SolidColorBrush x:Key="DatePickerYearBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearBorderBrush" Color="Transparent" />
-    <SolidColorBrush x:Key="DatePickerYearPointeroverBackground" Opacity="0.05" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerYearPressedBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedBackground" Color="#0077FA" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedForeground" Color="White" />
-    <SolidColorBrush x:Key="DatePickerYearSelectedPointeroverBackground" Color="#0062D6" />
+    <SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderYearPointeroverBackground" Opacity="0.05" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderYearPressedBackground" Opacity="0.09" Color="#2E3238" />
+    <SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="#0077FA" />
+    <SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="White" />
+    <SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="#0062D6" />
 
     <!--CalenderView-->
-    <SolidColorBrush x:Key="DatePickerViewBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
 </ResourceDictionary>
\ No newline at end of file

From 1ec3e85d8224719acccf1e3304047f6c868402a6 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:22:02 +0800
Subject: [PATCH 7/7] feat: extract shared resources.

---
 src/Ursa.Themes.Semi/Controls/Calendar.axaml  | 64 +++++++++----------
 .../Themes/Shared/DatePicker.axaml            | 26 ++++++++
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Calendar.axaml b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
index 9ac66b4..8cc7683 100644
--- a/src/Ursa.Themes.Semi/Controls/Calendar.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Calendar.axaml
@@ -11,14 +11,14 @@
         </ThemeVariantScope>
     </Design.PreviewWith>
     <ControlTheme x:Key="{x:Type u:CalendarDayButton}" TargetType="u:CalendarDayButton">
-        <Setter Property="MinWidth" Value="32" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="Margin" Value="0 2" />
+        <Setter Property="MinWidth" Value="{DynamicResource CalenderDayMinWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderDayMinHeight}" />
+        <Setter Property="Margin" Value="{DynamicResource CalenderDayMargin}" />
         <Setter Property="Background" Value="{DynamicResource CalenderDayBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayCornerRadius}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarDayButton">
                 <Panel>
@@ -41,8 +41,8 @@
 
         <Style Selector="^:in-range">
             <Setter Property="Background" Value="{DynamicResource CalenderDayInRangeBackground}" />
-            <Setter Property="CornerRadius" Value="0" />
-            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayInRangeCornerRadius}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" />
         </Style>
 
         <Style Selector="^:today">
@@ -69,8 +69,8 @@
 
         <Style Selector="^:selected">
             <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedBackground}" />
-            <Setter Property="CornerRadius" Value="3" />
-            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayCornerRadius}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayNoBorderThickness}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource CalenderDaySelectedPointeroverBackground}" />
@@ -82,7 +82,7 @@
 
 
         <Style Selector="^:start-date">
-            <Setter Property="CornerRadius" Value="3 0 0 3" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayStartDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
@@ -94,12 +94,12 @@
             </Style>
             <Style Selector="^:in-range">
                 <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
-                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
             </Style>
         </Style>
 
         <Style Selector="^:end-date">
-            <Setter Property="CornerRadius" Value="0 3 3 0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayEndDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayStartEndDateBackground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateBorderBrush}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderDaySelectedForeground}" />
@@ -111,12 +111,12 @@
             </Style>
             <Style Selector="^:in-range">
                 <Setter Property="BorderBrush" Value="{DynamicResource CalenderDayStartEndDateInRangeBackground}" />
-                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="BorderThickness" Value="{DynamicResource CalenderDayBorderThickness}" />
             </Style>
         </Style>
 
         <Style Selector="^:preview-start-date">
-            <Setter Property="CornerRadius" Value="3 0 0 3" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayStartDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
@@ -124,7 +124,7 @@
         </Style>
 
         <Style Selector="^:preview-end-date">
-            <Setter Property="CornerRadius" Value="0 3 3 0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderDayEndDateCornerRadius}" />
             <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDateBackground}" />
             <Style Selector="^:pressed">
                 <Setter Property="Background" Value="{DynamicResource CalenderDayPreviewStartEndDatePressedBackground}" />
@@ -142,13 +142,13 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type u:CalendarYearButton}" TargetType="u:CalendarYearButton">
-        <Setter Property="MinWidth" Value="32" />
-        <Setter Property="MinHeight" Value="32" />
-        <Setter Property="Margin" Value="0 2" />
+        <Setter Property="MinWidth" Value="{DynamicResource CalenderYearMinWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderYearMinHeight }" />
+        <Setter Property="Margin" Value="{DynamicResource CalenderYearMargin}" />
         <Setter Property="Background" Value="{DynamicResource CalenderYearBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource CalenderYearBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CornerRadius" Value="3" />
+        <Setter Property="BorderThickness" Value="{DynamicResource CalenderYearBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource CalenderYearCornerRadius}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarDayButton">
                 <Panel>
@@ -177,8 +177,8 @@
         </Style>
         <Style Selector="^:selected">
             <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedBackground}" />
-            <Setter Property="CornerRadius" Value="3" />
-            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource CalenderYearCornerRadius}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource CalenderYearSelectedBorderThickness}" />
             <Setter Property="Foreground" Value="{DynamicResource CalenderYearSelectedForeground}" />
             <Style Selector="^:pointerover">
                 <Setter Property="Background" Value="{DynamicResource CalenderYearSelectedPointeroverBackground}" />
@@ -187,8 +187,8 @@
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type u:CalendarView}" TargetType="u:CalendarView">
-        <Setter Property="MinHeight" Value="260" />
-        <Setter Property="MinWidth" Value="260" />
+        <Setter Property="MinHeight" Value="{DynamicResource CalenderViewMinWidth}" />
+        <Setter Property="MinWidth" Value="{DynamicResource CalenderViewMinHeight}" />
         <Setter Property="Background" Value="{DynamicResource DatePickerViewBackground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:CalendarView">
@@ -204,8 +204,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarViewFastForwardGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -217,8 +217,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarItemPreviousIconGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -251,8 +251,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarItemNextIconGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
@@ -263,8 +263,8 @@
                             Foreground="{TemplateBinding Foreground}"
                             Theme="{DynamicResource BorderlessButton}">
                             <PathIcon
-                                Width="12"
-                                Height="12"
+                                Width="{DynamicResource CalenderViewPathIconWidth}"
+                                Height="{DynamicResource CalenderViewPathIconHeight}"
                                 Data="{DynamicResource CalendarViewFastBackwardGlyph}"
                                 Foreground="{DynamicResource CalendarItemIconForeground}" />
                         </Button>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml b/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
index fe185a3..0cfcfe6 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/DatePicker.axaml
@@ -1,4 +1,30 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--CalenderDayButton-->
+    <x:Double x:Key="CalenderDayMinWidth">32</x:Double>
+    <x:Double x:Key="CalenderDayMinHeight">32</x:Double>
+    <Thickness x:Key="CalenderDayMargin">0 2</Thickness>
+    <Thickness x:Key="CalenderDayBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CalenderDayCornerRadius">3</CornerRadius>
+
+    <CornerRadius x:Key="CalenderDayInRangeCornerRadius">0</CornerRadius>
+    <Thickness x:Key="CalenderDayNoBorderThickness">0</Thickness>
+
+    <CornerRadius x:Key="CalenderDayStartDateCornerRadius">3 0 0 3</CornerRadius>
+    <CornerRadius x:Key="CalenderDayEndDateCornerRadius">0 3 3 0</CornerRadius>
+
+    <!--CalenderYearButton-->
+    <x:Double x:Key="CalenderYearMinWidth">32</x:Double>
+    <x:Double x:Key="CalenderYearMinHeight">32</x:Double>
+    <Thickness x:Key="CalenderYearMargin">0 2</Thickness>
+    <Thickness x:Key="CalenderYearBorderThickness">1</Thickness>
+    <CornerRadius x:Key="CalenderYearCornerRadius">3</CornerRadius>
+    <Thickness x:Key="CalenderYearSelectedBorderThickness">0</Thickness>
+
+    <!--CalenderView-->
+    <x:Double x:Key="CalenderViewMinWidth">260</x:Double>
+    <x:Double x:Key="CalenderViewMinHeight">260</x:Double>
+    <x:Double x:Key="CalenderViewPathIconWidth">12</x:Double>
+    <x:Double x:Key="CalenderViewPathIconHeight">12</x:Double>
     <StreamGeometry x:Key="CalendarViewFastForwardGlyph">M12.6185 4.39653C13.1272 4.92524 13.1272 5.78245 12.6185 6.31116L7.14483 12L12.6185 17.6888C13.1272 18.2176 13.1272 19.0748 12.6185 19.6035C12.1098 20.1322 11.285 20.1322 10.7763 19.6035L4.38153 12.9573C3.87282 12.4286 3.87282 11.5714 4.38153 11.0427L10.7763 4.39653C11.285 3.86782 12.1098 3.86782 12.6185 4.39653Z M19.6185 4.39653C20.1272 4.92524 20.1272 5.78245 19.6185 6.31116L14.1448 12L19.6185 17.6888C20.1272 18.2176 20.1272 19.0748 19.6185 19.6035C19.1098 20.1322 18.285 20.1322 17.7763 19.6035L11.3815 12.9573C10.8728 12.4286 10.8728 11.5714 11.3815 11.0427L17.7763 4.39653C18.285 3.86782 19.1098 3.86782 19.6185 4.39653Z</StreamGeometry>
     <StreamGeometry x:Key="CalendarViewFastBackwardGlyph">M4.38153 4.39653C4.89024 3.86782 5.71502 3.86782 6.22373 4.39653L12.6185 11.0427C13.1272 11.5714 13.1272 12.4286 12.6185 12.9573L6.22373 19.6035C5.71502 20.1322 4.89024 20.1322 4.38153 19.6035C3.87282 19.0748 3.87282 18.2176 4.38153 17.6888L9.85517 12L4.38153 6.31116C3.87282 5.78245 3.87282 4.92524 4.38153 4.39653Z M11.3815 4.39653C11.8902 3.86782 12.715 3.86782 13.2237 4.39653L19.6185 11.0427C20.1272 11.5714 20.1272 12.4286 19.6185 12.9573L13.2237 19.6035C12.715 20.1322 11.8902 20.1322 11.3815 19.6035C10.8728 19.0748 10.8728 18.2176 11.3815 17.6888L16.8552 12L11.3815 6.31116C10.8728 5.78245 10.8728 4.92524 11.3815 4.39653Z</StreamGeometry>
 </ResourceDictionary>
\ No newline at end of file