From ca8e01ffa0860101dcee85c225e4d238d86f217b Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Tue, 21 Mar 2023 12:02:36 +0800
Subject: [PATCH] feat: add resources

---
 demo/Ursa.Demo/Pages/DividerDemo.axaml        |  30 +++++
 demo/Ursa.Demo/Pages/DividerDemo.axaml.cs     |  18 +++
 demo/Ursa.Demo/Views/MainWindow.axaml         |   3 +
 src/Ursa.Themes.Semi/Controls/Divider.axaml   | 125 +++++++++++++++---
 src/Ursa.Themes.Semi/Controls/_index.axaml    |   1 +
 .../Themes/Dark/Divider.axaml                 |   4 +
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml |   7 +-
 .../Themes/Light/Divider.axaml                |   4 +
 .../Themes/Light/_index.axaml                 |   7 +-
 .../Themes/Shared/Divider.axaml               |  14 ++
 .../Themes/Shared/_index.axaml                |   7 +-
 src/Ursa/Controls/Divider.cs                  |  23 +++-
 12 files changed, 212 insertions(+), 31 deletions(-)
 create mode 100644 demo/Ursa.Demo/Pages/DividerDemo.axaml
 create mode 100644 demo/Ursa.Demo/Pages/DividerDemo.axaml.cs
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/Divider.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Shared/Divider.axaml

diff --git a/demo/Ursa.Demo/Pages/DividerDemo.axaml b/demo/Ursa.Demo/Pages/DividerDemo.axaml
new file mode 100644
index 0000000..bedde3d
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/DividerDemo.axaml
@@ -0,0 +1,30 @@
+<UserControl
+    x:Class="Ursa.Demo.Pages.DividerDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:u="https://irihi.tech/ursa"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <StackPanel Spacing="20">
+        <u:Divider>Center</u:Divider>
+        <u:Divider HorizontalContentAlignment="Left">Left</u:Divider>
+        <u:Divider HorizontalContentAlignment="Right">Right</u:Divider>
+        <u:Divider HorizontalContentAlignment="Center">Center</u:Divider>
+        <u:Divider HorizontalContentAlignment="Stretch">Stretch</u:Divider>
+        <u:Divider />
+        <u:Divider Orientation="Vertical" />
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="A" />
+            <u:Divider Margin="12,0" Orientation="Vertical" />
+            <TextBlock Text="A" />
+            <u:Divider Orientation="Vertical" />
+            <TextBlock Text="A" />
+        </StackPanel>
+        <Grid Height="100" Background="LightGreen">
+            <u:Divider HorizontalContentAlignment="Stretch">Stretch</u:Divider>
+        </Grid>
+    </StackPanel>
+</UserControl>
diff --git a/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs b/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs
new file mode 100644
index 0000000..bdd3bd4
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Pages;
+
+public partial class DividerDemo : UserControl
+{
+    public DividerDemo()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Views/MainWindow.axaml b/demo/Ursa.Demo/Views/MainWindow.axaml
index 613691a..de1f2dd 100644
--- a/demo/Ursa.Demo/Views/MainWindow.axaml
+++ b/demo/Ursa.Demo/Views/MainWindow.axaml
@@ -29,6 +29,9 @@
             <TabItem Header="Banner">
                 <pages:BannerDemo />
             </TabItem>
+            <TabItem Header="Divider">
+                <pages:DividerDemo />
+            </TabItem>
             <TabItem Header="IPv4Box">
                 <pages:IPv4BoxDemo />
             </TabItem>
diff --git a/src/Ursa.Themes.Semi/Controls/Divider.axaml b/src/Ursa.Themes.Semi/Controls/Divider.axaml
index 1b36fb0..be677a7 100644
--- a/src/Ursa.Themes.Semi/Controls/Divider.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Divider.axaml
@@ -2,22 +2,117 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
+    <Design.PreviewWith>
+        <StackPanel Spacing="20">
+            <u:Divider Content="Hello" />
+        </StackPanel>
+    </Design.PreviewWith>
     <!--  Add Resources Here  -->
+    <ControlTheme x:Key="DividerLeftLine" TargetType="{x:Type Rectangle}">
+        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerLeftMinWidth}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+
+    <ControlTheme x:Key="DividerRightLine" TargetType="{x:Type Rectangle}">
+        <Setter Property="Rectangle.Fill" Value="{DynamicResource DividerBorderBrush}" />
+        <Setter Property="Rectangle.Height" Value="{DynamicResource SizeDividerWidth}" />
+        <Setter Property="Rectangle.MinWidth" Value="{DynamicResource SizeDividerRightMinWidth}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+
+    <ControlTheme x:Key="DividerContentPresenter" TargetType="{x:Type ContentPresenter}">
+        <Setter Property="ContentPresenter.Content" Value="{TemplateBinding Content}" />
+        <Setter Property="ContentPresenter.Background" Value="{TemplateBinding Background}" />
+        <Setter Property="TextElement.Foreground" Value="{TemplateBinding Foreground}" />
+        <Setter Property="ContentPresenter.ContentTemplate" Value="{TemplateBinding ContentTemplate}" />
+        <Setter Property="TextElement.FontFamily" Value="{TemplateBinding FontFamily}" />
+        <Setter Property="TextElement.FontWeight" Value="{TemplateBinding FontWeight}" />
+        <Setter Property="TextElement.FontSize" Value="{TemplateBinding FontSize}" />
+        <Setter Property="ContentPresenter.IsVisible" Value="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static ObjectConverters.IsNotNull}}" />
+        <Setter Property="ContentPresenter.Margin" Value="{DynamicResource ThicknessDividerTextMargin}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </ControlTheme>
+
     <ControlTheme x:Key="{x:Type u:Divider}" TargetType="u:Divider">
