Skip to content

Commit d6b7785

Browse files
Luke BlevinsLuke Blevins
Luke Blevins
authored and
Luke Blevins
committed
Remove All File Headings to Prep For Project Abandonment
1 parent ee9bec7 commit d6b7785

24 files changed

+38
-352
lines changed

‎AddItem.xaml.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
5-
using System.Runtime.InteropServices.WindowsRuntime;
6-
using Windows.Foundation;
7-
using Windows.Foundation.Collections;
8-
using Windows.UI.ViewManagement;
1+
using System.Collections.Generic;
92
using Windows.UI.Xaml;
103
using Windows.UI.Xaml.Controls;
11-
using Windows.UI.Xaml.Controls.Primitives;
12-
using Windows.UI.Xaml.Data;
13-
using Windows.UI.Xaml.Input;
14-
using Windows.UI.Xaml.Media;
15-
using Windows.UI.Xaml.Navigation;
164

175

186

197
namespace Files
208
{
21-
9+
2210
public sealed partial class AddItem : Page
2311
{
2412
public AddItem()

‎App.xaml‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,24 @@
11
<Application
22
x:Class="Files.App"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:local="using:Files"
6-
xmlns:pages="using:Files.SettingsPages">
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
75
<Application.Resources>
86
<ResourceDictionary>
97
<ResourceDictionary.ThemeDictionaries>
108
<ResourceDictionary x:Key="Light">
11-
<!-- The "Default" theme dictionary is used unless a specific
12-
light, dark, or high contrast dictionary is provided. These
13-
resources should be tested with both the light and dark themes,
14-
and specific light or dark resources provided as needed. -->
9+
1510
<AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
1611
BackgroundSource="Backdrop"
1712
TintColor="LightSlateGray"
1813
TintOpacity="0.6"/>
19-
<AcrylicBrush x:Key="NavigationViewTopPaneBackground"
20-
BackgroundSource="Backdrop"
21-
TintColor="{ThemeResource SystemAccentColor}"
22-
TintOpacity="0.6"/>
14+
<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="#FFFAFAFA"/>
2315
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="White" FallbackColor="{StaticResource SystemChromeHighColor}"/>
2416
</ResourceDictionary>
2517
<ResourceDictionary x:Key="Dark">
2618
<AcrylicBrush x:Key="NavigationViewExpandedPaneBackground" BackgroundSource="HostBackdrop" TintOpacity="0.6" TintColor="Black" FallbackColor="#FF494949"/>
2719
</ResourceDictionary>
2820
<ResourceDictionary x:Key="HighContrast">
29-
<!-- Always include a "HighContrast" dictionary when you override
30-
theme resources. This empty dictionary ensures that the
31-
default high contrast resources are used when the user
32-
turns on high contrast mode. -->
21+
<!-- This empty dictionary ensures that the default high contrast resources are used when the user turns on high contrast mode. -->
3322
</ResourceDictionary>
3423
</ResourceDictionary.ThemeDictionaries>
3524
</ResourceDictionary>

‎App.xaml.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,17 @@
22
using System.Diagnostics;
33
using Windows.ApplicationModel;
44
using Windows.ApplicationModel.Activation;
5-
using Windows.Storage;
65
using Windows.UI;
76
using Windows.UI.Xaml;
87
using Windows.UI.Xaml.Controls;
98
using Windows.UI.Xaml.Navigation;
109

1110
namespace Files
1211
{
13-
/// <summary>
14-
/// Provides application-specific behavior to supplement the default Application class.
15-
/// </summary>
12+
1613
sealed partial class App : Application
1714
{
1815

19-
/// <summary>
20-
/// Initializes the singleton application object. This is the first line of authored code
21-
/// executed, and as such is the logical equivalent of main() or WinMain().
22-
/// </summary>
2316
public App()
2417
{
2518
this.InitializeComponent();

‎ClassicMode.xaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
x:Class="Files.ClassicMode"
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"
65
xmlns:local1="using:ItemListPresenter"
76
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
87
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
98
xmlns:Windows10version1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
10-
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
119
mc:Ignorable="d"
1210
Name="ClassicModePage"
1311
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">

‎FileLoader.cs‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
// ---- FileLoader.cs ----
2-
//
3-
// Copyright 2018 Luke Blevins
4-
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// ---- This file contains code for loading filesystem items ----
12-
//
13-
14-
using System;
1+
using System;
152
using Files;
163
using Navigation;
174
using System.Collections.Generic;

‎GenericFileBrowser.xaml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
<!--- GenericFileBrowser.xaml
2-
3-
Copyright 2018 Luke Blevins
4-
5-
Licensed under the Apache License, Version 2.0 (the "License");
6-
you may not use this file except in compliance with the License.
7-
You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
This file contains the markup code for the regular item layout -->
12-
13-
14-
<Page
1+
<Page
152
x:Class="Files.GenericFileBrowser"
163
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
174
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

‎GenericFileBrowser.xaml.cs‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
1-
// ---- GenericFileBrowser.xaml.cs ----
2-
//
3-
// Copyright 2018 Luke Blevins
4-
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// ---- This file contains various behind-the-scenes code for the regular item layout ----
12-
//
13-
14-
15-
using ItemListPresenter;
1+
using ItemListPresenter;
162
using Microsoft.Toolkit.Uwp.UI.Controls;
173
using Navigation;
184
using System;
@@ -197,12 +183,18 @@ private async void AllView_CellEditEnded(object sender, DataGridCellEditEndedEve
197183
if(SelectedItem.FileExtension == "Folder")
198184
{
199185
StorageFolder FolderToRename = await StorageFolder.GetFolderFromPathAsync(SelectedItem.FilePath);
200-
await FolderToRename.RenameAsync(NewCellText);
186+
if(FolderToRename.Name != NewCellText)
187+
{
188+
await FolderToRename.RenameAsync(NewCellText);
189+
}
201190
}
202191
else
203192
{
204193
StorageFile FileToRename = await StorageFile.GetFileFromPathAsync(SelectedItem.FilePath);
205-
await FileToRename.RenameAsync(NewCellText);
194+
if (FileToRename.Name != NewCellText)
195+
{
196+
await FileToRename.RenameAsync(NewCellText);
197+
}
206198
}
207199
}
208200
}

‎ItemInteractions.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
1-
// ---- ItemInteractions.cs ----
2-
//
3-
// Copyright 2018 Luke Blevins
4-
//
5-
// Licensed under the Apache License, Version 2.0 (the "License");
6-
// you may not use this file except in compliance with the License.
7-
// You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// ---- This file contains code for user interaction with file system items ----
12-
//
13-
14-
15-
using Microsoft.Toolkit.Uwp.UI.Controls;
1+
using Microsoft.Toolkit.Uwp.UI.Controls;
162
using Windows.Storage;
173
using Windows.System;
184
using Windows.UI.Xaml;

‎LocationsList.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-

2-
3-
using System;
4-
using System.Collections.Generic;
1+
using System.Collections.Generic;
52

63
namespace Locations
74
{

‎MainPage.xaml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
<!--- MainPage.xaml
2-
3-
Copyright 2018 Luke Blevins
4-
5-
Licensed under the Apache License, Version 2.0 (the "License");
6-
you may not use this file except in compliance with the License.
7-
You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
This file contains the markup code for the page containing the navigation items and necessary frame -->
12-
13-
<Page
1+
<Page
142
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
153
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
164
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

0 commit comments

Comments
 (0)