From d80083f2f522d2614b43a0fb08bf78d9a559d4f4 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 11 Apr 2019 00:09:50 +0100
Subject: [PATCH] further progress on notifications ui

---
 samples/ControlCatalog/MainWindow.xaml        |  5 +-
 samples/ControlCatalog/MainWindow.xaml.cs     | 25 ++++++
 .../Notifications/Notification.cs             | 38 ++++++--
 .../Notifications/NotificationArea.cs         | 24 +++--
 .../Notifications/NotificationContent.cs      | 21 +++++
 .../Notifications/NotificationManager.cs      |  2 +-
 .../Properties/AssemblyInfo.cs                |  3 +-
 .../Avalonia.Themes.Default.csproj            | 14 ++-
 src/Avalonia.Themes.Default/DefaultTheme.xaml |  1 +
 .../NotificationArea.xaml                     | 87 +++++++++++++++++++
 10 files changed, 202 insertions(+), 18 deletions(-)
 create mode 100644 src/Avalonia.Controls/Notifications/NotificationContent.cs
 create mode 100644 src/Avalonia.Themes.Default/NotificationArea.xaml

diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml
index 4bae60b2a6..ae9574189a 100644
--- a/samples/ControlCatalog/MainWindow.xaml
+++ b/samples/ControlCatalog/MainWindow.xaml
@@ -4,5 +4,8 @@
         xmlns:local="clr-namespace:ControlCatalog"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="ControlCatalog.MainWindow">
-    <local:MainView/>
+    <Panel>
+        <local:MainView/>
+        <NotificationArea Name="Main" Position="TopRight" MaxItems="5" />
+    </Panel>
 </Window>
diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index e620a77e52..4057af59ff 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -1,18 +1,43 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
 using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
 using System;
+using System.Threading.Tasks;
 
 namespace ControlCatalog
 {
     public class MainWindow : Window
     {
+        private readonly NotificationManager _notificationManager = new NotificationManager();
+
         public MainWindow()
         {
             this.InitializeComponent();
             this.AttachDevTools();
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
+
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                await Task.Delay(5000);
+
+                _notificationManager.Show(new NotificationContent { Message = "Test1", Type = NotificationType.Information }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show(new NotificationContent { Message = "Test2", Type = NotificationType.Error }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show(new NotificationContent { Message = "Test3", Type = NotificationType.Warning }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show(new NotificationContent { Message = "Test4", Type = NotificationType.Success }, "Main");
+
+                await Task.Delay(500);
+                _notificationManager.Show("Test5", "Main");
+
+            });
         }
 
         private void InitializeComponent()
diff --git a/src/Avalonia.Controls/Notifications/Notification.cs b/src/Avalonia.Controls/Notifications/Notification.cs
index 690dbfaac9..c7cd176513 100644
--- a/src/Avalonia.Controls/Notifications/Notification.cs
+++ b/src/Avalonia.Controls/Notifications/Notification.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
@@ -11,7 +12,34 @@ namespace Avalonia.Controls.Notifications
 
         static Notification()
         {
-            CloseOnClickProperty.Changed.AddClassHandler<Button>(CloseOnClickChanged);
+            //CloseOnClickProperty.Changed.AddClassHandler<Button>(CloseOnClickChanged);
+        }
+
+        public Notification()
+        {
+            this.GetObservable(ContentProperty)
+                .OfType<NotificationContent>()
+                .Subscribe(x =>
+                {
+                    switch (x.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;
+                    }
+                });
         }
 
         public bool IsClosing { get; set; }
@@ -43,7 +71,7 @@ namespace Avalonia.Controls.Notifications
             remove { RemoveHandler(NotificationClosedEvent, value); }
         }
 
-        public static bool GetCloseOnClick(Notification obj)
+        /*public static bool GetCloseOnClick(Notification obj)
         {
             return (bool)obj.GetValue(CloseOnClickProperty);
         }
@@ -51,10 +79,10 @@ namespace Avalonia.Controls.Notifications
         public static void SetCloseOnClick(Notification obj, bool value)
         {
             obj.SetValue(CloseOnClickProperty, value);
-        }
+        }*/
 
-        public static readonly AvaloniaProperty CloseOnClickProperty =
-            AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
+        //public static readonly AvaloniaProperty CloseOnClickProperty =
+          //  AvaloniaProperty.RegisterDirect<Notification, bool>("CloseOnClick", GetCloseOnClick, SetCloseOnClick);
 
         private static void CloseOnClickChanged(Button dependencyObject, AvaloniaPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
diff --git a/src/Avalonia.Controls/Notifications/NotificationArea.cs b/src/Avalonia.Controls/Notifications/NotificationArea.cs
index 8cfbecfa1c..2b58aed639 100644
--- a/src/Avalonia.Controls/Notifications/NotificationArea.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationArea.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections;
+using System.Linq;
+using System.Threading.Tasks;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
 
@@ -15,7 +17,7 @@ namespace Avalonia.Controls.Notifications
             set { SetValue(PositionProperty, value); }
         }
 
-        public static readonly AvaloniaProperty PositionProperty =
+        public static readonly StyledProperty<NotificationPosition> PositionProperty =
             AvaloniaProperty.Register<NotificationArea, NotificationPosition>(nameof(Position), NotificationPosition.BottomRight);
 
         public int MaxItems
@@ -32,11 +34,19 @@ namespace Avalonia.Controls.Notifications
             NotificationManager.AddArea(this);
         }
 
+        static NotificationArea()
+        {
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopLeft, ":topleft");
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.TopRight, ":topright");
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomLeft, ":bottomleft");
+            PseudoClass<NotificationArea, NotificationPosition>(PositionProperty, x => x == NotificationPosition.BottomRight, ":bottomright");
+        }
+
         protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
         {
             base.OnTemplateApplied(e);
 
-            var itemsControl = this.FindControl<Panel>("PART_Items");
+            var itemsControl = e.NameScope.Find<Panel>("PART_Items");
             _items = itemsControl?.Children;
         }
 
