Skip to content

Commit f71c594

Browse files
authored
CodeMaid (#2283)
1 parent 6f166bf commit f71c594

33 files changed

+152
-143
lines changed

Common/Extensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Threading;
54
using System.Threading.Tasks;
65

76
namespace Files.Common

Files.Launcher/Program.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ private static object HandleMenuMessage(ValueSet message, Win32API.DisposableDic
344344
var drivePath = cMenuExec.ItemsPath.First();
345345
Win32API.OpenFormatDriveDialog(drivePath);
346346
break;
347+
347348
default:
348349
cMenuExec?.InvokeItem((int)menuId);
349350
break;

Files/App.xaml.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
using Files.CommandLine;
2-
using Files.Common;
32
using Files.Controllers;
43
using Files.Controls;
54
using Files.Filesystem;
65
using Files.Helpers;
7-
using Files.UserControls.MultitaskingControl;
86
using Files.View_Models;
97
using Files.Views;
108
using Microsoft.AppCenter;
@@ -13,7 +11,6 @@
1311
using Microsoft.Toolkit.Uwp.Extensions;
1412
using Microsoft.Toolkit.Uwp.Helpers;
1513
using Microsoft.Toolkit.Uwp.Notifications;
16-
using Newtonsoft.Json;
1714
using Newtonsoft.Json.Linq;
1815
using NLog;
1916
using System;
@@ -23,7 +20,6 @@
2320
using System.Threading.Tasks;
2421
using Windows.ApplicationModel;
2522
using Windows.ApplicationModel.Activation;
26-
using Windows.ApplicationModel.AppService;
2723
using Windows.ApplicationModel.Core;
2824
using Windows.Foundation.Metadata;
2925
using Windows.Storage;

Files/Commands/Delete.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Diagnostics;
99
using System.IO;
1010
using System.Threading.Tasks;
11-
using Windows.ApplicationModel;
1211
using Windows.Foundation.Collections;
1312
using Windows.Storage;
1413
using static Files.Dialogs.ConfirmDeleteDialog;

Files/Commands/ItemOperations.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace Files.Commands
1+
namespace Files.Commands
82
{
93
public partial class ItemOperations
104
{
11-
IShellPage AppInstance = null;
5+
private IShellPage AppInstance = null;
6+
127
public ItemOperations(IShellPage appInstance)
138
{
149
AppInstance = appInstance;
1510
}
1611
}
17-
}
12+
}

Files/DataModels/SidebarPinnedModel.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
using Files.Enums;
2-
using Files.Filesystem;
1+
using Files.Filesystem;
32
using Files.View_Models;
43
using Files.Views;
5-
using Microsoft.Toolkit.Uwp.UI;
64
using Newtonsoft.Json;
75
using System;
86
using System.Collections.Generic;
9-
using System.Collections.ObjectModel;
107
using System.Diagnostics;
118
using System.IO;
129
using System.Linq;
1310
using System.Threading.Tasks;
14-
using Windows.Storage;
1511
using Windows.UI.Xaml.Media;
1612

1713
namespace Files.DataModels
@@ -87,7 +83,7 @@ public bool MoveItem(INavigationControlItem locationItem, int oldIndex, int newI
8783
return false;
8884
}
8985

90-
if (oldIndex >= 0 && newIndex >=0)
86+
if (oldIndex >= 0 && newIndex >= 0)
9187
{
9288
MainPage.sideBarItems.RemoveAt(oldIndex);
9389
MainPage.sideBarItems.Insert(newIndex, locationItem);
@@ -102,7 +98,7 @@ public bool MoveItem(INavigationControlItem locationItem, int oldIndex, int newI
10298
/// </summary>
10399
/// <param name="firstLocationItem">The first location item</param>
104100
/// <param name="secondLocationItem">The second location item</param>
105-
public void SwapItems(INavigationControlItem firstLocationItem, INavigationControlItem secondLocationItem)
101+
public void SwapItems(INavigationControlItem firstLocationItem, INavigationControlItem secondLocationItem)
106102
{
107103
if (firstLocationItem == null || secondLocationItem == null)
108104
{
@@ -121,7 +117,7 @@ public void SwapItems(INavigationControlItem firstLocationItem, INavigationCont
121117
var result = MoveItem(firstLocationItem, indexOfFirstItemInMainPage, indexOfSecondItemInMainPage);
122118

123119
// Moves the items in this model and saves the model
124-
if(result == true)
120+
if (result == true)
125121
{
126122
var indexOfFirstItemInModel = this.Items.IndexOf(firstLocationItem.Path);
127123
var indexOfSecondItemInModel = this.Items.IndexOf(secondLocationItem.Path);

Files/Dialogs/AddItemDialog.xaml.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using Files.Filesystem;
2-
using Files.Helpers;
3-
using Microsoft.Toolkit.Uwp.Extensions;
4-
using System;
1+
using Microsoft.Toolkit.Uwp.Extensions;
52
using System.Collections.Generic;
6-
using Windows.Storage;
73
using Windows.UI.Xaml.Controls;
84

95
namespace Files.Dialogs

Files/Filesystem/DriveItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using Microsoft.Toolkit.Uwp.Extensions;
66
using Microsoft.Toolkit.Uwp.Helpers;
77
using System;
8-
using System.Linq;
9-
using System.Threading;
108
using System.Threading.Tasks;
119
using Windows.ApplicationModel.Core;
1210
using Windows.Storage;
@@ -38,13 +36,15 @@ public DriveType Type
3836
}
3937

4038
private string _text;
39+
4140
public string Text
4241
{
4342
get => _text;
4443
set => SetProperty(ref _text, value);
4544
}
4645

4746
private string _spaceText;
47+
4848
public string SpaceText
4949
{
5050
get => _spaceText;

Files/Filesystem/Drives.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using ByteSizeLib;
21
using Files.View_Models;
32
using Files.Views;
43
using Microsoft.Toolkit.Mvvm.ComponentModel;
@@ -318,7 +317,7 @@ private void GetVirtualDrivesList(IList<DriveItem> list)
318317
var setting = ApplicationData.Current.LocalSettings.Values["PinOneDrive"];
319318
if (setting == null || (bool)setting == true)
320319
{
321-
if (AppSettings.OneDrivePath != null)
320+
if (AppSettings.OneDrivePath != null)
322321
{
323322
var oneDriveItem = new DriveItem()
324323
{

Files/Filesystem/StorageFileHelpers/FilesystemResult.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.IO;
4-
using System.Linq;
5-
using System.Text;
63
using System.Threading.Tasks;
74
using Windows.Storage;
85

@@ -52,10 +49,12 @@ public FilesystemResult(FilesystemErrorCode errorCode)
5249
public FilesystemErrorCode ErrorCode { get; private set; }
5350

5451
public static implicit operator FilesystemErrorCode(FilesystemResult res) => res.ErrorCode;
52+
5553
public static explicit operator FilesystemResult(FilesystemErrorCode res) => new FilesystemResult(res);
5654

57-
public static implicit operator bool(FilesystemResult res) =>
55+
public static implicit operator bool(FilesystemResult res) =>
5856
res.ErrorCode == FilesystemErrorCode.ERROR_OK;
57+
5958
public static explicit operator FilesystemResult(bool res) =>
6059
new FilesystemResult(res ? FilesystemErrorCode.ERROR_OK : FilesystemErrorCode.ERROR_GENERIC);
6160
}
@@ -158,4 +157,4 @@ public async static Task<FilesystemResult> OnSuccess<T>(this Task<FilesystemResu
158157
return res;
159158
}
160159
}
161-
}
160+
}

0 commit comments

Comments
 (0)