Skip to content

Commit dd118dc

Browse files
author
Yair Aichenbaum
committed
Cleaned up code
Turned off delete shortcut when renaming a file
1 parent 311e5e5 commit dd118dc

22 files changed

+155
-216
lines changed

‎Files/App.xaml.cs

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
1-
using Files.Interacts;
1+
using Files.CommandLine;
2+
using Files.Controls;
3+
using Files.Filesystem;
4+
using Files.Interacts;
5+
using Files.View_Models;
6+
using Microsoft.AppCenter;
7+
using Microsoft.AppCenter.Analytics;
8+
using Microsoft.AppCenter.Crashes;
9+
using NLog;
210
using System;
311
using System.Collections.Generic;
4-
using System.Diagnostics;
12+
using System.Collections.ObjectModel;
13+
using System.Linq;
514
using Windows.ApplicationModel;
615
using Windows.ApplicationModel.Activation;
716
using Windows.ApplicationModel.DataTransfer;
817
using Windows.Storage;
9-
using Windows.UI;
18+
using Windows.UI.Core;
1019
using Windows.UI.Xaml;
1120
using Windows.UI.Xaml.Controls;
21+
using Windows.UI.Xaml.Controls.Primitives;
22+
using Windows.UI.Xaml.Media;
1223
using Windows.UI.Xaml.Media.Animation;
1324
using Windows.UI.Xaml.Navigation;
14-
using Microsoft.AppCenter;
15-
using Microsoft.AppCenter.Analytics;
16-
using Microsoft.AppCenter.Crashes;
17-
using Windows.UI.Xaml.Media;
18-
using Files.Filesystem;
19-
using System.IO;
20-
using System.Linq;
21-
using System.Collections.ObjectModel;
22-
using Windows.UI.Core;
23-
using Windows.UI.Xaml.Controls.Primitives;
24-
using Windows.System;
25-
using Files.CommandLine;
26-
using Files.View_Models;
27-
using Files.Controls;
28-
using NLog;
2925

