feat: add icon, improve demo.

demo/Ursa.Demo/Pages/MessageBoxDemo.axaml

@@ -1,17 +1,32 @@
-<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"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             xmlns:vm="using:Ursa.Demo.ViewModels"
-             x:DataType="vm:MessageBoxDemoViewModel"
-             x:CompileBindings="True"
-             x:Class="Ursa.Demo.Pages.MessageBoxDemo">
+<UserControl
+    x:Class="Ursa.Demo.Pages.MessageBoxDemo"
+    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:vm="using:Ursa.Demo.ViewModels"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    x:CompileBindings="True"
+    x:DataType="vm:MessageBoxDemoViewModel"
+    mc:Ignorable="d">
+    <UserControl.Styles>
+        <Style Selector="Button">
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Margin" Value="8"></Setter>
+        </Style>
+    </UserControl.Styles>
     <StackPanel HorizontalAlignment="Left">
-        <Button Content="Default" Command="{Binding DefaultMessageBoxCommand}"></Button>
-        <Button Content="OK" Command="{Binding OkCommand}" ></Button>
-        <Button Content="OKCancel" Command="{Binding OkCancelCommand}" ></Button>
-        <Button Content="YesNo" Command="{Binding YesNoCommand}" ></Button>
-        <Button Content="YesNoCancel" Command="{Binding YesNoCancelCommand}" ></Button>
+        <ComboBox ItemsSource="{Binding Icons}" SelectedItem="{Binding SelectedIcon}" />
+        <Button Command="{Binding DefaultMessageBoxCommand}" Content="Default" />
+        <Button Command="{Binding OkCommand}" Content="OK" />
+        <Button Command="{Binding OkCancelCommand}" Content="OKCancel" />
+        <Button Command="{Binding YesNoCommand}" Content="YesNo" />
+        <Button Command="{Binding YesNoCancelCommand}" Content="YesNoCancel" />
+        
+        <TextBlock>
+            <Run Text="Last Clicked Result: "></Run>
+            <Run Text="{Binding Result}"></Run>
+        </TextBlock>
     </StackPanel>
 </UserControl>

demo/Ursa.Demo/ViewModels/MessageBoxDemoViewModel.cs

@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -13,6 +15,22 @@ public class MessageBoxDemoViewModel: ObservableObject
     public ICommand YesNoCommand { get; set; }
     public ICommand YesNoCancelCommand { get; set; }
     public ICommand OkCancelCommand { get; set; }
+    
+    public ObservableCollection<MessageBoxIcon> Icons { get; set; }
+    
+    private MessageBoxIcon _selectedIcon;
+    public MessageBoxIcon SelectedIcon
+    {
+        get => _selectedIcon;
+        set => SetProperty(ref _selectedIcon, value);
+    }
+
+    private MessageBoxResult _result;
+    public MessageBoxResult Result
+    {
+        get => _result;
+        set => SetProperty(ref _result, value);
+    }
 
     public MessageBoxDemoViewModel()
     {
@@ -21,30 +39,33 @@ public class MessageBoxDemoViewModel: ObservableObject
         YesNoCommand = new AsyncRelayCommand(OnYesNoAsync);
         YesNoCancelCommand = new AsyncRelayCommand(OnYesNoCancelAsync);
         OkCancelCommand = new AsyncRelayCommand(OnOkCancelAsync);
+        Icons = new ObservableCollection<MessageBoxIcon>(
+            Enum.GetValues<MessageBoxIcon>());
+        SelectedIcon = MessageBoxIcon.None;
     }
 
     private async Task OnDefaultMessageAsync()
     {
-        var result = await MessageBox.ShowAsync("Hello Message Box");
+        Result = await MessageBox.ShowAsync("Hello Message Box", icon: SelectedIcon);
     }
     
     private async Task OnOkAsync()
     {
-        var result = await MessageBox.ShowAsync("Hello Message Box", "Hello", MessageBoxButton.OK);
+        Result = await MessageBox.ShowAsync("Hello Message Box", "Hello", icon: SelectedIcon, button:MessageBoxButton.OK);
     }
     
     private async Task OnYesNoAsync()
     {
-        var result = await MessageBox.ShowAsync("Hello Message Box", "Hello", MessageBoxButton.YesNo);
+        Result = await MessageBox.ShowAsync("Hello Message Box", "Hello", icon: SelectedIcon, button: MessageBoxButton.YesNo);
     }
     
     private async Task OnYesNoCancelAsync()
     {
-        var result = await MessageBox.ShowAsync("Hello Message Box", "Hello", MessageBoxButton.YesNoCancel);
+        Result = await MessageBox.ShowAsync("Hello Message Box", "Hello", icon: SelectedIcon, button: MessageBoxButton.YesNoCancel);
     }
     
     private async Task OnOkCancelAsync()
     {
-        var result = await MessageBox.ShowAsync("Hello Message Box", "Hello", MessageBoxButton.OKCancel);
+        Result = await MessageBox.ShowAsync("Hello Message Box", "Hello", icon: SelectedIcon, button:MessageBoxButton.OKCancel);
     }
 }

