Implement folder setting to sort directories and files together and add option to toolbar sort flyout (#9098)

manfromarce · web-flow · commit 3fcea26e9ebf · 2022-05-12T15:11:07.000-04:00
diff --git a/Files.sln b/Files.sln
@@ -1,4 +1,3 @@
-﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31911.196
diff --git a/src/Files.Backend/Services/Settings/ILayoutSettingsService.cs b/src/Files.Backend/Services/Settings/ILayoutSettingsService.cs
@@ -38,6 +38,8 @@ public interface ILayoutSettingsService : IBaseSettingsService, INotifyPropertyC
 
         SortOption DefaultDirectorySortOption { get; set; }
 
+        bool DefaultSortDirectoriesAlongsideFiles { get; set; }
+
         GroupOption DefaultDirectoryGroupOption { get; set; }
     }
 }
diff --git a/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs b/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs
@@ -39,7 +39,7 @@ public interface IPreferencesSettingsService : IBaseSettingsService, INotifyProp
         /// Gets or sets a value indicating whether or not to display dot files.
         /// </summary>
         bool ShowDotFiles{ get; set; }
-        
+
         /// <summary>
         /// Gets or sets a value indicating whether or not files should be sorted together with folders.
         /// </summary>
diff --git a/src/Files.Uwp/Helpers/ItemListDisplayHelpers/SortingHelper.cs b/src/Files.Uwp/Helpers/ItemListDisplayHelpers/SortingHelper.cs
@@ -1,6 +1,5 @@
 ﻿using Files.Shared.Enums;
 using Files.Uwp.Filesystem;
-using Files.Backend.Services.Settings;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -30,7 +29,7 @@ public static Func<ListedItem, object> GetSortFunc(SortOption directorySortOptio
             };
         }
 
-        public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFolders, SortOption directorySortOption, SortDirection directorySortDirection)
+        public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFolders, SortOption directorySortOption, SortDirection directorySortDirection, bool sortDirectoriesAlongsideFiles)
         {
             var orderFunc = GetSortFunc(directorySortOption);
             var naturalStringComparer = NaturalStringComparer.GetForProcessor();
@@ -40,13 +39,11 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
             static bool folderThenFileAsync(ListedItem listedItem) => (listedItem.PrimaryItemAttribute == StorageItemTypes.File || listedItem.IsShortcutItem || listedItem.IsZipItem);
             IOrderedEnumerable<ListedItem> ordered;
 
-            IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();
-
             if (directorySortDirection == SortDirection.Ascending)
             {
                 if (directorySortOption == SortOption.Name)
                 {
-                    if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)
+                    if (sortDirectoriesAlongsideFiles)
                     {
                         ordered = filesAndFolders.OrderBy(orderFunc, naturalStringComparer);
                     }
@@ -57,7 +54,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
                 }
                 else if (directorySortOption == SortOption.FileTag)
                 {
-                    if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)
+                    if (sortDirectoriesAlongsideFiles)
                     {
                         ordered = filesAndFolders.OrderBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenBy(orderFunc);
                     }
@@ -68,7 +65,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
                 }
                 else
                 {
-                    if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)
+                    if (sortDirectoriesAlongsideFiles)
                     {
                         ordered = filesAndFolders.OrderBy(orderFunc);
                     }
@@ -82,7 +79,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
             {
                 if (directorySortOption == SortOption.Name)
                 {
-                    if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)
+                    if (sortDirectoriesAlongsideFiles)
                     {
                         ordered = filesAndFolders.OrderByDescending(orderFunc, naturalStringComparer);
                     }
@@ -93,7 +90,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
                 }
                 else if (directorySortOption == SortOption.FileTag)
                 {
-                    if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)
+                    if (sortDirectoriesAlongsideFiles)
                     {
                         ordered = filesAndFolders.OrderBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenByDescending(orderFunc);
                     }
@@ -104,7 +101,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
                 }
                 else
                 {
-                    if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)
+                    if (sortDirectoriesAlongsideFiles)
                     {
                         ordered = filesAndFolders.OrderByDescending(orderFunc);
                     }