3026
namespace Files
3127
{
3228
sealed partial class App : Application
3329
{
34-
30+
3531
private static IShellPage currentInstance;
3632
public static IShellPage CurrentInstance
3733
{
@@ -41,9 +37,9 @@ public static IShellPage CurrentInstance
4137
}
4238
set
4339
{
44-
if(value != currentInstance && value != null)
40+
if (value != currentInstance && value != null)
4541
{
46-
currentInstance = value;
42+
currentInstance = value;
4743
}
4844
}
4945
}
@@ -62,7 +58,7 @@ public static IShellPage CurrentInstance
6258

6359
public App()
6460
{
65-
this.InitializeComponent();
61+
this.InitializeComponent();
6662
this.Suspending += OnSuspending;
6763

6864
// Initialize NLog
@@ -87,10 +83,10 @@ public App()
8783

8884
private void RegisterUncaughtExceptionLogger()
8985
{
90-
UnhandledException += (sender, args) =>
91-
{
92-
Logger.Error(args.Exception, args.Message);
93-
};
86+
UnhandledException += (sender, args) =>
87+
{
88+
Logger.Error(args.Exception, args.Message);
89+
};
9490
}
9591

9692
private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs args)
@@ -153,15 +149,15 @@ public static void Clipboard_ContentChanged(object sender, object e)
153149

154150
public static Windows.UI.Xaml.UnhandledExceptionEventArgs exceptionInfo { get; set; }
155151
public static string exceptionStackTrace { get; set; }
156-
152+
157153

158154

159155
private async void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
160156
{
161157
e.Handled = true;
162158
exceptionInfo = e;
163159
exceptionStackTrace = e.Exception.StackTrace;
164-
await exceptionDialog.ShowAsync(ContentDialogPlacement.Popup);
160+
await exceptionDialog.ShowAsync(ContentDialogPlacement.Popup);
165161
}
166162

167163
public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
@@ -170,7 +166,7 @@ public static IReadOnlyList<ContentDialog> FindDisplayedContentDialogs<T>()
170166
List<ContentDialog> dialogs = new List<ContentDialog>();
171167
List<ContentDialog> openDialogs = new List<ContentDialog>();
172168
Interaction.FindChildren<ContentDialog>(dialogs, Window.Current.Content.XamlRoot.Content as DependencyObject);
173-
foreach(var dialog in dialogs)
169+
foreach (var dialog in dialogs)
174170
{
175171
var popups = new List<Popup>();
176172
Interaction.FindChildren<Popup>(popups, dialog);
@@ -194,7 +190,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
194190
{
195191
Logger.Info("App launched");
196192

197-
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
193+
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
198194

199195
Frame rootFrame = Window.Current.Content as Frame;
200196

‎Files/BaseLayout.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Files.Controls;
2-
using Files.Filesystem;
1+
using Files.Filesystem;
32
using Files.Interacts;
43
using Files.Views.Pages;
54
using System;
@@ -8,17 +7,11 @@
87
using System.IO;
98
using System.Linq;
109
using System.Runtime.CompilerServices;
11-
using System.Runtime.InteropServices.WindowsRuntime;
12-
using Windows.Foundation;
13-
using Windows.Foundation.Collections;
1410
using Windows.Storage;
1511
using Windows.UI.Core;
1612
using Windows.UI.Xaml;
1713
using Windows.UI.Xaml.Controls;
18-
using Windows.UI.Xaml.Controls.Primitives;
19-
using Windows.UI.Xaml.Data;
2014
using Windows.UI.Xaml.Input;
21-
using Windows.UI.Xaml.Media;
2215
using Windows.UI.Xaml.Navigation;
2316

2417

@@ -61,10 +54,10 @@ public List<ListedItem> SelectedItems
6154
}
6255
set
6356
{
64-
if(value != _SelectedItems)
57+
if (value != _SelectedItems)
6558
{
6659
_SelectedItems = value;
67-
if(value == null)
60+
if (value == null)
6861
{
6962
IsItemSelected = false;
7063
}

‎Files/LocationsList.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,13 @@ public class FavoriteLocationItem
1313

1414
public class ItemLoader
1515
{
16-
public ItemLoader()
17-
{
18-
}
1916
public static List<FavoriteLocationItem> itemsAdded = new List<FavoriteLocationItem>();
2017
public static void DisplayItems()
2118
{
2219
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Blue.png", Icon = "\xE896", Text = "Downloads", Tag = "Downloads" });
2320
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Green.png", Icon = "\xE8A5", Text = "Documents", Tag = "Documents" });
2421
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Orange.png", Icon = "\xEB9F", Text = "Pictures", Tag = "Pictures" });
25-
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Pink.png", Icon = "\xEC4F", Text = "Music", Tag = "Music"});
22+
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Pink.png", Icon = "\xEC4F", Text = "Music", Tag = "Music" });
2623
itemsAdded.Add(new FavoriteLocationItem() { ImageSource = "Assets/Cards/Gradients/Red.png", Icon = "\xE8B2", Text = "Videos", Tag = "Videos" });
2724
}
2825
}

‎Files/NavigationActions.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
using System;
2-
using Files.Filesystem;
32
using System.Linq;
43
using Windows.UI.Core;
54
using Windows.UI.Xaml;
65
using Windows.UI.Xaml.Controls;
76
using Windows.UI.Xaml.Media.Animation;
8-
using Files.View_Models;
9-
using Files.Controls;
107

118
namespace Files
129
{

‎Files/Settings.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
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
1+
namespace Files
82
{
93
public static class LocalSettings
104
{

‎Files/UserControls/LayoutModes/GenericFileBrowser.xaml.cs

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1+
using Files.Enums;
2+
using Files.Filesystem;
3+
using Files.Views.Pages;
14
using Microsoft.Toolkit.Uwp.UI;
25
using Microsoft.Toolkit.Uwp.UI.Controls;
36
using System;
7+
using System.Collections.Generic;
48
using System.ComponentModel;
9+
using System.Linq;
510
using Windows.ApplicationModel.DataTransfer;
611
using Windows.Storage;
7-
using Windows.UI.Xaml;
8-
using Windows.UI.Xaml.Controls;
9-
using Files.Enums;
10-
using Files.Filesystem;
1112
using Windows.System;
12-
using Windows.UI.Xaml.Input;
1313
using Windows.UI.Core;
1414
using Windows.UI.Input;
15-
using Files.Controls;
16-
using Microsoft.Xaml.Interactivity;
17-
using System.Linq;
18-
using Microsoft.Toolkit.Uwp.UI.Behaviors;
19-
using Windows.Foundation;
20-
using Windows.UI.Xaml.Media;
21-
using System.Collections.Generic;
22-
using Files.Views.Pages;
15+
using Windows.UI.Xaml;
16+
using Windows.UI.Xaml.Controls;
17+
using Windows.UI.Xaml.Input;
2318

2419
namespace Files
2520
{
@@ -113,7 +108,7 @@ private async void ViewModel_PropertyChanged(object sender, PropertyChangedEvent
113108
var allRows = new List<DataGridRow>();
114109

115110
Interacts.Interaction.FindChildren<DataGridRow>(allRows, AllView);
116-
foreach(DataGridRow row in allRows.Take(20))
111+
foreach (DataGridRow row in allRows.Take(20))
117112
{
118113
if (!(row.DataContext as ListedItem).ItemPropertiesInitialized)
119114
{
@@ -205,7 +200,7 @@ private void AllView_DragStarting(UIElement sender, DragStartingEventArgs args)
205200
{
206201
args.DragUI.SetContentFromDataPackage();
207202
}
208-
203+
209204
private async void AllView_Sorting(object sender, DataGridColumnEventArgs e)
210205
{
211206
if (e.Column == SortedColumn)
@@ -270,12 +265,12 @@ private void BaseLayout_PointerPressed(object sender, PointerRoutedEventArgs e)
270265
startingPoint = e.GetCurrentPoint(this);
271266
IsSelectionRectangleDisplayed = true;
272267
SelectionRectangle.Margin = new Thickness(e.GetCurrentPoint(this).Position.X, e.GetCurrentPoint(this).Position.Y, 0, 0);
273-
268+
274269
}
275270

276271
private void BaseLayout_PointerMoved(object sender, PointerRoutedEventArgs e)
277272
{
278-
if(e.GetCurrentPoint(this).Position.X < startingPoint.Position.X)
273+
if (e.GetCurrentPoint(this).Position.X < startingPoint.Position.X)
279274
{
280275
SelectionRectangle.Width -= e.GetCurrentPoint(this).Position.X;
281276
}
@@ -288,10 +283,10 @@ private void BaseLayout_PointerMoved(object sender, PointerRoutedEventArgs e)
288283
private async void Icon_EffectiveViewportChanged(FrameworkElement sender, EffectiveViewportChangedEventArgs args)
289284
{
290285
var parentRow = Interacts.Interaction.FindParent<DataGridRow>(sender);
291-
if((!(parentRow.DataContext as ListedItem).ItemPropertiesInitialized) && (args.BringIntoViewDistanceX < sender.ActualHeight))
286+
if ((!(parentRow.DataContext as ListedItem).ItemPropertiesInitialized) && (args.BringIntoViewDistanceX < sender.ActualHeight))
292287
{
293288
await Window.Current.CoreWindow.Dispatcher.RunIdleAsync((e) =>
294-
{
289+
{
295290
App.CurrentInstance.ViewModel.LoadExtendedItemProperties(parentRow.DataContext as ListedItem);
296291
(parentRow.DataContext as ListedItem).ItemPropertiesInitialized = true;
297292
//sender.EffectiveViewportChanged -= Icon_EffectiveViewportChanged;

‎Files/UserControls/LayoutModes/PhotoAlbum.xaml.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
using Windows.UI.Xaml;
1+
using Files.Filesystem;
2+
using System;
3+
using System.Linq;
4+
using Windows.System;
5+
using Windows.UI.Core;
6+
using Windows.UI.Xaml;
27
using Windows.UI.Xaml.Controls;
3-
using Files.Filesystem;
48
using Windows.UI.Xaml.Input;
5-
using Windows.System;
69
using Interaction = Files.Interacts.Interaction;
7-
using Windows.UI.Core;
8-
using Files.Controls;
9-
using System;
10-
using System.Linq;
1110

1211
namespace Files
1312
{
@@ -27,7 +26,7 @@ private void FileList_Tapped(object sender, TappedRoutedEventArgs e)
2726
var BoxPressed = Interaction.FindParent<GridViewItem>(e.OriginalSource as DependencyObject);
2827
if (BoxPressed == null)
2928
{
30-
FileList.SelectedItems.Clear();
29+
FileList.SelectedItems.Clear();
3130
}
3231
}
3332

‎Files/View Models/InteractionViewModel.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
using GalaSoft.MvvmLight;
2-
using GalaSoft.MvvmLight.Command;
3-
using Windows.UI.Xaml.Controls;
42
using System;
5-
using Files.Interacts;
63
using Windows.UI.Xaml;
74

85
namespace Files.Controls

0 commit comments

Comments
 (0)