From ccc883d5f80702697d9d43d42996de79cb7b954b Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Sat, 27 Jan 2024 03:47:54 +0800
Subject: [PATCH 1/2] feat: add two tone icon.

---
 demo/Ursa.Demo/Models/MenuKeys.cs             |  1 +
 .../Ursa.Demo/Pages/TwoTonePathIconDemo.axaml | 18 ++++
 .../Pages/TwoTonePathIconDemo.axaml.cs        | 13 +++
 .../Ursa.Demo/ViewModels/MainViewViewModel.cs |  1 +
 demo/Ursa.Demo/ViewModels/MenuViewModel.cs    |  1 +
 .../TwoTonePathIconDemoViewModel.cs           |  8 ++
 .../Controls/TwoTonePathIcon.axaml            | 38 ++++++++
 src/Ursa.Themes.Semi/Controls/_index.axaml    |  1 +
 src/Ursa/Controls/Icons/TwoTonePathIcon.cs    | 92 +++++++++++++++++++
 9 files changed, 173 insertions(+)
 create mode 100644 demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml
 create mode 100644 demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml.cs
 create mode 100644 demo/Ursa.Demo/ViewModels/TwoTonePathIconDemoViewModel.cs
 create mode 100644 src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml
 create mode 100644 src/Ursa/Controls/Icons/TwoTonePathIcon.cs

diff --git a/demo/Ursa.Demo/Models/MenuKeys.cs b/demo/Ursa.Demo/Models/MenuKeys.cs
index b0eaf2f..17714e1 100644
--- a/demo/Ursa.Demo/Models/MenuKeys.cs
+++ b/demo/Ursa.Demo/Models/MenuKeys.cs
@@ -21,5 +21,6 @@ public static class MenuKeys
     public const string MenuKeyRangeSlider = "RangeSlider";
     public const string MenuKeyTagInput = "TagInput";
     public const string MenuKeyTimeline = "Timeline";
+    public const string MenuKeyTwoTonePathIcon = "TwoTonePathIcon";
 
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml b/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml
new file mode 100644
index 0000000..ae22c4b
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml
@@ -0,0 +1,18 @@
+<UserControl 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"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ursa.Demo.Pages.TwoTonePathIconDemo">
+    <StackPanel>
+        <TextBlock Text="Size"></TextBlock>
+        <Slider Name="width" Minimum="0" Maximum="100" Value="20" Width="300"></Slider>
+        <ToggleSwitch Name="active" Content="Active"></ToggleSwitch>
+        <u:TwoTonePathIcon
+            IsActive="{Binding ElementName=active, Path=IsChecked}"
+            Width="{Binding #width.Value}"
+            Height="{Binding #width.Value}"
+            Data="M12 3L2 12H5V20H19V12H22L12 3M13 18H11V16H13V18M13 14H11V8H13V14Z"/>
+    </StackPanel>
+</UserControl>
diff --git a/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml.cs b/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml.cs
new file mode 100644
index 0000000..72e0a25
--- /dev/null
+++ b/demo/Ursa.Demo/Pages/TwoTonePathIconDemo.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Pages;
+
+public partial class TwoTonePathIconDemo : UserControl
+{
+    public TwoTonePathIconDemo()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
index 8ebf182..be51f3b 100644
--- a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
@@ -43,6 +43,7 @@ public class MainViewViewModel : ViewModelBase
             MenuKeys.MenuKeyRangeSlider => new RangeSliderDemoViewModel(),
             MenuKeys.MenuKeyTagInput => new TagInputDemoViewModel(),
             MenuKeys.MenuKeyTimeline => new TimelineDemoViewModel(),
+            MenuKeys.MenuKeyTwoTonePathIcon => new TwoTonePathIconDemoViewModel(),
         };
     }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
index 95ac6f9..fa35634 100644
--- a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
@@ -30,6 +30,7 @@ public class MenuViewModel: ViewModelBase
             new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider, Status = "New"},
             new() { MenuHeader = "TagInput", Key = MenuKeys.MenuKeyTagInput },
             new() { MenuHeader = "Timeline", Key = MenuKeys.MenuKeyTimeline, Status = "Updated" },
+            new() { MenuHeader = "TwoTonePathIcon", Key = MenuKeys.MenuKeyTwoTonePathIcon, Status = "New"},
         };
     }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/TwoTonePathIconDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/TwoTonePathIconDemoViewModel.cs
new file mode 100644
index 0000000..d2112a1
--- /dev/null
+++ b/demo/Ursa.Demo/ViewModels/TwoTonePathIconDemoViewModel.cs
@@ -0,0 +1,8 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Ursa.Demo.ViewModels;
+
+public class TwoTonePathIconDemoViewModel:ObservableObject
+{
+    
+}
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml b/src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml
new file mode 100644
index 0000000..1fe4731
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Controls/TwoTonePathIcon.axaml
@@ -0,0 +1,38 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:u="https://irihi.tech/ursa">
+    <!--  Add Resources Here  -->
+    <ControlTheme x:Key="{x:Type u:TwoTonePathIcon}" TargetType="u:TwoTonePathIcon">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
+        <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
+        <Setter Property="StrokeThickness" Value="0.4" />
+        <Setter Property="Foreground" Value="{DynamicResource SemiBlue2}" />
+        <Setter Property="StrokeBrush" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="ActiveForeground" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="ActiveStrokeBrush" Value="{DynamicResource SemiBlue6}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="u:TwoTonePathIcon">
+                <Border Background="{TemplateBinding Background}">
+                    <Panel>
+                        <Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                            <Path
+                                Name="PART_Fill"
+                                Data="{TemplateBinding Data}"
+                                StrokeThickness="{TemplateBinding StrokeThickness}"
+                                StrokeJoin="Round"
+                                Fill="{TemplateBinding Foreground}"
+                                Stroke="{TemplateBinding StrokeBrush}"
+                                Stretch="Uniform" />
+                        </Viewbox>
+                    </Panel>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:active /template/ Path#PART_Fill">
+            <Setter Property="Fill" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActiveForeground}" />
+            <Setter Property="Stroke" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ActiveStrokeBrush}" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Controls/_index.axaml b/src/Ursa.Themes.Semi/Controls/_index.axaml
index 9f871de..fc8eba7 100644
--- a/src/Ursa.Themes.Semi/Controls/_index.axaml
+++ b/src/Ursa.Themes.Semi/Controls/_index.axaml
@@ -19,5 +19,6 @@
         <ResourceInclude Source="RangeSlider.axaml" />
         <ResourceInclude Source="TagInput.axaml" />
         <ResourceInclude Source="Timeline.axaml" />
