Fixed settings page navigation

Author: Yair Aichenbaum

Files.Package/Files.Package.wapproj

@@ -59,7 +59,7 @@
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <EntryPointProjectUniqueName>..\Files\Files.csproj</EntryPointProjectUniqueName>
-    <PackageCertificateThumbprint>72235815D2912224F3229AE45F9386420BE848AA</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>4BCB7C3E4C2C60760763F4E78EDEC8AA61CF3209</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Always</AppxBundle>

Files.Package/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
-  <Identity Name="49306atecsolution.FilesUWP" Publisher="CN=Luke Blevins" Version="0.7.0.0" />
+  <Identity Name="49306atecsolution.FilesUWP" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.7.0.0" />
   <Properties>
     <DisplayName>Files UWP - Preview</DisplayName>
     <PublisherDisplayName>Yair A</PublisherDisplayName>

Files/Views/Pages/Settings.xaml

@@ -34,38 +34,50 @@
                 <muxc:NavigationViewItem
                     x:Uid="SettingsNavAppearance"
                     Content="Appearance"
-                    IsSelected="True">
+                    IsSelected="True"
+                    Tag="Appearance">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE790;" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem
                     x:Uid="SettingsNavOnStartup"
                     Content="On Startup"
-                    IsSelected="True">
+                    IsSelected="True"
+                    Tag="On Startup">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE7E8;" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
                 <muxc:NavigationViewItem
                     x:Uid="SettingsNavPageLayouts"
                     Content="Page Layouts"
+                    Tag="Page Layouts"
                     Visibility="Collapsed">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE737;" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
-                <muxc:NavigationViewItem x:Uid="SettingsNavPreferences" Content="Preferences">
+                <muxc:NavigationViewItem
+                    x:Uid="SettingsNavPreferences"
+                    Content="Preferences"
+                    Tag="Preferences">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE713;" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
-                <muxc:NavigationViewItem x:Uid="SettingsNavFilesAndFolders" Content="Files and Folders">
+                <muxc:NavigationViewItem
+                    x:Uid="SettingsNavFilesAndFolders"
+                    Content="Files and Folders"
+                    Tag="Files and Folders">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xEC50;" />
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
-                <muxc:NavigationViewItem x:Uid="SettingsNavAbout" Content="About">
+                <muxc:NavigationViewItem
+                    x:Uid="SettingsNavAbout"
+                    Content="About"
+                    Tag="About">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE946;" />
                     </muxc:NavigationViewItem.Icon>

Files/Views/Pages/Settings.xaml.cs

@@ -51,7 +51,7 @@ public Settings()
 
         private void NavigationView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)
         {
-            var item = args.InvokedItem;
+            var item = args.InvokedItemContainer.Tag;
 
             _= args.InvokedItem.ToString() switch
             {