Fix Home Button being broken

Remove Custom NavigationView template, it should support everything we need now
Remove workaround for WinUI 2.4 bug
Add new workaround for another issue...

Author: michael-hawker

Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs

@@ -124,15 +124,7 @@ SamplePickerGridView.ItemsSource is Sample[] currentSamples &&
 
         private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)
         {
-            //// Temp Workaround for WinUI Bug https://github.com/microsoft/microsoft-ui-xaml/issues/2520
-            var invokedItem = args.InvokedItem;
-            if (invokedItem is FrameworkElement fe && fe.DataContext is SampleCategory cat2)
-            {
-                invokedItem = cat2;
-            }
-            //// End Workaround - args.InvokedItem
-
-            if (invokedItem is SampleCategory category)
+            if (args.InvokedItem is SampleCategory category)
             {
                 if (SamplePickerGrid.Visibility != Visibility.Collapsed && _selectedCategory == category)
                 {
@@ -149,13 +141,16 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
                     dispatcherQueue.EnqueueAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
                 }
             }
-            else if (args.IsSettingsInvoked)
+        }
+
+        private void SettingsTopNavPaneItem_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            // Can't get FooterMenuItems to work properly right now with ItemInvoked above, bug?
+            // For now just hard-code an event.
+            HideSamplePicker();
+            if (NavigationFrame.CurrentSourcePageType != typeof(About))
             {
-                HideSamplePicker();
-                if (NavigationFrame.CurrentSourcePageType != typeof(About))
-                {
-                    NavigateToSample(null);
-                }
+                NavigateToSample(null);
             }
         }
 

Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml

@@ -4,10 +4,10 @@
       xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
       xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
+      xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
       xmlns:winui="using:Microsoft.UI.Xaml.Controls"
       ui:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}"
       ui:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}"
@@ -29,20 +29,26 @@
     </Page.Resources>
     <Grid>
         <winui:NavigationView x:Name="NavView"
-                              IsSettingsVisible="True"
+                              IsSettingsVisible="False"
                               ItemInvoked="NavView_ItemInvoked"
                               MenuItemTemplate="{StaticResource CategoryTemplate}"
                               PaneDisplayMode="Top"
-                              SelectionFollowsFocus="Disabled"
-                              Style="{StaticResource ToolkitNavViewStyle}">
-            <winui:NavigationView.PaneFooter>
+                              SelectionFollowsFocus="Disabled">
+            <winui:NavigationView.AutoSuggestBox>
                 <AutoSuggestBox x:Name="SearchBox"
                                 MinWidth="150"
                                 VerticalAlignment="Center"
                                 KeyDown="SearchBox_KeyDown"
                                 QueryIcon="Find"
                                 QuerySubmitted="SearchBox_QuerySubmitted"
                                 TextChanged="SearchBox_TextChanged" />
+            </winui:NavigationView.AutoSuggestBox>
+            <winui:NavigationView.PaneFooter>
+                <!--  Not sure why we can't get to display properly with FooterMenuItems  -->
+                <winui:NavigationViewItem x:Name="SettingsTopNavPaneItem"
+                                          Icon="Home"
+                                          PointerReleased="SettingsTopNavPaneItem_PointerReleased"
+                                          Style="{ThemeResource MUX_NavigationViewSettingsItemStyleWhenOnTopPane}" />
             </winui:NavigationView.PaneFooter>
             <Grid>
                 <winui:ParallaxView x:Name="Parallax"