From eabaa776cc450a0ae551d9d68f75643f48eadf1a Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Tue, 11 Jul 2023 16:29:41 +0200
Subject: [PATCH 01/13] feat: Customize Notifications

---
 .../ViewModels/NotificationViewModel.cs       |  2 +-
 .../IManagedNotificationManager.cs            | 13 +++-
 .../Notifications/NotificationCard.cs         | 65 ++++++++++++++++++-
 .../WindowNotificationManager.cs              | 24 +++----
 4 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index bcbcb345ef..84a3c74dbf 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -11,7 +11,7 @@ namespace ControlCatalog.ViewModels
         {
             ShowCustomManagedNotificationCommand = MiniCommand.Create(() =>
             {
-                NotificationManager?.Show(new NotificationViewModel() { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" , NotificationManager = NotificationManager});
+                NotificationManager?.Show(new NotificationViewModel() { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" , NotificationManager = NotificationManager}, NotificationType.Warning);
             });
 
             ShowManagedNotificationCommand = MiniCommand.Create(() =>
diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index b2e6e9e80b..8d1cb644be 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -1,4 +1,5 @@
-using Avalonia.Metadata;
+using System;
+using Avalonia.Metadata;
 
 namespace Avalonia.Controls.Notifications
 {
@@ -18,6 +19,14 @@ namespace Avalonia.Controls.Notifications
         /// Shows a notification.
         /// </summary>
         /// <param name="content">The content to be displayed.</param>
-        void Show(object content);
+        /// <param name="type">The <see cref="NotificationType"/> of the notification.</param>
+        /// <param name="expiration">the expiration time of the notification after which it will automatically close. If the value is <see cref="TimeSpan.Zero"/> then the notification will remain open until the user closes it.</param>
+        /// <param name="onClick">an Action to be run when the notification is clicked.</param>
+        /// <param name="onClose">an Action to be run when the notification is closed.</param>
+        void Show(object content,
+            NotificationType type = NotificationType.Information,
+            TimeSpan? expiration = null,
+            Action? onClick = null,
+            Action? onClose = null);
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
index 7d5b6cc0ca..da9e15a7f3 100644
--- a/src/Avalonia.Controls/Notifications/NotificationCard.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Avalonia.Reactive;
 using Avalonia.Controls.Metadata;
@@ -61,6 +61,7 @@ namespace Avalonia.Controls.Notifications
                         }
                     }
                 });
+            UpdateNotificationType();
         }
 
         /// <summary>
@@ -93,6 +94,21 @@ namespace Avalonia.Controls.Notifications
         public static readonly StyledProperty<bool> IsClosedProperty =
             AvaloniaProperty.Register<NotificationCard, bool>(nameof(IsClosed));
 
+        /// <summary>
+        /// Gets or sets the type of the notification
+        /// </summary>
+        public NotificationType NotificationType
+        {
+            get { return GetValue(NotificationTypeProperty); }
+            set { SetValue(NotificationTypeProperty, value); }
+        }
+
+        /// <summary>
+        /// Defines the <see cref="NotificationType" /> property
+        /// </summary>
+        public static readonly StyledProperty<NotificationType> NotificationTypeProperty =
+            AvaloniaProperty.Register<NotificationCard, NotificationType>(nameof(NotificationType));
+
         /// <summary>
         /// Defines the <see cref="NotificationClosed"/> event.
         /// </summary>
@@ -163,5 +179,52 @@ namespace Avalonia.Controls.Notifications
 
             IsClosing = true;
         }
+
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+
+            if (e.Property == ContentProperty && e.NewValue is INotification notification)
+            {
+                SetValue(NotificationTypeProperty, notification.Type);
+            }
+
+            if (e.Property == NotificationTypeProperty)
+            {
+                UpdateNotificationType();
+            }
+
+            if (e.Property == IsClosedProperty)
+            {
+                if (!IsClosing && !IsClosed)
+                {
+                    return;
+                }
+
+                RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
+            }
+        }
+
+        private void UpdateNotificationType()
+        {
+            switch (NotificationType)
+            {
+                case NotificationType.Error:
+                    PseudoClasses.Add(":error");
+                    break;
+
+                case NotificationType.Information:
+                    PseudoClasses.Add(":information");
+                    break;
+
+                case NotificationType.Success:
+                    PseudoClasses.Add(":success");
+                    break;
+
+                case NotificationType.Warning:
+                    PseudoClasses.Add(":warning");
+                    break;
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index b03099f750..d764f2bd78 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -80,32 +80,32 @@ namespace Avalonia.Controls.Notifications
         /// <inheritdoc/>
         public void Show(INotification content)
         {
-            Show(content as object);
+            Show(content, content.Type, content.Expiration, content.OnClick, content.OnClose);
         }
 
         /// <inheritdoc/>
-        public async void Show(object content)
+        public async void Show(object content, 
+            NotificationType type = NotificationType.Information, 
+            TimeSpan? expiration = null,
+            Action? onClick = null, 
+            Action? onClose = null)
         {
-            var notification = content as INotification;
-
             var notificationControl = new NotificationCard
             {
-                Content = content
+                Content = content,
+                NotificationType = type
             };
 
             notificationControl.NotificationClosed += (sender, args) =>
             {
-                notification?.OnClose?.Invoke();
+                onClose?.Invoke();
 
                 _items?.Remove(sender);
             };
 
             notificationControl.PointerPressed += (sender, args) =>
             {
-                if (notification != null && notification.OnClick != null)
-                {
-                    notification.OnClick.Invoke();
-                }
+                onClick?.Invoke();
 
                 (sender as NotificationCard)?.Close();
             };
@@ -117,12 +117,12 @@ namespace Avalonia.Controls.Notifications
                 _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
             }
 
-            if (notification != null && notification.Expiration == TimeSpan.Zero)
+            if (expiration == TimeSpan.Zero)
             {
                 return;
             }
 
-            await Task.Delay(notification?.Expiration ?? TimeSpan.FromSeconds(5));
+            await Task.Delay(expiration ?? TimeSpan.FromSeconds(5));
 
             notificationControl.Close();
         }

From 7514d7085c8b60583d59de86d5d87048197e3eec Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Thu, 13 Jul 2023 16:02:43 +0200
Subject: [PATCH 02/13] Added an option to specify classes

---
 .../Notifications/IManagedNotificationManager.cs     |  4 +++-
 .../Notifications/WindowNotificationManager.cs       | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index 8d1cb644be..5eba36dbe6 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -23,10 +23,12 @@ namespace Avalonia.Controls.Notifications
         /// <param name="expiration">the expiration time of the notification after which it will automatically close. If the value is <see cref="TimeSpan.Zero"/> then the notification will remain open until the user closes it.</param>
         /// <param name="onClick">an Action to be run when the notification is clicked.</param>
         /// <param name="onClose">an Action to be run when the notification is closed.</param>
+        /// <param name="classes">Style-classes to ba added to the notification card</param>
         void Show(object content,
             NotificationType type = NotificationType.Information,
             TimeSpan? expiration = null,
             Action? onClick = null,
-            Action? onClose = null);
+            Action? onClose = null, 
+            string[]? classes = null);
     }
 }
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index d764f2bd78..0b7a19707b 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -88,7 +88,8 @@ namespace Avalonia.Controls.Notifications
             NotificationType type = NotificationType.Information, 
             TimeSpan? expiration = null,
             Action? onClick = null, 