+        <ResourceInclude Source="TwoTonePathIcon.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/Ursa/Controls/Icons/TwoTonePathIcon.cs b/src/Ursa/Controls/Icons/TwoTonePathIcon.cs
new file mode 100644
index 0000000..d44ad7c
--- /dev/null
+++ b/src/Ursa/Controls/Icons/TwoTonePathIcon.cs
@@ -0,0 +1,92 @@
+using System.ComponentModel;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Media;
+
+namespace Ursa.Controls;
+
+[PseudoClasses(PC_Active)]
+public class TwoTonePathIcon: TemplatedControl
+{
+    public const string PC_Active = ":active";
+    
+    public static readonly StyledProperty<IBrush?> StrokeBrushProperty = AvaloniaProperty.Register<TwoTonePathIcon, IBrush?>(
+        nameof(StrokeBrush));
+
+    public IBrush? StrokeBrush
+    {
+        get => GetValue(StrokeBrushProperty);
+        set => SetValue(StrokeBrushProperty, value);
+    }
+    
+    public static readonly StyledProperty<Geometry> DataProperty = AvaloniaProperty.Register<PathIcon, Geometry>(
+        nameof(Data));
+
+    public Geometry Data
+    {
+        get => GetValue(DataProperty);
+        set => SetValue(DataProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> IsActiveProperty = AvaloniaProperty.Register<TwoTonePathIcon, bool>(
+        nameof(IsActive), defaultBindingMode: BindingMode.TwoWay);
+
+    public bool IsActive
+    {
+        get => GetValue(IsActiveProperty);
+        set => SetValue(IsActiveProperty, value);
+    }
+
+    public static readonly StyledProperty<IBrush?> ActiveForegroundProperty = AvaloniaProperty.Register<TwoTonePathIcon, IBrush?>(
+        nameof(ActiveForeground));
+
+    public IBrush? ActiveForeground
+    {
+        get => GetValue(ActiveForegroundProperty);
+        set => SetValue(ActiveForegroundProperty, value);
+    }
+
+    public static readonly StyledProperty<IBrush?> ActiveStrokeBrushProperty = AvaloniaProperty.Register<TwoTonePathIcon, IBrush?>(
+        nameof(ActiveStrokeBrush));
+
+    public IBrush? ActiveStrokeBrush
+    {
+        get => GetValue(ActiveStrokeBrushProperty);
+        set => SetValue(ActiveStrokeBrushProperty, value);
+    }
+
+    public static readonly StyledProperty<double> StrokeThicknessProperty =
+        AvaloniaProperty.Register<TwoTonePathIcon, double>(
+            nameof(StrokeThickness));
+    public double StrokeThickness
+    {
+        get => GetValue(StrokeThicknessProperty);
+        set => SetValue(StrokeThicknessProperty, value);
+    }
+    
+    static TwoTonePathIcon()
+    {
+        AffectsRender<TwoTonePathIcon>(
+            DataProperty, 
+            StrokeBrushProperty, 
+            ForegroundProperty,
+            ActiveForegroundProperty,
+            ActiveStrokeBrushProperty);
+        IsActiveProperty.Changed.AddClassHandler<TwoTonePathIcon, bool>((o, e) => o.OnIsActiveChanged(e));
+    }
+
+    private void OnIsActiveChanged(AvaloniaPropertyChangedEventArgs<bool> args)
+    {
+        var newValue = args.NewValue.Value;
+        PseudoClasses.Set(PC_Active, newValue);
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        PseudoClasses.Set(PC_Active, IsActive);
+    }
+}
\ No newline at end of file

From 25c36c941c1ddefb4ef30254ee5af2c66b475d6f Mon Sep 17 00:00:00 2001
From: rabbitism <dongbin@irihi.tech>
Date: Sat, 27 Jan 2024 14:03:39 +0800
Subject: [PATCH 2/2] feat: improve button group demo.

---
 demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml
index 3026968..4081616 100644
--- a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml
+++ b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml
@@ -18,7 +18,10 @@
                        ItemsSource="{Binding Items}" >
             <u:ButtonGroup.ItemTemplate>
                 <DataTemplate x:DataType="vm:ButtonItem">
-                    <TextBlock Text="{Binding Name}" Foreground="{DynamicResource SemiGrey3}"></TextBlock>
+                    <TextBlock>
+                        <Run Text="🐼"></Run>
+                        <Run Text="{Binding Name}"></Run>
+                    </TextBlock>
                 </DataTemplate>
             </u:ButtonGroup.ItemTemplate>
         </u:ButtonGroup>