Feature: Added settings for default order directions (#11220)

hishitetsu · web-flow · commit 68ce757d62c6 · 2023-02-08T22:45:11.000-05:00
diff --git a/src/Files.App/Helpers/LayoutPreferences/LayoutPreferences.cs b/src/Files.App/Helpers/LayoutPreferences/LayoutPreferences.cs
@@ -31,9 +31,9 @@ public LayoutPreferences()
 			GridViewSize = UserSettingsService.LayoutSettingsService.DefaultGridViewSize;
 			DirectorySortOption = UserSettingsService.FoldersSettingsService.DefaultSortOption;
 			DirectoryGroupOption = UserSettingsService.FoldersSettingsService.DefaultGroupOption;
-			DirectorySortDirection = UserSettingsService.LayoutSettingsService.DefaultDirectorySortDirection;
-			DirectoryGroupDirection = UserSettingsService.LayoutSettingsService.DefaultDirectoryGroupDirection;
-			SortDirectoriesAlongsideFiles = UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles;
+			DirectorySortDirection = UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection;
+			DirectoryGroupDirection = UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection;
+			SortDirectoriesAlongsideFiles = UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles;
 			IsAdaptiveLayoutOverridden = defaultLayout is not FolderLayoutModes.Adaptive;
 
 			ColumnsViewModel = new ColumnsViewModel();
diff --git a/src/Files.App/ServicesImplementation/Settings/FoldersSettingsService.cs b/src/Files.App/ServicesImplementation/Settings/FoldersSettingsService.cs
@@ -226,6 +226,24 @@ public GroupOption DefaultGroupOption
 			set => Set((long)value);
 		}
 
+		public SortDirection DefaultDirectorySortDirection
+		{
+			get => (SortDirection)Get((long)SortDirection.Ascending);
+			set => Set((long)value);
+		}
+
+		public SortDirection DefaultDirectoryGroupDirection
+		{
+			get => (SortDirection)Get((long)SortDirection.Ascending);
+			set => Set((long)value);
+		}
+
+		public bool DefaultSortDirectoriesAlongsideFiles
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
 		public bool ShowFileExtensions
 		{
 			get => Get(true);
diff --git a/src/Files.App/ServicesImplementation/Settings/LayoutSettingsService.cs b/src/Files.App/ServicesImplementation/Settings/LayoutSettingsService.cs
@@ -17,23 +17,5 @@ public int DefaultGridViewSize
 			get => (int)Get((long)Constants.Browser.GridViewBrowser.GridViewSizeMedium);
 			set => Set((long)value);
 		}
-
-		public SortDirection DefaultDirectorySortDirection
-		{
-			get => (SortDirection)Get((long)SortDirection.Ascending);
-			set => Set((long)value);
-		}
-
-		public SortDirection DefaultDirectoryGroupDirection
-		{
-			get => (SortDirection)Get((long)SortDirection.Ascending);
-			set => Set((long)value);
-		}
-
-		public bool DefaultSortDirectoriesAlongsideFiles
-		{
-			get => Get(false);
-			set => Set(value);
-		}
 	}
 }
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -2841,6 +2841,12 @@
   <data name="SortBy" xml:space="preserve">
     <value>Sort by</value>
   </data>
+  <data name="GroupInDescendingOrder" xml:space="preserve">
+    <value>Group in descending order</value>
+  </data>
+  <data name="SortInDescendingOrder" xml:space="preserve">
+    <value>Sort in descending order</value>
+  </data>
   <data name="NewShortcutDialogTitle" xml:space="preserve">
     <value>Create a new shortcut</value>
   </data>
