Skip to content

Commit 05cc9bf

Browse files
yaira2yaira2
authored
CodeMaid (#1959)
1 parent def5084 commit 05cc9bf

22 files changed

+82
-87
lines changed

‎Files/Commands/Delete.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,5 +200,5 @@ private static async Task DeleteItem(StorageDeleteOption deleteOption, IShellPag
200200
itemsDeleted++;
201201
}
202202
}
203-
}
204-
}
203+
}
204+
}

‎Files/Commands/Paste.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Diagnostics;
77
using System.IO;
88
using System.Linq;
9-
using System.Threading;
109
using System.Threading.Tasks;
1110
using Windows.ApplicationModel.DataTransfer;
1211
using Windows.Storage;
@@ -68,7 +67,7 @@ private static async Task PasteItem(DataPackageView packageView, string destinat
6867
await DialogDisplayHelper.ShowDialog(ResourceController.GetTranslation("ErrorDialogThisActionCannotBeDone"), ResourceController.GetTranslation("ErrorDialogUnsupportedOperation"));
6968
return;
7069
}
71-
70+
7271
List<IStorageItem> pastedSourceItems = new List<IStorageItem>();
7372
HashSet<IStorageItem> pastedItems = new HashSet<IStorageItem>();
7473
var totalItemsSize = CalculateTotalItemsSize(itemsToPaste);
@@ -335,4 +334,4 @@ public static long CalculateFileSize(string path)
335334
}
336335
}
337336
}
338-
}
337+
}

‎Files/Converters/MultiBooleanConverter.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
using System;
2-
using Windows.Storage;
3-
using Windows.UI.Xaml;
4-
using Windows.UI.Xaml.Data;
52

63
namespace Files.Converters
74
{

‎Files/Dialogs/RestartDialog.xaml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
x:Class="Files.Dialogs.RestartDialog"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
56
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
67
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
8-
mc:Ignorable="d"
98
d:DesignHeight="300"
10-
d:DesignWidth="400">
9+
d:DesignWidth="400"
10+
mc:Ignorable="d">
1111

1212
<UserControl.Resources>
1313
<DataTemplate x:Key="RestartDialogTemplate">
@@ -27,16 +27,16 @@
2727
x:Name="TextBlock"
2828
x:Uid="RestartNotificationText"
2929
Grid.RowSpan="2"
30-
TextWrapping="WrapWholeWords"
31-
VerticalAlignment="Center" />
30+
VerticalAlignment="Center"
31+
TextWrapping="WrapWholeWords" />
3232

3333
<StackPanel
3434
x:Name="ButtonsStackPanel"
3535
Grid.RowSpan="2"
3636
Grid.Column="1"
3737
Margin="20,0,0,0"
38-
Orientation="Horizontal"
39-
VerticalAlignment="Center">
38+
VerticalAlignment="Center"
39+
Orientation="Horizontal">
4040

4141
<Button
4242
x:Name="YesButton"
@@ -58,7 +58,5 @@
5858
</DataTemplate>
5959
</UserControl.Resources>
6060

61-
<controls:InAppNotification
62-
x:Name="RestartNotification"
63-
ContentTemplate="{StaticResource RestartDialogTemplate}" />
64-
</UserControl>
61+
<controls:InAppNotification x:Name="RestartNotification" ContentTemplate="{StaticResource RestartDialogTemplate}" />
62+
</UserControl>

‎Files/Dialogs/RestartDialog.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ private void NoButton_Click(object sender, RoutedEventArgs e)
3636
RestartNotification.Dismiss();
3737
}
3838
}
39-
}
39+
}

‎Files/IShellPage.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Files.Filesystem;
22
using Files.Interacts;
33
using Files.UserControls;
4-
using Files.UserControls.MultiTaskingControl;
54
using Files.View_Models;
65
using System;
76
using Windows.UI.Xaml.Controls;

‎Files/Interacts/Interaction.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Files.Enums;
44
using Files.Filesystem;
55
using Files.Helpers;
6-
using Files.UserControls;
76
using Files.View_Models;
87
using Files.Views;
98
using Files.Views.Pages;
@@ -13,7 +12,6 @@
1312
using System.Collections.Generic;
1413
using System.Diagnostics;
1514
using System.IO;
16-
using System.IO.Compression;
1715
using System.Linq;
1816
using System.Reflection;
1917
using System.Text.RegularExpressions;
@@ -40,7 +38,6 @@
4038
using Windows.UI.Xaml.Input;
4139
using Windows.UI.Xaml.Media;
4240
using Windows.UI.Xaml.Media.Animation;
43-
using static Files.Dialogs.ConfirmDeleteDialog;
4441