diff --git a/src/Files.Uwp/ServicesImplementation/Settings/LayoutSettingsService.cs b/src/Files.Uwp/ServicesImplementation/Settings/LayoutSettingsService.cs
@@ -6,10 +6,14 @@ namespace Files.Uwp.ServicesImplementation.Settings
 {
     internal sealed class LayoutSettingsService : BaseObservableJsonSettings, ILayoutSettingsService
     {
+        private readonly IUserSettingsService userSettingsService;
+
         public LayoutSettingsService(ISettingsSharingContext settingsSharingContext)
         {
             // Register root
             RegisterSettingsContext(settingsSharingContext);
+
+            userSettingsService = settingsSharingContext as IUserSettingsService;
         }
 
         public bool ShowDateColumn
@@ -65,6 +69,12 @@ public SortOption DefaultDirectorySortOption
             get => (SortOption)Get((long)SortOption.Name);
             set => Set((long)value);
         }
+        
+        public bool DefaultSortDirectoriesAlongsideFiles
+        {
+            get => Get(userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles);
+            set => Set(value);
+        }
 
         public GroupOption DefaultDirectoryGroupOption
         {
diff --git a/src/Files.Uwp/UserControls/InnerNavigationToolbar.xaml b/src/Files.Uwp/UserControls/InnerNavigationToolbar.xaml
@@ -507,6 +507,8 @@
                         <MenuFlyoutSeparator />
                         <ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedAscending, Mode=TwoWay}" Text="{helpers:ResourceString Name=Ascending}" />
                         <ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedDescending, Mode=TwoWay}" Text="{helpers:ResourceString Name=Descending}" />
+                         <MenuFlyoutSeparator />
+                         <ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.AreDirectoriesSortedAlongsideFiles, Mode=TwoWay}" Text="{helpers:ResourceString Name=SettingsListAndSortDirectoriesAlongsideFiles}" />
                     </MenuFlyout>
                 </AppBarButton.Flyout>
             </AppBarButton>
diff --git a/src/Files.Uwp/ViewModels/FolderSettingsViewModel.cs b/src/Files.Uwp/ViewModels/FolderSettingsViewModel.cs
@@ -276,6 +276,8 @@ public int GridViewSize
         public event EventHandler<GroupOption> GroupOptionPreferenceUpdated;
 
         public event EventHandler<SortDirection> SortDirectionPreferenceUpdated;
+        
+        public event EventHandler<bool> SortDirectoriesAlongsideFilesPreferenceUpdated;
 
         public SortOption DirectorySortOption
         {
@@ -318,6 +320,28 @@ public SortDirection DirectorySortDirection
             }
         }
 
