refactoring for the next stage

samples/NotificationFlyoutSample/App.xaml

@@ -6,4 +6,4 @@
     <xamlhost:XamlApplication.Resources>
         <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" Version="Latest" />
     </xamlhost:XamlApplication.Resources>
-</xamlhost:XamlApplication>
+</xamlhost:XamlApplication>

samples/NotificationFlyoutSample/App.xaml.cs

@@ -9,4 +9,4 @@ namespace NotificationFlyoutSample
             Initialize();
         }
     }
-}
+}

samples/NotificationFlyoutSample/Properties/AssemblyInfo.cs

@@ -1,8 +1,7 @@
 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("NotificationFlyoutSample")]
@@ -17,11 +16,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")]

samples/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
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
+    <Type Name="App1.MyClass" Dynamic="Required All" />
 
     To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
     <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
@@ -22,10 +22,7 @@
       the application package. The asterisks are not wildcards.
     -->
     <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
+
     <!-- Add your application specific runtime directives here. -->
-
-
   </Application>
 </Directives>

samples/NotificationFlyoutSample/Shell.xaml

@@ -6,9 +6,11 @@
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     IconSource="/Assets/Icon.ico"
     LightIconSource="/Assets/Icon-Light.ico">
-    <controls:NotificationFlyout.ContextMenuItems>
-        <MenuFlyoutItem Click="MenuFlyoutItem_Click" Text="Close" />
-    </controls:NotificationFlyout.ContextMenuItems>
+    <controls:NotificationFlyout.ContextMenu>
+        <controls:NotificationFlyoutContextMenu>
+            <MenuFlyoutItem Click="MenuFlyoutItem_Click" Text="Close" />
+        </controls:NotificationFlyoutContextMenu>
+    </controls:NotificationFlyout.ContextMenu>
     <StackPanel Margin="24">
         <ComboBox
             x:Name="Theme"
@@ -44,7 +46,10 @@
             IsIndeterminate="True"
             ShowError="False"
             ShowPaused="False" />
-        <Button Margin="0,0,0,8" Content="Open window" Click="Button_Click" />
+        <Button
+            Margin="0,0,0,8"
+            Click="Button_Click"
+            Content="Open window" />
         <Slider Margin="0,0,0,8" />
         <TextBox Margin="0,0,0,8" />
         <CalendarView Margin="0,0,0,8" />
@@ -83,4 +88,4 @@
         </StackPanel>
         <muxc:RatingControl AutomationProperties.Name="RatingControl with placeholder" PlaceholderValue="0" />
     </StackPanel>
-</controls:NotificationFlyout>
+</controls:NotificationFlyout>

samples/NotificationFlyoutSample/Shell.xaml.cs

@@ -14,9 +14,11 @@
                 case 0:
                     RequestedTheme = Windows.UI.Xaml.ElementTheme.Default;
                     break;
+
                 case 1:
                     RequestedTheme = Windows.UI.Xaml.ElementTheme.Dark;
                     break;
+
                 case 2:
                     RequestedTheme = Windows.UI.Xaml.ElementTheme.Light;
                     break;
@@ -35,4 +37,4 @@
             app.OpenAsWindow<WindowContent>();
         }
     }
-}
+}

samples/NotificationFlyoutSample/WindowContent.xaml

@@ -24,4 +24,4 @@
         </muxc:NavigationView.MenuItems>
         <Frame x:Name="contentFrame" />
     </muxc:NavigationView>
-</UserControl>
+</UserControl>

samples/NotificationFlyoutSample/WindowContent.xaml.cs

@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
+using Windows.UI.Xaml.Controls;
 
 // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
@@ -24,4 +11,4 @@ namespace NotificationFlyoutSample
             this.InitializeComponent();
         }
     }
-}
+}