CodeMaid (#1959)

yaira2 · web-flow · commit 05cc9bfe3d88 · 2020-09-22T10:18:02.000-04:00
diff --git a/Files/Commands/Delete.cs b/Files/Commands/Delete.cs
@@ -200,5 +200,5 @@ private static async Task DeleteItem(StorageDeleteOption deleteOption, IShellPag
                 itemsDeleted++;
             }
         }
-    } 
-}
+    }
+}
diff --git a/Files/Commands/Paste.cs b/Files/Commands/Paste.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
@@ -68,7 +67,7 @@ private static async Task PasteItem(DataPackageView packageView, string destinat
                 await DialogDisplayHelper.ShowDialog(ResourceController.GetTranslation("ErrorDialogThisActionCannotBeDone"), ResourceController.GetTranslation("ErrorDialogUnsupportedOperation"));
                 return;
             }
-            
+
             List<IStorageItem> pastedSourceItems = new List<IStorageItem>();
             HashSet<IStorageItem> pastedItems = new HashSet<IStorageItem>();
             var totalItemsSize = CalculateTotalItemsSize(itemsToPaste);
@@ -335,4 +334,4 @@ public static long CalculateFileSize(string path)
             }
         }
     }
-}
+}
diff --git a/Files/Converters/MultiBooleanConverter.cs b/Files/Converters/MultiBooleanConverter.cs
@@ -1,7 +1,4 @@
 ﻿using System;
-using Windows.Storage;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
 
 namespace Files.Converters
 {
diff --git a/Files/Dialogs/RestartDialog.xaml b/Files/Dialogs/RestartDialog.xaml
@@ -2,12 +2,12 @@
     x:Class="Files.Dialogs.RestartDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-    mc:Ignorable="d"
     d:DesignHeight="300"
-    d:DesignWidth="400">
+    d:DesignWidth="400"
+    mc:Ignorable="d">
 
     <UserControl.Resources>
         <DataTemplate x:Key="RestartDialogTemplate">
@@ -27,16 +27,16 @@
                         x:Name="TextBlock"
                         x:Uid="RestartNotificationText"
                         Grid.RowSpan="2"
-                        TextWrapping="WrapWholeWords"
-                        VerticalAlignment="Center" />
+                        VerticalAlignment="Center"
+                        TextWrapping="WrapWholeWords" />
 
                     <StackPanel
                         x:Name="ButtonsStackPanel"
                         Grid.RowSpan="2"
                         Grid.Column="1"
                         Margin="20,0,0,0"
-                        Orientation="Horizontal"
-                        VerticalAlignment="Center">
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
 
                         <Button
                             x:Name="YesButton"
@@ -58,7 +58,5 @@
         </DataTemplate>
     </UserControl.Resources>
 
-    <controls:InAppNotification
-        x:Name="RestartNotification"
-        ContentTemplate="{StaticResource RestartDialogTemplate}" />
-</UserControl>
+    <controls:InAppNotification x:Name="RestartNotification" ContentTemplate="{StaticResource RestartDialogTemplate}" />
+</UserControl>
diff --git a/Files/Dialogs/RestartDialog.xaml.cs b/Files/Dialogs/RestartDialog.xaml.cs
@@ -36,4 +36,4 @@ private void NoButton_Click(object sender, RoutedEventArgs e)
             RestartNotification.Dismiss();
         }
     }
-}
+}
diff --git a/Files/IShellPage.cs b/Files/IShellPage.cs
@@ -1,7 +1,6 @@
 ﻿using Files.Filesystem;
 using Files.Interacts;
 using Files.UserControls;
-using Files.UserControls.MultiTaskingControl;
 using Files.View_Models;
 using System;
 using Windows.UI.Xaml.Controls;
diff --git a/Files/Interacts/Interaction.cs b/Files/Interacts/Interaction.cs
@@ -3,7 +3,6 @@
 using Files.Enums;
 using Files.Filesystem;
 using Files.Helpers;
-using Files.UserControls;
 using Files.View_Models;
 using Files.Views;
 using Files.Views.Pages;