+        public bool SortDirectoriesAlongsideFiles
+        {
+            get
+            {
+                return UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder ?                
+                LayoutPreference.SortDirectoriesAlongsideFiles : 
+                UserSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles;
+            }
+            set
+            {
+                if (SetProperty(ref LayoutPreference.SortDirectoriesAlongsideFiles, value, nameof(SortDirectoriesAlongsideFiles)))
+                {
+                   LayoutPreferencesUpdateRequired?.Invoke(this, new LayoutPreferenceEventArgs(LayoutPreference));
+                   SortDirectoriesAlongsideFilesPreferenceUpdated?.Invoke(this, SortDirectoriesAlongsideFiles);
+                   if (!UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)
+                   {
+                       UserSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles = value;
+                   }
+                }
+            }
+        }
+
         public ColumnsViewModel ColumnsViewModel
         {
             get => LayoutPreference.ColumnsViewModel;
@@ -371,6 +395,7 @@ public void UpdateLayoutPreferencesForPath(string folderPath, LayoutPreferences
                     UserSettingsService.LayoutSettingsService.DefaultDirectoryGroupOption = prefs.DirectoryGroupOption;
                 }
                 UserSettingsService.LayoutSettingsService.DefaultDirectorySortDirection = prefs.DirectorySortDirection;
+                UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles = prefs.SortDirectoriesAlongsideFiles;
                 UserSettingsService.LayoutSettingsService.ShowDateColumn = !prefs.ColumnsViewModel.DateModifiedColumn.UserCollapsed;
                 UserSettingsService.LayoutSettingsService.ShowDateCreatedColumn = !prefs.ColumnsViewModel.DateCreatedColumn.UserCollapsed;
                 UserSettingsService.LayoutSettingsService.ShowTypeColumn = !prefs.ColumnsViewModel.ItemTypeColumn.UserCollapsed;
@@ -426,6 +451,7 @@ private static LayoutPreferences ReadLayoutPreferencesFromSettings(string folder
                     GridViewSize = userSettingsService.LayoutSettingsService.DefaultGridViewSize,
                     DirectorySortOption = userSettingsService.LayoutSettingsService.DefaultDirectorySortOption,
                     DirectorySortDirection = userSettingsService.LayoutSettingsService.DefaultDirectorySortDirection,
+                    SortDirectoriesAlongsideFiles = userSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles,
                     ColumnsViewModel = new ColumnsViewModel(),
                     DirectoryGroupOption = GroupOption.DateCreated,
                 };
@@ -439,6 +465,7 @@ private static LayoutPreferences ReadLayoutPreferencesFromSettings(string folder
                     GridViewSize = userSettingsService.LayoutSettingsService.DefaultGridViewSize,
                     DirectorySortOption = userSettingsService.LayoutSettingsService.DefaultDirectorySortOption,
                     DirectorySortDirection = userSettingsService.LayoutSettingsService.DefaultDirectorySortDirection,
+                    SortDirectoriesAlongsideFiles = userSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles,
                     ColumnsViewModel = new ColumnsViewModel(),
                     DirectoryGroupOption = GroupOption.FolderPath,
                 };
@@ -479,6 +506,7 @@ private set
                     OnPropertyChanged(nameof(DirectoryGroupOption));
                     OnPropertyChanged(nameof(DirectorySortOption));
                     OnPropertyChanged(nameof(DirectorySortDirection));
+                    OnPropertyChanged(nameof(SortDirectoriesAlongsideFiles));
                 }
             }
         }
@@ -489,6 +517,7 @@ public class LayoutPreferences
 
             public SortOption DirectorySortOption;
             public SortDirection DirectorySortDirection;
+            public bool SortDirectoriesAlongsideFiles;
             public GroupOption DirectoryGroupOption;
             public FolderLayoutModes LayoutMode;
             public int GridViewSize;
@@ -506,6 +535,7 @@ public LayoutPreferences()
                 this.DirectorySortOption = UserSettingsService.LayoutSettingsService.DefaultDirectorySortOption;
                 this.DirectoryGroupOption = UserSettingsService.LayoutSettingsService.DefaultDirectoryGroupOption;
                 this.DirectorySortDirection = UserSettingsService.LayoutSettingsService.DefaultDirectorySortDirection;
+                this.SortDirectoriesAlongsideFiles = UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles;
 
                 this.ColumnsViewModel = new ColumnsViewModel();
                 this.ColumnsViewModel.DateCreatedColumn.UserCollapsed = !UserSettingsService.LayoutSettingsService.ShowDateCreatedColumn;
@@ -525,7 +555,8 @@ public static LayoutPreferences FromCompositeValue(ApplicationDataCompositeValue
                     GridViewSize = (int)compositeValue[nameof(GridViewSize)],
                     DirectorySortOption = (SortOption)(int)compositeValue[nameof(DirectorySortOption)],
                     DirectorySortDirection = (SortDirection)(int)compositeValue[nameof(DirectorySortDirection)],
-                    IsAdaptiveLayoutOverridden = compositeValue[nameof(IsAdaptiveLayoutOverridden)] is bool val ? val : false,
+                    SortDirectoriesAlongsideFiles = compositeValue[nameof(SortDirectoriesAlongsideFiles)] is bool val ? val : false,
+                    IsAdaptiveLayoutOverridden = compositeValue[nameof(IsAdaptiveLayoutOverridden)] is bool val2 ? val2 : false,
                 };
 
                 if (compositeValue.TryGetValue(nameof(DirectoryGroupOption), out var gpOption))