4542
namespace Files.Interacts
4643
{

‎Files/ResourceDictionaries/PropertiesStyles.xaml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,42 @@
1-
<ResourceDictionary
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
42

5-
<Style TargetType="StackPanel" x:Key="PropertiesTab">
6-
<Setter Property="Padding" Value="14,0,14,14"/>
7-
<Setter Property="VerticalAlignment" Value="Top"/>
3+
<Style x:Key="PropertiesTab" TargetType="StackPanel">
4+
<Setter Property="Padding" Value="14,0,14,14" />
5+
<Setter Property="VerticalAlignment" Value="Top" />
86
</Style>
97

108
<Thickness x:Key="PropertyNameMargin">0,7</Thickness>
119
<Thickness x:Key="PropertyValueMargin">20,0,0,0</Thickness>
1210
<VerticalAlignment x:Key="PropertyValueVerticalAlignment">Center</VerticalAlignment>
1311

14-
<Style TargetType="TextBlock" x:Key="PropertyName">
15-
<Setter Property="Margin" Value="{StaticResource PropertyNameMargin}"/>
16-
<Setter Property="FontWeight" Value="SemiBold"/>
12+
<Style x:Key="PropertyName" TargetType="TextBlock">
13+
<Setter Property="Margin" Value="{StaticResource PropertyNameMargin}" />
14+
<Setter Property="FontWeight" Value="SemiBold" />
1715
</Style>
1816

19-
<Style TargetType="Grid" x:Key="PropertyValueGrid">
20-
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
21-
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
17+
<Style x:Key="PropertyValueGrid" TargetType="Grid">
18+
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
19+
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
2220
</Style>
2321

24-
<Style TargetType="Grid" x:Key="PropertyValueStackPanel">
25-
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
26-
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
22+
<Style x:Key="PropertyValueStackPanel" TargetType="Grid">
23+
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
24+
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
2725
</Style>
2826

29-
<Style TargetType="TextBlock" x:Key="PropertyValueTextBlock">
30-
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
31-
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
32-
<Setter Property="IsTextSelectionEnabled" Value="True"/>
27+
<Style x:Key="PropertyValueTextBlock" TargetType="TextBlock">
28+
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
29+
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
30+
<Setter Property="IsTextSelectionEnabled" Value="True" />
3331
</Style>
3432

35-
<Style TargetType="TextBox" BasedOn="{StaticResource DefaultTextBoxStyle}" x:Key="PropertyValueTextBox">
36-
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}"/>
37-
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}"/>
38-
<Setter Property="HorizontalAlignment" Value="Stretch"/>
39-
<Setter Property="BorderThickness" Value="1"/>
33+
<Style
34+
x:Key="PropertyValueTextBox"
35+
BasedOn="{StaticResource DefaultTextBoxStyle}"
36+
TargetType="TextBox">
37+
<Setter Property="Margin" Value="{StaticResource PropertyValueMargin}" />
38+
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
39+
<Setter Property="HorizontalAlignment" Value="Stretch" />
40+
<Setter Property="BorderThickness" Value="1" />
4041
</Style>
4142
</ResourceDictionary>

‎Files/UserControls/FileIcon.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
x:Class="Files.UserControls.FileIcon"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:local="using:Files.UserControls"
65
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="using:Files.UserControls"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8-
mc:Ignorable="d"
98
d:DesignHeight="300"
10-
d:DesignWidth="400">
9+
d:DesignWidth="400"
10+
mc:Ignorable="d">
1111

1212
<StackPanel>
1313
<Image
@@ -64,4 +64,4 @@
6464
x:Load="{x:Bind ViewModel.LoadFileIcon, Mode=OneWay}"
6565
Source="{x:Bind ViewModel.FileIconSource, Mode=OneWay}" />
6666
</StackPanel>
67-
</UserControl>
67+
</UserControl>

‎Files/UserControls/FileIcon.xaml.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public sealed partial class FileIcon : UserControl
88
public SelectedItemsPropertiesViewModel ViewModel { get; set; }
99

1010
private double itemSize;
11+
1112
public double ItemSize
1213
{
1314
get => itemSize;
@@ -17,11 +18,12 @@ public double ItemSize
1718
LargerItemSize = itemSize + 2.0;
1819
}
1920
}
21+
2022
private double LargerItemSize { get; set; }
2123

2224
public FileIcon()
2325
{
2426
this.InitializeComponent();
2527
}
2628
}
27-
}
29+
}

0 commit comments

Comments
 (0)