From b920a4622af6635cecb4fa33b92c39f102eab937 Mon Sep 17 00:00:00 2001
From: Daniel Clark <dan@thexamlguy.com>
Date: Sun, 14 Feb 2021 22:03:12 +0000
Subject: [PATCH] Support setting notification tray icon as a png

---
 .../Assets/Icon-Light.ico                       | Bin 18686 -> 0 bytes
 .../NotificationFlyoutSample/Assets/Icon.ico    | Bin 18686 -> 0 bytes
 .../Assets/notification-icon-light.png          | Bin 0 -> 2052 bytes
 .../Assets/notification-icon.png                | Bin 0 -> 2135 bytes
 .../NotificationFlyoutSample.csproj             |   4 ++--
 samples/NotificationFlyoutSample/Shell.xaml     |   4 +++-
 .../Extensions/ImageSourceExtensions.cs         |  13 +++++++++++--
 7 files changed, 16 insertions(+), 5 deletions(-)
 delete mode 100644 samples/NotificationFlyoutSample/Assets/Icon-Light.ico
 delete mode 100644 samples/NotificationFlyoutSample/Assets/Icon.ico
 create mode 100644 samples/NotificationFlyoutSample/Assets/notification-icon-light.png
 create mode 100644 samples/NotificationFlyoutSample/Assets/notification-icon.png

diff --git a/samples/NotificationFlyoutSample/Assets/Icon-Light.ico b/samples/NotificationFlyoutSample/Assets/Icon-Light.ico
deleted file mode 100644
index 5c7e7a84841b691da0a36d103f3a3c3b001931af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18686
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
Tz=Y-h2NHe%Pe?G-{}1^W(9))m

diff --git a/samples/NotificationFlyoutSample/Assets/Icon.ico b/samples/NotificationFlyoutSample/Assets/Icon.ico
deleted file mode 100644
index 6375e26931544ca707fde9eb7e856f023e443b2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18686
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