@@ -556,7 +587,8 @@ public ApplicationDataCompositeValue ToCompositeValue()
                     { nameof(DirectorySortOption), (int)this.DirectorySortOption },
                     { nameof(DirectoryGroupOption), (int)this.DirectoryGroupOption },
                     { nameof(DirectorySortDirection), (int)this.DirectorySortDirection },
-                    { nameof(IsAdaptiveLayoutOverridden), (bool)this.IsAdaptiveLayoutOverridden },
+                    { nameof(SortDirectoriesAlongsideFiles), this.SortDirectoriesAlongsideFiles },
+                    { nameof(IsAdaptiveLayoutOverridden), this.IsAdaptiveLayoutOverridden },
                     { nameof(ColumnsViewModel), JsonConvert.SerializeObject(this.ColumnsViewModel) }
                 };
             }
@@ -578,6 +610,7 @@ public override bool Equals(object obj)
                         prefs.GridViewSize == this.GridViewSize &&
                         prefs.DirectorySortOption == this.DirectorySortOption &&
                         prefs.DirectorySortDirection == this.DirectorySortDirection &&
+                        prefs.SortDirectoriesAlongsideFiles == this.SortDirectoriesAlongsideFiles &&
                         prefs.IsAdaptiveLayoutOverridden == this.IsAdaptiveLayoutOverridden &&
                         prefs.ColumnsViewModel == this.ColumnsViewModel);
                 }
diff --git a/src/Files.Uwp/ViewModels/ItemViewModel.cs b/src/Files.Uwp/ViewModels/ItemViewModel.cs
@@ -216,6 +216,13 @@ public async void UpdateSortDirectionStatus()
             await ApplyFilesAndFoldersChangesAsync();
         }
 
+        public async void UpdateSortDirectoriesAlongsideFiles()
+        {
+            OnPropertyChanged(nameof(AreDirectoriesSortedAlongsideFiles));
+            await OrderFilesAndFoldersAsync();
+            await ApplyFilesAndFoldersChangesAsync();
+        }
+
         public bool IsSortedByName
         {
             get => folderSettings.DirectorySortOption == SortOption.Name;
@@ -355,6 +362,16 @@ public bool IsSortedDescending
             }
         }
 
+        public bool AreDirectoriesSortedAlongsideFiles
+        {
+            get => folderSettings.SortDirectoriesAlongsideFiles;
+            set
+            {
+                folderSettings.SortDirectoriesAlongsideFiles = value;
+                OnPropertyChanged(nameof(AreDirectoriesSortedAlongsideFiles));
+            }
+        }
+
         public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)
         {
             folderSettings = folderSettingsViewModel;
@@ -436,11 +453,17 @@ private async void UserSettingsService_OnSettingChangedEvent(object sender, Sett
                 case nameof(UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible):
                 case nameof(UserSettingsService.PreferencesSettingsService.AreSystemItemsHidden):
                 case nameof(UserSettingsService.PreferencesSettingsService.ShowDotFiles):
+                case nameof(UserSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles):
+                case nameof(UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder):
                 case nameof(UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled):
                 case nameof(UserSettingsService.PreferencesSettingsService.ShowFolderSize):
                     await dispatcherQueue.EnqueueAsync(() =>
                     {
                         shouldDisplayThumbnails = UserSettingsService.PreferencesSettingsService.ShowThumbnails;
+                        if (!UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)
+                        {
+                            folderSettings.SortDirectoriesAlongsideFiles = UserSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles;
+                        }
                         if (WorkingDirectory != "Home".GetLocalized())
                         {
                             RefreshItems(null);
@@ -576,7 +599,7 @@ await dispatcherQueue.EnqueueAsync(() =>
                     var group = FilesAndFolders.GroupedCollection?.FirstOrDefault(x => x.Model.Key == key);
                     if (group != null)
                     {
-                        group.OrderOne(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection), item);
+                        group.OrderOne(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles), item);
                     }
                 }
                 UpdateEmptyTextType();
@@ -738,7 +761,7 @@ void OrderEntries()
                     return;
                 }
 
-                filesAndFolders = SortingHelper.OrderFileList(filesAndFolders, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection).ToList();
+                filesAndFolders = SortingHelper.OrderFileList(filesAndFolders, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles).ToList();
             }
 
             if (NativeWinApiHelper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)
@@ -766,7 +789,7 @@ private void OrderGroups(CancellationToken token = default)
                     return;
                 }
 