src/Ursa.Themes.Semi/Controls/MessageBoxWindow.axaml

@@ -25,8 +25,13 @@
                     <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                     <Grid RowDefinitions="Auto, *, Auto">
                         <Grid Grid.Row="0" ColumnDefinitions="*, Auto">
-                            <TextBlock Grid.Column="0" Text="{TemplateBinding Title}" Margin="8 8 0 0" FontWeight="Bold" FontSize="14" />
-                            <!-- A temporary style copied from Semi. Will replace when I get time -->
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="8,8,0,0"
+                                FontSize="14"
+                                FontWeight="Bold"
+                                Text="{TemplateBinding Title}" />
+                            <!--  A temporary style copied from Semi. Will replace when I get time  -->
                             <Button
                                 Name="{x:Static u:MessageBoxWindow.PART_CloseButton}"
                                 Grid.Column="1"
@@ -49,14 +54,26 @@
                                     Foreground="{Binding $parent[Button].Foreground}" />
                             </Button>
                         </Grid>
-                        <ContentPresenter
-                            Name="PART_ContentPresenter"
+                        <Grid
                             Grid.Row="1"
                             Margin="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            ColumnDefinitions="Auto, *">
+                            <PathIcon
+                                Name="PART_Icon"
+                                Grid.Column="0"
+                                Width="24"
+                                Height="24"
+                                Margin="0,0,12,0"
+                                VerticalAlignment="Center" />
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        </Grid>
                         <StackPanel
                             Grid.Row="2"
                             Margin="0,0,8,8"
@@ -87,5 +104,39 @@
                 </Panel>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^[MessageIcon=None] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^[MessageIcon=Asterisk] /template/ PathIcon#PART_Icon ^[MessageIcon=Information] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowInformationIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Error] /template/ PathIcon#PART_Icon ^[MessageIcon=Hand] /template/ PathIcon#PART_Icon ^[MessageIcon=Stop] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
+            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowErrorIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Exclamation] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiYellow6}" />
+            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Question] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
+            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowQuestionIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Warning] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiYellow6}" />
+            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowWarningIconGlyph}" />
+        </Style>
+        <Style Selector="^[MessageIcon=Success] /template/ PathIcon#PART_Icon">
+            <Setter Property="IsVisible" Value="True" />
+            <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
+            <Setter Property="Data" Value="{DynamicResource MessageBoxWindowSuccessIconGlyph}" />
+        </Style>
+
     </ControlTheme>
 </ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Shared/MessageBoxWindow.axaml

@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <StreamGeometry x:Key="MessageBoxWindowQuestionIconGlyph">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 23ZM11.8281 14.6094C10.9688 14.6094 10.5391 14.0723 10.5391 13.3691C10.5391 12.3242 11.0566 11.6504 12.2676 10.7324C12.2894 10.7158 12.3111 10.6993 12.3326 10.6829C13.1573 10.0555 13.7324 9.61807 13.7324 8.82812C13.7324 7.93945 12.9023 7.42188 11.9746 7.42188C11.2129 7.42188 10.627 7.70508 10.168 8.30078C9.83594 8.64258 9.57227 8.82812 9.12305 8.82812C8.38086 8.82812 8 8.31055 8 7.71484C8 7.10938 8.3418 6.49414 8.87891 6.02539C9.60156 5.40039 10.7539 5 12.2773 5C14.9922 5 16.8965 6.33789 16.8965 8.64258C16.8965 10.3223 15.8906 11.1328 14.709 11.9531C13.9082 12.5391 13.5273 12.8809 13.2246 13.5742L13.2238 13.5756C12.8922 14.1609 12.638 14.6094 11.8281 14.6094ZM11.8086 18.7695C10.8711 18.7695 10.0996 18.1641 10.0996 17.2266C10.0996 16.2891 10.8711 15.6836 11.8086 15.6836C12.7461 15.6836 13.5078 16.2891 13.5078 17.2266C13.5078 18.1641 12.7461 18.7695 11.8086 18.7695Z</StreamGeometry>
+    <StreamGeometry x:Key="MessageBoxWindowInformationIconGlyph">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</StreamGeometry>
+    <StreamGeometry x:Key="MessageBoxWindowWarningIconGlyph">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</StreamGeometry>
+    <StreamGeometry x:Key="MessageBoxWindowErrorIconGlyph">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.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
+    <StreamGeometry x:Key="MessageBoxWindowSuccessIconGlyph">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</StreamGeometry>
+</ResourceDictionary>

