feat: Add resource.

2023-02-10 18:42:20 +08:00
parent e137adce02
commit 6ea1d3fdd6
10 changed files with 190 additions and 28 deletions
--- a/demo/Ursa.Demo/Pages/BannerDemo.axaml
+++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml
@@ -0,0 +1,35 @@
+<UserControl
+    x:Class="Ursa.Demo.Pages.BannerDemo"
+    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:Banner
+            Margin="8"
+            Classes="Bordered"
+            Content="Content"
+            Header="Header" />
+        <u:Banner
+            Margin="8"
+            Classes="Bordered"
+            Content="C" />
+        <u:Banner
+            Margin="8"
+            HorizontalContentAlignment="Left"
+            Classes="Bordered"
+            Content="Content"
+            Header="Header" />
+        <u:Banner
+            Margin="8"
+            HorizontalContentAlignment="Left"
+            Classes="Bordered"
+            Content="C" />
+        <u:Banner Margin="8" Content="Content" />
+    </StackPanel>
+</UserControl>
--- a/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs
+++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Pages;
+
+public partial class BannerDemo : UserControl
+{
+    public BannerDemo()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -23,7 +23,6 @@
        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview5" />
        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
-        <PackageReference Include="Semi.Avalonia" Version="0.1.0-preview5" />
        <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
    </ItemGroup>

--- a/demo/Ursa.Demo/Views/MainWindow.axaml
+++ b/demo/Ursa.Demo/Views/MainWindow.axaml
@@ -4,6 +4,7 @@
    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:pages="clr-namespace:Ursa.Demo.Pages"
    xmlns:vm="using:Ursa.Demo.ViewModels"
    Title="Ursa.Demo"
    d:DesignHeight="450"
@@ -15,12 +16,10 @@
        <vm:MainWindowViewModel />
    </Design.DataContext>

-    <StackPanel HorizontalAlignment="Left" Spacing="20">
-        <TextBlock
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Text="{Binding Greeting}" />
-        <Button Content="Hello World" />
-    </StackPanel>
+    <TabControl TabStripPlacement="Left">
+        <TabItem Header="Banner">
+            <pages:BannerDemo />
+        </TabItem>
+    </TabControl>

 </Window>
--- a/src/Ursa.Themes.Semi/Controls/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Banner.axaml
@@ -4,12 +4,79 @@
    xmlns:u="https://irihi.tech/ursa">
    <!--  Add Resources Here  -->
    <ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
+        <Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" />
        <Setter Property="u:Banner.Template">
            <ControlTemplate TargetType="u:Banner">
-                <Border>
-                    <!--    -->
+                <Border
+                    Name="PART_Container"
+                    Padding="12"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}">
+                    <Grid ColumnDefinitions="*, Auto">
+                        <Grid
+                            Grid.Column="0"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            ColumnDefinitions="Auto, *"
+                            RowDefinitions="Auto, *">
+                            <!--  Icon Area  -->
+                            <Panel
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Grid.Column="0"
+                                VerticalAlignment="Top"
+                                IsVisible="{TemplateBinding ShowIcon}">
+                                <ContentPresenter Content="{TemplateBinding Icon}" />
+                                <PathIcon
+                                    Name="PART_BuildInIcon"
+                                    Width="16"
+                                    Height="16"
+                                    IsVisible="{TemplateBinding Icon,
+                                                                Converter={x:Static ObjectConverters.IsNull}}" />
+                            </Panel>
+                            <ContentPresenter
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                IsVisible="{TemplateBinding Header,
+                                                            Converter={x:Static ObjectConverters.IsNotNull}}"
+                                TextElement.FontWeight="600" />
+                            <ContentPresenter
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        </Grid>
+                        <Button
+                            Name="{x:Static u:Banner.PART_CloseButton}"
+                            Grid.Column="1"
+                            IsVisible="{TemplateBinding CanClose}"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <PathIcon
+                                Width="12"
+                                Height="12"
+                                Data="{DynamicResource BannerCloseIconGeometry}"
+                                Foreground="Black" />
+                        </Button>
+                    </Grid>
                </Border>
            </ControlTemplate>
        </Setter>