-                gp.Order(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection));
+                gp.Order(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles));
             }
             if (!FilesAndFolders.GroupedCollection.IsSorted)
             {
diff --git a/src/Files.Uwp/ViewModels/ToolbarViewModel.cs b/src/Files.Uwp/ViewModels/ToolbarViewModel.cs
diff --git a/src/Files.Uwp/Views/ColumnShellPage.xaml.cs b/src/Files.Uwp/Views/ColumnShellPage.xaml.cs
diff --git a/src/Files.Uwp/Views/ModernShellPage.xaml.cs b/src/Files.Uwp/Views/ModernShellPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`Microsoft Visual Studio Solution File, Format Version 12.00`
`3`	`2`	`# Visual Studio Version 16`
`4`	`3`	`VisualStudioVersion = 16.0.31911.196`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public interface ILayoutSettingsService : IBaseSettingsService, INotifyPropertyC`
`38`	`38`
`39`	`39`	`SortOption DefaultDirectorySortOption { get; set; }`
`40`	`40`
	`41`	`+ bool DefaultSortDirectoriesAlongsideFiles { get; set; }`
	`42`	`+`
`41`	`43`	`GroupOption DefaultDirectoryGroupOption { get; set; }`
`42`	`44`	`}`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using Files.Shared.Enums;`
`2`	`2`	`using Files.Uwp.Filesystem;`
`3`		`-using Files.Backend.Services.Settings;`
`4`	`3`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`5`	`4`	`using System;`
`6`	`5`	`using System.Collections.Generic;`
`@@ -30,7 +29,7 @@ public static Func<ListedItem, object> GetSortFunc(SortOption directorySortOptio`
`30`	`29`	`};`
`31`	`30`	`}`
`32`	`31`
`33`		`- public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFolders, SortOption directorySortOption, SortDirection directorySortDirection)`
	`32`	`+ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFolders, SortOption directorySortOption, SortDirection directorySortDirection, bool sortDirectoriesAlongsideFiles)`
`34`	`33`	`{`
`35`	`34`	`var orderFunc = GetSortFunc(directorySortOption);`
`36`	`35`	`var naturalStringComparer = NaturalStringComparer.GetForProcessor();`
`@@ -40,13 +39,11 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol`
`40`	`39`	`static bool folderThenFileAsync(ListedItem listedItem) => (listedItem.PrimaryItemAttribute == StorageItemTypes.File \|\| listedItem.IsShortcutItem \|\| listedItem.IsZipItem);`
`41`	`40`	`IOrderedEnumerable<ListedItem> ordered;`
`42`	`41`
`43`		`- IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();`
`44`		`-`
`45`	`42`	`if (directorySortDirection == SortDirection.Ascending)`
`46`	`43`	`{`
`47`	`44`	`if (directorySortOption == SortOption.Name)`
`48`	`45`	`{`
`49`		`- if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)`
	`46`	`+ if (sortDirectoriesAlongsideFiles)`
`50`	`47`	`{`
`51`	`48`	`ordered = filesAndFolders.OrderBy(orderFunc, naturalStringComparer);`
`52`	`49`	`}`
`@@ -57,7 +54,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol`
`57`	`54`	`}`
`58`	`55`	`else if (directorySortOption == SortOption.FileTag)`
`59`	`56`	`{`
`60`		`- if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)`
	`57`	`+ if (sortDirectoriesAlongsideFiles)`