-            Action? onClose = null)
+            Action? onClose = null, 
+            string[]? classes = null)
         {
             var notificationControl = new NotificationCard
             {
@@ -96,6 +97,15 @@ namespace Avalonia.Controls.Notifications
                 NotificationType = type
             };
 
+            // Add style classes if any
+            if (classes != null)
+            {
+                foreach (var @class in classes)
+                {
+                    notificationControl.Classes.Add(@class);
+                }
+            }
+            
             notificationControl.NotificationClosed += (sender, args) =>
             {
                 onClose?.Invoke();

From 540bade45a0d4c31fbb0dcb6483e6b68c9355e5e Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Fri, 21 Jul 2023 15:00:53 +0200
Subject: [PATCH 03/13] Improve WinodwNotificationManager

- Allow usage from XAML
- Allow any Visual as Host, so it can be used inside UserControl for example
- Allow adding style classes for NotificationCards
---
 .../WindowNotificationManager.cs              | 78 +++++++++++++++----
 1 file changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 0b7a19707b..80931d1865 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections;
 using System.Linq;
-using Avalonia.Reactive;
 using System.Threading.Tasks;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
-using Avalonia.Rendering;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Notifications
@@ -18,6 +17,7 @@ namespace Avalonia.Controls.Notifications
     public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
     {
         private IList? _items;
+        private AdornerLayer? adornerLayer;
 
         /// <summary>
         /// Defines the <see cref="Position"/> property.
@@ -50,17 +50,40 @@ namespace Avalonia.Controls.Notifications
             set { SetValue(MaxItemsProperty, value); }
         }
 
+        /// <summary>
+        /// Defines the <see cref="Host" /> property
+        /// </summary>
+        public static readonly DirectProperty<WindowNotificationManager, Visual?> HostProperty =
+            AvaloniaProperty.RegisterDirect<WindowNotificationManager, Visual?>(
+                nameof(Host),
+                o => o.Host,
+                (o, v) => o.Host = v);
+
+        private Visual? _Host;
+
+        /// <summary>
+        /// The Host that this NotificationManger should register to. If the Host is null, the Parent will be used.
+        /// </summary>
+        public Visual? Host
+        {
+            get { return _Host; }
+            set { SetAndRaise(HostProperty, ref _Host, value); }
+        }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>
-        /// <param name="host">The window that will host the control.</param>
-        public WindowNotificationManager(TopLevel? host)
+        /// <param name="host">The visual that will host the control.</param>
+        public WindowNotificationManager(Visual? host) : this()
         {
-            if (host != null)
-            {
-                Install(host);
-            }
+            Host = host;
+        }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
+        /// </summary>
+        public WindowNotificationManager()
+        {
             UpdatePseudoClasses(Position);
         }
 
@@ -73,6 +96,8 @@ namespace Avalonia.Controls.Notifications
         /// <inheritdoc/>
         protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
+            base.OnApplyTemplate(e);
+            
             var itemsControl = e.NameScope.Find<Panel>("PART_Items");
             _items = itemsControl?.Children;
         }
@@ -120,12 +145,15 @@ namespace Avalonia.Controls.Notifications
                 (sender as NotificationCard)?.Close();
             };
 