+        <Style Selector="^[Type=Information]">
+            <Style Selector="^ /template/ Border#PART_Container">
+                <Setter Property="Background" Value="{DynamicResource BannerInformationBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource BannerInformationBorderBrush}" />
+            </Style>
+            <Style Selector="^ /template/ PathIcon#PART_BuildInIcon">
+                <Setter Property="PathIcon.Data" Value="{DynamicResource BannerInformationIconGeometry}" />
+                <Setter Property="PathIcon.Foreground" Value="{DynamicResource BannerInformationBorderBrush}" />
+            </Style>
+        </Style>
+        <Style Selector="^.Bordered">
+            <Style Selector="^ /template/ Border#PART_Container">
+                <Setter Property="Border.CornerRadius" Value="{DynamicResource BannerCornerRadius}" />
+                <Setter Property="Border.BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
+            </Style>
+        </Style>
    </ControlTheme>
 </ResourceDictionary>
--- a/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/Banner.axaml
@@ -1,3 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="BannerInformationBackground" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="BannerInformationBorderBrush" Color="#0077FA" />
 </ResourceDictionary>
--- a/src/Ursa.Themes.Semi/Themes/Shared/Banner.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Banner.axaml
@@ -1,3 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <!--  Add Resources Here  -->
+    <PathGeometry x:Key="BannerInformationIconGeometry">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM14 7C14 8.10457 13.1046 9 12 9C10.8954 9 10 8.10457 10 7C10 5.89543 10.8954 5 12 5C13.1046 5 14 5.89543 14 7ZM9 10.75C9 10.3358 9.33579 10 9.75 10H12.5C13.0523 10 13.5 10.4477 13.5 11V16.5H14.25C14.6642 16.5 15 16.8358 15 17.25C15 17.6642 14.6642 18 14.25 18H9.75C9.33579 18 9 17.6642 9 17.25C9 16.8358 9.33579 16.5 9.75 16.5H10.5V11.5H9.75C9.33579 11.5 9 11.1642 9 10.75Z</PathGeometry>
+    <PathGeometry x:Key="BannerWarningIconGeometry">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.8831 9.82235L11.6854 17.4112C11.4029 17.7806 10.965 17.9981 10.5 18C10.035 18.0019 9.59533 17.788 9.30982 17.421L5.81604 13.4209C5.30744 12.767 5.42524 11.8246 6.07916 11.316C6.73308 10.8074 7.67549 10.9252 8.1841 11.5791L10.4838 14.0439L15.5 8C16.0032 7.34193 16.9446 7.21641 17.6027 7.71964C18.2608 8.22287 18.3863 9.16428 17.8831 9.82235Z</PathGeometry>
+    <PathGeometry x:Key="BannerErrorIconGeometry">M10.2268 2.3986L1.52616 19.0749C0.831449 20.4064 1.79747 22 3.29933 22H20.7007C22.2025 22 23.1686 20.4064 22.4739 19.0749L13.7732 2.3986C13.0254 0.965441 10.9746 0.965442 10.2268 2.3986ZM13.1415 14.0101C13.0603 14.5781 12.5739 15 12.0001 15C11.4263 15 10.9398 14.5781 10.8586 14.0101L10.2829 9.97992C10.1336 8.93495 10.9445 8.00002 12.0001 8.00002C13.0556 8.00002 13.8665 8.93495 13.7172 9.97992L13.1415 14.0101ZM13.5001 18.5C13.5001 19.3284 12.8285 20 12.0001 20C11.1716 20 10.5001 19.3284 10.5001 18.5C10.5001 17.6716 11.1716 17 12.0001 17C12.8285 17 13.5001 17.6716 13.5001 18.5Z</PathGeometry>
+    <PathGeometry x:Key="BannerSuccessIconGeometry">M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM13.5 17.5C13.5 16.6716 12.8284 16 12 16C11.1716 16 10.5 16.6716 10.5 17.5C10.5 18.3284 11.1716 19 12 19C12.8284 19 13.5 18.3284 13.5 17.5ZM12 5C10.9138 5 10.0507 5.91244 10.1109 6.99692L10.4168 12.5023C10.4635 13.3426 11.1584 14 12 14C12.8416 14 13.5365 13.3426 13.5832 12.5023L13.8891 6.99692C13.9493 5.91244 13.0862 5 12 5Z</PathGeometry>
+    <PathGeometry x:Key="BannerCloseIconGeometry">M 17.6568 19.7782 C 18.2426 20.3639 19.1924 20.3639 19.7782 19.7782 C 20.3639 19.1924 20.3639 18.2426 19.7782 17.6568 L 14.1213 12 L 19.7782 6.34313 C 20.3639 5.75734 20.3639 4.8076 19.7782 4.22181 C 19.1924 3.63602 18.2426 3.63602 17.6568 4.22181 L 12 9.87866 L 6.34313 4.22181 C 5.75734 3.63602 4.8076 3.63602 4.22181 4.22181 C 3.63602 4.8076 3.63602 5.75734 4.22181 6.34313 L 9.87866 12 L 4.22181 17.6568 C 3.63602 18.2426 3.63602 19.1924 4.22181 19.7782 C 4.8076 20.3639 5.75734 20.3639 6.34313 19.7782 L 12 14.1213 L 17.6568 19.7782 Z</PathGeometry>
+
+    <CornerRadius x:Key="BannerCornerRadius">3</CornerRadius>
+    <Thickness x:Key="BannerBorderThickness">1</Thickness>
 </ResourceDictionary>