@@ -13,7 +12,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -40,7 +38,6 @@
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Animation;
-using static Files.Dialogs.ConfirmDeleteDialog;
 
 namespace Files.Interacts
 {
diff --git a/Files/ResourceDictionaries/PropertiesStyles.xaml b/Files/ResourceDictionaries/PropertiesStyles.xaml
@@ -1,41 +1,42 @@
-﻿<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style TargetType="StackPanel" x:Key="PropertiesTab">
-        <Setter Property="Padding" Value="14,0,14,14"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
+    <Style x:Key="PropertiesTab" TargetType="StackPanel">
+        <Setter Property="Padding" Value="14,0,14,14" />
+        <Setter Property="VerticalAlignment" Value="Top" />
     </Style>
 
     <Thickness x:Key="PropertyNameMargin">0,7</Thickness>
     <Thickness x:Key="PropertyValueMargin">20,0,0,0</Thickness>
     <VerticalAlignment x:Key="PropertyValueVerticalAlignment">Center</VerticalAlignment>
 
-    <Style TargetType="TextBlock" x:Key="PropertyName">
-        <Setter Property="Margin" Value="{StaticResource PropertyNameMargin}"/>
-        <Setter Property="FontWeight" Value="SemiBold"/>
+    <Style x:Key="PropertyName" TargetType="TextBlock">
+        <Setter Property="Margin" Value="{StaticResource PropertyNameMargin}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
     </Style>
 
-    <Style TargetType="Grid" x:Key="PropertyValueGrid">
-        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
-        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
+    <Style x:Key="PropertyValueGrid" TargetType="Grid">
+        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
+        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
     </Style>
 
-    <Style TargetType="Grid" x:Key="PropertyValueStackPanel">
-        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
-        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
+    <Style x:Key="PropertyValueStackPanel" TargetType="Grid">
+        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
+        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
     </Style>
 
-    <Style TargetType="TextBlock" x:Key="PropertyValueTextBlock">
-        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
-        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
-        <Setter Property="IsTextSelectionEnabled" Value="True"/>
+    <Style x:Key="PropertyValueTextBlock" TargetType="TextBlock">
+        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
+        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
+        <Setter Property="IsTextSelectionEnabled" Value="True" />
     </Style>
 
-    <Style TargetType="TextBox" BasedOn="{StaticResource DefaultTextBoxStyle}" x:Key="PropertyValueTextBox">
-        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
-        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
-        <Setter Property="BorderThickness" Value="1"/>
+    <Style
+        x:Key="PropertyValueTextBox"
+        BasedOn="{StaticResource DefaultTextBoxStyle}"
+        TargetType="TextBox">
+        <Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
+        <Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="BorderThickness" Value="1" />
     </Style>
 </ResourceDictionary>
diff --git a/Files/UserControls/FileIcon.xaml b/Files/UserControls/FileIcon.xaml
@@ -2,12 +2,12 @@
     x:Class="Files.UserControls.FileIcon"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Files.UserControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Files.UserControls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
     d:DesignHeight="300"
-    d:DesignWidth="400">
+    d:DesignWidth="400"
+    mc:Ignorable="d">
 
     <StackPanel>
         <Image
@@ -64,4 +64,4 @@
             x:Load="{x:Bind ViewModel.LoadFileIcon, Mode=OneWay}"
             Source="{x:Bind ViewModel.FileIconSource, Mode=OneWay}" />
     </StackPanel>
-</UserControl>
+</UserControl>
diff --git a/Files/UserControls/FileIcon.xaml.cs b/Files/UserControls/FileIcon.xaml.cs
@@ -8,6 +8,7 @@ public sealed partial class FileIcon : UserControl
         public SelectedItemsPropertiesViewModel ViewModel { get; set; }
 
         private double itemSize;
+
         public double ItemSize
         {
             get => itemSize;
@@ -17,11 +18,12 @@ public double ItemSize
                 LargerItemSize = itemSize + 2.0;
             }
         }
+
         private double LargerItemSize { get; set; }
 
         public FileIcon()
         {
             this.InitializeComponent();
         }
     }
-}
+}
diff --git a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
@@ -13,7 +13,6 @@
 using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
-using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media;
diff --git a/Files/UserControls/StatusCenter.xaml b/Files/UserControls/StatusCenter.xaml
@@ -146,8 +146,8 @@
                                 <ColumnDefinition Width="30" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