-            _items?.Add(notificationControl);
-
-            if (_items?.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
+            Dispatcher.UIThread.Post(() =>
             {
-                _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
-            }
+                _items?.Add(notificationControl);
+
+                if (_items?.OfType<NotificationCard>().Count(i => !i.IsClosing) > MaxItems)
+                {
+                    _items.OfType<NotificationCard>().First(i => !i.IsClosing).Close();
+                }
+            });
 
             if (expiration == TimeSpan.Zero)
             {
@@ -145,16 +173,32 @@ namespace Avalonia.Controls.Notifications
             {
                 UpdatePseudoClasses(change.GetNewValue<NotificationPosition>());
             }
+
+            if (change.Property == HostProperty)
+            {
+                Install();
+            }
         }
 
         /// <summary>
         /// Installs the <see cref="WindowNotificationManager"/> within the <see cref="AdornerLayer"/>
-        /// of the host <see cref="Window"/>.
         /// </summary>
-        /// <param name="host">The <see cref="Window"/> that will be the host.</param>
-        private void Install(TemplatedControl host)
+        private void Install()
         {
-            var adornerLayer = host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer;
+            // unregister from AdornerLayer if this control was already installed
+            if (adornerLayer is not null && !adornerLayer.Children.Contains(this))
+            {
+                adornerLayer.Children.Remove(this);
+            }
+            
+            // Try to get the host. If host was null, use the TopLevel instead.
+            var host = Host ?? Parent as Visual;
+
+            if (host is null) throw new InvalidOperationException("NotificationControl cannot be installed. Host was not found.");
+
+            adornerLayer = host is TopLevel 
+                ? host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer 
+                : AdornerLayer.GetAdornerLayer(host);
 
             if (adornerLayer is not null)
             {

From eadf63ce450a5daa9f61e8fd72f995616210ee6a Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Mon, 24 Jul 2023 12:15:49 +0200
Subject: [PATCH 04/13] Revert breaking change

---
 .../IManagedNotificationManager.cs            |  8 ++++++-
 .../WindowNotificationManager.cs              | 21 +++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index 5eba36dbe6..94d927f8ca 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -15,6 +15,12 @@ namespace Avalonia.Controls.Notifications
     [NotClientImplementable]
     public interface IManagedNotificationManager : INotificationManager
     {
+        /// <summary>
+        /// Shows a notification.
+        /// </summary>
+        /// <param name="content">The content to be displayed.</param>
+        void Show(object content);
+        
         /// <summary>
         /// Shows a notification.
         /// </summary>
@@ -25,7 +31,7 @@ namespace Avalonia.Controls.Notifications
         /// <param name="onClose">an Action to be run when the notification is closed.</param>
         /// <param name="classes">Style-classes to ba added to the notification card</param>
         void Show(object content,
-            NotificationType type = NotificationType.Information,
+            NotificationType type,
             TimeSpan? expiration = null,
             Action? onClick = null,
             Action? onClose = null, 
diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 80931d1865..26ca8abb42 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -73,8 +73,8 @@ namespace Avalonia.Controls.Notifications
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>
-        /// <param name="host">The visual that will host the control.</param>
-        public WindowNotificationManager(Visual? host) : this()
+        /// <param name="host">The TopLevel that will host the control.</param>
+        public WindowNotificationManager(TopLevel? host) : this()
         {
             Host = host;
         }
@@ -108,9 +108,22 @@ namespace Avalonia.Controls.Notifications
             Show(content, content.Type, content.Expiration, content.OnClick, content.OnClose);
         }
 
+        /// <inheritdoc/>
+        public async void Show(object content)
+        {
+            if (content is INotification notification)
+            {
+                Show(notification, notification.Type, notification.Expiration, notification.OnClick, notification.OnClose);
+            }
+            else
+            {
+                Show(content, NotificationType.Information);
+            }
+        }
+        
         /// <inheritdoc/>
         public async void Show(object content, 
-            NotificationType type = NotificationType.Information, 
+            NotificationType type, 
             TimeSpan? expiration = null,
             Action? onClick = null, 
             Action? onClose = null, 
@@ -202,7 +215,7 @@ namespace Avalonia.Controls.Notifications
 
             if (adornerLayer is not null)
             {
-                adornerLayer.Children.Add(this);
+                // adornerLayer.Children.Add(this);
                 AdornerLayer.SetAdornedElement(this, adornerLayer);
             }
         }

From 7477aa7330fad59caa68e475e09ace45b0698946 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Mon, 24 Jul 2023 13:03:08 +0200
Subject: [PATCH 05/13] Revert more breaking changes

---
 .../Notifications/IManagedNotificationManager.cs | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
index 94d927f8ca..bd57f3a86f 100644
--- a/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/IManagedNotificationManager.cs
@@ -20,21 +20,5 @@ namespace Avalonia.Controls.Notifications
         /// </summary>
         /// <param name="content">The content to be displayed.</param>
         void Show(object content);
-        
-        /// <summary>
-        /// Shows a notification.
-        /// </summary>
-        /// <param name="content">The content to be displayed.</param>
-        /// <param name="type">The <see cref="NotificationType"/> of the notification.</param>
-        /// <param name="expiration">the expiration time of the notification after which it will automatically close. If the value is <see cref="TimeSpan.Zero"/> then the notification will remain open until the user closes it.</param>
-        /// <param name="onClick">an Action to be run when the notification is clicked.</param>
-        /// <param name="onClose">an Action to be run when the notification is closed.</param>
-        /// <param name="classes">Style-classes to ba added to the notification card</param>
-        void Show(object content,
-            NotificationType type,
-            TimeSpan? expiration = null,
-            Action? onClick = null,
-            Action? onClose = null, 
-            string[]? classes = null);
     }
 }

From e83ebc2bb33315b7c033d02fcfd0fae0d455bcf6 Mon Sep 17 00:00:00 2001
From: Tim <47110241+timunie@users.noreply.github.com>
Date: Wed, 30 Aug 2023 15:34:05 +0200
Subject: [PATCH 06/13] Handle merge conflicts comming from current master

---
 .../Notifications/NotificationCard.cs         | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/NotificationCard.cs b/src/Avalonia.Controls/Notifications/NotificationCard.cs
index da9e15a7f3..d233525056 100644
--- a/src/Avalonia.Controls/Notifications/NotificationCard.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationCard.cs
@@ -25,42 +25,6 @@ namespace Avalonia.Controls.Notifications
         /// </summary>
         public NotificationCard()
         {
-            this.GetObservable(IsClosedProperty)
-                .Subscribe(x =>
-                {
-                    if (!IsClosing && !IsClosed)
-                    {
-                        return;
-                    }
-
-                    RaiseEvent(new RoutedEventArgs(NotificationClosedEvent));
-                });
-
-            this.GetObservable(ContentProperty)
-                .Subscribe(x =>
-                {
-                    if (x is INotification notification)
-                    {
-                        switch (notification.Type)
-                        {
-                            case NotificationType.Error:
-                                PseudoClasses.Add(":error");
-                                break;
-
-                            case NotificationType.Information:
-                                PseudoClasses.Add(":information");
-                                break;
-
-                            case NotificationType.Success:
-                                PseudoClasses.Add(":success");
-                                break;
-
-                            case NotificationType.Warning:
-                                PseudoClasses.Add(":warning");
-                                break;
-                        }
-                    }
-                });
             UpdateNotificationType();
         }
 

From 3f0769a1f44c49aa8e933dfd0ffc2cecfcdda9cb Mon Sep 17 00:00:00 2001
From: Tim <47110241+timunie@users.noreply.github.com>
Date: Wed, 30 Aug 2023 15:46:37 +0200
Subject: [PATCH 07/13] Uncomment code that was commented by accident

---
 .../Notifications/WindowNotificationManager.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 26ca8abb42..cb6a844d32 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -215,7 +215,7 @@ namespace Avalonia.Controls.Notifications
 
             if (adornerLayer is not null)
             {
-                // adornerLayer.Children.Add(this);
+                adornerLayer.Children.Add(this);
                 AdornerLayer.SetAdornedElement(this, adornerLayer);
             }
         }

