diff --git a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj index 0b69427..5bf0b5f 100644 --- a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj +++ b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj @@ -14,8 +14,15 @@ + + + + + + + \ No newline at end of file diff --git a/samples/NotificationFlyoutSample.sln b/samples/NotificationFlyoutSample.sln index 24e73b0..44f2dc2 100644 --- a/samples/NotificationFlyoutSample.sln +++ b/samples/NotificationFlyoutSample.sln @@ -10,16 +10,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Shared.UI", "..\src\TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj", "{DF0630F3-5571-46C5-8D1D-39079BFCEC74}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls", "..\src\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj", "{8501316D-F994-4A29-9EC4-DC6C6B93F565}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI", "..\src\TheXamlGuy.NotificationFlyout.Wpf.UI\TheXamlGuy.NotificationFlyout.Wpf.UI.csproj", "{6501E7B8-2DC1-4971-9AD5-76945F48E773}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls", "..\src\TheXamlGuy.NotificationFlyout.Wpf.UI.Controls\TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj", "{0310655E-5620-4B6B-81E5-8155EB04C2A6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyoutSample.Host", "NotificationFlyoutSample.Host\NotificationFlyoutSample.Host.csproj", "{591F26F7-C057-434A-B612-AEB37B1234AE}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Shared.UI", "..\src\TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj", "{38E34B61-E389-4EE1-8D5E-5372568DE982}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls", "..\src\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj", "{ACA2CC23-A9AE-427F-A900-ED75A96698F4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls", "..\src\TheXamlGuy.NotificationFlyout.Wpf.UI.Controls\TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj", "{BE3B1281-CD44-4291-BE1D-33FC13E61E06}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI", "..\src\TheXamlGuy.NotificationFlyout.Wpf.UI\TheXamlGuy.NotificationFlyout.Wpf.UI.csproj", "{A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Common", "..\src\TheXamlGuy.NotificationFlyout.Common\TheXamlGuy.NotificationFlyout.Common.csproj", "{293834F2-4A99-4C92-A165-7C617D98FCC7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,86 +63,6 @@ Global {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|x86.ActiveCfg = Release|x86 {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|x86.Build.0 = Release|x86 {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|x86.Deploy.0 = Release|x86 - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|Any CPU.ActiveCfg = Debug|x64 - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|Any CPU.Build.0 = Debug|x64 - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|ARM.Build.0 = Debug|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|ARM64.Build.0 = Debug|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|x64.ActiveCfg = Debug|x64 - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|x64.Build.0 = Debug|x64 - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|x86.ActiveCfg = Debug|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Debug|x86.Build.0 = Debug|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|Any CPU.Build.0 = Release|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|ARM.ActiveCfg = Release|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|ARM.Build.0 = Release|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|ARM64.ActiveCfg = Release|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|ARM64.Build.0 = Release|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|x64.ActiveCfg = Release|x64 - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|x64.Build.0 = Release|x64 - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|x86.ActiveCfg = Release|Any CPU - {DF0630F3-5571-46C5-8D1D-39079BFCEC74}.Release|x86.Build.0 = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|Any CPU.ActiveCfg = Debug|x64 - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|Any CPU.Build.0 = Debug|x64 - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|ARM.Build.0 = Debug|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|ARM64.Build.0 = Debug|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|x64.ActiveCfg = Debug|x64 - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|x64.Build.0 = Debug|x64 - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|x86.ActiveCfg = Debug|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Debug|x86.Build.0 = Debug|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|Any CPU.Build.0 = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|ARM.ActiveCfg = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|ARM.Build.0 = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|ARM64.ActiveCfg = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|ARM64.Build.0 = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|x64.ActiveCfg = Release|x64 - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|x64.Build.0 = Release|x64 - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|x86.ActiveCfg = Release|Any CPU - {8501316D-F994-4A29-9EC4-DC6C6B93F565}.Release|x86.Build.0 = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|Any CPU.ActiveCfg = Debug|x64 - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|Any CPU.Build.0 = Debug|x64 - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|ARM.Build.0 = Debug|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|ARM64.Build.0 = Debug|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|x64.ActiveCfg = Debug|x64 - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|x64.Build.0 = Debug|x64 - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|x86.ActiveCfg = Debug|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Debug|x86.Build.0 = Debug|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|Any CPU.Build.0 = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|ARM.ActiveCfg = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|ARM.Build.0 = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|ARM64.ActiveCfg = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|ARM64.Build.0 = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|x64.ActiveCfg = Release|x64 - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|x64.Build.0 = Release|x64 - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|x86.ActiveCfg = Release|Any CPU - {6501E7B8-2DC1-4971-9AD5-76945F48E773}.Release|x86.Build.0 = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|Any CPU.ActiveCfg = Debug|x64 - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|Any CPU.Build.0 = Debug|x64 - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|ARM.Build.0 = Debug|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|ARM64.Build.0 = Debug|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|x64.ActiveCfg = Debug|x64 - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|x64.Build.0 = Debug|x64 - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|x86.ActiveCfg = Debug|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Debug|x86.Build.0 = Debug|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|Any CPU.Build.0 = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|ARM.ActiveCfg = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|ARM.Build.0 = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|ARM64.ActiveCfg = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|ARM64.Build.0 = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|x64.ActiveCfg = Release|x64 - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|x64.Build.0 = Release|x64 - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|x86.ActiveCfg = Release|Any CPU - {0310655E-5620-4B6B-81E5-8155EB04C2A6}.Release|x86.Build.0 = Release|Any CPU {591F26F7-C057-434A-B612-AEB37B1234AE}.Debug|Any CPU.ActiveCfg = Debug|x64 {591F26F7-C057-434A-B612-AEB37B1234AE}.Debug|Any CPU.Build.0 = Debug|x64 {591F26F7-C057-434A-B612-AEB37B1234AE}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -157,10 +79,110 @@ Global {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|ARM.Build.0 = Release|Any CPU {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|ARM64.ActiveCfg = Release|Any CPU {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|ARM64.Build.0 = Release|Any CPU - {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|x64.ActiveCfg = Release|Any CPU - {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|x64.Build.0 = Release|Any CPU + {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|x64.ActiveCfg = Release|x64 + {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|x64.Build.0 = Release|x64 {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|x86.ActiveCfg = Release|Any CPU {591F26F7-C057-434A-B612-AEB37B1234AE}.Release|x86.Build.0 = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|Any CPU.Build.0 = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|ARM.ActiveCfg = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|ARM.Build.0 = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|ARM64.Build.0 = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|x64.ActiveCfg = Debug|x64 + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|x64.Build.0 = Debug|x64 + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|x86.ActiveCfg = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Debug|x86.Build.0 = Debug|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|Any CPU.ActiveCfg = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|Any CPU.Build.0 = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|ARM.ActiveCfg = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|ARM.Build.0 = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|ARM64.ActiveCfg = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|ARM64.Build.0 = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|x64.ActiveCfg = Release|x64 + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|x64.Build.0 = Release|x64 + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|x86.ActiveCfg = Release|Any CPU + {38E34B61-E389-4EE1-8D5E-5372568DE982}.Release|x86.Build.0 = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|ARM.ActiveCfg = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|ARM.Build.0 = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|ARM64.Build.0 = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|x64.ActiveCfg = Debug|x64 + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|x64.Build.0 = Debug|x64 + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|x86.ActiveCfg = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Debug|x86.Build.0 = Debug|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|Any CPU.Build.0 = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|ARM.ActiveCfg = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|ARM.Build.0 = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|ARM64.ActiveCfg = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|ARM64.Build.0 = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|x64.ActiveCfg = Release|x64 + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|x64.Build.0 = Release|x64 + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|x86.ActiveCfg = Release|Any CPU + {ACA2CC23-A9AE-427F-A900-ED75A96698F4}.Release|x86.Build.0 = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|ARM.ActiveCfg = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|ARM.Build.0 = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|ARM64.Build.0 = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|x64.ActiveCfg = Debug|x64 + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|x64.Build.0 = Debug|x64 + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|x86.ActiveCfg = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Debug|x86.Build.0 = Debug|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|Any CPU.Build.0 = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|ARM.ActiveCfg = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|ARM.Build.0 = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|ARM64.ActiveCfg = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|ARM64.Build.0 = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|x64.ActiveCfg = Release|x64 + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|x64.Build.0 = Release|x64 + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|x86.ActiveCfg = Release|Any CPU + {BE3B1281-CD44-4291-BE1D-33FC13E61E06}.Release|x86.Build.0 = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|ARM.Build.0 = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|ARM64.Build.0 = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|x64.ActiveCfg = Debug|x64 + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|x64.Build.0 = Debug|x64 + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|x86.ActiveCfg = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Debug|x86.Build.0 = Debug|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|Any CPU.Build.0 = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|ARM.ActiveCfg = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|ARM.Build.0 = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|ARM64.ActiveCfg = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|ARM64.Build.0 = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|x64.ActiveCfg = Release|x64 + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|x64.Build.0 = Release|x64 + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|x86.ActiveCfg = Release|Any CPU + {A38BA7F7-5FEC-49F2-9FEB-F80AFE5934AF}.Release|x86.Build.0 = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|ARM.ActiveCfg = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|ARM.Build.0 = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|ARM64.Build.0 = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|x64.ActiveCfg = Debug|x64 + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|x64.Build.0 = Debug|x64 + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|x86.ActiveCfg = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Debug|x86.Build.0 = Debug|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|Any CPU.Build.0 = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|ARM.ActiveCfg = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|ARM.Build.0 = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|ARM64.ActiveCfg = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|ARM64.Build.0 = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|x64.ActiveCfg = Release|x64 + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|x64.Build.0 = Release|x64 + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|x86.ActiveCfg = Release|Any CPU + {293834F2-4A99-4C92-A165-7C617D98FCC7}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj index 0b1c571..79e3569 100644 --- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj @@ -152,31 +152,31 @@ - 6.2.11 + 6.2.12 6.1.2 - 2.6.0-prerelease.210113001 + 2.6.0-prerelease.210129001 - - - Designer - MSBuild:Compile - - - {8501316d-f994-4a29-9ec4-dc6c6b93f565} + {aca2cc23-a9ae-427f-a900-ed75a96698f4} TheXamlGuy.NotificationFlyout.Uwp.UI.Controls - {8501316d-f994-4a29-9ec4-dc6c6b93f565} + {aca2cc23-a9ae-427f-a900-ed75a96698f4} TheXamlGuy.NotificationFlyout.Shared.UI + + + MSBuild:Compile + Designer + + 14.0 diff --git a/samples/NotificationFlyoutSample/Shell.xaml.cs b/samples/NotificationFlyoutSample/Shell.xaml.cs index 4e94189..c5f5cd3 100644 --- a/samples/NotificationFlyoutSample/Shell.xaml.cs +++ b/samples/NotificationFlyoutSample/Shell.xaml.cs @@ -17,18 +17,5 @@ namespace NotificationFlyoutSample var app = GetApplication(); app.Exit(); } - - private async void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e) - { - //var gsmtcsm = await GetSystemMediaTransportControlsSessionManager(); - //var mediaProperties = await GetMediaProperties(gsmtcsm.GetCurrentSession()); - - } - - //private static async Task GetSystemMediaTransportControlsSessionManager() => - //await GlobalSystemMediaTransportControlsSessionManager.RequestAsync(); - - //private static async Task GetMediaProperties(GlobalSystemMediaTransportControlsSession session) => - // await session.TryGetMediaPropertiesAsync(); } } \ No newline at end of file diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ExecutionMode.cs b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/ExecutionMode.cs similarity index 84% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ExecutionMode.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Extensions/ExecutionMode.cs index 0ff5629..307544c 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ExecutionMode.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/ExecutionMode.cs @@ -1,6 +1,6 @@ using Microsoft.Windows.Sdk; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions +namespace TheXamlGuy.NotificationFlyout.Common.Extensions { internal class ExecutionMode { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/ImageSourceExtensions.cs similarity index 96% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Extensions/ImageSourceExtensions.cs index 78b92df..c1fc638 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/ImageSourceExtensions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media.Imaging; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions +namespace TheXamlGuy.NotificationFlyout.Common.Extensions { public static class ImageSourceExtensions { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/OperatingSystemExtensions.cs similarity index 79% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemExtensions.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Extensions/OperatingSystemExtensions.cs index fbf1349..48bdcdf 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemExtensions.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/OperatingSystemExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions +namespace TheXamlGuy.NotificationFlyout.Common.Extensions { public static class OperatingSystemExtensions { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemVersion.cs b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/OperatingSystemVersion.cs similarity index 82% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemVersion.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Extensions/OperatingSystemVersion.cs index 5ff8097..06a9e4b 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/OperatingSystemVersion.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/OperatingSystemVersion.cs @@ -1,4 +1,5 @@ -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions + +namespace TheXamlGuy.NotificationFlyout.Common.Extensions { public enum OperatingSystemVersion : int { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RECTExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/RECTExtensions.cs similarity index 86% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RECTExtensions.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Extensions/RECTExtensions.cs index d885436..696caee 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RECTExtensions.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/RECTExtensions.cs @@ -1,7 +1,7 @@ using Microsoft.Windows.Sdk; using Windows.Foundation; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions +namespace TheXamlGuy.NotificationFlyout.Common.Extensions { internal static class RECTExtensions { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RegistryKeyExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/RegistryKeyExtensions.cs similarity index 85% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RegistryKeyExtensions.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Extensions/RegistryKeyExtensions.cs index f2682a1..b5f99bc 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/RegistryKeyExtensions.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Extensions/RegistryKeyExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.Win32; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions +namespace TheXamlGuy.NotificationFlyout.Common.Extensions { public static class RegistryKeyExtensions { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/CursorHelper.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/CursorHelper.cs similarity index 80% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/CursorHelper.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/CursorHelper.cs index d18c1d8..e7f76e1 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/CursorHelper.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/CursorHelper.cs @@ -1,6 +1,6 @@ using Microsoft.Windows.Sdk; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal class CursorHelper { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.PInvokes.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconHelper.PInvokes.cs similarity index 97% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.PInvokes.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconHelper.PInvokes.cs index decb976..aae6ae9 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.PInvokes.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconHelper.PInvokes.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public partial class NotificationIconHelper { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconHelper.cs similarity index 98% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconHelper.cs index d5028ee..ce09ce9 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconHelper.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconHelper.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public partial class NotificationIconHelper : IDisposable, IWndProcHandler { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconInvokedEventArgs.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconInvokedEventArgs.cs similarity index 82% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconInvokedEventArgs.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconInvokedEventArgs.cs index 70a0a5b..48d968f 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/NotificationIconInvokedEventArgs.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/NotificationIconInvokedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public class NotificationIconInvokedEventArgs : EventArgs { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/PointerButton.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/PointerButton.cs similarity index 70% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/PointerButton.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/PointerButton.cs index 79610d8..c2f81db 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/PointerButton.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/PointerButton.cs @@ -1,4 +1,5 @@ -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers + +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public enum PointerButton { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/Screen.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/Screen.cs similarity index 98% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/Screen.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/Screen.cs index eeab0cf..a0c7651 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/Screen.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/Screen.cs @@ -3,7 +3,7 @@ using System; using System.Runtime.InteropServices; using Windows.Foundation; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public class Screen { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemInformationHelper.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemInformationHelper.cs similarity index 94% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemInformationHelper.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemInformationHelper.cs index 4881792..6d1a7e7 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemInformationHelper.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemInformationHelper.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using Windows.Foundation; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public static class SystemInformationHelper { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationChangedEventArgs.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemPersonalisationChangedEventArgs.cs similarity index 87% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationChangedEventArgs.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemPersonalisationChangedEventArgs.cs index 7df9bd8..f9845c5 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationChangedEventArgs.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemPersonalisationChangedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public class SystemPersonalisationChangedEventArgs : EventArgs { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemPersonalisationHelper.cs similarity index 95% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemPersonalisationHelper.cs index 2e3aa95..acaa0f1 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemPersonalisationHelper.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemPersonalisationHelper.cs @@ -1,9 +1,9 @@ using Microsoft.Win32; -using TheXamlGuy.NotificationFlyout.Shared.UI.Extensions; using System; +using TheXamlGuy.NotificationFlyout.Common.Extensions; using Windows.UI.ViewManagement; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public class SystemPersonalisationHelper : IWndProcHandler { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemTheme.cs similarity index 54% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemTheme.cs index 74d8715..50bf0c6 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/SystemTheme.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/SystemTheme.cs @@ -1,4 +1,5 @@ -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers + +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public enum SystemTheme { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.PInvokes.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarHelper.PInvokes.cs similarity index 96% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.PInvokes.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarHelper.PInvokes.cs index 3efada1..38ad932 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.PInvokes.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarHelper.PInvokes.cs @@ -2,7 +2,7 @@ using System; using System.Runtime.InteropServices; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public partial class TaskbarHelper { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarHelper.cs similarity index 91% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarHelper.cs index 773ef27..2dd548f 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarHelper.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarHelper.cs @@ -1,8 +1,8 @@ -using TheXamlGuy.NotificationFlyout.Shared.UI.Extensions; -using System; +using System; using System.Runtime.InteropServices; +using TheXamlGuy.NotificationFlyout.Common.Extensions; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public partial class TaskbarHelper : IWndProcHandler { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarPosition.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarPosition.cs similarity index 66% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarPosition.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarPosition.cs index 2c6ecb7..914ef69 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarPosition.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarPosition.cs @@ -1,4 +1,5 @@ -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers + +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public enum TaskbarPosition { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarState.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarState.cs similarity index 74% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarState.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarState.cs index 2a9b76f..c0c061e 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/TaskbarState.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/TaskbarState.cs @@ -1,6 +1,6 @@ using Windows.Foundation; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public struct TaskbarState { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WindowHelper.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WindowHelper.cs similarity index 82% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WindowHelper.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/WindowHelper.cs index ad0a4ae..d8a8c25 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WindowHelper.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WindowHelper.cs @@ -1,7 +1,7 @@ using Microsoft.Windows.Sdk; using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public class WindowHelper { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.PInvokes.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelper.PInvokes.cs similarity index 96% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.PInvokes.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelper.PInvokes.cs index a46656f..a4c0fcb 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.PInvokes.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelper.PInvokes.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal partial class WndProcHelper { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelper.cs similarity index 96% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelper.cs index 6e70179..45fce9d 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelper.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelper.cs @@ -1,6 +1,6 @@ using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal partial class WndProcHelper : IDisposable { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelperMessageEventArgs.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelperMessageEventArgs.cs similarity index 88% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelperMessageEventArgs.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelperMessageEventArgs.cs index dfd57c1..de7a699 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcHelperMessageEventArgs.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcHelperMessageEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal class WndProcHelperMessageEventArgs : EventArgs { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcMessages.cs b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcMessages.cs similarity index 77% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcMessages.cs rename to src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcMessages.cs index 9596286..dcfff55 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Helpers/WndProcMessages.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/Helpers/WndProcMessages.cs @@ -1,4 +1,5 @@ -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers + +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal enum WndProcMessages { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/NativeMethods.txt b/src/TheXamlGuy.NotificationFlyout.Common/NativeMethods.txt similarity index 100% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/NativeMethods.txt rename to src/TheXamlGuy.NotificationFlyout.Common/NativeMethods.txt diff --git a/src/TheXamlGuy.NotificationFlyout.Common/Properties/AssemblyInfo.cs b/src/TheXamlGuy.NotificationFlyout.Common/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..346cb34 --- /dev/null +++ b/src/TheXamlGuy.NotificationFlyout.Common/Properties/AssemblyInfo.cs @@ -0,0 +1,5 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI")] +[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions")] +[assembly: InternalsVisibleTo("TheXamlGuy.NotificationFlyout.Wpf.UI.Controls")] \ No newline at end of file diff --git a/src/TheXamlGuy.NotificationFlyout.Common/TheXamlGuy.NotificationFlyout.Common.csproj b/src/TheXamlGuy.NotificationFlyout.Common/TheXamlGuy.NotificationFlyout.Common.csproj new file mode 100644 index 0000000..756b42f --- /dev/null +++ b/src/TheXamlGuy.NotificationFlyout.Common/TheXamlGuy.NotificationFlyout.Common.csproj @@ -0,0 +1,25 @@ + + + + netcoreapp3.1 + 9.0 + false + TheXamlGuy + TheXamlGuy + NotificationFlyout + 1.0.0 + AnyCPU;x64 + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandler.cs b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandler.cs similarity index 69% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandler.cs rename to src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandler.cs index 0f1f189..51bb2cf 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandler.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandler.cs @@ -1,6 +1,6 @@ using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public interface IWndProcHandler { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerCollection.cs b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandlerCollection.cs similarity index 69% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerCollection.cs rename to src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandlerCollection.cs index efdaa8a..fe7174d 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerCollection.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandlerCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal interface IWndProcHandlerCollection : IList { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerSubscriber.cs b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandlerSubscriber.cs similarity index 73% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerSubscriber.cs rename to src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandlerSubscriber.cs index 50068c1..ea7df61 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/IWndProcHandlerSubscriber.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/IWndProcHandlerSubscriber.cs @@ -1,4 +1,5 @@ -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers + +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public interface IWndProcHandlerSubscriber { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerCollection.cs b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerCollection.cs similarity index 86% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerCollection.cs rename to src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerCollection.cs index 620e765..0d96064 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerCollection.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerCollection.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal class WndProcHandlerCollection : List, IWndProcHandlerCollection { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerReference.cs b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerReference.cs similarity index 92% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerReference.cs rename to src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerReference.cs index 7e1c811..5af6a94 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerReference.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerReference.cs @@ -1,6 +1,6 @@ using System; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { internal class WndProcHandlerReference { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerSubscriber.cs b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerSubscriber.cs similarity index 92% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerSubscriber.cs rename to src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerSubscriber.cs index d4bdb35..b21a9d5 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcHandlerSubscriber.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcHandlerSubscriber.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public class WndProcHandlerSubscriber : IWndProcHandlerSubscriber { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcListener.cs b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcListener.cs similarity index 96% rename from src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcListener.cs rename to src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcListener.cs index 158aaa7..11cd3c2 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/WndProc/WndProcListener.cs +++ b/src/TheXamlGuy.NotificationFlyout.Common/WndProc/WndProcListener.cs @@ -1,7 +1,7 @@ using System; using System.Linq; -namespace TheXamlGuy.NotificationFlyout.Shared.UI.Helpers +namespace TheXamlGuy.NotificationFlyout.Common.Helpers { public class WndProcListener { diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/TheXamlGuy.NotificationFlyout.Common.csproj b/src/TheXamlGuy.NotificationFlyout.Shared.UI/TheXamlGuy.NotificationFlyout.Common.csproj new file mode 100644 index 0000000..6c616c9 --- /dev/null +++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/TheXamlGuy.NotificationFlyout.Common.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp3.1;uap10.0.19041 + 9.0 + false + TheXamlGuy + TheXamlGuy + NotificationFlyout + 1.0.0 + AnyCPU;x64 + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + false + false + + diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/TheXamlGuy.NotificationFlyout.Shared.UI.csproj b/src/TheXamlGuy.NotificationFlyout.Shared.UI/TheXamlGuy.NotificationFlyout.Shared.UI.csproj index 6c616c9..a036c86 100644 --- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/TheXamlGuy.NotificationFlyout.Shared.UI.csproj +++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/TheXamlGuy.NotificationFlyout.Shared.UI.csproj @@ -13,17 +13,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - false - false - diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.cs similarity index 100% rename from src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.cs rename to src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.cs diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml similarity index 100% rename from src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutContextMenuFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml rename to src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutContextMenuFlyoutHost.xaml diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs index 4f91d95..cb76eac 100644 --- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs +++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs @@ -1,25 +1,17 @@ -using TheXamlGuy.NotificationFlyout.Shared.UI.Helpers; -using Windows.UI.Xaml; +using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls { public class NotificationFlyoutPresenter : ContentControl { - private SystemPersonalisationHelper _systemPersonalisationHelper; - public NotificationFlyoutPresenter() { DefaultStyleKey = typeof(NotificationFlyoutPresenter); - - _systemPersonalisationHelper = SystemPersonalisationHelper.Current; - _systemPersonalisationHelper.ThemeChanged += OnThemeChanged; } - protected override void OnApplyTemplate() => UpdateThemeVisualStates(false); + // protected override void OnApplyTemplate() => UpdateThemeVisualStates(false); - private void OnThemeChanged(object sender, SystemPersonalisationChangedEventArgs args) => UpdateThemeVisualStates(true); - - private void UpdateThemeVisualStates(bool useTransition) => VisualStateManager.GoToState(this, _systemPersonalisationHelper.IsColorPrevalence ? "ColorPrevalenceTheme" : "DefaultTheme", useTransition); + // private void UpdateThemeVisualStates(bool useTransition) => VisualStateManager.GoToState(this, _systemPersonalisationHelper.IsColorPrevalence ? "ColorPrevalenceTheme" : "DefaultTheme", useTransition); } } \ No newline at end of file diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj index 0f4d476..99fc891 100644 --- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj +++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj @@ -14,7 +14,7 @@ - + Designer MSBuild:Compile diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml index 9719823..9756989 100644 --- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml +++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs index d607cb3..fdeacff 100644 --- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs +++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs @@ -1,4 +1,4 @@ -using TheXamlGuy.NotificationFlyout.Shared.UI.Helpers; +using TheXamlGuy.NotificationFlyout.Common.Helpers; using System.Windows; using System.Windows.Markup; using TheXamlGuy.NotificationFlyout.Shared.UI; diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs index c88978c..6861ab9 100644 --- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs +++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs @@ -1,5 +1,5 @@ using TheXamlGuy.NotificationFlyout.Uwp.UI.Controls; -using TheXamlGuy.NotificationFlyout.Shared.UI.Helpers; +using TheXamlGuy.NotificationFlyout.Common.Helpers; using TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions; using System; diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs index cd4a1af..caaaa1e 100644 --- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs +++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs @@ -1,12 +1,10 @@ -using TheXamlGuy.NotificationFlyout.Shared.UI.Extensions; -using TheXamlGuy.NotificationFlyout.Shared.UI.Helpers; +using TheXamlGuy.NotificationFlyout.Common.Extensions; +using TheXamlGuy.NotificationFlyout.Common.Helpers; using TheXamlGuy.NotificationFlyout.Uwp.UI.Controls; using TheXamlGuy.NotificationFlyout.Wpf.UI.Extensions; using System; using System.Windows; using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Controls; -using System.Windows.Media; using System.Windows.Media.Imaging; namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj index 861b922..bddaa8f 100644 --- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj +++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj @@ -22,7 +22,6 @@ - diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj index faa27b5..983797b 100644 --- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj +++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI/TheXamlGuy.NotificationFlyout.Wpf.UI.csproj @@ -19,6 +19,7 @@ + diff --git a/src/TheXamlGuy.NotificationFlyout.sln b/src/TheXamlGuy.NotificationFlyout.sln index 4cd2d48..53516e8 100644 --- a/src/TheXamlGuy.NotificationFlyout.sln +++ b/src/TheXamlGuy.NotificationFlyout.sln @@ -8,54 +8,118 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Shared.UI", "TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj", "{DBC9BB92-49C7-4900-AB47-E9E66089CD56}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls", "TheXamlGuy.NotificationFlyout.Uwp.UI.Controls\TheXamlGuy.NotificationFlyout.Uwp.UI.Controls.csproj", "{354F67A7-3699-4CCE-A49B-91DA70C98BF3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI", "TheXamlGuy.NotificationFlyout.Wpf.UI\TheXamlGuy.NotificationFlyout.Wpf.UI.csproj", "{EC20A0A9-CBCB-4357-846A-AA497BB02836}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls", "TheXamlGuy.NotificationFlyout.Wpf.UI.Controls\TheXamlGuy.NotificationFlyout.Wpf.UI.Controls.csproj", "{3205F101-E5F3-4B57-B0BB-33693F906B77}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheXamlGuy.NotificationFlyout.Shared.UI", "TheXamlGuy.NotificationFlyout.Shared.UI\TheXamlGuy.NotificationFlyout.Shared.UI.csproj", "{341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheXamlGuy.NotificationFlyout.Common", "TheXamlGuy.NotificationFlyout.Common\TheXamlGuy.NotificationFlyout.Common.csproj", "{4F05A3D6-DBBC-4921-97BA-6843925CD74B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|Any CPU.ActiveCfg = Debug|x64 - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|Any CPU.Build.0 = Debug|x64 - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|x64.ActiveCfg = Debug|x64 - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Debug|x64.Build.0 = Debug|x64 - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|Any CPU.Build.0 = Release|Any CPU - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|x64.ActiveCfg = Release|x64 - {DBC9BB92-49C7-4900-AB47-E9E66089CD56}.Release|x64.Build.0 = Release|x64 {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|Any CPU.ActiveCfg = Debug|x64 {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|Any CPU.Build.0 = Debug|x64 + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|ARM.Build.0 = Debug|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|ARM64.Build.0 = Debug|Any CPU {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|x64.ActiveCfg = Debug|x64 {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|x64.Build.0 = Debug|x64 + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|x86.ActiveCfg = Debug|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Debug|x86.Build.0 = Debug|Any CPU {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|Any CPU.Build.0 = Release|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|ARM.ActiveCfg = Release|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|ARM.Build.0 = Release|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|ARM64.ActiveCfg = Release|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|ARM64.Build.0 = Release|Any CPU {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|x64.ActiveCfg = Release|x64 {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|x64.Build.0 = Release|x64 + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|x86.ActiveCfg = Release|Any CPU + {354F67A7-3699-4CCE-A49B-91DA70C98BF3}.Release|x86.Build.0 = Release|Any CPU {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|Any CPU.ActiveCfg = Debug|x64 {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|Any CPU.Build.0 = Debug|x64 + {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|ARM.ActiveCfg = Debug|Any CPU + {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|ARM64.ActiveCfg = Debug|Any CPU {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|x64.ActiveCfg = Debug|x64 {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|x64.Build.0 = Debug|x64 + {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Debug|x86.ActiveCfg = Debug|Any CPU {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|Any CPU.Build.0 = Release|Any CPU + {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|ARM.ActiveCfg = Release|Any CPU + {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|ARM64.ActiveCfg = Release|Any CPU {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|x64.ActiveCfg = Release|x64 {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|x64.Build.0 = Release|x64 + {EC20A0A9-CBCB-4357-846A-AA497BB02836}.Release|x86.ActiveCfg = Release|Any CPU {3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|Any CPU.ActiveCfg = Debug|x64 {3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|Any CPU.Build.0 = Debug|x64 + {3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|ARM64.ActiveCfg = Debug|Any CPU {3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|x64.ActiveCfg = Debug|x64 {3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|x64.Build.0 = Debug|x64 + {3205F101-E5F3-4B57-B0BB-33693F906B77}.Debug|x86.ActiveCfg = Debug|Any CPU {3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|Any CPU.ActiveCfg = Release|Any CPU {3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|Any CPU.Build.0 = Release|Any CPU + {3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|ARM.ActiveCfg = Release|Any CPU + {3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|ARM64.ActiveCfg = Release|Any CPU {3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|x64.ActiveCfg = Release|x64 {3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|x64.Build.0 = Release|x64 + {3205F101-E5F3-4B57-B0BB-33693F906B77}.Release|x86.ActiveCfg = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|ARM.Build.0 = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|ARM64.Build.0 = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|x64.ActiveCfg = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|x64.Build.0 = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|x86.ActiveCfg = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Debug|x86.Build.0 = Debug|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|Any CPU.Build.0 = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|ARM.ActiveCfg = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|ARM.Build.0 = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|ARM64.ActiveCfg = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|ARM64.Build.0 = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|x64.ActiveCfg = Release|x64 + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|x64.Build.0 = Release|x64 + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|x86.ActiveCfg = Release|Any CPU + {341F9830-BB2F-4A2F-A81A-3DBAF307B4EF}.Release|x86.Build.0 = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|ARM.Build.0 = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|ARM64.Build.0 = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|x64.ActiveCfg = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|x64.Build.0 = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|x86.ActiveCfg = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Debug|x86.Build.0 = Debug|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|Any CPU.Build.0 = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|ARM.ActiveCfg = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|ARM.Build.0 = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|ARM64.ActiveCfg = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|ARM64.Build.0 = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|x64.ActiveCfg = Release|x64 + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|x64.Build.0 = Release|x64 + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|x86.ActiveCfg = Release|Any CPU + {4F05A3D6-DBBC-4921-97BA-6843925CD74B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE