CodeMaid (#1818)

Author: yaira2

Common/ContextMenu.cs

@@ -30,4 +30,4 @@ public class Win32ContextMenuItem
         public MenuItemType Type { get; set; }
         public List<Win32ContextMenuItem> SubItems { get; set; }
     }
-}
+}

Files.Launcher/Program.cs

@@ -11,7 +11,6 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
 using Windows.ApplicationModel;
@@ -255,9 +254,9 @@ private static async Task parseArguments(AppServiceRequestReceivedEventArgs args
                     {
                         await execThreadWithMessageQueue.PostMessage(args.Request.Message);
                     }
-                    // The following line is needed to cleanup resources when menu is closed. 
+                    // The following line is needed to cleanup resources when menu is closed.
                     // Unfortunately if you uncomment it some menu items will randomly stop working.
-                    // Resource cleanup is currently done on app closing, 
+                    // Resource cleanup is currently done on app closing,
                     // if we find a solution for the issue above, we should cleanup as soon as a menu is closed.
                     //handleTable.RemoveValue(menuKey);
                     break;
@@ -319,9 +318,9 @@ private static object HandleMenuMessage(ValueSet message, Win32API.DisposableDic
                 case "ExecAndCloseContextMenu":
                     var cMenuExec = table.GetValue<Win32API.ContextMenu>("MENU");
                     cMenuExec?.InvokeItem(message.Get("ItemID", -1));
-                    // The following line is needed to cleanup resources when menu is closed. 
+                    // The following line is needed to cleanup resources when menu is closed.
                     // Unfortunately if you uncomment it some menu items will randomly stop working.
-                    // Resource cleanup is currently done on app closing, 
+                    // Resource cleanup is currently done on app closing,
                     // if we find a solution for the issue above, we should cleanup as soon as a menu is closed.
                     //table.RemoveValue("MENU");
                     return null;

Files.Launcher/Win32API.cs

@@ -8,7 +8,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
-using Vanara.Windows.Shell;
 using Windows.System;
 
 namespace FilesFullTrust
@@ -117,7 +116,4 @@ public static void UnlockBitlockerDrive(string drive, string password)
     // There is usually no need to define Win32 COM interfaces/P-Invoke methods here.
     // The Vanara library contains the definitions for all members of Shell32.dll, User32.dll and more
     // The ones below are due to bugs in the current version of the library and can be removed once fixed
-    #region WIN32_INTERFACES
-
-    #endregion
 }

Files.Launcher/Win32API_ContextMenu.cs

@@ -12,7 +12,6 @@
 using Vanara.InteropServices;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
-using Windows.Foundation.Collections;
 using static Vanara.PInvoke.Gdi32;
 
 namespace FilesFullTrust
@@ -174,6 +173,7 @@ public void InvokeItem(int itemID)
             }
 
             #region FactoryMethods
+
             public static ContextMenu GetContextMenuForFiles(string[] filePathList, Shell32.CMF flags, Func<string, bool> itemFilter = null)
             {
                 List<ShellItem> shellItems = new List<ShellItem>();
@@ -208,12 +208,13 @@ public static ContextMenu GetContextMenuForFiles(ShellItem[] shellItems, Shell32
                 User32.DestroyMenu(hMenu);
                 return contextMenu;
             }
-            #endregion
+
+            #endregion FactoryMethods
 
             private static void EnumMenuItems(
-                Shell32.IContextMenu cMenu, 
-                HMENU hMenu, 
-                List<Win32ContextMenuItem> menuItemsResult, 
+                Shell32.IContextMenu cMenu,
+                HMENU hMenu,
+                List<Win32ContextMenuItem> menuItemsResult,
                 Func<string, bool> itemFilter = null)
             {
                 var itemCount = User32.GetMenuItemCount(hMenu);
@@ -338,6 +339,7 @@ private static Bitmap GetTransparentBitmap(HBITMAP hbitmap)
             }
 
             #region IDisposable Support
+
             private bool disposedValue = false; // To detect redundant calls
 
             protected virtual void Dispose(bool disposing)
@@ -376,12 +378,14 @@ public void Dispose()
                 Dispose(true);
                 GC.SuppressFinalize(this);
             }
-            #endregion
+
+            #endregion IDisposable Support
         }
 
         public class ContextMenuItem : Win32ContextMenuItem, IDisposable
         {
             private Bitmap _Icon;
+
             [JsonIgnore]
             public Bitmap Icon
             {
@@ -418,7 +422,4 @@ public void Dispose()
     // There is usually no need to define Win32 COM interfaces/P-Invoke methods here.
     // The Vanara library contains the definitions for all members of Shell32.dll, User32.dll and more
     // The ones below are due to bugs in the current version of the library and can be removed once fixed
-    #region WIN32_INTERFACES
-
-    #endregion
-}
+}

Files/App.xaml.cs

@@ -4,13 +4,10 @@
 using Files.Controls;
 using Files.Filesystem;
 using Files.Helpers;
-using Files.UserControls;
 using Files.View_Models;
 using Files.Views;
-using Microsoft.AppCenter;
-using Microsoft.AppCenter.Analytics;
-using Microsoft.AppCenter.Crashes;
 using Microsoft.Toolkit.Uwp.Helpers;
+using Microsoft.Toolkit.Uwp.Notifications;
 using Newtonsoft.Json;
 using NLog;
 using System;
@@ -23,17 +20,15 @@
 using Windows.ApplicationModel.AppService;
 using Windows.Storage;
 using Windows.UI.Core;
+using Windows.UI.Notifications;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
+using Microsoft.AppCenter;
+using Microsoft.AppCenter.Analytics;
+using Microsoft.AppCenter.Crashes;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media.Animation;
 using Windows.UI.Xaml.Navigation;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.Notifications;
-using Windows.UI.Notifications;
-using System.Linq;
-using Newtonsoft.Json;
-using Files.Common;
 
 namespace Files
 {
@@ -56,6 +51,7 @@ public static IShellPage CurrentInstance
                 }
             }
         }
+
         public static SettingsViewModel AppSettings { get; set; }
         public static InteractionViewModel InteractionViewModel { get; set; }
         public static JumpListManager JumpList { get; } = new JumpListManager();
@@ -487,4 +483,4 @@ public class WSLDistroItem : INavigationControlItem
         public NavigationControlItemType ItemType => NavigationControlItemType.LinuxDistro;
         public Uri Logo { get; set; }
     }
-}
+}

Files/BaseLayout.cs

@@ -13,7 +13,6 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation.Collections;
 using Windows.Storage;
@@ -333,7 +332,7 @@ private void LoadMenuFlyoutItem(IList<MenuFlyoutItemBase> MenuItemsList, IEnumer
                     };
                     MenuItemsList.Insert(0, menuLayoutItem);
                 }
-                else if (menuFlyoutItem.SubItems.Where(x => x.Type != MenuItemType.MFT_SEPARATOR).Any() 
+                else if (menuFlyoutItem.SubItems.Where(x => x.Type != MenuItemType.MFT_SEPARATOR).Any()
                     && !string.IsNullOrEmpty(menuFlyoutItem.Label))
                 {
                     var menuLayoutSubItem = new MenuFlyoutSubItem()
@@ -400,8 +399,8 @@ await App.Connection.SendMessageAsync(new ValueSet() {
         public void RightClickItemContextMenu_Opening(object sender, object e)
         {
             var shiftPressed = Window.Current.CoreWindow.GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-            var showOpenMenu = (SelectedItems.Count == 1) 
-                && SelectedItem.PrimaryItemAttribute == StorageItemTypes.File 
+            var showOpenMenu = (SelectedItems.Count == 1)
+                && SelectedItem.PrimaryItemAttribute == StorageItemTypes.File
                 && !string.IsNullOrEmpty(SelectedItem.FileExtension)
                 && SelectedItem.FileExtension.Equals(".msi", StringComparison.OrdinalIgnoreCase);
             SetShellContextmenu(shiftPressed, showOpenMenu);

Files/Interacts/Interaction.cs

@@ -976,7 +976,7 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
             {
                 return false;
             }
-            
+
             CurrentInstance.NavigationToolbar.CanGoForward = false;
             return true;
         }
@@ -1657,4 +1657,4 @@ public async Task<string> GetHashForFile(ListedItem fileItem, string nameOfAlg,
             return CryptographicBuffer.EncodeToHexString(hash.GetValueAndReset()).ToLower();
         }
     }
-}
+}