From 61305ca00f458716f9b14b6161f55d05d7405e68 Mon Sep 17 00:00:00 2001
From: Daniel Clark <dan@thexamlguy.com>
Date: Sun, 7 Feb 2021 11:22:26 +0000
Subject: [PATCH] Ensure the flyout respects the given RequestedTheme...
 although it doesn't seem to be picking up the theme changes from Windows user
 settings just yet...

---
 .../NotificationFlyoutPresenter.xaml          | 28 ++-----------------
 .../NotificationFlyoutPresenter.xaml.cs       | 13 +++++++++
 .../SampleNotificationFlyout.xaml             |  3 +-
 .../NotificationFlyoutPresenter.xaml          | 13 ++++++++-
 .../NotificationFlyout/NotificationFlyout.cs  |  8 +++++-
 5 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml b/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml
index c3d79bf..88cdfea 100644
--- a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml
+++ b/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml
@@ -3,34 +3,12 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls"
-    CornerRadius="8">
+    CornerRadius="4"
+    RequestedTheme="Default">
     <Grid
         Width="330"
         Height="360"
         Margin="23">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <TextBlock Text="Quick lauch" />
-        <GridView Grid.Row="1" HorizontalAlignment="Center">
-            <GridView.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <ItemsWrapGrid Orientation="Horizontal" />
-                </ItemsPanelTemplate>
-            </GridView.ItemsPanel>
-            <Button
-                Width="94"
-                Margin="6,6,3,6"
-                Content="Test" />
-            <Button
-                Width="94"
-                Margin="3,6,3,6"
-                Content="Test" />
-            <Button
-                Width="94"
-                Margin="3,6,6,6"
-                Content="Test" />
-        </GridView>
+        <ToggleSwitch x:Name="test" Toggled="ToggleSwitch_Toggled" />
     </Grid>
 </controls:NotificationFlyoutPresenter>
diff --git a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml.cs b/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml.cs
index 1a461fd..e18280b 100644
--- a/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml.cs
+++ b/NotificationFlyout.Sample/NotificationFlyoutPresenter.xaml.cs
@@ -6,5 +6,18 @@
         {
             InitializeComponent();
         }
+
+        private void ToggleSwitch_Toggled(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            if (test.IsOn)
+            {
+                this.RequestedTheme = Windows.UI.Xaml.ElementTheme.Dark;
+            }
+            else
+            {
+                this.RequestedTheme = Windows.UI.Xaml.ElementTheme.Light;
+
+            }
+        }
     }
 }
diff --git a/NotificationFlyout.Tray/SampleNotificationFlyout.xaml b/NotificationFlyout.Tray/SampleNotificationFlyout.xaml
index 653c556..0b4c2e5 100644
--- a/NotificationFlyout.Tray/SampleNotificationFlyout.xaml
+++ b/NotificationFlyout.Tray/SampleNotificationFlyout.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:sample="clr-namespace:NotificationFlyout.Sample;assembly=NotificationFlyout.Sample"
-    IconSource="/Assets/Icon.ico">
+    IconSource="/Assets/Icon.ico"
+    LightIconSource="/Assets/Icon.ico">
     <sample:NotificationFlyoutPresenter />
 </NotificationFlyout>
diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
index cf18094..8a9dd7f 100644
--- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
+++ b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml
@@ -2,8 +2,19 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <StaticResource x:Key="NotificationFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="HighContrast">
+            <StaticResource x:Key="NotificationFlyoutPresenterBackground" ResourceKey="SystemControlPageBackgroundChromeMediumLowBrush" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <StaticResource x:Key="NotificationFlyoutPresenterBackground" ResourceKey="SystemControlTransientBackgroundBrush" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
     <Style TargetType="controls:NotificationFlyoutPresenter">
-        <Setter Property="Background" Value="{StaticResource SystemControlTransientBackgroundBrush}" />
+        <Setter Property="Background" Value="{ThemeResource SystemControlTransientBackgroundBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:NotificationFlyoutPresenter">
diff --git a/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyout.cs b/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyout.cs
index 9e73b85..1c08447 100644
--- a/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyout.cs
+++ b/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyout.cs
@@ -81,6 +81,11 @@ namespace NotificationFlyout.Wpf.UI.Controls
         }
 
         private void OnIconPropertyChanged()
+        {
+            SetIcon();
+        }
+
+        private void SetIcon()
         {
             var shellTrayHandle = WindowHelper.GetHandle(ShellTrayHandleName);
             if (shellTrayHandle == null) return;
@@ -88,8 +93,9 @@ namespace NotificationFlyout.Wpf.UI.Controls
             var dpi = WindowHelper.GetDpi(shellTrayHandle);
 
             var iconSource = SystemSettingsHelper.DefaultSystemTheme == SystemTheme.Dark ? IconSource : LightIconSource;
-            using var icon = iconSource.ConvertToIcon(dpi);
+            if (iconSource == null) return;
 
+            using var icon = iconSource.ConvertToIcon(dpi);
             _xamlHost.SetNotificationIcon(icon.Handle);
         }
     }