Feature: Added option to prioritize files when sorting (files-community#14253)

Author: hishitetsu

src/Files.App/Actions/Display/ToggleSortDirectoriesAlongsideFilesAction.cs renamed to src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs

@@ -3,20 +3,20 @@
 
 namespace Files.App.Actions
 {
-internal class ToggleSortDirectoriesAlongsideFilesAction : ObservableObject, IToggleAction
+internal class SortFilesAndFoldersTogetherAction : ObservableObject, IToggleAction
 {
 private readonly IDisplayPageContext context;
 
 public string Label
-=> "SettingsListAndSortDirectoriesAlongsideFiles".GetLocalizedResource();
+=> "SortFilesAndFoldersTogether".GetLocalizedResource();
 
 public string Description
-=> "ToggleSortDirectoriesAlongsideFilesDescription".GetLocalizedResource();
+=> "SortFilesAndFoldersTogetherDescription".GetLocalizedResource();
 
 public bool IsOn
 => context.SortDirectoriesAlongsideFiles;
 
-public ToggleSortDirectoriesAlongsideFilesAction()
+public SortFilesAndFoldersTogetherAction()
 {
 context = Ioc.Default.GetRequiredService<IDisplayPageContext>();
 
@@ -25,7 +25,7 @@ public ToggleSortDirectoriesAlongsideFilesAction()
 
 public Task ExecuteAsync()
 {
-context.SortDirectoriesAlongsideFiles = !IsOn;
+context.SortDirectoriesAlongsideFiles = true;
 
 return Task.CompletedTask;
 }

src/Files.App/Actions/Display/SortFilesFirstAction.cs

@@ -0,0 +1,40 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Actions
+{
+internal class SortFilesFirstAction : ObservableObject, IToggleAction
+{
+private readonly IDisplayPageContext context;
+
+public string Label
+=> "SortFilesFirst".GetLocalizedResource();
+
+public string Description
+=> "SortFilesFirstDescription".GetLocalizedResource();
+
+public bool IsOn
+=> context.SortFilesFirst && !context.SortDirectoriesAlongsideFiles;
+
+public SortFilesFirstAction()
+{
+context = Ioc.Default.GetRequiredService<IDisplayPageContext>();
+
+context.PropertyChanged += Context_PropertyChanged;
+}
+
+public Task ExecuteAsync()
+{
+context.SortFilesFirst = true;
+context.SortDirectoriesAlongsideFiles = false;
+
+return Task.CompletedTask;
+}
+
+private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+{
+if (e.PropertyName is nameof(IDisplayPageContext.SortFilesFirst) or nameof(IDisplayPageContext.SortDirectoriesAlongsideFiles))
+OnPropertyChanged(nameof(IsOn));
+}
+}
+}

src/Files.App/Actions/Display/SortFoldersFirstAction.cs

@@ -0,0 +1,40 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Actions
+{
+internal class SortFoldersFirstAction : ObservableObject, IToggleAction
+{
+private readonly IDisplayPageContext context;
+
+public string Label
+=> "SortFoldersFirst".GetLocalizedResource();
+
+public string Description
+=> "SortFoldersFirstDescription".GetLocalizedResource();
+
+public bool IsOn
+=> !context.SortFilesFirst && !context.SortDirectoriesAlongsideFiles;
+
+public SortFoldersFirstAction()
+{
+context = Ioc.Default.GetRequiredService<IDisplayPageContext>();
+
+context.PropertyChanged += Context_PropertyChanged;
+}
+
+public Task ExecuteAsync()
+{
+context.SortFilesFirst = false;
+context.SortDirectoriesAlongsideFiles = false;
+
+return Task.CompletedTask;
+}
+
+private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+{
+if (e.PropertyName is nameof(IDisplayPageContext.SortFilesFirst) or nameof(IDisplayPageContext.SortDirectoriesAlongsideFiles))
+OnPropertyChanged(nameof(IsOn));
+}
+}
+}

src/Files.App/Data/Commands/CommandCodes.cs

@@ -133,7 +133,9 @@ public enum CommandCodes
 SortAscending,
 SortDescending,
 ToggleSortDirection,
-ToggleSortDirectoriesAlongsideFiles,
+SortFoldersFirst,
+SortFilesFirst,
+SortFilesAndFoldersTogether,
 
 // Group by
 GroupByNone,

src/Files.App/Data/Commands/Manager/CommandManager.cs

@@ -131,7 +131,9 @@ public IRichCommand this[HotKey hotKey]
 public IRichCommand SortAscending => commands[CommandCodes.SortAscending];
 public IRichCommand SortDescending => commands[CommandCodes.SortDescending];
 public IRichCommand ToggleSortDirection => commands[CommandCodes.ToggleSortDirection];
-public IRichCommand ToggleSortDirectoriesAlongsideFiles => commands[CommandCodes.ToggleSortDirectoriesAlongsideFiles];
+public IRichCommand SortFoldersFirst => commands[CommandCodes.SortFoldersFirst];
+public IRichCommand SortFilesFirst => commands[CommandCodes.SortFilesFirst];
+public IRichCommand SortFilesAndFoldersTogether => commands[CommandCodes.SortFilesAndFoldersTogether];
 public IRichCommand GroupByNone => commands[CommandCodes.GroupByNone];
 public IRichCommand GroupByName => commands[CommandCodes.GroupByName];
 public IRichCommand GroupByDateModified => commands[CommandCodes.GroupByDateModified];
@@ -296,7 +298,9 @@ public CommandManager()
 [CommandCodes.SortAscending] = new SortAscendingAction(),
 [CommandCodes.SortDescending] = new SortDescendingAction(),
 [CommandCodes.ToggleSortDirection] = new ToggleSortDirectionAction(),
-[CommandCodes.ToggleSortDirectoriesAlongsideFiles] = new ToggleSortDirectoriesAlongsideFilesAction(),
+[CommandCodes.SortFoldersFirst] = new SortFoldersFirstAction(),
+[CommandCodes.SortFilesFirst] = new SortFilesFirstAction(),
+[CommandCodes.SortFilesAndFoldersTogether] = new SortFilesAndFoldersTogetherAction(),
 [CommandCodes.GroupByNone] = new GroupByNoneAction(),
 [CommandCodes.GroupByName] = new GroupByNameAction(),
 [CommandCodes.GroupByDateModified] = new GroupByDateModifiedAction(),

src/Files.App/Data/Commands/Manager/ICommandManager.cs

@@ -118,7 +118,9 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 IRichCommand SortAscending { get; }
 IRichCommand SortDescending { get; }
 IRichCommand ToggleSortDirection { get; }
-IRichCommand ToggleSortDirectoriesAlongsideFiles { get; }
+IRichCommand SortFoldersFirst { get; }
+IRichCommand SortFilesFirst { get; }
+IRichCommand SortFilesAndFoldersTogether { get; }
 
 IRichCommand GroupByNone { get; }
 IRichCommand GroupByName { get; }

src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs

@@ -115,6 +115,17 @@ public bool SortDirectoriesAlongsideFiles
 }
 }
 
+private bool _SortFilesFirst = false;
+public bool SortFilesFirst
+{
+get => _SortFilesFirst;
+set
+{
+if (FolderSettings is LayoutPreferencesManager viewModel)
+viewModel.SortFilesFirst = value;
+}
+}
+
 private LayoutPreferencesManager? FolderSettings => context.PaneOrColumn?.InstanceViewModel?.FolderSettings;
 
 public DisplayPageContext()
@@ -181,6 +192,9 @@ private void FolderSettings_PropertyChanged(object? sender, PropertyChangedEvent
 case nameof(LayoutPreferencesManager.SortDirectoriesAlongsideFiles):
 SetProperty(ref _SortDirectoriesAlongsideFiles, viewModel.SortDirectoriesAlongsideFiles, nameof(SortDirectoriesAlongsideFiles));
 break;
+case nameof(LayoutPreferencesManager.SortFilesFirst):
+SetProperty(ref _SortFilesFirst, viewModel.SortFilesFirst, nameof(SortFilesFirst));
+break;
 }
 }
 
@@ -214,6 +228,7 @@ private void Update()
 SetProperty(ref _GroupDirection, viewModel.DirectoryGroupDirection, nameof(GroupDirection));
 SetProperty(ref _GroupByDateUnit, viewModel.DirectoryGroupByDateUnit, nameof(GroupByDateUnit));
 SetProperty(ref _SortDirectoriesAlongsideFiles, viewModel.SortDirectoriesAlongsideFiles, nameof(SortDirectoriesAlongsideFiles));
+SetProperty(ref _SortFilesFirst, viewModel.SortFilesFirst, nameof(SortFilesFirst));
 }
 }
 

