Native notifications for Windows, Linux and OSX

native/Avalonia.Native/inc/avalonia-native.h

@@ -172,6 +172,18 @@ enum AvnWindowEdge
     WindowEdgeSouthEast
 };
 
+
+typedef void (*AvnNotificationActionCallback)();
+typedef void (*AvnNotificationCloseCallback)();
+
+struct AvnNotification {
+    const char* TitleUtf8;
+    const char* TextUtf8;
+    int durationMs;
+    AvnNotificationActionCallback ActionCallback;
+    AvnNotificationCloseCallback CloseCallback;
+};
+
 AVNCOM(IAvaloniaNativeFactory, 01) : IUnknown
 {
 public:
@@ -412,4 +424,9 @@ AVNCOM(IAvnAppMenuItem, 19) : IUnknown
     virtual HRESULT SetAction (IAvnPredicateCallback* predicate, IAvnActionCallback* callback) = 0;
 };
 
+AVNCOM(IAvnNotificationManager, 20) : IUnknown
+{
+    virtual bool ShowNotification(AvnNotification* notification) = 0;
+};
+
 extern "C" IAvaloniaNativeFactory* CreateAvaloniaNative();

native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		AB661C1E2148230F00291242 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB661C1D2148230F00291242 /* AppKit.framework */; };
 		AB661C202148286E00291242 /* window.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB661C1F2148286E00291242 /* window.mm */; };
 		AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */; };
+		FA7E93B823B10CE0004F99B3 /* NotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA7E93B723B10CE0004F99B3 /* NotificationManager.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -47,6 +48,7 @@
 		AB661C212148288600291242 /* common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
 		AB7A61EF2147C815003C5833 /* libAvalonia.Native.OSX.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libAvalonia.Native.OSX.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platformthreading.mm; sourceTree = "<group>"; };
+		FA7E93B723B10CE0004F99B3 /* NotificationManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NotificationManager.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -74,6 +76,7 @@
 		AB7A61E62147C814003C5833 = {
 			isa = PBXGroup;
 			children = (
+				FA7E93B723B10CE0004F99B3 /* NotificationManager.mm */,
 				1A002B9D232135EE00021753 /* app.mm */,
 				37DDA9B121933371002E132B /* AvnString.h */,
 				37DDA9AF219330F8002E132B /* AvnString.mm */,
@@ -181,6 +184,7 @@
 				37DDA9B0219330F8002E132B /* AvnString.mm in Sources */,
 				AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */,
 				37E2330F21583241000CB7E2 /* KeyTransform.mm in Sources */,
+				FA7E93B823B10CE0004F99B3 /* NotificationManager.mm in Sources */,
 				520624B322973F4100C4DCEF /* menu.mm in Sources */,
 				37A517B32159597E00FBA241 /* Screens.mm in Sources */,
 				AB00E4F72147CA920032A60A /* main.mm in Sources */,

native/Avalonia.Native/src/OSX/NotificationManager.mm

@@ -0,0 +1,38 @@
+#include "common.h"
+#import <Cocoa/Cocoa.h>
+
+class NotificationManager : public ComSingleObject<IAvnNotificationManager, &IID_IAvnNotificationManager>
+{
+public:
+   FORWARD_IUNKNOWN()
+
+    virtual bool ShowNotification(AvnNotification* notification) override {
+        NSUserNotification* cocoaNotification = [NSUserNotification new];
+
+        //cocoaNotification.identifier = @"unique-id";
+        cocoaNotification.title = [NSString stringWithUTF8String:notification->TitleUtf8];
+        cocoaNotification.informativeText = [NSString stringWithUTF8String:notification->TextUtf8];
+
+        NSMutableDictionary* userData = [NSMutableDictionary dictionary];
+        [userData setValue:[NSValue valueWithPointer:(const void*) notification->ActionCallback]
+                  forKey:@"actionCallback"];
+        [userData setValue:[NSValue valueWithPointer:(const void*) notification->CloseCallback]
+                  forKey:@"closeCallback"];
+        cocoaNotification.userInfo = userData;
+
+        [[NSUserNotificationCenter defaultUserNotificationCenter]
+             deliverNotification:cocoaNotification];
+
+        if (notification->durationMs != -1) {
+            unsigned long long durationNs = notification->durationMs * NSEC_PER_MSEC;
+
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, durationNs), dispatch_get_main_queue(), ^{
+                [[NSUserNotificationCenter defaultUserNotificationCenter]
+                 removeDeliveredNotification:cocoaNotification];
+            });
+        }
+
+        return YES;
+    }
+
+};