--- a/src/Ursa.Themes.Semi/Ursa.Themes.Semi.csproj
+++ b/src/Ursa.Themes.Semi/Ursa.Themes.Semi.csproj
@@ -9,6 +9,7 @@

    <ItemGroup>
      <PackageReference Include="Avalonia" Version="11.0.0-preview5" />
+      <PackageReference Include="Semi.Avalonia" Version="0.1.0-preview5" />
      <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
    </ItemGroup>

--- a/src/Ursa/AssemblyInfo.cs
+++ b/src/Ursa/AssemblyInfo.cs
@@ -2,3 +2,4 @@ using Avalonia.Metadata;

 [assembly:XmlnsDefinition("https://irihi.tech/ursa", "Ursa")]
 [assembly:XmlnsDefinition("https://irihi.tech/ursa", "Ursa.Controls")]
+[assembly:XmlnsPrefix("https://irihi.tech/ursa", "u")]
--- a/src/Ursa/Controls/Banner.cs
+++ b/src/Ursa/Controls/Banner.cs
@@ -1,18 +1,23 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Notifications;
+using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
+using Avalonia.Interactivity;
+using Avalonia.Metadata;

 namespace Ursa.Controls;

-public enum BannerType
-{
-    None,
-    Info,
-    Warning,
-    Danger,
-    Success,
-}
-public class Banner: ContentControl
+[PseudoClasses(PC_Icon)]
+[TemplatePart(PART_CloseButton, typeof(Button))]
+public class Banner: HeaderedContentControl
 {
+    public const string PC_Icon = ":icon";
+    public const string PART_CloseButton = "PART_CloseButton";
+
+    private Button? _closeButton;
+    
    public static readonly StyledProperty<bool> CanCloseProperty = AvaloniaProperty.Register<Banner, bool>(
        nameof(CanClose));

@@ -23,7 +28,7 @@ public class Banner: ContentControl
    }

    public static readonly StyledProperty<bool> ShowIconProperty = AvaloniaProperty.Register<Banner, bool>(
-        nameof(ShowIcon));
+        nameof(ShowIcon), true);

    public bool ShowIcon
    {
@@ -31,14 +36,41 @@ public class Banner: ContentControl
        set => SetValue(ShowIconProperty, value);
    }

-    public static readonly StyledProperty<object?> HeaderProperty = AvaloniaProperty.Register<Banner, object?>(
-        nameof(Header));
+    public static readonly StyledProperty<object?> IconProperty = AvaloniaProperty.Register<Banner, object?>(
+        nameof(Icon));

-    public object? Header
+    public object? Icon
    {
-        get => GetValue(HeaderProperty);
-        set => SetValue(HeaderProperty, value);
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
    }

+    public static readonly StyledProperty<NotificationType> TypeProperty = AvaloniaProperty.Register<Banner, NotificationType>(
+        nameof(Type));

+    public NotificationType Type
+    {
+        get => GetValue(TypeProperty);
+        set => SetValue(TypeProperty, value);
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        if (_closeButton != null)
+        {
+            _closeButton.Click -= OnCloseClick;
+        }
+        _closeButton = e.NameScope.Find<Button>(PART_CloseButton);
+        if (_closeButton != null)
+        {
+            _closeButton.Click += OnCloseClick;
+        }
+        
+    }
+
+    private void OnCloseClick(object sender, RoutedEventArgs args)
+    {
+        IsVisible = false;
+    }
 }