diff --git a/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj b/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj deleted file mode 100644 index 8977c46..0000000 --- a/NotificationFlyout.Sample.Uwp/NotificationFlyout.Sample.Uwp.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - uap10.0.19041 - AnyCPU;x64 - false - false - 9.0 - false - - - - - - - - - - - - Designer - MSBuild:Compile - - - \ No newline at end of file diff --git a/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml.cs b/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml.cs deleted file mode 100644 index 6e102ec..0000000 --- a/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace NotificationFlyout.Sample.Uwp -{ - public sealed partial class NotificationFlyoutPresenter - { - public NotificationFlyoutPresenter() - { - InitializeComponent(); - } - - private void test_SelectionChanged(object sender, Windows.UI.Xaml.Controls.SelectionChangedEventArgs e) - { - if (test.SelectedIndex == 0) - { - this.RequestedTheme = Windows.UI.Xaml.ElementTheme.Default; - - } - - if (test.SelectedIndex == 1) - { - this.RequestedTheme = Windows.UI.Xaml.ElementTheme.Dark; - - } - - if (test.SelectedIndex == 2) - { - this.RequestedTheme = Windows.UI.Xaml.ElementTheme.Light; - - } - } - } -} diff --git a/NotificationFlyout.Sample.Wpf/App.xaml b/NotificationFlyout.Sample.Wpf/App.xaml deleted file mode 100644 index f36cb30..0000000 --- a/NotificationFlyout.Sample.Wpf/App.xaml +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/NotificationFlyout.Sample.Wpf/NotificationFlyout.Sample.Wpf.csproj b/NotificationFlyout.Sample.Wpf/NotificationFlyout.Sample.Wpf.csproj deleted file mode 100644 index c7f6052..0000000 --- a/NotificationFlyout.Sample.Wpf/NotificationFlyout.Sample.Wpf.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - WinExe - netcoreapp3.1 - true - uap10.0.19041 - NotificationFlyout.Sample.Wpf.Program - 9.0 - AnyCPU;x64 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout - Backup.Uwp.UI.Controls.csproj b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout - Backup.Uwp.UI.Controls.csproj deleted file mode 100644 index f3abab7..0000000 --- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout - Backup.Uwp.UI.Controls.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - uap10.0.19041 - AnyCPU;x64 - false - false - 9.0 - false - - - - - - - - - - - XamlIntelliSenseFileGenerator - - - XamlIntelliSenseFileGenerator - - - - - - XamlIntelliSenseFileGenerator - - - \ No newline at end of file diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs deleted file mode 100644 index 3281e06..0000000 --- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Windows.UI.Xaml.Controls; - -namespace NotificationFlyout.Uwp.UI.Controls -{ - public class NotificationFlyoutPresenter : ContentControl - { - public NotificationFlyoutPresenter() - { - DefaultStyleKey = typeof(NotificationFlyoutPresenter); - } - } -} \ No newline at end of file diff --git a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml b/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml deleted file mode 100644 index 4b1b86b..0000000 --- a/NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/samples/NotificationFlyoutSample/ClassLibrary1/ClassLibrary1.csproj b/samples/NotificationFlyoutSample/ClassLibrary1/ClassLibrary1.csproj new file mode 100644 index 0000000..ee6799d --- /dev/null +++ b/samples/NotificationFlyoutSample/ClassLibrary1/ClassLibrary1.csproj @@ -0,0 +1,138 @@ + + + + + Debug + AnyCPU + {04bbe7f7-2adc-46cd-bbd7-8715bbf36f57} + Library + Properties + ClassLibrary1 + ClassLibrary1 + en-US + UAP + 10.0.19041.0 + 10.0.17763.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + prompt + 4 + + + x86 + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x86 + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + ARM + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + ARM64 + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + ARM64 + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + x64 + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + false + prompt + + + x64 + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + false + prompt + + + PackageReference + + + + + + + + 14.0 + + + + diff --git a/NotificationFlyout.Sample.Uwp/Properties/AssemblyInfo.cs b/samples/NotificationFlyoutSample/ClassLibrary1/Properties/AssemblyInfo.cs similarity index 88% rename from NotificationFlyout.Sample.Uwp/Properties/AssemblyInfo.cs rename to samples/NotificationFlyoutSample/ClassLibrary1/Properties/AssemblyInfo.cs index 9f09b60..6df563c 100644 --- a/NotificationFlyout.Sample.Uwp/Properties/AssemblyInfo.cs +++ b/samples/NotificationFlyoutSample/ClassLibrary1/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NotificationFlyout.Sample.Uwp")] +[assembly: AssemblyTitle("ClassLibrary1")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NotificationFlyout.Sample.Uwp")] +[assembly: AssemblyProduct("ClassLibrary1")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/samples/NotificationFlyoutSample/ClassLibrary1/Properties/ClassLibrary1.rd.xml b/samples/NotificationFlyoutSample/ClassLibrary1/Properties/ClassLibrary1.rd.xml new file mode 100644 index 0000000..4639215 --- /dev/null +++ b/samples/NotificationFlyoutSample/ClassLibrary1/Properties/ClassLibrary1.rd.xml @@ -0,0 +1,33 @@ + + + + + + + + + diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/App.xaml b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/App.xaml new file mode 100644 index 0000000..acca37f --- /dev/null +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/App.xaml @@ -0,0 +1,6 @@ + + + diff --git a/NotificationFlyout.Sample.Wpf/App.xaml.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/App.xaml.cs similarity index 88% rename from NotificationFlyout.Sample.Wpf/App.xaml.cs rename to samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/App.xaml.cs index e1e5788..83f9881 100644 --- a/NotificationFlyout.Sample.Wpf/App.xaml.cs +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/App.xaml.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -namespace NotificationFlyout.Sample.Wpf +namespace NotificationFlyoutSample.Host { /// /// Interaction logic for App.xaml diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/AssemblyInfo.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/AssemblyInfo.cs new file mode 100644 index 0000000..8b5504e --- /dev/null +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/NotificationFlyout.Sample.Wpf/Assets/Icon-Light.ico b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Assets/Icon-Light.ico similarity index 100% rename from NotificationFlyout.Sample.Wpf/Assets/Icon-Light.ico rename to samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Assets/Icon-Light.ico diff --git a/NotificationFlyout.Sample.Wpf/Assets/Icon.ico b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Assets/Icon.ico similarity index 100% rename from NotificationFlyout.Sample.Wpf/Assets/Icon.ico rename to samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Assets/Icon.ico diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj new file mode 100644 index 0000000..8cffeaa --- /dev/null +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj @@ -0,0 +1,35 @@ + + + + WinExe + netcoreapp3.1 + true + x64 + uap10.0.19041 + NotificationFlyoutSample.Host.Program + false + false + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NotificationFlyout.Sample.Wpf/Progam.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Program.cs similarity index 74% rename from NotificationFlyout.Sample.Wpf/Progam.cs rename to samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Program.cs index 554d99d..2e523ad 100644 --- a/NotificationFlyout.Sample.Wpf/Progam.cs +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Program.cs @@ -1,13 +1,13 @@ using System; -namespace NotificationFlyout.Sample.Wpf +namespace NotificationFlyoutSample.Host { public class Program { [STAThread()] public static void Main() { - using (new XamlHost.App()) + using (new NotificationFlyoutSample.App()) { var app = new App(); new SampleNotificationFlyout(); diff --git a/NotificationFlyout.Sample.Wpf/SampleNotificationFlyout.xaml b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml similarity index 55% rename from NotificationFlyout.Sample.Wpf/SampleNotificationFlyout.xaml rename to samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml index 01b13eb..6d456f7 100644 --- a/NotificationFlyout.Sample.Wpf/SampleNotificationFlyout.xaml +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml @@ -1,9 +1,9 @@  - + diff --git a/NotificationFlyout.Sample.Wpf/SampleNotificationFlyout.xaml.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml.cs similarity index 79% rename from NotificationFlyout.Sample.Wpf/SampleNotificationFlyout.xaml.cs rename to samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml.cs index ada3e21..d2795ec 100644 --- a/NotificationFlyout.Sample.Wpf/SampleNotificationFlyout.xaml.cs +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml.cs @@ -1,4 +1,4 @@ -namespace NotificationFlyout.Sample.Wpf +namespace NotificationFlyoutSample.Host { public partial class SampleNotificationFlyout { diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.sln b/samples/NotificationFlyoutSample/NotificationFlyoutSample.sln new file mode 100644 index 0000000..5940889 --- /dev/null +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.sln @@ -0,0 +1,149 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30914.41 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyoutSample.Host", "NotificationFlyoutSample.Host\NotificationFlyoutSample.Host.csproj", "{D13742AD-DB71-4269-B3AF-7CA8C4E51A19}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyoutSample", "NotificationFlyoutSample\NotificationFlyoutSample.csproj", "{2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1E895953-2231-4ACA-84A6-64F8F57FE86A}" + ProjectSection(SolutionItems) = preProject + global.json = global.json + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Uwp.UI.Controls", "..\..\src\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj", "{95F851E4-87A5-4BB7-953E-C0FE3B306F0E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Wpf.UI", "..\..\src\NotificationFlyout.Wpf.UI\NotificationFlyout.Wpf.UI.csproj", "{49BCC188-22D2-468B-89EA-99C810BE790E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Wpf.UI.Controls", "..\..\src\NotificationFlyout.Wpf.UI.Controls\NotificationFlyout.Wpf.UI.Controls.csproj", "{094A2030-C430-490B-AB26-205385A0D4BF}" +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 + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|Any CPU.ActiveCfg = Debug|x64 + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|Any CPU.Build.0 = Debug|x64 + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|ARM.ActiveCfg = Debug|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|ARM.Build.0 = Debug|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|ARM64.Build.0 = Debug|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|x64.ActiveCfg = Debug|x64 + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|x64.Build.0 = Debug|x64 + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|x86.ActiveCfg = Debug|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Debug|x86.Build.0 = Debug|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|Any CPU.Build.0 = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|ARM.ActiveCfg = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|ARM.Build.0 = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|ARM64.ActiveCfg = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|ARM64.Build.0 = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|x64.ActiveCfg = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|x64.Build.0 = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|x86.ActiveCfg = Release|Any CPU + {D13742AD-DB71-4269-B3AF-7CA8C4E51A19}.Release|x86.Build.0 = Release|Any CPU + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|Any CPU.ActiveCfg = Debug|x64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|Any CPU.Build.0 = Debug|x64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|ARM.ActiveCfg = Debug|ARM + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|ARM.Build.0 = Debug|ARM + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|ARM.Deploy.0 = Debug|ARM + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|ARM64.Build.0 = Debug|ARM64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|x64.ActiveCfg = Debug|x64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|x64.Build.0 = Debug|x64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|x64.Deploy.0 = Debug|x64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|x86.ActiveCfg = Debug|x86 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|x86.Build.0 = Debug|x86 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Debug|x86.Deploy.0 = Debug|x86 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|Any CPU.ActiveCfg = Release|x86 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|ARM.ActiveCfg = Release|ARM + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|ARM.Build.0 = Release|ARM + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|ARM.Deploy.0 = Release|ARM + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|ARM64.ActiveCfg = Release|ARM64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|ARM64.Build.0 = Release|ARM64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|ARM64.Deploy.0 = Release|ARM64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|x64.ActiveCfg = Release|x64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|x64.Build.0 = Release|x64 + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}.Release|x64.Deploy.0 = Release|x64 + {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 + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|ARM.ActiveCfg = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|ARM.Build.0 = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|ARM64.Build.0 = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|x64.ActiveCfg = Debug|x64 + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|x64.Build.0 = Debug|x64 + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|x86.ActiveCfg = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Debug|x86.Build.0 = Debug|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|Any CPU.Build.0 = Release|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|ARM.ActiveCfg = Release|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|ARM.Build.0 = Release|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|ARM64.ActiveCfg = Release|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|ARM64.Build.0 = Release|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|x64.ActiveCfg = Release|x64 + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|x64.Build.0 = Release|x64 + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|x86.ActiveCfg = Release|Any CPU + {95F851E4-87A5-4BB7-953E-C0FE3B306F0E}.Release|x86.Build.0 = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|ARM.ActiveCfg = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|ARM.Build.0 = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|ARM64.Build.0 = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|x64.ActiveCfg = Debug|x64 + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|x64.Build.0 = Debug|x64 + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|x86.ActiveCfg = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Debug|x86.Build.0 = Debug|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|Any CPU.Build.0 = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|ARM.ActiveCfg = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|ARM.Build.0 = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|ARM64.ActiveCfg = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|ARM64.Build.0 = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|x64.ActiveCfg = Release|x64 + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|x64.Build.0 = Release|x64 + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|x86.ActiveCfg = Release|Any CPU + {49BCC188-22D2-468B-89EA-99C810BE790E}.Release|x86.Build.0 = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|ARM.Build.0 = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|ARM64.Build.0 = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|x64.ActiveCfg = Debug|x64 + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|x64.Build.0 = Debug|x64 + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|x86.ActiveCfg = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Debug|x86.Build.0 = Debug|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|Any CPU.Build.0 = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|ARM.ActiveCfg = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|ARM.Build.0 = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|ARM64.ActiveCfg = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|ARM64.Build.0 = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|x64.ActiveCfg = Release|x64 + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|x64.Build.0 = Release|x64 + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|x86.ActiveCfg = Release|Any CPU + {094A2030-C430-490B-AB26-205385A0D4BF}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {03157D81-42AD-4A82-96E1-1E1D6F247D03} + EndGlobalSection +EndGlobal diff --git a/NotificationFlyout.XamlHost/App.xaml b/samples/NotificationFlyoutSample/NotificationFlyoutSample/App.xaml similarity index 83% rename from NotificationFlyout.XamlHost/App.xaml rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/App.xaml index 41474d6..318f7f3 100644 --- a/NotificationFlyout.XamlHost/App.xaml +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/App.xaml @@ -1,9 +1,9 @@  - \ No newline at end of file + diff --git a/NotificationFlyout.XamlHost/App.xaml.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample/App.xaml.cs similarity index 82% rename from NotificationFlyout.XamlHost/App.xaml.cs rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/App.xaml.cs index 893892e..ed596a9 100644 --- a/NotificationFlyout.XamlHost/App.xaml.cs +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/App.xaml.cs @@ -1,6 +1,6 @@ using Microsoft.Toolkit.Win32.UI.XamlHost; -namespace NotificationFlyout.XamlHost +namespace NotificationFlyoutSample { public sealed partial class App : XamlApplication { @@ -9,4 +9,4 @@ namespace NotificationFlyout.XamlHost Initialize(); } } -} \ No newline at end of file +} diff --git a/NotificationFlyout.XamlHost/Assets/LockScreenLogo.scale-200.png b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from NotificationFlyout.XamlHost/Assets/LockScreenLogo.scale-200.png rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/LockScreenLogo.scale-200.png diff --git a/NotificationFlyout.XamlHost/Assets/SplashScreen.scale-200.png b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/SplashScreen.scale-200.png similarity index 100% rename from NotificationFlyout.XamlHost/Assets/SplashScreen.scale-200.png rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/SplashScreen.scale-200.png diff --git a/NotificationFlyout.XamlHost/Assets/Square150x150Logo.scale-200.png b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from NotificationFlyout.XamlHost/Assets/Square150x150Logo.scale-200.png rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Square150x150Logo.scale-200.png diff --git a/NotificationFlyout.XamlHost/Assets/Square44x44Logo.scale-200.png b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from NotificationFlyout.XamlHost/Assets/Square44x44Logo.scale-200.png rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Square44x44Logo.scale-200.png diff --git a/NotificationFlyout.XamlHost/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from NotificationFlyout.XamlHost/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/NotificationFlyout.XamlHost/Assets/StoreLogo.png b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/StoreLogo.png similarity index 100% rename from NotificationFlyout.XamlHost/Assets/StoreLogo.png rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/StoreLogo.png diff --git a/NotificationFlyout.XamlHost/Assets/Wide310x150Logo.scale-200.png b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from NotificationFlyout.XamlHost/Assets/Wide310x150Logo.scale-200.png rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Wide310x150Logo.scale-200.png diff --git a/NotificationFlyout.XamlHost/NotificationFlyout.XamlHost.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample/NotificationFlyoutSample.csproj similarity index 90% rename from NotificationFlyout.XamlHost/NotificationFlyout.XamlHost.csproj rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/NotificationFlyoutSample.csproj index 97c40ec..ba35c2f 100644 --- a/NotificationFlyout.XamlHost/NotificationFlyout.XamlHost.csproj +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/NotificationFlyoutSample.csproj @@ -4,11 +4,11 @@ Debug x86 - {95D6E127-BC04-4591-ACFF-FB35BBB64884} + {2057ADE0-C61E-45EE-BB7E-A469FE4D4C41} AppContainerExe Properties - NotificationFlyout.XamlHost - NotificationFlyout.XamlHost + NotificationFlyoutSample + NotificationFlyoutSample en-US UAP 10.0.19041.0 @@ -120,6 +120,9 @@ App.xaml + + Shell.xaml + @@ -150,12 +153,18 @@ 6.1.2 - 2.5.0-prerelease.201202003 + 2.6.0-prerelease.210113001 - - {9987b132-e42c-401a-9ad5-e62529faca40} + + Designer + MSBuild:Compile + + + + + {95f851e4-87a5-4bb7-953e-c0fe3b306f0e} NotificationFlyout.Uwp.UI.Controls @@ -170,4 +179,8 @@ --> + + false + false + \ No newline at end of file diff --git a/NotificationFlyout.XamlHost/Package.appxmanifest b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Package.appxmanifest similarity index 76% rename from NotificationFlyout.XamlHost/Package.appxmanifest rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Package.appxmanifest index 9e7b83d..a3e3020 100644 --- a/NotificationFlyout.XamlHost/Package.appxmanifest +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Package.appxmanifest @@ -7,14 +7,14 @@ IgnorableNamespaces="uap mp"> - + - NotificationFlyout.XamlHost + NotificationFlyoutSample dan Assets\StoreLogo.png @@ -30,12 +30,12 @@ + EntryPoint="NotificationFlyoutSample.App"> diff --git a/NotificationFlyout.XamlHost/Properties/AssemblyInfo.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Properties/AssemblyInfo.cs similarity index 80% rename from NotificationFlyout.XamlHost/Properties/AssemblyInfo.cs rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Properties/AssemblyInfo.cs index abc3bb1..16d6268 100644 --- a/NotificationFlyout.XamlHost/Properties/AssemblyInfo.cs +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Properties/AssemblyInfo.cs @@ -1,14 +1,15 @@ using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NotificationFlyout.XamlHost")] +[assembly: AssemblyTitle("NotificationFlyoutSample")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NotificationFlyout.XamlHost")] +[assembly: AssemblyProduct("NotificationFlyoutSample")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -16,11 +17,11 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/NotificationFlyout.XamlHost/Properties/Default.rd.xml b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Properties/Default.rd.xml similarity index 94% rename from NotificationFlyout.XamlHost/Properties/Default.rd.xml rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Properties/Default.rd.xml index 7454086..af00722 100644 --- a/NotificationFlyout.XamlHost/Properties/Default.rd.xml +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Properties/Default.rd.xml @@ -6,7 +6,7 @@ Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919 To fully enable reflection for App1.MyClass and all of its public/private members - + To enable dynamic creation of the specific instantiation of AppClass over System.Int32 @@ -22,7 +22,10 @@ the application package. The asterisks are not wildcards. --> - + + + + \ No newline at end of file diff --git a/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml similarity index 58% rename from NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml rename to samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml index f53eff9..4168d62 100644 --- a/NotificationFlyout.Sample.Uwp/NotificationFlyoutPresenter.xaml +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml @@ -1,5 +1,5 @@  @@ -7,14 +7,6 @@ Width="330" Height="500" Margin="24"> - - System - Dark - Light -