-                                <RowDefinition/>
-                                <RowDefinition Height="Auto"/>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Grid>
                                 <muxc:ProgressRing
@@ -180,22 +180,34 @@
                             <Button
                                 Grid.Column="2"
                                 Padding="0"
-                                DataContext="{x:Bind}"
-                                Click="Button_Click"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Top"
-                                Background="Transparent">
+                                Background="Transparent"
+                                Click="Button_Click"
+                                DataContext="{x:Bind}">
                                 <Button.Content>
                                     <FontIcon FontSize="11" Glyph="&#xE711;" />
                                 </Button.Content>
                             </Button>
-                            <Grid x:Name="solutionButtons" x:Load="{x:Bind SolutionButtonsVisible}" Grid.ColumnSpan="3" Grid.Row="1">
+                            <Grid
+                                x:Name="solutionButtons"
+                                Grid.Row="1"
+                                Grid.ColumnSpan="3"
+                                x:Load="{x:Bind SolutionButtonsVisible}">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
-                                <Button DataContext="{x:Bind}" Content="{x:Bind PrimaryButtonText}" Click="Button_Click_1" Grid.Column="0"/>
-                                <Button DataContext="{x:Bind}" Content="{x:Bind SecondaryButtonText}" Click="Button_Click" Grid.Column="1"/>
+                                <Button
+                                    Grid.Column="0"
+                                    Click="Button_Click_1"
+                                    Content="{x:Bind PrimaryButtonText}"
+                                    DataContext="{x:Bind}" />
+                                <Button
+                                    Grid.Column="1"
+                                    Click="Button_Click"
+                                    Content="{x:Bind SecondaryButtonText}"
+                                    DataContext="{x:Bind}" />
                             </Grid>
                         </Grid>
                     </Grid>
diff --git a/Files/UserControls/StatusCenter.xaml.cs b/Files/UserControls/StatusCenter.xaml.cs
@@ -21,7 +21,7 @@ public StatusCenter()
         }
 
         /// <summary>
-        /// Posts a new banner to the Status Center control for an operation. 
+        /// Posts a new banner to the Status Center control for an operation.
         /// It may be used to return the progress, success, or failure of the respective operation.
         /// </summary>
         /// <param name="title">Reserved for success and error banners. Otherwise, pass an empty string for this argument.</param>
@@ -60,6 +60,7 @@ private void Button_Click(object sender, RoutedEventArgs e)
             var itemToDismiss = (sender as Button).DataContext as StatusBanner;
             StatusBannersSource.Remove(itemToDismiss);
         }
+
         // Primary action button click
         private async void Button_Click_1(object sender, RoutedEventArgs e)
         {
@@ -73,6 +74,7 @@ public class PostedStatusBanner
     {
         internal StatusBanner Banner;
         public Progress<uint> Progress;
+
         public PostedStatusBanner(StatusBanner bannerArg)
         {
             Banner = bannerArg;
@@ -231,6 +233,7 @@ public StatusBanner(string message, string title, uint progress, StatusBannerSev
                     break;
             }
         }
+
         /// <summary>
         /// Post an error message banner following a failed operation
         /// </summary>
@@ -269,7 +272,5 @@ public StatusBanner(string message, string title, string primaryButtonText, stri
                 };
             }
         }
-
-        
     }
 }
diff --git a/Files/View Models/InteractionViewModel.cs b/Files/View Models/InteractionViewModel.cs
@@ -1,7 +1,6 @@
 ﻿using Files.View_Models;
 using Files.Views;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
-using System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
diff --git a/Files/View Models/Properties/PropertiesTab.cs b/Files/View Models/Properties/PropertiesTab.cs
@@ -52,4 +52,4 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             base.OnNavigatedTo(e);
         }
     }
-}
+}
diff --git a/Files/View Models/SettingsViewModel.cs b/Files/View Models/SettingsViewModel.cs
@@ -1,6 +1,5 @@
 using Files.Common;
 using Files.Controllers;
-using Files.Controls;
 using Files.DataModels;
 using Files.Enums;
 using Files.Filesystem;
@@ -16,7 +15,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Windows.ApplicationModel;
-using Windows.ApplicationModel.Core;
 using Windows.Globalization;
 using Windows.Storage;
 using Windows.System;