`61`	`58`	`{`
`62`	`59`	`ordered = filesAndFolders.OrderBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenBy(orderFunc);`
`63`	`60`	`}`
`@@ -68,7 +65,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol`
`68`	`65`	`}`
`69`	`66`	`else`
`70`	`67`	`{`
`71`		`- if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)`
	`68`	`+ if (sortDirectoriesAlongsideFiles)`
`72`	`69`	`{`
`73`	`70`	`ordered = filesAndFolders.OrderBy(orderFunc);`
`74`	`71`	`}`
`@@ -82,7 +79,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol`
`82`	`79`	`{`
`83`	`80`	`if (directorySortOption == SortOption.Name)`
`84`	`81`	`{`
`85`		`- if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)`
	`82`	`+ if (sortDirectoriesAlongsideFiles)`
`86`	`83`	`{`
`87`	`84`	`ordered = filesAndFolders.OrderByDescending(orderFunc, naturalStringComparer);`
`88`	`85`	`}`
`@@ -93,7 +90,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol`
`93`	`90`	`}`
`94`	`91`	`else if (directorySortOption == SortOption.FileTag)`
`95`	`92`	`{`
`96`		`- if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)`
	`93`	`+ if (sortDirectoriesAlongsideFiles)`
`97`	`94`	`{`
`98`	`95`	`ordered = filesAndFolders.OrderBy(x => string.IsNullOrEmpty(orderFunc(x) as string)).ThenByDescending(orderFunc);`
`99`	`96`	`}`
`@@ -104,7 +101,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol`
`104`	`101`	`}`
`105`	`102`	`else`
`106`	`103`	`{`
`107`		`- if (userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles)`
	`104`	`+ if (sortDirectoriesAlongsideFiles)`