From bfeeb10adf8fa52c4f358ecf6c9c7d8f66dbcf37 Mon Sep 17 00:00:00 2001
From: Tim <47110241+timunie@users.noreply.github.com>
Date: Wed, 30 Aug 2023 15:46:57 +0200
Subject: [PATCH 08/13] improved help text

---
 .../Notifications/WindowNotificationManager.cs         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index cb6a844d32..889e17ba03 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -121,7 +121,15 @@ namespace Avalonia.Controls.Notifications
             }
         }
         
-        /// <inheritdoc/>
+        /// <summary>
+        /// Shows a Notification
+        /// </summary>
+        /// <param name="content">the content of the notification</param>
+        /// <param name="type">the type of the notification</param>
+        /// <param name="expiration">the expiration time of the notification after which it will automatically close. If the value is Zero then the notification will remain open until the user closes it</param>
+        /// <param name="onClick">an Action to be run when the notification is clicked</param>
+        /// <param name="onClose">an Action to be run when the notification is closed</param>
+        /// <param name="classes">style classes to apply</param>
         public async void Show(object content, 
             NotificationType type, 
             TimeSpan? expiration = null,

From 8b8b137c30af56285c18acdfdf507f2003b7aea0 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 30 Aug 2023 17:46:12 -0700
Subject: [PATCH 09/13] Remove "Show Native Notification" as we won't have them
 soon

---
 samples/ControlCatalog/Pages/NotificationsPage.xaml       | 3 +--
 .../ControlCatalog/ViewModels/NotificationViewModel.cs    | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml b/samples/ControlCatalog/Pages/NotificationsPage.xaml
index 46c1fe52de..425837d4b9 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@@ -6,6 +6,5 @@
   <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Left">
         <Button Content="Show Standard Managed Notification" Command="{Binding ShowManagedNotificationCommand}" />
         <Button Content="Show Custom Managed Notification" Command="{Binding ShowCustomManagedNotificationCommand}" />
-        <Button Content="Show Native Notification" Command="{Binding ShowNativeNotificationCommand}" />
-    </StackPanel>
+  </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
index 84a3c74dbf..40af6e033a 100644
--- a/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/NotificationViewModel.cs
@@ -19,11 +19,6 @@ namespace ControlCatalog.ViewModels
                 NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
             });
 