diff --git a/Files/Views/MainPage.xaml.cs b/Files/Views/MainPage.xaml.cs
@@ -3,7 +3,6 @@
 using Files.Controls;
 using Files.Filesystem;
 using Files.UserControls;
-using Files.UserControls.MultiTaskingControl;
 using Files.View_Models;
 using Files.Views.Pages;
 using System;
diff --git a/Files/Views/ModernShellPage.xaml.cs b/Files/Views/ModernShellPage.xaml.cs
@@ -3,7 +3,6 @@
 using Files.Filesystem;
 using Files.Interacts;
 using Files.UserControls;
-using Files.UserControls.MultiTaskingControl;
 using Files.View_Models;
 using System;
 using System.Linq;
diff --git a/Files/Views/Pages/PropertiesGeneral.xaml b/Files/Views/Pages/PropertiesGeneral.xaml
diff --git a/Files/Views/Pages/PropertiesShortcut.xaml b/Files/Views/Pages/PropertiesShortcut.xaml
diff --git a/Files/Views/SettingsPages/Multitasking.xaml.cs b/Files/Views/SettingsPages/Multitasking.xaml.cs
diff --git a/Files/Views/SettingsPages/Preferences.xaml b/Files/Views/SettingsPages/Preferences.xaml

Original file line number	Diff line number	Diff line change
`@@ -200,5 +200,5 @@ private static async Task DeleteItem(StorageDeleteOption deleteOption, IShellPag`
`200`	`200`	`itemsDeleted++;`
`201`	`201`	`}`
`202`	`202`	`}`
`203`		`- }`
`204`		`-}`
	`203`	`+ }`
	`204`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using System.Diagnostics;`
`7`	`7`	`using System.IO;`
`8`	`8`	`using System.Linq;`
`9`		`-using System.Threading;`
`10`	`9`	`using System.Threading.Tasks;`
`11`	`10`	`using Windows.ApplicationModel.DataTransfer;`
`12`	`11`	`using Windows.Storage;`
`@@ -68,7 +67,7 @@ private static async Task PasteItem(DataPackageView packageView, string destinat`
`68`	`67`	`await DialogDisplayHelper.ShowDialog(ResourceController.GetTranslation("ErrorDialogThisActionCannotBeDone"), ResourceController.GetTranslation("ErrorDialogUnsupportedOperation"));`
`69`	`68`	`return;`
`70`	`69`	`}`
`71`		`-`
	`70`	`+`
`72`	`71`	`List<IStorageItem> pastedSourceItems = new List<IStorageItem>();`
`73`	`72`	`HashSet<IStorageItem> pastedItems = new HashSet<IStorageItem>();`
`74`	`73`	`var totalItemsSize = CalculateTotalItemsSize(itemsToPaste);`
`@@ -335,4 +334,4 @@ public static long CalculateFileSize(string path)`
`335`	`334`	`}`
`336`	`335`	`}`
`337`	`336`	`}`
`338`		`-}`
	`337`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using Windows.Storage;`
`3`		`-using Windows.UI.Xaml;`
`4`		`-using Windows.UI.Xaml.Data;`
`5`	`2`
`6`	`3`	`namespace Files.Converters`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,4 @@ private void NoButton_Click(object sender, RoutedEventArgs e)`
`36`	`36`	`RestartNotification.Dismiss();`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ public sealed partial class FileIcon : UserControl`
`8`	`8`	`public SelectedItemsPropertiesViewModel ViewModel { get; set; }`
`9`	`9`
`10`	`10`	`private double itemSize;`
	`11`	`+`
`11`	`12`	`public double ItemSize`
`12`	`13`	`{`
`13`	`14`	`get => itemSize;`
`@@ -17,11 +18,12 @@ public double ItemSize`
`17`	`18`	`LargerItemSize = itemSize + 2.0;`
`18`	`19`	`}`
`19`	`20`	`}`
	`21`	`+`
`20`	`22`	`private double LargerItemSize { get; set; }`
`21`	`23`
`22`	`24`	`public FileIcon()`
`23`	`25`	`{`
`24`	`26`	`this.InitializeComponent();`
`25`	`27`	`}`
`26`	`28`	`}`
`27`		`-}`
	`29`	`+}`