diff --git a/src/Files.App/ViewModels/FolderSettingsViewModel.cs b/src/Files.App/ViewModels/FolderSettingsViewModel.cs
@@ -344,9 +344,9 @@ public static void SetLayoutPreferencesForPath(string folderPath, LayoutPreferen
 				{
 					userSettingsService.FoldersSettingsService.DefaultGroupOption = prefs.DirectoryGroupOption;
 				}
-				userSettingsService.LayoutSettingsService.DefaultDirectorySortDirection = prefs.DirectorySortDirection;
-				userSettingsService.LayoutSettingsService.DefaultDirectoryGroupDirection = prefs.DirectoryGroupDirection;
-				userSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles = prefs.SortDirectoriesAlongsideFiles;
+				userSettingsService.FoldersSettingsService.DefaultDirectorySortDirection = prefs.DirectorySortDirection;
+				userSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection = prefs.DirectoryGroupDirection;
+				userSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles = prefs.SortDirectoriesAlongsideFiles;
 
 				userSettingsService.FoldersSettingsService.ShowDateColumn = !prefs.ColumnsViewModel.DateModifiedColumn.UserCollapsed;
 				userSettingsService.FoldersSettingsService.ShowDateCreatedColumn = !prefs.ColumnsViewModel.DateCreatedColumn.UserCollapsed;
@@ -528,7 +528,7 @@ public void OnDefaultPreferencesChanged(string folderPath, string settingsName)
 			var prefs = GetLayoutPreferencesForPath(folderPath);
 			switch (settingsName)
 			{
-				case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):
+				case nameof(UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles):
 					SortDirectoriesAlongsideFiles = prefs.SortDirectoriesAlongsideFiles;
 					break;
 				case nameof(UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories):
diff --git a/src/Files.App/ViewModels/ItemViewModel.cs b/src/Files.App/ViewModels/ItemViewModel.cs
@@ -483,7 +483,7 @@ await dispatcherQueue.EnqueueAsync(() =>
 					break;
 				case nameof(UserSettingsService.FoldersSettingsService.DefaultSortOption):
 				case nameof(UserSettingsService.FoldersSettingsService.DefaultGroupOption):
-				case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):
+				case nameof(UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles):
 				case nameof(UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories):
 					await dispatcherQueue.EnqueueAsync(() =>
 					{
diff --git a/src/Files.App/ViewModels/SettingsViewModels/FoldersViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/FoldersViewModel.cs
@@ -250,14 +250,43 @@ public bool OpenFoldersNewTab
 			}
 		}
 
+		public bool SortInDescendingOrder
+		{
+			get => UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection == SortDirection.Descending;
+			set
+			{
+				if (value != (UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection == SortDirection.Descending))
+				{
+					UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection = value ? SortDirection.Descending : SortDirection.Ascending;
+					OnPropertyChanged();
+				}
+			}
+		}
+
+		public bool GroupInDescendingOrder
+		{
+			get => UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection == SortDirection.Descending;
+			set
+			{
+				if (value != (UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection == SortDirection.Descending))
+				{
+					UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection = value ? SortDirection.Descending : SortDirection.Ascending;
+					OnPropertyChanged();
+				}
+			}
+		}
+
+		public bool isDefaultGrouped
+			=> UserSettingsService.FoldersSettingsService.DefaultGroupOption != GroupOption.None;
+
 		public bool ListAndSortDirectoriesAlongsideFiles
 		{
-			get => UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles;
+			get => UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles;
 			set
 			{
-				if (value != UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles)
+				if (value != UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles)
 				{
-					UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles = value;
+					UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles = value;
 					OnPropertyChanged();
 				}
 			}
@@ -300,6 +329,8 @@ public int SelectedDefaultGroupingIndex
 				{
 					OnPropertyChanged(nameof(SelectedDefaultGroupingIndex));
 					UserSettingsService.FoldersSettingsService.DefaultGroupOption = value == FileTagGroupingIndex ? GroupOption.FileTag : (GroupOption)value;
+					// Raise an event for the 'Group in descending order' toggle switch availability
+					OnPropertyChanged(nameof(isDefaultGrouped));
 				}
 			}
 		}
diff --git a/src/Files.App/Views/SettingsPages/Folders.xaml b/src/Files.App/Views/SettingsPages/Folders.xaml
@@ -115,6 +115,14 @@
 							</ComboBox>
 						</local:SettingsBlockControl>
 
+						<!--  Sort in Descending order  -->
+						<local:SettingsBlockControl Title="{helpers:ResourceString Name=SortInDescendingOrder}" HorizontalAlignment="Stretch">
+							<ToggleSwitch
+								AutomationProperties.Name="{helpers:ResourceString Name=SortInDescendingOrder}"
+								IsOn="{x:Bind ViewModel.SortInDescendingOrder, Mode=TwoWay}"
+								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+						</local:SettingsBlockControl>
+
 						<!--  Grouping Options  -->
 						<local:SettingsBlockControl Title="{helpers:ResourceString Name=GroupBy}" HorizontalAlignment="Stretch">
 							<ComboBox AutomationProperties.Name="{helpers:ResourceString Name=GroupBy}" SelectedIndex="{x:Bind ViewModel.SelectedDefaultGroupingIndex, Mode=TwoWay}">
@@ -128,6 +136,15 @@
 							</ComboBox>
 						</local:SettingsBlockControl>
 
+						<!--  Group in Descending order  -->
+						<local:SettingsBlockControl Title="{helpers:ResourceString Name=GroupInDescendingOrder}" HorizontalAlignment="Stretch">
+							<ToggleSwitch
+								AutomationProperties.Name="{helpers:ResourceString Name=GroupInDescendingOrder}"
+								IsOn="{x:Bind ViewModel.GroupInDescendingOrder, Mode=TwoWay}"
+								IsEnabled="{x:Bind ViewModel.isDefaultGrouped, Mode=OneWay}"
+								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+						</local:SettingsBlockControl>
+
 						<!--  Sort Folders Alongside Files  -->
 						<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsListAndSortDirectoriesAlongsideFiles}" HorizontalAlignment="Stretch">
 							<ToggleSwitch