-            ShowNativeNotificationCommand = MiniCommand.Create(() =>
-            {
-                NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
-            });
-
             YesCommand = MiniCommand.Create(() =>
             {
                 NotificationManager?.Show(new Avalonia.Controls.Notifications.Notification("Avalonia Notifications", "Start adding notifications to your app today."));
@@ -45,8 +40,5 @@ namespace ControlCatalog.ViewModels
         public MiniCommand ShowCustomManagedNotificationCommand { get; }
 
         public MiniCommand ShowManagedNotificationCommand { get; }
-
-        public MiniCommand ShowNativeNotificationCommand { get; }
-
     }
 }

From 4bd5c96ea901f0deb50a631acb9cc3d7f1a0a57b Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 30 Aug 2023 19:11:27 -0700
Subject: [PATCH 10/13] Make Notification properties open and some bindable

---
 .../Notifications/Notification.cs             | 55 ++++++++++++++++---
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 376df175f3..ace8cba243 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace Avalonia.Controls.Notifications
 {
@@ -9,8 +12,10 @@ namespace Avalonia.Controls.Notifications
     /// This class represents a notification that can be displayed either in a window using
     /// <see cref="WindowNotificationManager"/> or by the host operating system (to be implemented).
     /// </remarks>
-    public class Notification : INotification
+    public class Notification : INotification, INotifyPropertyChanged
     {
+        private string? _title, _message;
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="Notification"/> class.
         /// </summary>
@@ -35,23 +40,59 @@ namespace Avalonia.Controls.Notifications
             OnClick = onClick;
             OnClose = onClose;
         }
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Notification"/> class.
+        /// </summary>
+        public Notification() : this(null, null)
+        {
+        }
 
         /// <inheritdoc/>
-        public string? Title { get; private set; }
+        public string? Title
+        {
+            get => _title;
+            set
+            {
+                if (_title != value)
+                {
+                    _title = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         /// <inheritdoc/>
-        public string? Message { get; private set; }
+        public string? Message
+        {
+            get => _message;
+            set
+            {
+                if (_message != value)
+                {
+                    _message = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         /// <inheritdoc/>
-        public NotificationType Type { get; private set; }
+        public NotificationType Type { get; set; }
 
         /// <inheritdoc/>
-        public TimeSpan Expiration { get; private set; }
+        public TimeSpan Expiration { get; set; }
 
         /// <inheritdoc/>
-        public Action? OnClick { get; private set; }
+        public Action? OnClick { get; set; }
 
         /// <inheritdoc/>
-        public Action? OnClose { get; private set; }
+        public Action? OnClose { get; set; }
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }

From 66c42ac8ec229d891af98f13fe020087a02ebaf4 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 30 Aug 2023 19:11:56 -0700
Subject: [PATCH 11/13] Update Host attachment behavior once again

---
 .../WindowNotificationManager.cs              | 68 +++++++------------
 .../Primitives/AdornerLayer.cs                |  2 +-
 2 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index 889e17ba03..cb7ade44b3 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Avalonia.Collections;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Threading;
@@ -17,8 +19,6 @@ namespace Avalonia.Controls.Notifications
     public class WindowNotificationManager : TemplatedControl, IManagedNotificationManager
     {
         private IList? _items;
-        private AdornerLayer? adornerLayer;
-
         /// <summary>
         /// Defines the <see cref="Position"/> property.
         /// </summary>
@@ -49,34 +49,14 @@ namespace Avalonia.Controls.Notifications
             get { return GetValue(MaxItemsProperty); }
             set { SetValue(MaxItemsProperty, value); }
         }
-
-        /// <summary>
-        /// Defines the <see cref="Host" /> property
-        /// </summary>
-        public static readonly DirectProperty<WindowNotificationManager, Visual?> HostProperty =
-            AvaloniaProperty.RegisterDirect<WindowNotificationManager, Visual?>(
-                nameof(Host),
-                o => o.Host,
-                (o, v) => o.Host = v);
-
-        private Visual? _Host;
-
-        /// <summary>
-        /// The Host that this NotificationManger should register to. If the Host is null, the Parent will be used.
-        /// </summary>
-        public Visual? Host
-        {
-            get { return _Host; }
-            set { SetAndRaise(HostProperty, ref _Host, value); }
-        }
         
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>
         /// <param name="host">The TopLevel that will host the control.</param>
-        public WindowNotificationManager(TopLevel? host) : this()
+        public WindowNotificationManager(TopLevel host) : this()
         {
-            Host = host;
+            InstallFromTopLevel(host);
         }
 
         /// <summary>
@@ -137,6 +117,8 @@ namespace Avalonia.Controls.Notifications
             Action? onClose = null, 
             string[]? classes = null)
         {
+            Dispatcher.UIThread.VerifyAccess();
+            
             var notificationControl = new NotificationCard
             {
                 Content = content,
@@ -194,38 +176,34 @@ namespace Avalonia.Controls.Notifications
             {
                 UpdatePseudoClasses(change.GetNewValue<NotificationPosition>());
             }
-
-            if (change.Property == HostProperty)
-            {
-                Install();
-            }
         }
 
         /// <summary>
         /// Installs the <see cref="WindowNotificationManager"/> within the <see cref="AdornerLayer"/>
         /// </summary>
-        private void Install()
+        private void InstallFromTopLevel(TopLevel topLevel)
         {
-            // unregister from AdornerLayer if this control was already installed
-            if (adornerLayer is not null && !adornerLayer.Children.Contains(this))
+            topLevel.TemplateApplied += TopLevelOnTemplateApplied;
+            var adorner = topLevel.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer;
+            if (adorner is not null)
             {
-                adornerLayer.Children.Remove(this);
+                adorner.Children.Add(this);
+                AdornerLayer.SetAdornedElement(this, adorner);
             }
-            
-            // Try to get the host. If host was null, use the TopLevel instead.
-            var host = Host ?? Parent as Visual;
-
-            if (host is null) throw new InvalidOperationException("NotificationControl cannot be installed. Host was not found.");
-
-            adornerLayer = host is TopLevel 
-                ? host.FindDescendantOfType<VisualLayerManager>()?.AdornerLayer 
-                : AdornerLayer.GetAdornerLayer(host);
+        }
 
-            if (adornerLayer is not null)
+        private void TopLevelOnTemplateApplied(object? sender, TemplateAppliedEventArgs e)
+        {
+            if (Parent is AdornerLayer adornerLayer)
             {
-                adornerLayer.Children.Add(this);
-                AdornerLayer.SetAdornedElement(this, adornerLayer);
+                adornerLayer.Children.Remove(this);
+                AdornerLayer.SetAdornedElement(this, null);
             }
+            
+            // Reinstall notification manager on template reapplied.
+            var topLevel = (TopLevel)sender!;
+            topLevel.TemplateApplied -= TopLevelOnTemplateApplied;
+            InstallFromTopLevel(topLevel);
         }
 
         private void UpdatePseudoClasses(NotificationPosition position)
diff --git a/src/Avalonia.Controls/Primitives/AdornerLayer.cs b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
index 37c46e1e7d..f21b608667 100644
--- a/src/Avalonia.Controls/Primitives/AdornerLayer.cs
+++ b/src/Avalonia.Controls/Primitives/AdornerLayer.cs
@@ -61,7 +61,7 @@ namespace Avalonia.Controls.Primitives
             return adorner.GetValue(AdornedElementProperty);
         }
 
-        public static void SetAdornedElement(Visual adorner, Visual adorned)
+        public static void SetAdornedElement(Visual adorner, Visual? adorned)
         {
             adorner.SetValue(AdornedElementProperty, adorned);
         }

From 0f85a4603d094aa72727b8ac84b35ea5eab8f376 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 30 Aug 2023 19:18:03 -0700
Subject: [PATCH 12/13] Make WindowNotificationManager(TopLevel) ctor nullable
 as it was before

---
 .../Notifications/WindowNotificationManager.cs             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
index cb7ade44b3..6d9a030ead 100644
--- a/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/WindowNotificationManager.cs
@@ -54,9 +54,12 @@ namespace Avalonia.Controls.Notifications
         /// Initializes a new instance of the <see cref="WindowNotificationManager"/> class.
         /// </summary>
         /// <param name="host">The TopLevel that will host the control.</param>
-        public WindowNotificationManager(TopLevel host) : this()
+        public WindowNotificationManager(TopLevel? host) : this()
         {
-            InstallFromTopLevel(host);
+            if (host is not null)
+            {
+                InstallFromTopLevel(host);
+            }
         }
 
         /// <summary>

From 12863fe9c584a007565eef6da63837153e2bb2e5 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 30 Aug 2023 19:18:10 -0700
Subject: [PATCH 13/13] Add XAML usage sample

---
 .../Pages/NotificationsPage.xaml              | 26 ++++++++++++++++---
 .../Pages/NotificationsPage.xaml.cs           |  8 +++++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml b/samples/ControlCatalog/Pages/NotificationsPage.xaml
index 425837d4b9..b4094d8a2e 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@@ -1,10 +1,28 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:viewModels="using:ControlCatalog.ViewModels"
+             xmlns:system="clr-namespace:System;assembly=System.Runtime"
              x:Class="ControlCatalog.Pages.NotificationsPage"
              x:DataType="viewModels:NotificationViewModel">
-  <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Left">
-        <Button Content="Show Standard Managed Notification" Command="{Binding ShowManagedNotificationCommand}" />
-        <Button Content="Show Custom Managed Notification" Command="{Binding ShowCustomManagedNotificationCommand}" />
-  </StackPanel>
+  <DockPanel>
+    <TextBlock DockPanel.Dock="Top"
+               Margin="2" Classes="h2" TextWrapping="Wrap">TopLevel bound notification manager.</TextBlock>
+    <StackPanel DockPanel.Dock="Top"
+                Orientation="Vertical" Spacing="4" HorizontalAlignment="Left">
+      <Button Content="Show Standard Managed Notification" Command="{Binding ShowManagedNotificationCommand}" />
+      <Button Content="Show Custom Managed Notification" Command="{Binding ShowCustomManagedNotificationCommand}" />
+    </StackPanel>
+    
+    <TextBlock DockPanel.Dock="Top"
+               Margin="2" Classes="h2" TextWrapping="Wrap">XAML only notification manager.</TextBlock>
+    <Button DockPanel.Dock="Top"
+            Content="Show XAML only Notification" Command="{Binding #ControlNotifications.Show}">
+      <Button.CommandParameter>
+        <Notification Title="Title" Message="Message" OnClick="NotificationOnClick" />
+      </Button.CommandParameter>
+    </Button>
+    <Border Padding="10" BorderBrush="{DynamicResource SystemAccentColor}">
+      <WindowNotificationManager x:Name="ControlNotifications" />
+    </Border>
+  </DockPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
index 6f83e5c366..fac1989976 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using Avalonia.Markup.Xaml;
 using ControlCatalog.ViewModels;
 
@@ -27,7 +28,12 @@ namespace ControlCatalog.Pages
         {
             base.OnAttachedToVisualTree(e);
 
-            _viewModel.NotificationManager = new Avalonia.Controls.Notifications.WindowNotificationManager(TopLevel.GetTopLevel(this));
+            _viewModel.NotificationManager = new WindowNotificationManager(TopLevel.GetTopLevel(this)!);
+        }
+
+        public void NotificationOnClick()
+        {
+            this.Get<WindowNotificationManager>("ControlNotifications").Show("Notification clicked");
         }
     }
 }