-        <Setter Property="u:Divider.Template">
-            <ControlTemplate TargetType="u:Divider">
-                <StackPanel Orientation="Horizontal">
-                    <Border
-                        BorderBrush="Gray"
-                        BorderDashArray="{TemplateBinding DashArray}"
-                        BorderThickness="0,0,0,1" />
-                    <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                    <Border
-                        BorderBrush="Gray"
-                        BorderDashArray="{TemplateBinding DashArray}"
-                        BorderThickness="0,0,0,1" />
-                </StackPanel>
-            </ControlTemplate>
-        </Setter>
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="Foreground" Value="{DynamicResource ColorDividerForeground}" />
+        <Setter Property="FontFamily" Value="{DynamicResource FontRegularFontFamily}" />
+        <!--  FontSize to be updated to dynamic resource  -->
+        <Setter Property="FontSize" Value="14" />
+
+        <Style Selector="^[Orientation=Horizontal]">
+            <Style Selector="^[HorizontalContentAlignment=Left]">
+                <Setter Property="Template">
+                    <ControlTemplate>
+                        <Grid
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            ColumnDefinitions="Auto,Auto,*">
+                            <Rectangle Theme="{StaticResource DividerLeftLine}" />
+                            <ContentPresenter Grid.Column="1" Theme="{StaticResource DividerContentPresenter}" />
+                            <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter>
+            </Style>
+            <Style Selector="^[HorizontalContentAlignment=Right]">
+                <Setter Property="Template">
+                    <ControlTemplate>
+                        <Grid
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            ColumnDefinitions="*,Auto,Auto">
+                            <Rectangle Theme="{StaticResource DividerLeftLine}" />
+                            <ContentPresenter Grid.Column="1" Theme="{StaticResource DividerContentPresenter}" />
+                            <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter>
+            </Style>
+            <Style Selector="^[HorizontalContentAlignment=Center]">
+                <Setter Property="Template">
+                    <ControlTemplate>
+                        <Grid
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            ColumnDefinitions="*,Auto,*">
+                            <Rectangle Theme="{StaticResource DividerLeftLine}" />
+                            <ContentPresenter Grid.Column="1" Theme="{StaticResource DividerContentPresenter}" />
+                            <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter>
+            </Style>
+            <Style Selector="^[HorizontalContentAlignment=Stretch]">
+                <Setter Property="Template">
+                    <ControlTemplate>
+                        <Grid
+                            Width="{TemplateBinding Width}"
+                            Height="{TemplateBinding Height}"
+                            ColumnDefinitions="*,Auto,*">
+                            <Rectangle Theme="{StaticResource DividerLeftLine}" />
+                            <ContentPresenter Grid.Column="1" Theme="{StaticResource DividerContentPresenter}" />
+                            <Rectangle Grid.Column="2" Theme="{StaticResource DividerRightLine}" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter>
+            </Style>
+        </Style>
+
+        <Style Selector="^[Orientation=Vertical]">
+            <Setter Property="Height" Value="{DynamicResource SizeDividerVerticalHeight}" />
+            <Setter Property="Margin" Value="{DynamicResource ThicknessDividerVerticalMargin}" />
+            <Setter Property="Width" Value="{DynamicResource SizeDividerWidth}" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Rectangle
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Fill="{DynamicResource DividerBorderBrush}" />
+                </ControlTemplate>
+            </Setter>
+        </Style>
     </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index f0db1d0..4d15016 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -3,6 +3,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="Badge.axaml" />
         <ResourceInclude Source="Banner.axaml" />
