From 96d912c46c2f1cf3e3f1087994735ae8a1e1800a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 May 2019 22:52:16 +0100
Subject: [PATCH] implement notifications page in control catalog

---
 samples/ControlCatalog/MainView.xaml          |  2 +-
 .../Pages/NotificationsPage.xaml              |  9 ++---
 .../ViewModels/MainWindowViewModel.cs         | 36 +++++++++----------
 .../Views/NotificationView.xaml               |  2 +-
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index ce79a4bddd..b6b4e0c242 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -29,7 +29,7 @@
       <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
       <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
       <TabItem Header="Menu"><pages:MenuPage/></TabItem>
-      <TabItem Header="Notifications"><pages:NotificationPage/></TabItem>
+      <TabItem Header="Notifications"><pages:NotificationsPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
       <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/NotificationsPage.xaml b/samples/ControlCatalog/Pages/NotificationsPage.xaml
index 3f68878337..94e2314dc7 100644
--- a/samples/ControlCatalog/Pages/NotificationsPage.xaml
+++ b/samples/ControlCatalog/Pages/NotificationsPage.xaml
@@ -1,9 +1,10 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Pages.NotificationsPage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-        <Button Content="Show Custom Managed Notification" />
-        <Button Content="Show Standard Managed Notification" />
-        <Button Content="Show Native Notification" />
+  <StackPanel Orientation="Vertical" Spacing="4" HorizontalAlignment="Left">
+        <TextBlock Classes="h1">Notifications</TextBlock>
+        <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>
 </UserControl>
diff --git a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
index 95995b9f26..4623149a88 100644
--- a/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
+++ b/samples/ControlCatalog/ViewModels/MainWindowViewModel.cs
@@ -1,7 +1,9 @@
+using System.Reactive;
 using System.Threading.Tasks;
 using Avalonia.Controls.Notifications;
 using Avalonia.Diagnostics.ViewModels;
 using Avalonia.Threading;
+using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
@@ -9,27 +11,19 @@ namespace ControlCatalog.ViewModels
     {
         public MainWindowViewModel()
         {
-            Dispatcher.UIThread.InvokeAsync(async () =>
+            ShowCustomManagedNotificationCommand = ReactiveCommand.Create(() =>
             {
-                await Task.Delay(5000);
-
-                NotificationManager.Show(new NotificationViewModel (NotificationManager) { Title = "Warning", Message = "Did you know that Avalonia now supports Notifications?" });
-
-                await Task.Delay(1500);
-                NotificationManager.Show(new NotificationContent { Title= "Title", Message = "Test2", Type = NotificationType.Error });
-
-                await Task.Delay(2000);
-                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test3", Type = NotificationType.Warning });
-
-                await Task.Delay(2500);
-                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test4", Type = NotificationType.Success });
-
-                await Task.Delay(2500);
-                NotificationManager.Show(new NotificationContent { Title = "Title", Message = "Test5", Type = NotificationType.Information });
+                NotificationManager.Show(new NotificationViewModel(NotificationManager) { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" });
+            });
 
-                await Task.Delay(500);
-                NotificationManager.Show("Test5");
+            ShowManagedNotificationCommand = ReactiveCommand.Create(() =>
+            {
+                NotificationManager.Show(new NotificationContent { Title = "Welcome", Message = "Avalonia now supports Notifications.", Type = NotificationType.Information });
+            });
 
+            ShowNativeNotificationCommand = ReactiveCommand.Create(() =>
+            {
+                NotificationManager.Show(new NotificationContent { Title = "Error", Message = "Native Notifications are not quite ready. Coming soon.", Type = NotificationType.Error });
             });
         }
 
@@ -40,5 +34,11 @@ namespace ControlCatalog.ViewModels
             get { return _notificationManager; }
             set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
         }
+
+        public ReactiveCommand<Unit, Unit> ShowCustomManagedNotificationCommand { get; }
+
+        public ReactiveCommand<Unit, Unit> ShowManagedNotificationCommand { get; }
+
+        public ReactiveCommand<Unit, Unit> ShowNativeNotificationCommand { get; }
     }
 }
diff --git a/samples/ControlCatalog/Views/NotificationView.xaml b/samples/ControlCatalog/Views/NotificationView.xaml
index a7576f11c3..5552aeb370 100644
--- a/samples/ControlCatalog/Views/NotificationView.xaml
+++ b/samples/ControlCatalog/Views/NotificationView.xaml
@@ -1,7 +1,7 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Class="ControlCatalog.Views.NotificationView">
-    <Border Padding="12" MinHeight="20" Background="Teal">
+    <Border Padding="12" MinHeight="20" Background="DodgerBlue">
         <Grid ColumnDefinitions="Auto,*">
             <Panel Margin="0,0,12,0" Width="25" Height="25" VerticalAlignment="Top">
                 <TextBlock Text="&#xE115;" FontFamily="Segoe UI Symbol" FontSize="20" TextAlignment="Center" VerticalAlignment="Center"/>