Merge branch 'main' into dean/app-buttons

Author: deansheather

App/App.xaml.cs

@@ -22,6 +22,7 @@
 using Microsoft.Windows.AppLifecycle;
 using Serilog;
 using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs;
+using Microsoft.Windows.AppNotifications;
 
 namespace Coder.Desktop.App;
 
@@ -74,6 +75,7 @@ public App()
         services.AddOptions<MutagenControllerConfig>()
             .Bind(builder.Configuration.GetSection(MutagenControllerConfigSection));
         services.AddSingleton<ISyncSessionController, MutagenController>();
+        services.AddSingleton<IUserNotifier, UserNotifier>();
 
         // SignInWindow views and view models
         services.AddTransient<SignInViewModel>();
@@ -194,10 +196,14 @@ public void OnActivated(object? sender, AppActivationArguments args)
                     _logger.LogWarning("URI activation with null data");
                     return;
                 }
-
                 HandleURIActivation(protoArgs.Uri);
                 break;
 
+            case ExtendedActivationKind.AppNotification:
+                var notificationArgs = (args.Data as AppNotificationActivatedEventArgs)!;
+                HandleNotification(null, notificationArgs);
+                break;
+
             default:
                 _logger.LogWarning("activation for {kind}, which is unhandled", args.Kind);
                 break;
@@ -210,6 +216,12 @@ public void HandleURIActivation(Uri uri)
         _logger.LogInformation("handling URI activation for {path}", uri.AbsolutePath);
     }
 
+    public void HandleNotification(AppNotificationManager? sender, AppNotificationActivatedEventArgs args)
+    {
+        // right now, we don't do anything other than log
+        _logger.LogInformation("handled notification activation");
+    }
+
     private static void AddDefaultConfig(IConfigurationBuilder builder)
     {
         var logPath = Path.Combine(

App/Program.cs

@@ -5,6 +5,7 @@
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
+using Microsoft.Windows.AppNotifications;
 using WinRT;
 
 namespace Coder.Desktop.App;
@@ -28,9 +29,9 @@ private static void Main(string[] args)
         {
             ComWrappersSupport.InitializeComWrappers();
             var mainInstance = GetMainInstance();
+            var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
             if (!mainInstance.IsCurrent)
             {
-                var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
                 mainInstance.RedirectActivationToAsync(activationArgs).AsTask().Wait();
                 return;
             }
@@ -58,6 +59,15 @@ private static void Main(string[] args)
 
                 // redirections via RedirectActivationToAsync above get routed to the App
                 mainInstance.Activated += app.OnActivated;
+                var notificationManager = AppNotificationManager.Default;
+                notificationManager.NotificationInvoked += app.HandleNotification;
+                notificationManager.Register();
+                if (activationArgs.Kind != ExtendedActivationKind.Launch)
+                {
+                    // this means we were activated without having already launched, so handle
+                    // the activation as well.
+                    app.OnActivated(null, activationArgs);
+                }
             });
         }
         catch (Exception e)

App/Services/UserNotifier.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Windows.AppNotifications;
+using Microsoft.Windows.AppNotifications.Builder;
+
+namespace Coder.Desktop.App.Services;
+
+public interface IUserNotifier : IAsyncDisposable
+{
+    public Task ShowErrorNotification(string title, string message);
+}
+
+public class UserNotifier : IUserNotifier
+{
+    private readonly AppNotificationManager _notificationManager = AppNotificationManager.Default;
+
+    public ValueTask DisposeAsync()
+    {
+        return ValueTask.CompletedTask;
+    }
+
+    public Task ShowErrorNotification(string title, string message)
+    {
+        var builder = new AppNotificationBuilder().AddText(title).AddText(message);
+        _notificationManager.Show(builder.BuildNotification());
+        return Task.CompletedTask;
+    }
+}
+

App/Utils/TitleBarIcon.cs

@@ -0,0 +1,19 @@
+using System;
+using Microsoft.UI;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using WinRT.Interop;
+
+namespace Coder.Desktop.App.Utils
+{
+    public static class TitleBarIcon
+    {
+        public static void SetTitlebarIcon(Window window)
+        {
+            var hwnd = WindowNative.GetWindowHandle(window);
+            var windowId = Win32Interop.GetWindowIdFromWindow(hwnd);
+            AppWindow.GetFromWindowId(windowId).SetIcon("coder.ico");
+        }
+    }
+}

App/Views/DirectoryPickerWindow.xaml.cs

@@ -9,6 +9,7 @@
 using Microsoft.UI.Xaml.Media;
 using WinRT.Interop;
 using WinUIEx;
+using Coder.Desktop.App.Utils;
 
 namespace Coder.Desktop.App.Views;
 
@@ -17,6 +18,8 @@ public sealed partial class DirectoryPickerWindow : WindowEx
     public DirectoryPickerWindow(DirectoryPickerViewModel viewModel)
     {
         InitializeComponent();
+        TitleBarIcon.SetTitlebarIcon(this);
+
         SystemBackdrop = new DesktopAcrylicBackdrop();
 
         viewModel.Initialize(this, DispatcherQueue);

App/Views/FileSyncListWindow.xaml.cs

@@ -2,6 +2,7 @@
 using Coder.Desktop.App.Views.Pages;
 using Microsoft.UI.Xaml.Media;
 using WinUIEx;
+using Coder.Desktop.App.Utils;
 
 namespace Coder.Desktop.App.Views;
 
@@ -13,11 +14,14 @@ public FileSyncListWindow(FileSyncListViewModel viewModel)
     {
         ViewModel = viewModel;
         InitializeComponent();
+        TitleBarIcon.SetTitlebarIcon(this);
+
         SystemBackdrop = new DesktopAcrylicBackdrop();
 
         ViewModel.Initialize(this, DispatcherQueue);
         RootFrame.Content = new FileSyncListMainPage(ViewModel);
 
         this.CenterOnScreen();
     }
+
 }

App/Views/SignInWindow.xaml.cs

@@ -7,6 +7,7 @@
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+using Coder.Desktop.App.Utils;
 
 namespace Coder.Desktop.App.Views;
 
@@ -23,6 +24,7 @@ public sealed partial class SignInWindow : Window
     public SignInWindow(SignInViewModel viewModel)
     {
         InitializeComponent();
+        TitleBarIcon.SetTitlebarIcon(this);
         SystemBackdrop = new DesktopAcrylicBackdrop();
         RootFrame.SizeChanged += RootFrame_SizeChanged;