+        <ResourceInclude Source="Divider.axaml" />
         <ResourceInclude Source="IPv4Box.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml
new file mode 100644
index 0000000..1405352
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Divider.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="DividerBorderBrush" Opacity="0.2" Color="White" />
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index f0db1d0..7a530cc 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -1,8 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="Badge.axaml" />
-        <ResourceInclude Source="Banner.axaml" />
-        <ResourceInclude Source="IPv4Box.axaml" />
+        <MergeResourceInclude Source="Badge.axaml" />
+        <MergeResourceInclude Source="Banner.axaml" />
+        <MergeResourceInclude Source="Divider.axaml" />
+        <MergeResourceInclude Source="IPv4Box.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Divider.axaml b/src/Ursa.Themes.Semi/Themes/Light/Divider.axaml
new file mode 100644
index 0000000..32b32e8
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/Divider.axaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="DividerBorderBrush" Opacity="0.2" Color="#1C1F23" />
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index f0db1d0..7a530cc 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -1,8 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="Badge.axaml" />
-        <ResourceInclude Source="Banner.axaml" />
-        <ResourceInclude Source="IPv4Box.axaml" />
+        <MergeResourceInclude Source="Badge.axaml" />
+        <MergeResourceInclude Source="Banner.axaml" />
+        <MergeResourceInclude Source="Divider.axaml" />
+        <MergeResourceInclude Source="IPv4Box.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Divider.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Divider.axaml
new file mode 100644
index 0000000..8664705
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Divider.axaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <x:Double x:Key="SizeDividerVerticalHeight">20</x:Double>
+    <x:Double x:Key="SizeDividerVerticaMinHeight">0</x:Double>
+    <x:Double x:Key="SizeDividerLeftWidth">40</x:Double>
+    <x:Double x:Key="SizeDividerRightWidth">40</x:Double>
+    <x:Double x:Key="SizeDividerLeftMinWidth">20</x:Double>
+    <x:Double x:Key="SizeDividerRightMinWidth">20</x:Double>
+    <x:Double x:Key="SizeDividerWidth">1</x:Double>
+
+    <Thickness x:Key="ThicknessDividerVerticalMargin">1,0</Thickness>
+    <Thickness x:Key="ThicknessDividerHorizontalMargin">0,1</Thickness>
+    <Thickness x:Key="ThicknessDividerTextMargin">8,0</Thickness>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index f0db1d0..7a530cc 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -1,8 +1,9 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="Badge.axaml" />
-        <ResourceInclude Source="Banner.axaml" />
-        <ResourceInclude Source="IPv4Box.axaml" />
+        <MergeResourceInclude Source="Badge.axaml" />
+        <MergeResourceInclude Source="Banner.axaml" />
+        <MergeResourceInclude Source="Divider.axaml" />
+        <MergeResourceInclude Source="IPv4Box.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Ursa/Controls/Divider.cs b/src/Ursa/Controls/Divider.cs
index 04d457b..497a2de 100644
--- a/src/Ursa/Controls/Divider.cs
+++ b/src/Ursa/Controls/Divider.cs
@@ -1,17 +1,26 @@
 using Avalonia;
-using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
+using Avalonia.Layout;
 
 namespace Ursa.Controls;
 
 public class Divider : ContentControl
 {
-    public static readonly StyledProperty<AvaloniaList<double>?> DashArrayProperty = Shape.StrokeDashArrayProperty.AddOwner<Divider>();
-
-    public AvaloniaList<double>? DashArray
+    static Divider()
     {
-        get => GetValue(DashArrayProperty);
-        set => SetValue(DashArrayProperty, value);
+        HorizontalContentAlignmentProperty.OverrideDefaultValue<Divider>(HorizontalAlignment.Center);
+    }
+
+    public Divider()
+    {
+        HorizontalContentAlignment = HorizontalAlignment.Center;
+    }
+    
+    public static readonly StyledProperty<Orientation> OrientationProperty = AvaloniaProperty.Register<Divider, Orientation>(
+            nameof(Orientation));
+    public Orientation Orientation
+    {
+        get => GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
     }
 }
\ No newline at end of file