diff --git a/src/Files.Backend/Services/Settings/IFoldersSettingsService.cs b/src/Files.Backend/Services/Settings/IFoldersSettingsService.cs
@@ -156,6 +156,21 @@ public interface IFoldersSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		GroupOption DefaultGroupOption { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating the default sorting direction.
+		/// </summary>
+		SortDirection DefaultDirectorySortDirection { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating the default grouping direction.
+		/// </summary>
+		SortDirection DefaultDirectoryGroupDirection { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating if directories should be sorted alongside files by.
+		/// </summary>
+		bool DefaultSortDirectoriesAlongsideFiles { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating if file extensions should be displayed.
 		/// </summary>
diff --git a/src/Files.Backend/Services/Settings/ILayoutSettingsService.cs b/src/Files.Backend/Services/Settings/ILayoutSettingsService.cs
@@ -6,11 +6,5 @@ namespace Files.Backend.Services.Settings
 	public interface ILayoutSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{
 		int DefaultGridViewSize { get; set; }
-
-		SortDirection DefaultDirectorySortDirection { get; set; }
-
-		SortDirection DefaultDirectoryGroupDirection { get; set; }
-
-		bool DefaultSortDirectoriesAlongsideFiles { get; set; }
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ await dispatcherQueue.EnqueueAsync(() =>`
`483`	`483`	`break;`
`484`	`484`	`case nameof(UserSettingsService.FoldersSettingsService.DefaultSortOption):`
`485`	`485`	`case nameof(UserSettingsService.FoldersSettingsService.DefaultGroupOption):`
`486`		`- case nameof(UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles):`
	`486`	`+ case nameof(UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles):`
`487`	`487`	`case nameof(UserSettingsService.FoldersSettingsService.SyncFolderPreferencesAcrossDirectories):`
`488`	`488`	`await dispatcherQueue.EnqueueAsync(() =>`
`489`	`489`	`{`
Original file line number	Diff line number	Diff line change
`@@ -250,14 +250,43 @@ public bool OpenFoldersNewTab`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
	`253`	`+ public bool SortInDescendingOrder`
	`254`	`+ {`
	`255`	`+ get => UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection == SortDirection.Descending;`
	`256`	`+ set`
	`257`	`+ {`
	`258`	`+ if (value != (UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection == SortDirection.Descending))`
	`259`	`+ {`
	`260`	`+ UserSettingsService.FoldersSettingsService.DefaultDirectorySortDirection = value ? SortDirection.Descending : SortDirection.Ascending;`
	`261`	`+ OnPropertyChanged();`
	`262`	`+ }`
	`263`	`+ }`
	`264`	`+ }`
	`265`	`+`
	`266`	`+ public bool GroupInDescendingOrder`
	`267`	`+ {`
	`268`	`+ get => UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection == SortDirection.Descending;`
	`269`	`+ set`
	`270`	`+ {`
	`271`	`+ if (value != (UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection == SortDirection.Descending))`
	`272`	`+ {`
	`273`	`+ UserSettingsService.FoldersSettingsService.DefaultDirectoryGroupDirection = value ? SortDirection.Descending : SortDirection.Ascending;`
	`274`	`+ OnPropertyChanged();`
	`275`	`+ }`
	`276`	`+ }`
	`277`	`+ }`
	`278`	`+`
	`279`	`+ public bool isDefaultGrouped`
	`280`	`+ => UserSettingsService.FoldersSettingsService.DefaultGroupOption != GroupOption.None;`
	`281`	`+`
`253`	`282`	`public bool ListAndSortDirectoriesAlongsideFiles`
`254`	`283`	`{`
`255`		`- get => UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles;`
	`284`	`+ get => UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles;`
`256`	`285`	`set`
`257`	`286`	`{`
`258`		`- if (value != UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles)`
	`287`	`+ if (value != UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles)`
`259`	`288`	`{`
`260`		`- UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles = value;`
	`289`	`+ UserSettingsService.FoldersSettingsService.DefaultSortDirectoriesAlongsideFiles = value;`
`261`	`290`	`OnPropertyChanged();`
`262`	`291`	`}`
`263`	`292`	`}`
`@@ -300,6 +329,8 @@ public int SelectedDefaultGroupingIndex`
`300`	`329`	`{`
`301`	`330`	`OnPropertyChanged(nameof(SelectedDefaultGroupingIndex));`
`302`	`331`	`UserSettingsService.FoldersSettingsService.DefaultGroupOption = value == FileTagGroupingIndex ? GroupOption.FileTag : (GroupOption)value;`
	`332`	`+ // Raise an event for the 'Group in descending order' toggle switch availability`
	`333`	`+ OnPropertyChanged(nameof(isDefaultGrouped));`
`303`	`334`	`}`
`304`	`335`	`}`
`305`	`336`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,5 @@ namespace Files.Backend.Services.Settings`
`6`	`6`	`public interface ILayoutSettingsService : IBaseSettingsService, INotifyPropertyChanged`
`7`	`7`	`{`
`8`	`8`	`int DefaultGridViewSize { get; set; }`
`9`		`-`
`10`		`- SortDirection DefaultDirectorySortDirection { get; set; }`
`11`		`-`
`12`		`- SortDirection DefaultDirectoryGroupDirection { get; set; }`
`13`		`-`
`14`		`- bool DefaultSortDirectoriesAlongsideFiles { get; set; }`
`15`	`9`	`}`
`16`	`10`	`}`