From a328e2bb99b072365e4b43106ea05e41f8c6f293 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 14 Aug 2024 20:00:43 +0800
Subject: [PATCH] feat: add Light class to NotificationCard.

---
 .../Pages/ExpanderDemo.axaml                  |   3 +-
 .../Pages/NotificationDemo.axaml              |  41 ++++---
 .../Pages/NotificationDemo.axaml.cs           |  26 ++++-
 .../Controls/NotificationCard.axaml           | 102 +++++++++++-------
 4 files changed, 117 insertions(+), 55 deletions(-)

diff --git a/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml
index 2de225a..bd2cc1e 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ExpanderDemo.axaml
@@ -9,6 +9,7 @@
     mc:Ignorable="d">
     <StackPanel Spacing="20">
         <StackPanel>
+            <Slider Name="SliderTest" Maximum="400" Minimum="0" TickFrequency="1" IsSnapToTickEnabled="True" />
             <Expander Header="Expander 1">
                 <TextBlock Text="Hello Avalonia!" />
             </Expander>
@@ -36,4 +37,4 @@
             </Expander>
         </Grid>
     </StackPanel>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml
index dd3b7da..ab62545 100644
--- a/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml
@@ -7,18 +7,33 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <StackPanel.Styles>
-            <Style Selector="Button">
-                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-            </Style>
-        </StackPanel.Styles>
-
-        <Button Click="InfoButton_OnClick" Content="Default" />
-        <Button Click="InfoButton_OnClick" Content="Information" />
-        <Button Click="InfoButton_OnClick" Content="Success" Classes="Success" />
-        <Button Click="InfoButton_OnClick" Content="Warning" Classes="Warning" />
-        <Button Click="InfoButton_OnClick" Content="Error" Classes="Danger" />
+    <StackPanel Spacing="20">
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <Button Click="NormalButton_OnClick" Content="Information" />
+            <Button Click="NormalButton_OnClick" Content="Success" Classes="Success" />
+            <Button Click="NormalButton_OnClick" Content="Warning" Classes="Warning" />
+            <Button Click="NormalButton_OnClick" Content="Error" Classes="Danger" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <Button Click="PositionButton_OnClick" Content="TopLeft" />
+            <Button Click="PositionButton_OnClick" Content="TopCenter" />
+            <Button Click="PositionButton_OnClick" Content="TopRight" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <Button Click="PositionButton_OnClick" Content="BottomLeft" />
+            <Button Click="PositionButton_OnClick" Content="BottomCenter" />
+            <Button Click="PositionButton_OnClick" Content="BottomRight" />
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" Spacing="20">
+            <StackPanel.Styles>
+                <Style Selector="Button">
+                    <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+                </Style>
+            </StackPanel.Styles>
+            <Button Click="LightButton_OnClick" Content="Information" />
+            <Button Click="LightButton_OnClick" Content="Success" Classes="Success" />
+            <Button Click="LightButton_OnClick" Content="Warning" Classes="Warning" />
+            <Button Click="LightButton_OnClick" Content="Error" Classes="Danger" />
+        </StackPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml.cs
index 65a0955..63a252f 100644
--- a/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml.cs
@@ -22,13 +22,35 @@ public partial class NotificationDemo : UserControl
         _manager = new WindowNotificationManager(topLevel) { MaxItems = 3 };
     }
 