src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs

@@ -16,6 +16,7 @@ public interface IDisplayPageContext : INotifyPropertyChanging, INotifyPropertyC
 GroupByDateUnit GroupByDateUnit { get; set; }
 
 bool SortDirectoriesAlongsideFiles { get; set; }
+bool SortFilesFirst { get; set; }
 
 void DecreaseLayoutSize();
 void IncreaseLayoutSize();

src/Files.App/Data/Models/ItemViewModel.cs

@@ -221,6 +221,14 @@ public async Task UpdateSortDirectoriesAlongsideFilesAsync()
 await ApplyFilesAndFoldersChangesAsync();
 }
 
+public async Task UpdateSortFilesFirstAsync()
+{
+OnPropertyChanged(nameof(AreFilesSortedFirst));
+
+await OrderFilesAndFoldersAsync();
+await ApplyFilesAndFoldersChangesAsync();
+}
+
 private void UpdateSortAndGroupOptions()
 {
 OnPropertyChanged(nameof(IsSortedByName));
@@ -236,6 +244,7 @@ private void UpdateSortAndGroupOptions()
 OnPropertyChanged(nameof(IsSortedAscending));
 OnPropertyChanged(nameof(IsSortedDescending));
 OnPropertyChanged(nameof(AreDirectoriesSortedAlongsideFiles));
+OnPropertyChanged(nameof(AreFilesSortedFirst));
 }
 
 public bool IsSortedByName