`108`	`105`	`{`
`109`	`106`	`ordered = filesAndFolders.OrderByDescending(orderFunc);`
`110`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,14 @@ namespace Files.Uwp.ServicesImplementation.Settings`
`6`	`6`	`{`
`7`	`7`	`internal sealed class LayoutSettingsService : BaseObservableJsonSettings, ILayoutSettingsService`
`8`	`8`	`{`
	`9`	`+ private readonly IUserSettingsService userSettingsService;`
	`10`	`+`
`9`	`11`	`public LayoutSettingsService(ISettingsSharingContext settingsSharingContext)`
`10`	`12`	`{`
`11`	`13`	`// Register root`
`12`	`14`	`RegisterSettingsContext(settingsSharingContext);`
	`15`	`+`
	`16`	`+ userSettingsService = settingsSharingContext as IUserSettingsService;`
`13`	`17`	`}`
`14`	`18`
`15`	`19`	`public bool ShowDateColumn`
`@@ -65,6 +69,12 @@ public SortOption DefaultDirectorySortOption`
`65`	`69`	`get => (SortOption)Get((long)SortOption.Name);`
`66`	`70`	`set => Set((long)value);`
`67`	`71`	`}`
	`72`	`+`
	`73`	`+ public bool DefaultSortDirectoriesAlongsideFiles`
	`74`	`+ {`
	`75`	`+ get => Get(userSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles);`
	`76`	`+ set => Set(value);`
	`77`	`+ }`
`68`	`78`
`69`	`79`	`public GroupOption DefaultDirectoryGroupOption`
`70`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,13 @@ public async void UpdateSortDirectionStatus()`
`216`	`216`	`await ApplyFilesAndFoldersChangesAsync();`
`217`	`217`	`}`
`218`	`218`
	`219`	`+ public async void UpdateSortDirectoriesAlongsideFiles()`
	`220`	`+ {`
	`221`	`+ OnPropertyChanged(nameof(AreDirectoriesSortedAlongsideFiles));`
	`222`	`+ await OrderFilesAndFoldersAsync();`
	`223`	`+ await ApplyFilesAndFoldersChangesAsync();`
	`224`	`+ }`
	`225`	`+`
`219`	`226`	`public bool IsSortedByName`
`220`	`227`	`{`
`221`	`228`	`get => folderSettings.DirectorySortOption == SortOption.Name;`
`@@ -355,6 +362,16 @@ public bool IsSortedDescending`
`355`	`362`	`}`
`356`	`363`	`}`
`357`	`364`
	`365`	`+ public bool AreDirectoriesSortedAlongsideFiles`
	`366`	`+ {`
	`367`	`+ get => folderSettings.SortDirectoriesAlongsideFiles;`
	`368`	`+ set`
	`369`	`+ {`
	`370`	`+ folderSettings.SortDirectoriesAlongsideFiles = value;`
	`371`	`+ OnPropertyChanged(nameof(AreDirectoriesSortedAlongsideFiles));`
	`372`	`+ }`
	`373`	`+ }`
	`374`	`+`
`358`	`375`	`public ItemViewModel(FolderSettingsViewModel folderSettingsViewModel)`
`359`	`376`	`{`
`360`	`377`	`folderSettings = folderSettingsViewModel;`
`@@ -436,11 +453,17 @@ private async void UserSettingsService_OnSettingChangedEvent(object sender, Sett`
`436`	`453`	`case nameof(UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible):`
`437`	`454`	`case nameof(UserSettingsService.PreferencesSettingsService.AreSystemItemsHidden):`
`438`	`455`	`case nameof(UserSettingsService.PreferencesSettingsService.ShowDotFiles):`
	`456`	`+ case nameof(UserSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles):`
	`457`	`+ case nameof(UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder):`
`439`	`458`	`case nameof(UserSettingsService.PreferencesSettingsService.AreFileTagsEnabled):`
`440`	`459`	`case nameof(UserSettingsService.PreferencesSettingsService.ShowFolderSize):`
`441`	`460`	`await dispatcherQueue.EnqueueAsync(() =>`
`442`	`461`	`{`
`443`	`462`	`shouldDisplayThumbnails = UserSettingsService.PreferencesSettingsService.ShowThumbnails;`
	`463`	`+ if (!UserSettingsService.PreferencesSettingsService.AreLayoutPreferencesPerFolder)`
	`464`	`+ {`
	`465`	`+ folderSettings.SortDirectoriesAlongsideFiles = UserSettingsService.PreferencesSettingsService.ListAndSortDirectoriesAlongsideFiles;`
	`466`	`+ }`
`444`	`467`	`if (WorkingDirectory != "Home".GetLocalized())`
`445`	`468`	`{`
`446`	`469`	`RefreshItems(null);`
`@@ -576,7 +599,7 @@ await dispatcherQueue.EnqueueAsync(() =>`
`576`	`599`	`var group = FilesAndFolders.GroupedCollection?.FirstOrDefault(x => x.Model.Key == key);`
`577`	`600`	`if (group != null)`
`578`	`601`	`{`
`579`		`- group.OrderOne(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection), item);`
	`602`	`+ group.OrderOne(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles), item);`
`580`	`603`	`}`
`581`	`604`	`}`
`582`	`605`	`UpdateEmptyTextType();`
`@@ -738,7 +761,7 @@ void OrderEntries()`
`738`	`761`	`return;`
`739`	`762`	`}`
`740`	`763`
`741`		`- filesAndFolders = SortingHelper.OrderFileList(filesAndFolders, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection).ToList();`
	`764`	`+ filesAndFolders = SortingHelper.OrderFileList(filesAndFolders, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles).ToList();`
`742`	`765`	`}`
`743`	`766`
`744`	`767`	`if (NativeWinApiHelper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)`
`@@ -766,7 +789,7 @@ private void OrderGroups(CancellationToken token = default)`
`766`	`789`	`return;`
`767`	`790`	`}`
`768`	`791`
`769`		`- gp.Order(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection));`
	`792`	`+ gp.Order(list => SortingHelper.OrderFileList(list, folderSettings.DirectorySortOption, folderSettings.DirectorySortDirection, folderSettings.SortDirectoriesAlongsideFiles));`
`770`	`793`	`}`
`771`	`794`	`if (!FilesAndFolders.GroupedCollection.IsSorted)`
`772`	`795`	`{`