native/Avalonia.Native/src/OSX/app.mm

@@ -1,8 +1,11 @@
 #include "common.h"
+#include <Cocoa/Cocoa.h>
+
 @interface AvnAppDelegate : NSObject<NSApplicationDelegate>
 @end
 
 extern NSApplicationActivationPolicy AvnDesiredActivationPolicy = NSApplicationActivationPolicyRegular;
+
 @implementation AvnAppDelegate
 - (void)applicationWillFinishLaunching:(NSNotification *)notification
 {
@@ -22,6 +25,32 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification
     [[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
 }
 
+- (void)userNotificationCenter:(NSUserNotificationCenter *)center
+       didActivateNotification:(NSUserNotification *)notification{
+
+    if (notification.activationType != NSUserNotificationActivationTypeContentsClicked &&
+        notification.activationType != NSUserNotificationActivationTypeActionButtonClicked) {
+        return;
+    }
+
+    NSValue* actionCallbackValue = (NSValue*) notification.userInfo[@"actionCallback"];
+
+    if (actionCallbackValue.pointerValue) {
+        AvnNotificationActionCallback actionCallback =
+            (AvnNotificationActionCallback) actionCallbackValue.pointerValue;
+        actionCallback();
+    }
+
+    //TODO: I can't really find a proper event for closing.
+    NSValue* closeCallbackValue = (NSValue*) notification.userInfo[@"closeCallback"];
+
+    if (closeCallbackValue.pointerValue) {
+        AvnNotificationActionCallback closeCallback =
+            (AvnNotificationCloseCallback) closeCallbackValue.pointerValue;
+        closeCallback();
+    }
+}
+
 @end
 
 extern void InitializeAvnApp()

samples/ControlCatalog/MainWindow.xaml

@@ -45,10 +45,10 @@
   <DockPanel LastChildFill="True">
     <Menu Name="MainMenu" DockPanel.Dock="Top">
       <MenuItem Header="File">
-        <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
+        <MenuItem Header="Exit" Command="{Binding Exit}" />
       </MenuItem>
       <MenuItem Header="Help">
-        <MenuItem Header="About" Command="{Binding AboutCommand}" />
+        <MenuItem Header="About" Command="{Binding About}" />
       </MenuItem>
     </Menu>
     <local:MainView />

samples/ControlCatalog/Pages/NotificationsPage.xaml

@@ -3,8 +3,8 @@
              x:Class="ControlCatalog.Pages.NotificationsPage">
   <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}" />
+        <Button Content="Show Standard Managed Notification" Command="{Binding ShowManagedNotification}" />
+        <Button Content="Show Custom Managed Notification" Command="{Binding ShowCustomManagedNotification}" />
+        <Button Content="Show Native Notification" Command="{Binding ShowNativeNotification}" />
     </StackPanel>
 </UserControl>

samples/ControlCatalog/ViewModels/MainWindowViewModel.cs

@@ -1,63 +1,93 @@
-using System.Reactive;
+using System;
+using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Notifications;
 using Avalonia.Dialogs;
+using JetBrains.Annotations;
 using ReactiveUI;
 
 namespace ControlCatalog.ViewModels
 {
-    class MainWindowViewModel : ReactiveObject
+    public class MainWindowViewModel : ReactiveObject
     {
+        private readonly INotificationManager _nativeNotificationManager;
         private IManagedNotificationManager _notificationManager;
 
         public MainWindowViewModel(IManagedNotificationManager notificationManager)
         {
             _notificationManager = notificationManager;
+            _nativeNotificationManager = AvaloniaLocator.Current.GetService<INotificationManager>();
+        }
 
-            ShowCustomManagedNotificationCommand = ReactiveCommand.Create(() =>
-            {
-                NotificationManager.Show(new NotificationViewModel(NotificationManager) { Title = "Hey There!", Message = "Did you know that Avalonia now supports Custom In-Window Notifications?" });
-            });
+        public IManagedNotificationManager NotificationManager
+        {
+            get { return _notificationManager; }
+            set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
+        }
 
-            ShowManagedNotificationCommand = ReactiveCommand.Create(() =>
-            {
-                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Welcome", "Avalonia now supports Notifications.", NotificationType.Information));
-            });
+        [UsedImplicitly]
+        public void ShowManagedNotification()
+        {
+            NotificationManager.Show(new Notification(
+                "Welcome",
+                "Avalonia now supports Notifications."));
+        }
 
-            ShowNativeNotificationCommand = ReactiveCommand.Create(() =>
+        [UsedImplicitly]
+        public void ShowNativeNotification()
+        {
+            if (_nativeNotificationManager != null)
             {
-                NotificationManager.Show(new Avalonia.Controls.Notifications.Notification("Error", "Native Notifications are not quite ready. Coming soon.", NotificationType.Error));
-            });
-
-            AboutCommand = ReactiveCommand.CreateFromTask(async () =>
+                _nativeNotificationManager.Show(new Notification(
+                    "Native",
+                    "Native Notifications are finally here!",
+                    NotificationType.Success,
+                    onClick: NativeNotficationClicked,
+                    onClose: NativeNotificationClosed));
+            }
+            else
             {
-                var dialog = new AboutAvaloniaDialog();
-
-                var mainWindow = (App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow;
-
-                await dialog.ShowDialog(mainWindow);
-            });
+                NotificationManager.Show(new Notification(
+                    "Native",
+                    "Native Notifications are not supported on this platform!",
+                    NotificationType.Error));
+            }
+        }
 
-            ExitCommand = ReactiveCommand.Create(() =>
-            {
-                (App.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).Shutdown();
-            });
+        private static void NativeNotificationClosed()
+        {
+           Console.WriteLine("Native notification closed.");
         }
 
-        public IManagedNotificationManager NotificationManager
+        private static void NativeNotficationClicked()
         {
-            get { return _notificationManager; }
-            set { this.RaiseAndSetIfChanged(ref _notificationManager, value); }
+            Console.WriteLine("Native notification clicked.");
         }
 
-        public ReactiveCommand<Unit, Unit> ShowCustomManagedNotificationCommand { get; }
+        public async void About()
+        {
+            var dialog = new AboutAvaloniaDialog();
 
-        public ReactiveCommand<Unit, Unit> ShowManagedNotificationCommand { get; }
+            var mainWindow = (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)
+                ?.MainWindow;
 
-        public ReactiveCommand<Unit, Unit> ShowNativeNotificationCommand { get; }
+            await dialog.ShowDialog(mainWindow);
+        }
 
-        public ReactiveCommand<Unit, Unit> AboutCommand { get; }
+        public void Exit()
+        {
+            (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Shutdown();
+        }
 
-        public ReactiveCommand<Unit, Unit> ExitCommand { get; }
+        [UsedImplicitly]
+        public void ShowCustomManagedNotification()
+        {
+            NotificationManager.Show(
+                new NotificationViewModel(NotificationManager)
+                {
+                    Title = "Hey There!",
+                    Message = "Did you know that Avalonia now supports Custom In-Window Notifications?"
+                });
+        }
     }
 }

src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj

@@ -12,4 +12,12 @@
     <PackageReference Include="Tmds.DBus" Version="0.7.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <DotNetCliToolReference Include="Tmds.DBus.Tool" Version="0.7.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Tmds.DBus" Version="0.7.0" />
+  </ItemGroup>
+
 </Project>