@@ -406,6 +415,16 @@ public bool AreDirectoriesSortedAlongsideFiles
 }
 }
 
+public bool AreFilesSortedFirst
+{
+get => folderSettings.SortFilesFirst;
+set
+{
+folderSettings.SortFilesFirst = value;
+OnPropertyChanged(nameof(AreFilesSortedFirst));
+}
+}
+
 public bool HasNoWatcher { get; private set; }
 
 public ItemViewModel(LayoutPreferencesManager folderSettingsViewModel)
@@ -547,6 +566,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 case nameof(UserSettingsService.FoldersSettingsService.DefaultSortOption):
 case nameof(UserSettingsService.FoldersSettingsService.DefaultGroupOption):
 case nameof(UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles):
+case nameof(UserSettingsService.FoldersSettingsService.DefaultSortFilesFirst):
 case nameof(UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories):
 case nameof(UserSettingsService.FoldersSettingsService.DefaultGroupByDateUnit):
 await dispatcherQueue.EnqueueOrInvokeAsync(() =>
@@ -602,7 +622,8 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
 {
 var key = FilesAndFolders.ItemGroupKeySelector?.Invoke(item);
 var group = FilesAndFolders.GroupedCollection?.FirstOrDefault(x => x.Model.Key == key);
-group?.OrderOne(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles), item);
+group?.OrderOne(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection,
+folderSettings.SortDirectoriesAlongsideFiles, folderSettings.SortFilesFirst), item);
 }
 
 UpdateEmptyTextType();
@@ -753,7 +774,8 @@ void OrderEntries()
 if (filesAndFolders.Count == 0)
 return;
 
-filesAndFolders = new ConcurrentCollection<ListedItem>(SortingHelper.OrderFileList(filesAndFolders.ToList(), folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles));
+filesAndFolders = new ConcurrentCollection<ListedItem>(SortingHelper.OrderFileList(filesAndFolders.ToList(), folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection,
+folderSettings.SortDirectoriesAlongsideFiles, folderSettings.SortFilesFirst));
 }
 
 if (NativeWinApiHelper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)
@@ -775,7 +797,8 @@ private void OrderGroups(CancellationToken token = default)
 if (token.IsCancellationRequested)
 return;
 
-gp.Order(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles));
+gp.Order(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection,
+folderSettings.SortDirectoriesAlongsideFiles, folderSettings.SortFilesFirst));
 }
 
 if (FilesAndFolders.GroupedCollection is null || FilesAndFolders.GroupedCollection.IsSorted)

src/Files.App/Helpers/Layout/LayoutPreferencesItem.cs

@@ -17,6 +17,7 @@ public class LayoutPreferencesItem
 public ColumnsViewModel ColumnsViewModel;
 
 public bool SortDirectoriesAlongsideFiles;
+public bool SortFilesFirst;
 public bool IsAdaptiveLayoutOverridden;
 public int GridViewSize;
 
@@ -43,6 +44,7 @@ public LayoutPreferencesItem()
 DirectoryGroupDirection = UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection;
 DirectoryGroupByDateUnit = UserSettingsService.FoldersSettingsService.DefaultGroupByDateUnit;
 SortDirectoriesAlongsideFiles = UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles;
+SortFilesFirst = UserSettingsService.FoldersSettingsService.DefaultSortFilesFirst;
 IsAdaptiveLayoutOverridden = defaultLayout is not FolderLayoutModes.Adaptive;
 
 ColumnsViewModel = new ColumnsViewModel();
@@ -99,6 +101,7 @@ public override bool Equals(object? obj)
 item.DirectoryGroupDirection == DirectoryGroupDirection &&
 item.DirectoryGroupByDateUnit == DirectoryGroupByDateUnit &&
 item.SortDirectoriesAlongsideFiles == SortDirectoriesAlongsideFiles &&
+item.SortFilesFirst == SortFilesFirst &&
 item.IsAdaptiveLayoutOverridden == IsAdaptiveLayoutOverridden &&
 item.ColumnsViewModel.Equals(ColumnsViewModel));
 }
@@ -117,6 +120,7 @@ public override int GetHashCode()
 hash.Add(DirectoryGroupDirection);
 hash.Add(DirectoryGroupByDateUnit);
 hash.Add(SortDirectoriesAlongsideFiles);
+hash.Add(SortFilesFirst);
 hash.Add(IsAdaptiveLayoutOverridden);
 hash.Add(ColumnsViewModel);