Implement Delete Function and Fix Removable Drive Bugs

Author: lukeblevins

GenericFileBrowser.xaml

@@ -129,6 +129,9 @@
                                     <MenuFlyoutItem.Icon>
                                         <FontIcon Glyph="&#xE74D;"/>
                                     </MenuFlyoutItem.Icon>
+                                    <MenuFlyoutItem.KeyboardAccelerators>
+                                        <KeyboardAccelerator Key="Delete"/>
+                                    </MenuFlyoutItem.KeyboardAccelerators>
                                 </MenuFlyoutItem>
                                 <MenuFlyoutItem Text="Rename" Name="RenameItem" >
                                     <MenuFlyoutItem.Icon>

ItemInteractions.cs

@@ -496,9 +496,37 @@ private static void Manager_DataRequested(DataTransferManager sender, DataReques
 
         }
 
-        public static void DeleteItem_Click(object sender, RoutedEventArgs e)
+        public static async void DeleteItem_Click(object sender, RoutedEventArgs e)
         {
-            
+            //MessageDialog DeleteConfirmationDialog = new MessageDialog("Are you sure you want to send " + GenericFileBrowser.data.SelectedItems.Count + " item(s) to the Recycle Bin?", "Move to Recycle Bin?");
+            //DeleteConfirmationDialog.Commands.Add(new UICommand("Yes", new UICommandInvokedHandler(Interaction.DeleteConfirmed)));
+            //DeleteConfirmationDialog.Commands.Add(new UICommand("Cancel"));
+            //await DeleteConfirmationDialog.ShowAsync();
+            try
+            {
+                foreach (ListedItem storItem in GenericFileBrowser.data.SelectedItems)
+                {
+                    if (storItem.FileExtension != "Folder")
+                    {
+                        var item = await StorageFile.GetFileFromPathAsync(storItem.FilePath);
+                        await item.DeleteAsync(StorageDeleteOption.Default);
+
+                    }
+                    else
+                    {
+                        var item = await StorageFolder.GetFolderFromPathAsync(storItem.FilePath);
+                        await item.DeleteAsync(StorageDeleteOption.Default);
+
+                    }
+
+                }
+                NavigationActions.Refresh_Click(null, null);
+
+            }
+            catch (InvalidOperationException)
+            {
+
+            }
         }
 
         public static void RenameItem_Click(object sender, RoutedEventArgs e)

MainPage.xaml.cs

@@ -51,16 +51,51 @@ public MainPage()
 
         public async void PopulateNavViewWithExternalDrives()
         {
-            StorageFolder RemDevicesFolder = KnownFolders.RemovableDevices;
-            foreach (StorageFolder fol in await RemDevicesFolder.GetFoldersAsync())
+
+            StorageFolder fol;
+            string driveLetter;
+            string NavItemContent;
+            SymbolIcon icon; 
+            ObservableCollection<string> knownRemDevices = new ObservableCollection<string>();
+            foreach (StorageFolder f in await KnownFolders.RemovableDevices.GetFoldersAsync())
             {
-                nv.MenuItems.Add(new Microsoft.UI.Xaml.Controls.NavigationViewItem()
+                var path = f.Path;
+                knownRemDevices.Add(path);
+            }
+
+            for (char let = 'A'; let <= 'Z'; let++)
+            {
+                if (let != 'C')
                 {
-                    Content = "Removable Drive (" + fol.Name + ")",
-                    Icon = new SymbolIcon((Symbol)0xE88E),
-                    Tag = fol.Name
-                });
-                
+                    try
+                    {
+                        driveLetter = let + ":\\";
+                        fol = await StorageFolder.GetFolderFromPathAsync(driveLetter);
+
+                        if (knownRemDevices.Contains(driveLetter))
+                        {
+                            NavItemContent = "Removable Drive (" + driveLetter + ")";
+                            icon = new SymbolIcon((Symbol)0xE88E);
+                        }
+                        else
+                        {
+                            NavItemContent = "Local Disk (" + driveLetter + ")";
+                            icon = new SymbolIcon((Symbol)0xEDA2);
+                        }
+
+                        nv.MenuItems.Add(new Microsoft.UI.Xaml.Controls.NavigationViewItem()
+                        {
+                            Content = NavItemContent,
+                            Icon = icon,
+                            Tag = driveLetter
+                        });
+                    }
+                    catch (Exception)
+                    {
+                        // Debug.WriteLine("{0} not found", let);
+                    }
+                    
+                }
             }
         }