Finalize and Enable Up Navigation

Author: lukeblevins

Files UWP/FilesUWP.csproj

@@ -292,7 +292,7 @@
       <Version>5.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.1.190405004.2</Version>
+      <Version>2.1.190606001</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

Files UWP/ProHome.xaml

@@ -726,7 +726,7 @@
                             </Button.KeyboardAccelerators>
                         </Button>
 
-                        <Button Visibility="Collapsed" Style="{StaticResource NavigationButtonNormalStyle}" x:Name="Up">
+                        <Button Visibility="Visible" Style="{StaticResource NavigationButtonNormalStyle}" x:Name="Up">
                             <Button.Content>
                                 &#xE74A;
                             </Button.Content>

Files UWP/ProHome.xaml.cs

@@ -1480,8 +1480,18 @@ public static void Up_Click(object sender, RoutedEventArgs e)
             {
                 var instance = (instanceContentFrame.Content as GenericFileBrowser).instanceViewModel;
                 instance.CancelLoadAndClearFiles();
-                var parentDirectoryOfPath = instance.Universal.path.Remove(instance.Universal.path.LastIndexOf("\\"));
- 
+                string parentDirectoryOfPath = null;
+                // Check that there isn't a slash at the end
+                if((instance.Universal.path.Count() - 1) - instance.Universal.path.LastIndexOf("\\") > 0)
+                {
+                    parentDirectoryOfPath = instance.Universal.path.Remove(instance.Universal.path.LastIndexOf("\\"));
+                }
+                else  // Slash found at end
+                {
+                    var currentPathWithoutEndingSlash = instance.Universal.path.Remove(instance.Universal.path.LastIndexOf("\\"));
+                    parentDirectoryOfPath = currentPathWithoutEndingSlash.Remove(currentPathWithoutEndingSlash.LastIndexOf("\\"));
+                }
+
                 var CurrentTabInstance = ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>();
                 if (parentDirectoryOfPath == ProHome.DesktopPath)
                 {
@@ -1547,7 +1557,17 @@ public static void Up_Click(object sender, RoutedEventArgs e)
             {
                 var instance = (instanceContentFrame.Content as PhotoAlbum).instanceViewModel;
                 instance.CancelLoadAndClearFiles();
-                var parentDirectoryOfPath = instance.Universal.path.Remove(instance.Universal.path.LastIndexOf("\\"));
+                string parentDirectoryOfPath = null;
+                // Check that there isn't a slash at the end
+                if ((instance.Universal.path.Count() - 1) - instance.Universal.path.LastIndexOf("\\") > 0)
+                {
+                    parentDirectoryOfPath = instance.Universal.path.Remove(instance.Universal.path.LastIndexOf("\\"));
+                }
+                else  // Slash found at end
+                {
+                    var currentPathWithoutEndingSlash = instance.Universal.path.Remove(instance.Universal.path.LastIndexOf("\\"));
+                    parentDirectoryOfPath = currentPathWithoutEndingSlash.Remove(currentPathWithoutEndingSlash.LastIndexOf("\\"));
+                }
 
                 var CurrentTabInstance = ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>();
                 if (parentDirectoryOfPath == ProHome.DesktopPath)