@@ -58,17 +68,17 @@ namespace Avalonia.Controls.Notifications
             notification.NotificationClosed += (sender, args) => onClose?.Invoke();
             notification.NotificationClosed += OnNotificationClosed;
 
-           /* if (!IsLoaded)
+            /*if (!this.)
             {
                 return;
-            }
+            }*/
 
-            var w = Window.GetWindow(this);
+            /*var w = this.VisualRoot Window.GetWindow(this);
             var x = PresentationSource.FromVisual(w);
             if (x == null)
             {
                 return;
-            }
+            }*/
 
             lock (_items)
             {
@@ -86,7 +96,7 @@ namespace Avalonia.Controls.Notifications
             }
             await Task.Delay(expirationTime);
 
-            notification.Close();*/
+            notification.Close();
         }
 
         private void OnNotificationClosed(object sender, RoutedEventArgs routedEventArgs)
diff --git a/src/Avalonia.Controls/Notifications/NotificationContent.cs b/src/Avalonia.Controls/Notifications/NotificationContent.cs
new file mode 100644
index 0000000000..9c070b7e86
--- /dev/null
+++ b/src/Avalonia.Controls/Notifications/NotificationContent.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Controls.Notifications
+{
+    public class NotificationContent
+    {
+        public string Title { get; set; }
+        public string Message { get; set; }
+        public NotificationType Type { get; set; }
+    }
+
+    public enum NotificationType
+    {
+        Information,
+        Success,
+        Warning,
+        Error
+    }
+}
diff --git a/src/Avalonia.Controls/Notifications/NotificationManager.cs b/src/Avalonia.Controls/Notifications/NotificationManager.cs
index 236d67a35f..8e6ad0a90b 100644
--- a/src/Avalonia.Controls/Notifications/NotificationManager.cs
+++ b/src/Avalonia.Controls/Notifications/NotificationManager.cs
@@ -26,7 +26,7 @@ namespace Avalonia.Controls.Notifications
             }
 
             if (expirationTime == null)
-                expirationTime = TimeSpan.FromSeconds(5);
+                expirationTime = TimeSpan.FromSeconds(25);
 
             if (areaName == string.Empty && _window == null)
             {
diff --git a/src/Avalonia.Controls/Properties/AssemblyInfo.cs b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
index 3466119411..c04c66a77f 100644
--- a/src/Avalonia.Controls/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Controls/Properties/AssemblyInfo.cs
@@ -14,4 +14,5 @@ using Avalonia.Metadata;
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Presenters")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Primitives")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Shapes")]
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Templates")]
\ No newline at end of file
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Templates")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Notifications")]
diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
index ea53f308ab..7dedcdef57 100644
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@@ -12,10 +12,18 @@
     <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    <AvaloniaResource Include="DefaultTheme.xaml"/>