diff --git a/samples/NotificationFlyoutSample/Assets/notification-icon-light.png b/samples/NotificationFlyoutSample/Assets/notification-icon-light.png
new file mode 100644
index 0000000000000000000000000000000000000000..051e167f2457271913dbe44f86ac861308a05409
GIT binary patch
literal 2052
zcmcgtU1%It6y7#k(l&`fY0*CDIBjF4xjS<wv-4-x{_Lj7N;anHYT828J9qAE#_Y~)
zXC~cEDbyClhAL>#f>NX^sI(f8A{2xg`r=Q;2SFbSVg>u41nrx_AN0)rWudXu7Z+yd
z&b{Y+=X~dU_uiS&k-^S28`i{PvChm;dJNuoM^F1I_`h0CF2ZYdX=q;%i><vYdRD|<
zKMfYEE<3rs;oj`9LA_#}Sf0t^m0}63W3m2il@g(oEaXg<cibfZ>&Kt)oMR>V@kCb4
zmQrlO89MB<J%>kf^zbCrEq>d>Tz|y?fFcVCS1A_Uz^EkoDy{+JXj<U8s!2GR<aa~?
zxxLv@F6H@*Q{p0`q9}2y9><C-Yg#WSiIOOYs(?i#NrtExi9W9W;~|=F*~VCUS3MSd
zCHaXkEE$4OE|=rwzPRV-1+443AWDKHA+SKfv>TENa)XTxgft7N@03EvbGZnSnBG*F
z<RQ}<g<>h2Z34SNy--jxp+ZUmj*CLE81brF2jLi7N@H2;AU9oN!Wav@DW5Vh-?-#F
za0nvTIoyKtz#-;_O?N2$&7B)@EZVdyP5FgtnJg->0xJSu0Gx1>P-(&oy<o!o7wG14
zwGdGNsFv}l?|^7XA??wr2r`pS@~{%O9LrFNtwLWDNU|h?6e<&>+meN_giQ%kEg@=Z
z1E<x$rX$OvfYFR<$U0F)#b(G-h>Zxy1`&#7lpqO7rzXa_C^pbCZV(cevPL!zATiB0
znQ2m_FpVNYWE*KjHIdra$4r%o070w%M#^U-^!%LX6&l(dZPbQKr9i7#=C+JGuH}`3
z2U~ntnuILL180mx31K;hWh0>*lDxlWmGvygp1#3K!bU<gu->qO?PHOU+|16RhVA)9
z0wQvXB+rDBo9DTuYNfn_=R-J1r>}KBlS+;Hp6wK1As8Fn$z=vo3f2_`NpT$QlUiHT
z%y$kkYnSg8xvJ0&XStH9Oc(7wj8t1yqn0qF%UDIGrYcrK!I~m#eBB?~*%Zj~4c26;
zQ%%y5ElMiFn90c0RT){jL`{q7Hf0JgG*cXM0%+27{czaB4%SBn2O`4mG6;<}I?yD*
zBuXQiT#g2jG#e5Ii4sKu266&)YMBTQCI!=kOtED){L2#zAX_@z(z{xOz_Y_L@!5_%
zY=;~5BS~?wRXjB(Izik#gELpCGK>zV|IXvq6kZGX|L_nZBDK~CHDN7vt-987B18MC
zQ*g{j!{+@0AI%$zxlke>?w_u63kA5lzR#q0<c4NGI`v`K@$DVkpM3G;pU?b#^~=FO
zk{w;rdne~chI^)dXkYQm+_f`nH@))P8PxgK*@b(aKk(B$K7Hb|J1(>xxc~ghujVt4
zZOy%UaTr~{?dO%1&i>!&+h<?6J$saVV0Apu(?0XW=U*px9~-~(a(2!8v$>JSUuygD
z-uX=@j`e!^^~1*!*T0zm?l?Eyc3<0(?#lRcv5VKPZP~r$<kYhVvTuBQ<b2P&8}|3V
zbIRHG*PHtW@#akYp{@O!XXYk_{+`!XUs<_0YxOLyzx3(sWcSeGx$c*{E)==;gS)?Z
dx_e>W(MNh?9bK2Mtc&jH%)m%`Zs$|S{{e4KoJ9Zt

literal 0
HcmV?d00001

diff --git a/samples/NotificationFlyoutSample/Assets/notification-icon.png b/samples/NotificationFlyoutSample/Assets/notification-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6c45e096be5ae0eccea326d578d1c974d643f5b
GIT binary patch
literal 2135
zcmcgtTZ|J`819lNu&|K8VgTc29HK(l)0sIlom(i-ZFkusg{9lDToUAT=1e<oJ5y(7
zw_P+EHZk0y61;4dz{{#Hh!9Lrf)Zl5#rS{;$b-s*J_wQ^s3aH#^-OQugq7fnO{R0^
zod5s6|NH;{oU^lM^@^6}`OSeqpe5cNOOp3o|Cut0{M&O59wD!(h3*Y*ATVvV|1<^m
z?I#wGercxGd+QUcRL#x@k#47Pu#_(l>p)=1vQhzQ{n(?@IAdC2`sSynXv);XbYCdJ
zCJIrUHM_SuxOeO7l(w~BQ*?USQff&_B>;KsA*z(mS*}_N(`8(hjQwebrphK>f0&N=
zgw*;(4;8f?Oo>4jXe<jUNeObIAjon%1zE^4ti*6EfKX*cHN;cZA5GXC-B6RUt|}M#
z3e#E7E2s=pEEa=BK4?1`hEo)UVIcz{AQr$KvOH7*mb;*a5W}wKm<7+YEy_nkX?ws6
z(<IW0gnS{9r~_MWHBlsGObHbjF32+ZysxWl?RrT(9>#>$ZfdB2nIv}Y0Y}5ce8ISL
z=OAIOYIq3e&OvN>b$62b2Rqkzbggbz7;tjsH0c_Hb2v}%T%w7q3o2x7&vvu+zd+ZQ
z%Zcy_NVe29j!BvZ<zlur;6uh^VVbN2byHU*WJsj0ApmuVfT#%wC<fF42e~xlG&#h|
zQVplkztTs#tr3hmtI7!?kA)Bh7#ao;bwL5?5M%)-$U-R1>k{I`8d}_PJ!EOP7L7@e
zbeV95AP+bL3P4B;X(0201SB3qR@O9ZD16ypjXD^4wv)2$T&;I|YPq4JQPQiNKrQSu
zE!{4<iyC}z40$+A6U`i8A&D%-32I1Dp|G)Hm9TZw7`o32a-`iGtjPA!k%t~+r)#QV
zJ9$K!$jqY*W(rn@rpB`swR5&Z=tww3)%bio8trjx!_1KdH@TvNig!juP7y@_gPgxl
zDrJpf#~j3Zmt*Ita-*x}1S!Q5R#=1QfMiG#K!SjQB5)E&%aW*vL{1h3nXdYia@HGU
z;sVQprf4!$fWblua2ysuT9E{xD^N@8STQs#(o8+XZqp@28mb-+z4(RdC}$Ezvb$8I
z`5T?cL_~=nhCex>j1Y@Zh*to_d<ZCtz!GAJ0nZZ!$lx?2rEC7hEGCc*6>g|qg~7EA
zuZSER$&l@EfB!%jWE-2O;-qDfmBHl9Wy%Wu!|A{4c(@L)5dJ?p7+*-GG)$$j#;aCd
zYdDcf`N~t|nD>YE`-ObeZzyb$6glMn=~Z&S1_Dhm9*d;p*FO9@^6Y80b@Hu|Z{F@a
zv)h_{cKU_Qe>{1&d2I64&j+VmKYQf+_@&clE}veyHgaoWf9uTQzQvE{+L9-NPcv(>
z!EJl)c5MF3+;HcIdHb@P7c>WcKltbID=*&L|I!-c?~R|$FC7>-btQfBgOOQ#pX+Ta
zjl6qj)nl=zT9@n`oN@EKbpG3(CvIfa-Lpo|(XIOrpZRIiv0uizM%#C+TUeUE`^2P;
zM;E=59E&~Q`IX)BNp4qDM|+Hmc1`O$w8waLcv%bk$ie0G<!gt|&%M1}Y2)t9M$><E
zueP@)pSeEsw>P(cH_9x2@2!g~M!y)|%kZhbOFJ&Y<*&@y^?p=5Yl6t};Z4(aj8W^R
z9^2Hm_UH!uk#u?8jGxclzM$a)H|=0#+l9k#e0*)?$s2={0$URIUVpjCTX|(~vPqxk
PU;XjU)v?1JTZaDu;$X!L

literal 0
HcmV?d00001

diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
index 76ef38b..effc777 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
@@ -133,8 +133,8 @@
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assets\Icon-Light.ico" />
-    <Content Include="Assets\Icon.ico" />
+    <Content Include="Assets\notification-icon-light.png" />
+    <Content Include="Assets\notification-icon.png" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
diff --git a/samples/NotificationFlyoutSample/Shell.xaml b/samples/NotificationFlyoutSample/Shell.xaml
index f386b57..7145d8e 100644
--- a/samples/NotificationFlyoutSample/Shell.xaml
+++ b/samples/NotificationFlyoutSample/Shell.xaml
@@ -3,7 +3,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    IconSource="/Assets/notification-icon.png"
+    LightIconSource="/Assets/notification-icon-light.png">
     <controls:NotificationFlyout.FlyoutPresenterStyle>
         <Style TargetType="controls:NotificationFlyoutPresenter">
             <Setter Property="CornerRadius" Value="8" />
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
index f82595e..78b92df 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
@@ -18,16 +18,25 @@ namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
                 var uri = $"{AppDomain.CurrentDomain.BaseDirectory}{bitmapImage.UriSour‌​ce}".Replace("ms-appx:///", "").Replace("/", "\\");
 
                 using var stream = File.OpenRead(uri);
-                return new Icon(stream, new Size(PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CXICON, dpi), PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CYICON, dpi)));
+                return ExtractIcon(dpi, stream);
             }
             else
             {
                 var storageFile = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(bitmapImage.UriSource);
+
                 using var stream = await storageFile.OpenStreamForReadAsync();
-                return new Icon(stream, new Size(PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CXICON, dpi), PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CYICON, dpi)));
+                return ExtractIcon(dpi, stream);
             }
         }
 
+        private static Icon ExtractIcon(uint dpi, Stream stream)
+        {
+            var bitmap = (Bitmap)Image.FromStream(stream);
+            var icon = Icon.FromHandle(bitmap.GetHicon());
+
+            return new Icon(icon, new Size(PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CXICON, dpi), PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CYICON, dpi)));
+        }
+
         private enum SystemMetricFlag : int
         {
             SM_CXICON = 11,