From c724a71aebfc27ded030244203f25f5c87d5691e Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 11 Sep 2024 21:58:06 +0800
Subject: [PATCH] feat: replace some Notification resources in Toast.axaml.

---
 src/Ursa.Themes.Semi/Controls/Toast.axaml      | 14 +++++++-------
 src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml   |  5 +++++
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml  |  1 +
 src/Ursa.Themes.Semi/Themes/Light/Toast.axaml  |  5 +++++
 src/Ursa.Themes.Semi/Themes/Light/_index.axaml |  1 +
 src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml |  8 +++++++-
 6 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/Toast.axaml

diff --git a/src/Ursa.Themes.Semi/Controls/Toast.axaml b/src/Ursa.Themes.Semi/Controls/Toast.axaml
index 34387f2..6495116 100644
--- a/src/Ursa.Themes.Semi/Controls/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Toast.axaml
@@ -34,9 +34,9 @@
     <ControlTheme x:Key="{x:Type u:ToastCard}" TargetType="u:ToastCard">
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="BorderThickness" Value="{DynamicResource NotificationCardBorderThickness}" />
-        <Setter Property="Background" Value="{DynamicResource NotificationCardBackground}" />
-        <Setter Property="CornerRadius" Value="{DynamicResource NotificationCardCornerRadius}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ToastCardBorderThickness}" />
+        <Setter Property="Background" Value="{DynamicResource ToastCardBackground}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ToastCardCornerRadius}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ToastCard">
                 <LayoutTransformControl x:Name="PART_LayoutTransformControl" UseRenderTransform="True">
@@ -56,8 +56,8 @@
                             <DockPanel>
                                 <PathIcon
                                     x:Name="ToastIcon"
-                                    Width="{DynamicResource NotificationCardIconWidth}"
-                                    Height="{DynamicResource NotificationCardIconHeight}"
+                                    Width="{DynamicResource ToastCardIconWidth}"
+                                    Height="{DynamicResource ToastCardIconHeight}"
                                     Margin="{DynamicResource ToastCardIconMargin}"
                                     VerticalAlignment="Top"
                                     IsVisible="{TemplateBinding ShowIcon}"
@@ -71,14 +71,14 @@
                                     <ContentControl.DataTemplates>
                                         <DataTemplate DataType="u:IToast">
                                             <SelectableTextBlock
-                                                Foreground="{DynamicResource NotificationCardTitleForeground}"
+                                                Foreground="{DynamicResource ToastCardContentForeground}"
                                                 FontWeight="{DynamicResource ToastCardContentFontWeight}"
                                                 Text="{Binding Content}"
                                                 TextWrapping="Wrap" />
                                         </DataTemplate>
                                         <DataTemplate DataType="x:String">
                                             <SelectableTextBlock
-                                                Foreground="{DynamicResource NotificationCardTitleForeground}"
+                                                Foreground="{DynamicResource ToastCardContentForeground}"
                                                 FontWeight="{DynamicResource ToastCardContentFontWeight}"
                                                 Text="{Binding}"
                                                 TextWrapping="Wrap" />
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml
new file mode 100644
index 0000000..ef28a3c
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Toast.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToastCardContentForeground" Color="#F9F9F9" />
+    <SolidColorBrush x:Key="ToastCardBackground" Color="#43444A" />
+</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 2618039..91a84b5 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -17,6 +17,7 @@
         <MergeResourceInclude Source="Rating.axaml" />
         <MergeResourceInclude Source="TagInput.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
+        <MergeResourceInclude Source="Toast.axaml" />
         <MergeResourceInclude Source="Skeleton.axaml" />
         <MergeResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Toast.axaml b/src/Ursa.Themes.Semi/Themes/Light/Toast.axaml
new file mode 100644
index 0000000..1be95d0
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/Toast.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ToastCardContentForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ToastCardBackground" Color="White" />
+</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 2618039..91a84b5 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -17,6 +17,7 @@
         <MergeResourceInclude Source="Rating.axaml" />
         <MergeResourceInclude Source="TagInput.axaml" />
         <MergeResourceInclude Source="Timeline.axaml" />
+        <MergeResourceInclude Source="Toast.axaml" />
         <MergeResourceInclude Source="Skeleton.axaml" />
         <MergeResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
index cf8622f..197939b 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
@@ -1,8 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <x:Double x:Key="ToastCardMinHeight">40</x:Double>
-    <Thickness x:Key="ToastCardPadding">12 8</Thickness>
+    <Thickness x:Key="ToastCardBorderThickness">1</Thickness>
+    <CornerRadius x:Key="ToastCardCornerRadius">6</CornerRadius>
+
     <Thickness x:Key="ToastCardMargin">12</Thickness>
+    <Thickness x:Key="ToastCardPadding">12 8</Thickness>
+
+    <x:Double x:Key="ToastCardIconWidth">18</x:Double>
+    <x:Double x:Key="ToastCardIconHeight">18</x:Double>
     <Thickness x:Key="ToastCardIconMargin">0 2 0 0</Thickness>
 
     <FontWeight x:Key="ToastCardContentFontWeight">600</FontWeight>