Addressing bunch of small nits in AppNotifications sample (#217)

* nits

* Vaheeshta's words are more beautifuller than mine

* Adding App Notifications to readme

* nits from PR feedback

Co-authored-by: Eric Langlois <[email protected]>

Author: loneursid

README.md

@@ -26,6 +26,7 @@ This repository hosts samples for the [Windows App SDK](https://github.com/micro
 
 #### Notifications
 - [Push Notifications](Samples/Notifications/Push): This is a sample app that showcases Push Notifications.
+- [App Notifications](Samples/Notifications/App): This is a sample app that showcases App Notifications.
 
 #### Runtime Components
 - [Custom Controls](Samples/CustomControls): This sample shows how to author a Windows Runtime Component in C# with custom WinUI controls.

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/App.xaml.cpp

@@ -19,7 +19,7 @@ namespace winrt
 }
 
 // NotificationManager is responsible for registering and unregistering the Sample for App Notifications as well as
-// dispatching actionned notifications to the appropriate scenario.
+// dispatching actioned notifications to the appropriate scenario.
 // Registration will happen when Init() is called and Unregistration will happen when this
 // instance variable goes out of scope, i.e.: when the App is terminated.
 static NotificationManager g_notificationManager;
@@ -50,8 +50,8 @@ namespace winrt::CppUnpackagedAppNotifications::implementation
         assert(app != nullptr);
 
         HWND hwnd;
-        auto WindowNative{ app->window.as<IWindowNative>() };
-        if (WindowNative != nullptr && WindowNative->get_WindowHandle(&hwnd) == S_OK)
+        auto windowNative{ app->window.as<IWindowNative>() };
+        if (windowNative && SUCCEEDED(windowNative->get_WindowHandle(&hwnd)))
         {
             SwitchToThisWindow(hwnd, TRUE);
         }

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/MainPage.xaml.cpp

@@ -46,7 +46,6 @@ namespace winrt::CppUnpackagedAppNotifications::implementation
             else
             {
                 text.append(L"\t- Input received: " + notification.Input);
-
             }
         }
         messages.InsertAt(0, PropertyValue::CreateString(text));

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/Common.cpp

@@ -28,7 +28,7 @@ std::wstring Common::MakeScenarioIdToken(unsigned id)
     return std::wstring(scenarioTag) + L"=" + std::to_wstring(id);
 }
 
-std::optional <unsigned> Common::ExtractScenarioIdFromArgs(std::wstring const& args)
+std::optional<unsigned> Common::ExtractScenarioIdFromArgs(std::wstring const& args)
 {
     auto scenarioId{ ExtractParamFromArgs(args, scenarioTag) };
 

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/Common.h

@@ -8,6 +8,6 @@ struct Common
     static std::optional<std::wstring> ExtractParamFromArgs(std::wstring const& args, std::wstring const& paramName);
 
     static std::wstring MakeScenarioIdToken(unsigned Id);
-    static std::optional <unsigned> ExtractScenarioIdFromArgs(std::wstring const& string);
+    static std::optional<unsigned> ExtractScenarioIdFromArgs(std::wstring const& args);
 };
 

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.cpp

@@ -41,7 +41,9 @@ void NotificationManager::Init()
 {
     auto notificationManager{ winrt::AppNotificationManager::Default() };
 
-    // Always setup the notification hanlder before registering your App, otherwise notifications may get lost.
+    // To ensure all Notification handling happens in this process instance, register for
+    // NotificationInvoked before calling Register(). Without this a new process will
+    // be launched to handle the notification.
     const auto token{ notificationManager.NotificationInvoked([&](const auto&, winrt::AppNotificationActivatedEventArgs  const& notificationActivatedEventArgs)
         {
             NotifyUser::NotificationReceived();
@@ -58,8 +60,6 @@ void NotificationManager::Init()
 
 void NotificationManager::ProcessLaunchActivationArgs(winrt::AppNotificationActivatedEventArgs const& notificationActivatedEventArgs)
 {
-    assert(m_isRegistered);
-
     DispatchNotification(notificationActivatedEventArgs);
     NotifyUser::AppLaunchedFromNotification();
 }

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/ToastWithAvatar.cpp

@@ -38,14 +38,9 @@ bool ToastWithAvatar::SendToast()
         </toast>" };
 
     auto toast{ winrt::AppNotification(xmlPayload) };
-    toast.Priority(winrt::AppNotificationPriority::High);
     winrt::AppNotificationManager::Default().Show(toast);
-    if (toast.Id() == 0)
-    {
-        return false;
-    }
 
-    return true;
+    return toast.Id() != 0; // return true (indicating success) if the toast was sent (if it has an Id)
 }
 
 void ToastWithAvatar::NotificationReceived(winrt::Microsoft::Windows::AppNotifications::AppNotificationActivatedEventArgs const& notificationActivatedEventArgs)
@@ -56,5 +51,4 @@ void ToastWithAvatar::NotificationReceived(winrt::Microsoft::Windows::AppNotific
     notification.Action = action.has_value() ? action.value() : L"";
     winrt::MainPage::Current().NotificationReceived(notification);
     winrt::App::ToForeground();
-
 }

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/ToastWithTextBox.cpp

@@ -44,21 +44,16 @@ bool ToastWithTextBox::SendToast()
             </toast>" };
 
     auto toast{ winrt::AppNotification(xmlPayload) };
-    toast.Priority(winrt::AppNotificationPriority::High);
     winrt::AppNotificationManager::Default().Show(toast);
-    if (toast.Id() == 0)
-    {
-        return false;
-    }
 
-    return true;
+    return toast.Id() != 0; // return true (indicating success) if the toast was sent (if it has an Id)
 }
 
 void ToastWithTextBox::NotificationReceived(winrt::Microsoft::Windows::AppNotifications::AppNotificationActivatedEventArgs const& notificationActivatedEventArgs)
 {
-    // In a real life scenario, this type of action would usually be processed in the background. Your App would process the payload in
-    // the brackground (sending the payload back to your App Server) without ever showing the App's UI.
-    // This is no not  something that can easily be demonstrated in a sample such as this one, as we need to show the UI to demonstrate how
+    // In a real-life scenario, this type of action would usually be processed in the background. Your App would process the payload in
+    // the background (sending the payload back to your App Server) without ever showing the App's UI.
+    // This is not something that can easily be demonstrated in a sample such as this one, as we need to show the UI to demonstrate how
     // the payload is routed internally
 
     auto input{ notificationActivatedEventArgs.UserInput() };

Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/NotifyUser.cpp

@@ -22,7 +22,6 @@ void NotifyUser::ToastSentSuccessfully()
 void NotifyUser::AppLaunchedFromNotification()
 {
     winrt::MainPage::Current().NotifyUser(L"App launched from notifications", winrt::InfoBarSeverity::Informational);
-
 }
 
 void NotifyUser::NotificationReceived()