Skip to content

Feature: Created settings page for managing folder settings #10148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 7, 2022
Merged

Feature: Created settings page for managing folder settings #10148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c52fa3
Feature: Improved folder settings layout
yaira2 Oct 6, 2022
c07f428
Feature: Created new folder settings page
yaira2 Oct 7, 2022
df9eb4f
refc
yaira2 Oct 7, 2022
abff55d
Update Folders.xaml
yaira2 Oct 7, 2022
88c6138
Update ILayoutSettingsService.cs
yaira2 Oct 7, 2022
46d8615
Opening
yaira2 Oct 7, 2022
39faacc
Fix
yaira2 Oct 7, 2022
c7c3e75
Clean
yaira2 Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Files.App/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ private IServiceProvider ConfigureServices()
.AddSingleton<IMultitaskingSettingsService, MultitaskingSettingsService>((sp) => new MultitaskingSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IAppearanceSettingsService, AppearanceSettingsService>((sp) => new AppearanceSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IFoldersSettingsService, FoldersSettingsService>((sp) => new FoldersSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IApplicationSettingsService, ApplicationSettingsService>((sp) => new ApplicationSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IPaneSettingsService, PaneSettingsService>((sp) => new PaneSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<ILayoutSettingsService, LayoutSettingsService>((sp) => new LayoutSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
Expand Down
16 changes: 13 additions & 3 deletions src/Files.App/Dialogs/SettingsDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,22 @@
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItem
AccessKey="F"
AutomationProperties.AutomationId="SettingsItemFolders"
Content="{helpers:ResourceString Name=Folders}"
CornerRadius="0"
Tag="2">
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xE8B7;" />
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItem
AccessKey="M"
AutomationProperties.AutomationId="SettingsItemMultitasking"
Content="{helpers:ResourceString Name=SettingsNavMultitasking/Content}"
CornerRadius="0"
Tag="2">
Tag="3">
<NavigationViewItem.Icon>
<FontIcon FontSize="16" Glyph="&#xEE40;" />
</NavigationViewItem.Icon>
Expand All @@ -72,7 +82,7 @@
AutomationProperties.AutomationId="SettingsItemExperimental"
Content="{helpers:ResourceString Name=SettingsNavExperimental/Content}"
CornerRadius="0"
Tag="3">
Tag="4">
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xF1AD;" />
</NavigationViewItem.Icon>
Expand All @@ -82,7 +92,7 @@
AutomationProperties.AutomationId="SettingsItemAbout"
Content="{helpers:ResourceString Name=About}"
CornerRadius="0,4,4,0"
Tag="4">
Tag="5">
<NavigationViewItem.Icon>
<FontIcon FontSize="16" Glyph="&#xE946;" />
</NavigationViewItem.Icon>
Expand Down
7 changes: 4 additions & 3 deletions src/Files.App/Dialogs/SettingsDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,10 @@ private void SettingsPane_SelectionChanged(Microsoft.UI.Xaml.Controls.Navigation
{
0 => SettingsContentFrame.Navigate(typeof(Appearance)),
1 => SettingsContentFrame.Navigate(typeof(Preferences)),
2 => SettingsContentFrame.Navigate(typeof(Multitasking)),
3 => SettingsContentFrame.Navigate(typeof(Experimental)),
4 => SettingsContentFrame.Navigate(typeof(About)),
2 => SettingsContentFrame.Navigate(typeof(Folders)),
3 => SettingsContentFrame.Navigate(typeof(Multitasking)),
4 => SettingsContentFrame.Navigate(typeof(Experimental)),
5 => SettingsContentFrame.Navigate(typeof(About)),
_ => SettingsContentFrame.Navigate(typeof(Appearance))
};
}
Expand Down
6 changes: 6 additions & 0 deletions src/Files.App/Files.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
<ItemGroup>
<None Remove="Resources\PreviewPanePropertiesInformation.json" />
<None Remove="Resources\PropertiesInformation.json" />
<None Remove="Views\SettingsPages\Folders.xaml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ByteSize">
Expand Down Expand Up @@ -194,6 +195,11 @@
<ProjectReference Include="..\Files.Shared\Files.Shared.csproj" />
<ProjectReference Include="..\Files.Backend\Files.Backend.csproj" />
</ItemGroup>
<ItemGroup>
<Page Update="Views\SettingsPages\Folders.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
</Page>
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Sideload|x86'">
<OutputPath>bin\x86\Sideload\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;DISABLE_XAML_GENERATED_MAIN;SIDELOAD;CODE_ANALYSIS</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private static char[] RestrictedCharacters
get
{
var userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
if (userSettingsService.PreferencesSettingsService.AreAlternateStreamsVisible)
if (userSettingsService.FoldersSettingsService.AreAlternateStreamsVisible)
{
// Allow ":" char
return new[] { '\\', '/', '*', '?', '"', '<', '>', '|' };
Expand Down
18 changes: 9 additions & 9 deletions src/Files.App/Filesystem/Search/FolderSearch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ private async Task SearchAsync(BaseStorageFolder folder, IList<ListedItem> resul
try
{
var startWithDot = item.Name.StartsWith(".");
bool shouldBeListed = !startWithDot || UserSettingsService.PreferencesSettingsService.ShowDotFiles;
bool shouldBeListed = !startWithDot || UserSettingsService.FoldersSettingsService.ShowDotFiles;
if (shouldBeListed)
{
results.Add(await GetListedItemAsync(item));
Expand Down Expand Up @@ -219,9 +219,9 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can
var startWithDot = findData.cFileName.StartsWith(".");

bool shouldBeListed = (!isHidden ||
(UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible &&
(!isSystem || !UserSettingsService.PreferencesSettingsService.AreSystemItemsHidden))) &&
(!startWithDot || UserSettingsService.PreferencesSettingsService.ShowDotFiles);
(UserSettingsService.FoldersSettingsService.ShowHiddenItems &&
(!isSystem || UserSettingsService.FoldersSettingsService.ShowProtectedSystemFiles))) &&
(!startWithDot || UserSettingsService.FoldersSettingsService.ShowDotFiles);

if (shouldBeListed)
{
Expand All @@ -241,7 +241,7 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can
IStorageItem item = (BaseStorageFile)await GetStorageFileAsync(match.FilePath);
item ??= (BaseStorageFolder)await GetStorageFolderAsync(match.FilePath);
var startWithDot = item.Name.StartsWith(".");
bool shouldBeListed = !startWithDot || UserSettingsService.PreferencesSettingsService.ShowDotFiles;
bool shouldBeListed = !startWithDot || UserSettingsService.FoldersSettingsService.ShowDotFiles;
if (shouldBeListed)
{
results.Add(await GetListedItemAsync(item));
Expand Down Expand Up @@ -282,7 +282,7 @@ private async Task AddItemsAsync(string folder, IList<ListedItem> results, Cance
hiddenOnlyFromWin32 = (results.Count != 0);
}

if (!IsAQSQuery && (!hiddenOnlyFromWin32 || UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible))
if (!IsAQSQuery && (!hiddenOnlyFromWin32 || UserSettingsService.FoldersSettingsService.ShowHiddenItems))
{
await SearchWithWin32Async(folder, hiddenOnlyFromWin32, UsedMaxItemCount - (uint)results.Count, results, token);
}
Expand Down Expand Up @@ -318,9 +318,9 @@ await Task.Run(() =>
var startWithDot = findData.cFileName.StartsWith(".");

bool shouldBeListed = (hiddenOnly ?
isHidden && (!isSystem || !UserSettingsService.PreferencesSettingsService.AreSystemItemsHidden) :
!isHidden || (UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible && (!isSystem || !UserSettingsService.PreferencesSettingsService.AreSystemItemsHidden))) &&
(!startWithDot || UserSettingsService.PreferencesSettingsService.ShowDotFiles);
isHidden && (!isSystem || !UserSettingsService.FoldersSettingsService.ShowProtectedSystemFiles) :
!isHidden || (UserSettingsService.FoldersSettingsService.ShowHiddenItems && (!isSystem || UserSettingsService.FoldersSettingsService.ShowProtectedSystemFiles))) &&
(!startWithDot || UserSettingsService.FoldersSettingsService.ShowDotFiles);

if (shouldBeListed)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Filesystem/StorageEnumerators/UniversalStorageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ex is UnauthorizedAccessException
foreach (var item in items)
{
var startWithDot = item.Name.StartsWith(".");
if (!startWithDot || userSettingsService.PreferencesSettingsService.ShowDotFiles)
if (!startWithDot || userSettingsService.FoldersSettingsService.ShowDotFiles)
{
if (item.IsOfType(StorageItemTypes.Folder))
{
Expand Down
10 changes: 5 additions & 5 deletions src/Files.App/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ public static async Task<List<ListedItem>> ListEntries(
var isHidden = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden;
var startWithDot = findData.cFileName.StartsWith(".");
if ((!isHidden ||
(userSettingsService.PreferencesSettingsService.AreHiddenItemsVisible &&
(!isSystem || !userSettingsService.PreferencesSettingsService.AreSystemItemsHidden))) &&
(!startWithDot || userSettingsService.PreferencesSettingsService.ShowDotFiles))
(userSettingsService.FoldersSettingsService.ShowHiddenItems &&
(!isSystem || userSettingsService.FoldersSettingsService.ShowProtectedSystemFiles))) &&
(!startWithDot || userSettingsService.FoldersSettingsService.ShowDotFiles))
{
if (((FileAttributes)findData.dwFileAttributes & FileAttributes.Directory) != FileAttributes.Directory)
{
Expand All @@ -76,7 +76,7 @@ public static async Task<List<ListedItem>> ListEntries(
tempList.Add(file);
++count;

if (userSettingsService.PreferencesSettingsService.AreAlternateStreamsVisible)
if (userSettingsService.FoldersSettingsService.AreAlternateStreamsVisible)
{
tempList.AddRange(EnumAdsForPath(file.ItemPath, file));
}
Expand All @@ -97,7 +97,7 @@ public static async Task<List<ListedItem>> ListEntries(
tempList.Add(folder);
++count;

if (userSettingsService.PreferencesSettingsService.AreAlternateStreamsVisible)
if (userSettingsService.FoldersSettingsService.AreAlternateStreamsVisible)
{
tempList.AddRange(EnumAdsForPath(folder.ItemPath, folder));
}
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Helpers/AdaptiveLayoutHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, str
{
IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();

if (!userSettingsService.PreferencesSettingsService.ForceLayoutPreferencesOnAllDirectories
if (userSettingsService.FoldersSettingsService.EnableOverridingFolderPreferences
&& folderSettings.IsAdaptiveLayoutEnabled
&& !folderSettings.IsLayoutModeFixed
&& folderSettings.LayoutMode == FolderLayoutModes.Adaptive)
Expand Down
24 changes: 12 additions & 12 deletions src/Files.App/Helpers/LayoutPreferences/LayoutPreferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class LayoutPreferences

public LayoutPreferences()
{
this.LayoutMode = UserSettingsService.PreferencesSettingsService.DefaultLayoutMode;
this.LayoutMode = UserSettingsService.FoldersSettingsService.DefaultLayoutMode;
this.GridViewSize = UserSettingsService.LayoutSettingsService.DefaultGridViewSize;
this.DirectorySortOption = UserSettingsService.LayoutSettingsService.DefaultDirectorySortOption;
this.DirectoryGroupOption = UserSettingsService.LayoutSettingsService.DefaultDirectoryGroupOption;
Expand All @@ -33,18 +33,18 @@ public LayoutPreferences()
this.IsAdaptiveLayoutOverridden = false;

this.ColumnsViewModel = new ColumnsViewModel();
this.ColumnsViewModel.DateCreatedColumn.UserCollapsed = !UserSettingsService.PreferencesSettingsService.ShowDateCreatedColumn;
this.ColumnsViewModel.DateModifiedColumn.UserCollapsed = !UserSettingsService.PreferencesSettingsService.ShowDateColumn;
this.ColumnsViewModel.ItemTypeColumn.UserCollapsed = !UserSettingsService.PreferencesSettingsService.ShowTypeColumn;
this.ColumnsViewModel.SizeColumn.UserCollapsed = !UserSettingsService.PreferencesSettingsService.ShowSizeColumn;
this.ColumnsViewModel.TagColumn.UserCollapsed = !UserSettingsService.PreferencesSettingsService.ShowFileTagColumn;
this.ColumnsViewModel.DateCreatedColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowDateCreatedColumn;
this.ColumnsViewModel.DateModifiedColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowDateColumn;
this.ColumnsViewModel.ItemTypeColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowTypeColumn;
this.ColumnsViewModel.SizeColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowSizeColumn;
this.ColumnsViewModel.TagColumn.UserCollapsed = !UserSettingsService.FoldersSettingsService.ShowFileTagColumn;

this.ColumnsViewModel.NameColumn.UserLengthPixels = UserSettingsService.PreferencesSettingsService.NameColumnWidth;
this.ColumnsViewModel.DateModifiedColumn.UserLengthPixels = UserSettingsService.PreferencesSettingsService.DateModifiedColumnWidth;
this.ColumnsViewModel.DateCreatedColumn.UserLengthPixels = UserSettingsService.PreferencesSettingsService.DateCreatedColumnWidth;
this.ColumnsViewModel.ItemTypeColumn.UserLengthPixels = UserSettingsService.PreferencesSettingsService.TypeColumnWidth;
this.ColumnsViewModel.SizeColumn.UserLengthPixels = UserSettingsService.PreferencesSettingsService.SizeColumnWidth;
this.ColumnsViewModel.TagColumn.UserLengthPixels = UserSettingsService.PreferencesSettingsService.TagColumnWidth;
this.ColumnsViewModel.NameColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.NameColumnWidth;
this.ColumnsViewModel.DateModifiedColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.DateModifiedColumnWidth;
this.ColumnsViewModel.DateCreatedColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.DateCreatedColumnWidth;
this.ColumnsViewModel.ItemTypeColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.TypeColumnWidth;
this.ColumnsViewModel.SizeColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.SizeColumnWidth;
this.ColumnsViewModel.TagColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.TagColumnWidth;
}

public override bool Equals(object? obj)
Expand Down
10 changes: 5 additions & 5 deletions src/Files.App/Helpers/NavigationHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ private static async Task<FilesystemResult> OpenLibrary(string path, IShellPage
bool isHiddenItem = NativeFileOperationsHelper.HasFileAttribute(path, System.IO.FileAttributes.Hidden);
if (isHiddenItem)
{
if (forceOpenInNewTab || userSettingsService.PreferencesSettingsService.OpenFoldersInNewTab)
if (forceOpenInNewTab || userSettingsService.FoldersSettingsService.OpenFoldersInNewTab)
{
await OpenPathInNewTab(path);
}
Expand All @@ -246,7 +246,7 @@ private static async Task<FilesystemResult> OpenLibrary(string path, IShellPage
opened = (FilesystemResult)await library.CheckDefaultSaveFolderAccess();
if (opened)
{
if (forceOpenInNewTab || userSettingsService.PreferencesSettingsService.OpenFoldersInNewTab)
if (forceOpenInNewTab || userSettingsService.FoldersSettingsService.OpenFoldersInNewTab)
{
await OpenPathInNewTab(library.Text);
}
Expand Down Expand Up @@ -282,7 +282,7 @@ private static async Task<FilesystemResult> OpenDirectory(string path, IShellPag
}
else
{
if (forceOpenInNewTab || userSettingsService.PreferencesSettingsService.OpenFoldersInNewTab)
if (forceOpenInNewTab || userSettingsService.FoldersSettingsService.OpenFoldersInNewTab)
{
await OpenPathInNewTab(shortcutInfo.TargetPath);
}
Expand All @@ -302,7 +302,7 @@ private static async Task<FilesystemResult> OpenDirectory(string path, IShellPag
}
else if (isHiddenItem)
{
if (forceOpenInNewTab || userSettingsService.PreferencesSettingsService.OpenFoldersInNewTab)
if (forceOpenInNewTab || userSettingsService.FoldersSettingsService.OpenFoldersInNewTab)
{
await OpenPathInNewTab(path);
}
Expand Down Expand Up @@ -335,7 +335,7 @@ private static async Task<FilesystemResult> OpenDirectory(string path, IShellPag
}
if (opened)
{
if (forceOpenInNewTab || userSettingsService.PreferencesSettingsService.OpenFoldersInNewTab)
if (forceOpenInNewTab || userSettingsService.FoldersSettingsService.OpenFoldersInNewTab)
{
await OpenPathInNewTab(path);
}
Expand Down
Loading