From d8581f33e72ca658c9ce97e0c12a97d4447a383e Mon Sep 17 00:00:00 2001
From: Daniel Clark <dan@thexamlguy.com>
Date: Tue, 9 Feb 2021 14:14:42 +0000
Subject: [PATCH] Include WinUI reference

---
 .../NotificationFlyout.Sample.Uwp.csproj      |  3 ++
 .../NotificationFlyoutPresenter.xaml          |  2 +-
 .../Helpers/SystemPersonalisationHelper.cs    | 35 -------------------
 .../Helpers/SystemTheme.cs                    |  8 -----
 .../NotificationFlyout.Shared.UI.csproj       | 11 ------
 NotificationFlyout.XamlHost/App.xaml          |  6 +++-
 .../NotificationFlyout.XamlHost.csproj        |  3 ++
 7 files changed, 12 insertions(+), 56 deletions(-)
 delete mode 100644 NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs
 delete mode 100644 NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs
 delete mode 100644 NotificationFlyout.Shared.UI/NotificationFlyout.Shared.UI.csproj

diff --git a/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj b/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj
index 534f109..8977c46 100644
--- a/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj
+++ b/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj
@@ -7,6 +7,9 @@
     <LangVersion>9.0</LangVersion>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
+  </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj" />
diff --git a/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml b/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml
index adb6202..f53eff9 100644
--- a/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml
+++ b/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml
@@ -2,7 +2,7 @@
     x:Class="NotificationFlyout.Sample.Uwp.NotificationFlyoutPresenter"
     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">
+    xmlns:winui="using:Microsoft.UI.Xaml.Controls">
     <StackPanel
         Width="330"
         Height="500"
diff --git a/NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs b/NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs
deleted file mode 100644
index a683afe..0000000
--- a/NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using Windows.UI.ViewManagement;
-
-namespace NotificationFlyout.Shared.UI.Helpers
-{
-    public class SystemPersonalisationHelper
-    {
-        private readonly UISettings _settings = new UISettings();
-
-        private SystemPersonalisationHelper()
-        {
-            _settings.ColorValuesChanged += _settings_ColorValuesChanged;
-        }
-
-        private void _settings_ColorValuesChanged(UISettings sender, object args)
-        {
-            ThemeChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        public event EventHandler ThemeChanged;
-
-        public SystemTheme SystemTheme => GetSystemTheme();
-
-        public static SystemPersonalisationHelper Create()
-        {
-            return new SystemPersonalisationHelper();
-        }
-
-        private SystemTheme GetSystemTheme()
-        {
-            var uiTheme = _settings.GetColorValue(UIColorType.Background).ToString();
-            return uiTheme == "#FFFFFFFF" ? SystemTheme.Light : SystemTheme.Dark;
-        }
-    }
-}
diff --git a/NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs b/NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs
deleted file mode 100644
index ee90015..0000000
--- a/NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace NotificationFlyout.Shared.UI.Helpers
-{
-    public enum SystemTheme
-    {
-        Dark,
-        Light,
-    }
-}
diff --git a/NotificationFlyout.Shared.UI/NotificationFlyout.Shared.UI.csproj b/NotificationFlyout.Shared.UI/NotificationFlyout.Shared.UI.csproj
deleted file mode 100644
index 92145d4..0000000
--- a/NotificationFlyout.Shared.UI/NotificationFlyout.Shared.UI.csproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
-  </ItemGroup>
-
-</Project>
diff --git a/NotificationFlyout.XamlHost/App.xaml b/NotificationFlyout.XamlHost/App.xaml
index 2b769b7..41474d6 100644
--- a/NotificationFlyout.XamlHost/App.xaml
+++ b/NotificationFlyout.XamlHost/App.xaml
@@ -2,4 +2,8 @@
     x:Class="NotificationFlyout.XamlHost.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xamlhost="using:Microsoft.Toolkit.Win32.UI.XamlHost" />
\ No newline at end of file
+    xmlns:xamlhost="using:Microsoft.Toolkit.Win32.UI.XamlHost">
+    <xamlhost:XamlApplication.Resources>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+    </xamlhost:XamlApplication.Resources>
+</xamlhost:XamlApplication>
\ No newline at end of file
diff --git a/NotificationFlyout.XamlHost/NotificationFlyout.XamlHost.csproj b/NotificationFlyout.XamlHost/NotificationFlyout.XamlHost.csproj
index e3498f8..97c40ec 100644
--- a/NotificationFlyout.XamlHost/NotificationFlyout.XamlHost.csproj
+++ b/NotificationFlyout.XamlHost/NotificationFlyout.XamlHost.csproj
@@ -149,6 +149,9 @@
     <PackageReference Include="Microsoft.Toolkit.Win32.UI.XamlApplication">
       <Version>6.1.2</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.UI.Xaml">
+      <Version>2.5.0-prerelease.201202003</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj">