From 75a7591b064fc7ec2654479a7b15aad92214c9d1 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh <singhashish@microsoft.com>
Date: Thu, 25 Apr 2024 18:56:28 +0530
Subject: [PATCH 1/2] Add notification functionality from WinAppSDK

Signed-off-by: Ashish Kumar Singh <singhashish@microsoft.com>
---
 .../Win11ThemeGallery/App.xaml.cs             |  3 +-
 .../ViewModels/MainWindowViewModel.cs         |  6 +++
 .../ViewModels/NotificationsPageViewModel.cs  | 43 +++++++++++++++++++
 .../Views/NotificationsPage.xaml              | 14 ++++++
 .../Views/NotificationsPage.xaml.cs           | 31 +++++++++++++
 .../Win11ThemeGallery.csproj                  | 20 +++++++--
 6 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 Sample Applications/Win11ThemeGallery/ViewModels/NotificationsPageViewModel.cs
 create mode 100644 Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml
 create mode 100644 Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml.cs

diff --git a/Sample Applications/Win11ThemeGallery/App.xaml.cs b/Sample Applications/Win11ThemeGallery/App.xaml.cs
index 3bee797c0..bd0799e88 100644
--- a/Sample Applications/Win11ThemeGallery/App.xaml.cs	
+++ b/Sample Applications/Win11ThemeGallery/App.xaml.cs	
@@ -98,7 +98,8 @@ public partial class App : Application
 
             services.AddTransient<UserDashboardPage>();
             services.AddTransient<UserDashboardPageViewModel>();
-
+            services.AddTransient<NotificationsPage>();
+            services.AddTransient<NotificationsPageViewModel>();
             services.AddSingleton<SettingsPage>();
             services.AddSingleton<SettingsPageViewModel>();
         }).Build();
diff --git a/Sample Applications/Win11ThemeGallery/ViewModels/MainWindowViewModel.cs b/Sample Applications/Win11ThemeGallery/ViewModels/MainWindowViewModel.cs
index d3a3a8b03..1b99fb0d3 100644
--- a/Sample Applications/Win11ThemeGallery/ViewModels/MainWindowViewModel.cs	
+++ b/Sample Applications/Win11ThemeGallery/ViewModels/MainWindowViewModel.cs	
@@ -135,6 +135,12 @@ public partial class MainWindowViewModel : ObservableObject
                 new NavigationItem("PasswordBox", typeof(PasswordBoxPage)),
             }
         },
+        new NavigationItem
+        {
+            Name = "Notifications",
+            PageType = typeof(NotificationsPage),
+            Icon = "\xE8D2"
+        },
     };
 
     [ObservableProperty]
diff --git a/Sample Applications/Win11ThemeGallery/ViewModels/NotificationsPageViewModel.cs b/Sample Applications/Win11ThemeGallery/ViewModels/NotificationsPageViewModel.cs
new file mode 100644
index 000000000..e22517b61
--- /dev/null
+++ b/Sample Applications/Win11ThemeGallery/ViewModels/NotificationsPageViewModel.cs	
@@ -0,0 +1,43 @@
+using Microsoft.Windows.AppNotifications;
+using Microsoft.Windows.AppNotifications.Builder;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Win11ThemeGallery.ViewModels
+{
+    public partial class NotificationsPageViewModel
+    {
+        private static AppNotificationManager notificationManager;
+
+        static NotificationsPageViewModel()
+        {
+            notificationManager = AppNotificationManager.Default;
+            notificationManager.NotificationInvoked += OnNotificationInvoked;
+            notificationManager.Register();
+        }
+
+        private static void OnNotificationInvoked(AppNotificationManager sender, AppNotificationActivatedEventArgs args)
+        {
+            throw new NotImplementedException();
+        }
+
+        [RelayCommand]
+        public void SendNotification(object pageType)
+        {
+            
+                var appNotification = new AppNotificationBuilder()
+                      .AddArgument("action", "ToastClick")
+                      .AddText("Notification From Gallery App")
+                      .AddText("This is an example message using WPF")
+                      .AddButton(new AppNotificationButton("Open App")
+                          .AddArgument("action", "OpenApp")
+                      )
+                      .BuildNotification();
+                notificationManager.Show(appNotification);
+            
+        }
+    }
+}
diff --git a/Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml b/Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml
new file mode 100644
index 000000000..1fbaf3e87
--- /dev/null
+++ b/Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml	
@@ -0,0 +1,14 @@
+<Page x:Class="Win11ThemeGallery.Views.NotificationsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Win11ThemeGallery.Views"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="NotificationsPage">
+
+    <Grid>
+        <Button Width="200" Height="100" Command="{Binding ViewModel.SendNotificationCommand, RelativeSource={RelativeSource AncestorType={x:Type local:NotificationsPage}}}" CommandParameter="{Binding PageType}">Send Notification</Button>
+    </Grid>
+</Page>
diff --git a/Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml.cs b/Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml.cs
new file mode 100644
index 000000000..5885ed04b
--- /dev/null
+++ b/Sample Applications/Win11ThemeGallery/Views/NotificationsPage.xaml.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Win11ThemeGallery.ViewModels;
+namespace Win11ThemeGallery.Views
+{
+    /// <summary>
+    /// Interaction logic for NotificationsPage.xaml
+    /// </summary>
+    public partial class NotificationsPage : Page
+    {
+        public NotificationsPageViewModel ViewModel { get; }
+        public NotificationsPage(NotificationsPageViewModel viewModel)
+        {
+            InitializeComponent();
+            ViewModel = viewModel;
+            DataContext = this;
+        }
+    }
+}
diff --git a/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj b/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj
index 5a0a39f44..1c10cc5fa 100644
--- a/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj	
+++ b/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj	
@@ -2,10 +2,13 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net9.0-windows</TargetFramework>
+		<TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
+		<RuntimeIdentifiers>win-x64;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UseWPF>true</UseWPF>
+		<WindowsPackageType>None</WindowsPackageType>
+		<UseRidGraph>true</UseRidGraph>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU;x64</Platforms>
 		<StartupObject>Win11ThemeGallery.App</StartupObject>
@@ -24,8 +27,19 @@
 		<Resource Include="Assets\win11-dashboard.png" />
 		<Resource Include="Assets\*-100x100.jpg" />
 	</ItemGroup>
-	
-	<PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.164-beta">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.0" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
+		<ProjectCapability Include="Msix" />
+	</ItemGroup>
+	<!--<PropertyGroup>
 		<WpfRepoRoot>E:\Wpf</WpfRepoRoot>
 	</PropertyGroup>
 	<Import Project="$(WpfRepoRoot)\eng\wpf-debug.targets" />

From 731a42b362ca1d5e8328b4a4a99069ed8a38149c Mon Sep 17 00:00:00 2001
From: Ashish Kumar Singh <SINGHASHISH@MICROSOFT.COM>
Date: Thu, 25 Apr 2024 22:28:10 +0530
Subject: [PATCH 2/2] fix project build

---
 Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj b/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj
index 1c10cc5fa..8fcf57f3e 100644
--- a/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj	
+++ b/Sample Applications/Win11ThemeGallery/Win11ThemeGallery.csproj	
@@ -39,7 +39,7 @@
 	<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
 		<ProjectCapability Include="Msix" />
 	</ItemGroup>
-	<!--<PropertyGroup>
+	<PropertyGroup>
 		<WpfRepoRoot>E:\Wpf</WpfRepoRoot>
 	</PropertyGroup>
 	<Import Project="$(WpfRepoRoot)\eng\wpf-debug.targets" />