src/Ursa.Themes.Semi/Themes/Shared/_index.axaml

@@ -8,6 +8,7 @@
         <MergeResourceInclude Source="DualBadge.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
         <MergeResourceInclude Source="KeyGestureInput.axaml" />
+        <MergeResourceInclude Source="MessageBoxWindow.axaml" />
         <MergeResourceInclude Source="NavigationMenu.axaml" />
         <MergeResourceInclude Source="Pagination.axaml" />
         <MergeResourceInclude Source="TagInput.axaml" />

src/Ursa/Controls/MessageBox/MessageBox.cs

@@ -1,15 +1,23 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls.Notifications;
 
 namespace Ursa.Controls;
 
 public static class MessageBox
 {
-    public static async Task<MessageBoxResult> ShowAsync(string message)
+    public static async Task<MessageBoxResult> ShowAsync(
+        string message, 
+        string? title = null,
+        MessageBoxIcon icon = MessageBoxIcon.None,
+        MessageBoxButton button = MessageBoxButton.OKCancel)
     {
-        var messageWindow = new MessageBoxWindow()
+        var messageWindow = new MessageBoxWindow(button)
         {
-            Content = message
+            Content = message,
+            Title = title,
+            MessageIcon = icon,
         };
         var lifetime = Application.Current?.ApplicationLifetime;
         if (lifetime is IClassicDesktopStyleApplicationLifetime classLifetime)
@@ -32,31 +40,20 @@ public static class MessageBox
         }
     }
     
-    public static async Task<MessageBoxResult> ShowAsync(string message, string title, MessageBoxButton button)
+    public static async Task<MessageBoxResult> ShowAsync(
+        Window owner,
+        string message, 
+        string title, 
+        MessageBoxIcon icon = MessageBoxIcon.None,
+        MessageBoxButton button = MessageBoxButton.OKCancel)
     {
         var messageWindow = new MessageBoxWindow(button)
         {
             Content = message,
-            Title = title
+            Title = title,
+            MessageIcon = icon,
         };
-        var lifetime = Application.Current?.ApplicationLifetime;
-        if (lifetime is IClassicDesktopStyleApplicationLifetime classLifetime)
-        {
-            var main = classLifetime.MainWindow;
-            if (main is null)
-            {
-                messageWindow.Show();
-                return MessageBoxResult.None;
-            }
-            else
-            {
-                var result = await messageWindow.ShowDialog<MessageBoxResult>(main);
-                return result;
-            }
-        }
-        else
-        {
-            return MessageBoxResult.None;
-        }
+        var result = await messageWindow.ShowDialog<MessageBoxResult>(owner);
+        return result;
     }
 }

src/Ursa/Controls/MessageBox/MessageBoxIcon.cs

@@ -0,0 +1,15 @@
+namespace Ursa.Controls;
+
+public enum MessageBoxIcon
+{
+    Asterisk, // Same as Information
+    Error,
+    Exclamation, // Same as Warning
+    Hand, // Same as Error
+    Information,
+    None,
+    Question,
+    Stop, // Same as Error
+    Warning,
+    Success,
+}

src/Ursa/Controls/MessageBox/MessageBoxWindow.cs

@@ -1,3 +1,4 @@
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
@@ -30,9 +31,13 @@ public class MessageBoxWindow: Window
     
     protected override Type StyleKeyOverride => typeof(MessageBoxWindow);
 
-    static MessageBoxWindow()
+    public static readonly StyledProperty<MessageBoxIcon> MessageIconProperty = AvaloniaProperty.Register<MessageBoxWindow, MessageBoxIcon>(
+        nameof(MessageIcon));
+
+    public MessageBoxIcon MessageIcon
     {
-        
+        get => GetValue(MessageIconProperty);
+        set => SetValue(MessageIconProperty, value);
     }
 
     public MessageBoxWindow()