-    private void InfoButton_OnClick(object? sender, RoutedEventArgs e)
+    private void NormalButton_OnClick(object? sender, RoutedEventArgs e)
     {
         if (sender is Button b && b.Content is string s)
         {
-            _manager?.Show(Enum.TryParse<NotificationType>(s, out NotificationType t)
+            _manager?.Show(Enum.TryParse<NotificationType>(s, out var t)
                 ? new Notification(t.ToString(), "This is message", t)
                 : new Notification(s, "This is message"));
         }
     }
+
+    private void PositionButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (sender is Button b && b.Content is string s)
+        {
+            Enum.TryParse<NotificationPosition>(s, out var t);
+            _manager.Position = t;
+            _manager?.Show(new Notification(t.ToString(), "This is message"));
+        }
+    }
+
+    private void LightButton_OnClick(object? sender, RoutedEventArgs e)
+    {
+        if (sender is Button b && b.Content is string s)
+        {
+            Enum.TryParse<NotificationType>(s, out var notificationType);
+            _manager?.Show(
+                new Notification(notificationType.ToString(), "This is message"),
+                type: notificationType,
+                classes: ["Light"]);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/NotificationCard.axaml b/src/Semi.Avalonia/Controls/NotificationCard.axaml
index 1d3cfa4..5348ac6 100644
--- a/src/Semi.Avalonia/Controls/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Controls/NotificationCard.axaml
@@ -33,52 +33,56 @@
                 <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
                     <Border
                         Margin="{DynamicResource NotificationCardMargin}"
-                        Padding="{DynamicResource NotificationCardPadding}"
-                        BoxShadow="{DynamicResource NotificationCardBoxShadows}"
                         Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
-                        <DockPanel>
-                            <PathIcon
-                                Name="NotificationIcon"
-                                Width="{DynamicResource NotificationCardIconWidth}"
-                                Height="{DynamicResource NotificationCardIconHeight}"
-                                Margin="{DynamicResource NotificationCardIconMargin}"
-                                VerticalAlignment="Top"
-                                IsVisible="False"
-                                Data="{DynamicResource NotificationCardInformationIconPathData}" />
-                            <ContentControl
-                                Name="PART_Content"
-                                Content="{TemplateBinding Content}">
-                                <ContentControl.DataTemplates>
-                                    <DataTemplate DataType="INotification">
-                                        <StackPanel Spacing="{DynamicResource NotificationCardTitleSpacing}">
-                                            <SelectableTextBlock
-                                                Foreground="{DynamicResource NotificationCardTitleForeground}"
-                                                FontSize="{DynamicResource NotificationCardTitleFontSize}"
-                                                FontWeight="{DynamicResource NotificationCardTitleFontWeight}"
-                                                IsVisible="{Binding Title, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                                                Text="{Binding Title}" />
+                        <Border
+                            x:Name="PART_RootBorder"
+                            Padding="{DynamicResource NotificationCardPadding}"
+                            BoxShadow="{DynamicResource NotificationCardBoxShadow}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                            <DockPanel>
+                                <PathIcon
+                                    Name="NotificationIcon"
+                                    Width="{DynamicResource NotificationCardIconWidth}"
+                                    Height="{DynamicResource NotificationCardIconHeight}"
+                                    Margin="{DynamicResource NotificationCardIconMargin}"
+                                    VerticalAlignment="Top"
+                                    IsVisible="False"
+                                    Data="{DynamicResource NotificationCardInformationIconPathData}" />
+                                <ContentControl
+                                    Name="PART_Content"
+                                    Content="{TemplateBinding Content}">
+                                    <ContentControl.DataTemplates>
+                                        <DataTemplate DataType="INotification">
+                                            <StackPanel Spacing="{DynamicResource NotificationCardTitleSpacing}">
+                                                <SelectableTextBlock
+                                                    Foreground="{DynamicResource NotificationCardTitleForeground}"
+                                                    FontSize="{DynamicResource NotificationCardTitleFontSize}"
+                                                    FontWeight="{DynamicResource NotificationCardTitleFontWeight}"
+                                                    IsVisible="{Binding Title, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                                                    Text="{Binding Title}" />
+                                                <SelectableTextBlock
+                                                    Foreground="{DynamicResource NotificationCardMessageForeground}"
+                                                    FontSize="{DynamicResource NotificationCardMessageFontSize}"
+                                                    FontWeight="{DynamicResource NotificationCardMessageFontWeight}"
+                                                    Text="{Binding Message}"
+                                                    TextWrapping="Wrap" />
+                                            </StackPanel>
+                                        </DataTemplate>
+                                        <DataTemplate DataType="x:String">
                                             <SelectableTextBlock
                                                 Foreground="{DynamicResource NotificationCardMessageForeground}"
                                                 FontSize="{DynamicResource NotificationCardMessageFontSize}"
                                                 FontWeight="{DynamicResource NotificationCardMessageFontWeight}"
-                                                Text="{Binding Message}"
+                                                Text="{Binding}"
                                                 TextWrapping="Wrap" />
-                                        </StackPanel>
-                                    </DataTemplate>
-                                    <DataTemplate DataType="x:String">
-                                        <SelectableTextBlock
-                                            Foreground="{DynamicResource NotificationCardMessageForeground}"
-                                            FontSize="{DynamicResource NotificationCardMessageFontSize}"
-                                            FontWeight="{DynamicResource NotificationCardMessageFontWeight}"
-                                            Text="{Binding}"
-                                            TextWrapping="Wrap" />
-                                    </DataTemplate>
-                                </ContentControl.DataTemplates>
-                            </ContentControl>
-                        </DockPanel>
+                                        </DataTemplate>
+                                    </ContentControl.DataTemplates>
+                                </ContentControl>
+                            </DockPanel>
+                        </Border>
                     </Border>
                 </LayoutTransformControl>
             </ControlTemplate>
@@ -163,5 +167,25 @@
             <Setter Property="Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
             <Setter Property="Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
         </Style>
+
+        <Style Selector="^.Light">
+            <Setter Property="Background" Value="{DynamicResource SemiColorBackground0}" />
+            <Style Selector="^:information /template/ Border#PART_RootBorder">
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorInformation}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorInformationLight}" />
+            </Style>
+            <Style Selector="^:success /template/ Border#PART_RootBorder">
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorSuccess}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorSuccessLight}" />
+            </Style>
+            <Style Selector="^:warning /template/ Border#PART_RootBorder">
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorWarning}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorWarningLight}" />
+            </Style>
+            <Style Selector="^:error /template/ Border#PART_RootBorder">
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorDanger}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorDangerLight}" />
+            </Style>
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file