-    <AvaloniaResource Include="Accents/*.xaml"/>
+    <AvaloniaResource Include="DefaultTheme.xaml" />
+    <AvaloniaResource Include="Accents/*.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="NotificationArea.xaml" />
   </ItemGroup>  
   <Import Project="..\..\build\EmbedXaml.props" />
-  <Import Project="..\..\build\BuildTargets.targets"/>
+  <Import Project="..\..\build\BuildTargets.targets" />
   <Import Project="..\..\build\Rx.props" />
+  <ItemGroup>
+    <EmbeddedResource Update="NotificationArea.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
diff --git a/src/Avalonia.Themes.Default/DefaultTheme.xaml b/src/Avalonia.Themes.Default/DefaultTheme.xaml
index 2ed9eaa117..801fb61a4d 100644
--- a/src/Avalonia.Themes.Default/DefaultTheme.xaml
+++ b/src/Avalonia.Themes.Default/DefaultTheme.xaml
@@ -46,4 +46,5 @@
   <StyleInclude Source="resm:Avalonia.Themes.Default.ButtonSpinner.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.NumericUpDown.xaml?assembly=Avalonia.Themes.Default"/>
   <StyleInclude Source="resm:Avalonia.Themes.Default.AutoCompleteBox.xaml?assembly=Avalonia.Themes.Default"/>
+  <StyleInclude Source="resm:Avalonia.Themes.Default.NotificationArea.xaml?assembly=Avalonia.Themes.Default"/>
 </Styles>
diff --git a/src/Avalonia.Themes.Default/NotificationArea.xaml b/src/Avalonia.Themes.Default/NotificationArea.xaml
new file mode 100644
index 0000000000..3d3f4b8c20
--- /dev/null
+++ b/src/Avalonia.Themes.Default/NotificationArea.xaml
@@ -0,0 +1,87 @@
+<Styles xmlns="https://github.com/avaloniaui">
+    <Style Selector="NotificationArea">
+        <Setter Property="Margin" Value="0 0 8 8"/>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <StackPanel Name="PART_Items" />
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="Notification">
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Setter Property="Width" Value="350"/>
+        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Foreground" Value="White"/>
+        
+       <!-- <Setter Property="ContentTemplateSelector" Value="{StaticResource NotificationTemplateSelector}"/> -->
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Border Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}"
+                Margin="8,8,0,0">
+                    <Grid>
+                        <ContentPresenter Content="{TemplateBinding Content}" />
+                        <Button Name="PART_CloseButton" Margin="12" Foreground="{TemplateBinding Foreground}" Opacity="0.8"/>
+                    </Grid>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+
+    <Style Selector="Notification /template/ Button#PART_CloseButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <TextBlock Text="X" FontSize="12" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+    </Style>
+
+    <Style Selector="Notification">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="#444444"/>
+    </Style>
+    <Style Selector="Notification:information">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="CornflowerBlue"/>
+    </Style>
+    <Style Selector="Notification:success">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="LimeGreen"/>
+    </Style>
+    <Style Selector="Notification:warning">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="Orange"/>
+    </Style>
+    <Style Selector="Notification:error">
+        <!--<Setter TargetName="Icon" Property="Content" Value="{StaticResource InfoIcon}"/>-->
+        <Setter Property="Background" Value="OrangeRed"/>
+    </Style>
+
+    <Style Selector="NotificationArea:topleft /template/ StackPanel#PART_Items">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+    </Style>
+
+    <Style Selector="NotificationArea:topright /template/ StackPanel#PART_Items">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+    </Style>
+
+    <Style Selector="NotificationArea:bottomleft /template/ StackPanel#PART_Items">
+        <Setter Property="ReverseOrder" Value="True"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+    </Style>
+
+    <Style Selector="NotificationArea:bottomright /template/ StackPanel#PART_Items">
+        <Setter Property="ReverseOrder" Value="True"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+    </Style>
+</Styles>