Feature: Moved sidebar settings to preferences

src/Files.App/App.xaml.cs

@@ -182,19 +182,19 @@ private static async Task StartAppCenter()
 		private static async Task InitializeAppComponentsAsync()
 		{
 			var userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
-			var appearanceSettingsService = userSettingsService.AppearanceSettingsService;
+			var preferencesSettingsService = userSettingsService.PreferencesSettingsService;
 
 			// Start off a list of tasks we need to run before we can continue startup
 			await Task.Run(async () =>
 			{
 				await Task.WhenAll(
 					StartAppCenter(),
 					DrivesManager.UpdateDrivesAsync(),
-					OptionalTask(CloudDrivesManager.UpdateDrivesAsync(), appearanceSettingsService.ShowCloudDrivesSection),
+					OptionalTask(CloudDrivesManager.UpdateDrivesAsync(), preferencesSettingsService.ShowCloudDrivesSection),
 					LibraryManager.UpdateLibrariesAsync(),
-					OptionalTask(NetworkDrivesManager.UpdateDrivesAsync(), appearanceSettingsService.ShowNetworkDrivesSection),
-					OptionalTask(WSLDistroManager.UpdateDrivesAsync(), appearanceSettingsService.ShowWslSection),
-					OptionalTask(FileTagsManager.UpdateFileTagsAsync(), appearanceSettingsService.ShowFileTagsSection),
+					OptionalTask(NetworkDrivesManager.UpdateDrivesAsync(), preferencesSettingsService.ShowNetworkDrivesSection),
+					OptionalTask(WSLDistroManager.UpdateDrivesAsync(), preferencesSettingsService.ShowWslSection),
+					OptionalTask(FileTagsManager.UpdateFileTagsAsync(), preferencesSettingsService.ShowFileTagsSection),
 					SidebarPinnedController.InitializeAsync()
 				);
 				await Task.WhenAll(

src/Files.App/DataModels/SidebarPinnedModel.cs

@@ -273,7 +273,7 @@ private void AddLocationItemToSidebar(LocationItem locationItem)
 		/// </summary>
 		public async Task AddAllItemsToSidebar()
 		{
-			if (UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
+			if (UserSettingsService.PreferencesSettingsService.ShowFavoritesSection)
 			{
 				foreach (string path in FavoriteItems)
 				{

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

@@ -538,7 +538,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
 					Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(),
 					Glyph = "\uE840",
 					Command = commandsViewModel.PinDirectoryToFavoritesCommand,
-					ShowItem = itemViewModel.CurrentFolder is not null && !itemViewModel.CurrentFolder.IsPinned & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
+					ShowItem = itemViewModel.CurrentFolder is not null && !itemViewModel.CurrentFolder.IsPinned & userSettingsService.PreferencesSettingsService.ShowFavoritesSection,
 					ShowInFtpPage = true,
 					ShowInRecycleBin = true,
 				},
@@ -547,7 +547,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
 					Text = "BaseLayoutContextFlyoutUnpinFromFavorites/Text".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = commandsViewModel.UnpinDirectoryFromFavoritesCommand,
-					ShowItem = itemViewModel.CurrentFolder is not null && itemViewModel.CurrentFolder.IsPinned & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
+					ShowItem = itemViewModel.CurrentFolder is not null && itemViewModel.CurrentFolder.IsPinned & userSettingsService.PreferencesSettingsService.ShowFavoritesSection,
 					ShowInFtpPage = true,
 					ShowInRecycleBin = true,
 				},
@@ -963,7 +963,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
 					Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(),
 					Glyph = "\uE840",
 					Command = commandsViewModel.SidebarPinItemCommand,
-					ShowItem = selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && !x.IsPinned) & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
+					ShowItem = selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && !x.IsPinned) & userSettingsService.PreferencesSettingsService.ShowFavoritesSection,
 					ShowInSearchPage = true,
 					ShowInFtpPage = true,
 				},
@@ -972,7 +972,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
 					Text = "BaseLayoutContextFlyoutUnpinFromFavorites/Text".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = commandsViewModel.SidebarUnpinItemCommand,
-					ShowItem = selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && x.IsPinned) & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
+					ShowItem = selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && x.IsPinned) & userSettingsService.PreferencesSettingsService.ShowFavoritesSection,
 					ShowInSearchPage = true,
 					ShowInFtpPage = true,
 				},

src/Files.App/ServicesImplementation/Settings/AppearanceSettingsService.cs

@@ -27,48 +27,6 @@ public bool IsSidebarOpen
 			set => Set(value);
 		}
 
-		public bool ShowFavoritesSection
-		{
-			get => Get(true);
-			set => Set(value);
-		}
-
-		public bool ShowLibrarySection
-		{
-			get => Get(false);
-			set => Set(value);
-		}
-
-		public bool ShowDrivesSection
-		{
-			get => Get(true);
-			set => Set(value);
-		}
-
-		public bool ShowCloudDrivesSection
-		{
-			get => Get(true);
-			set => Set(value);
-		}
-
-		public bool ShowNetworkDrivesSection
-		{
-			get => Get(true);
-			set => Set(value);
-		}
-
-		public bool ShowWslSection
-		{
-			get => Get(true);
-			set => Set(value);
-		}
-
-		public bool ShowFileTagsSection
-		{
-			get => Get(true);
-			set => Set(value);
-		}
-
 		public bool MoveOverflowMenuItemsToSubMenu
 		{
 			get => Get(true);
@@ -121,12 +79,6 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 			switch (e.SettingName)
 			{
 				case nameof(MoveOverflowMenuItemsToSubMenu):
-				case nameof(ShowFavoritesSection):
-				case nameof(ShowLibrarySection):
-				case nameof(ShowCloudDrivesSection):
-				case nameof(ShowNetworkDrivesSection):
-				case nameof(ShowWslSection):
-				case nameof(ShowFileTagsSection):
 				case nameof(UseCompactStyles):
 				case nameof(AppThemeBackgroundColor):
 				case nameof(AppThemeAddressBarBackgroundColor):

src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs

@@ -153,6 +153,48 @@ public bool BundlesWidgetExpanded
 			set => Set(value);
 		}
 
+		public bool ShowFavoritesSection
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
+		public bool ShowLibrarySection
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
+		public bool ShowDrivesSection
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
+		public bool ShowCloudDrivesSection
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
+		public bool ShowNetworkDrivesSection
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
+		public bool ShowWslSection
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
+		public bool ShowFileTagsSection
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
 		protected override void RaiseOnSettingChangedEvent(object sender, SettingChangedEventArgs e)
 		{
 			switch (e.SettingName)
@@ -175,6 +217,12 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(RecentFilesWidgetExpanded):
 				case nameof(BundlesWidgetExpanded):
 				case nameof(DrivesWidgetExpanded):
+				case nameof(ShowFavoritesSection):
+				case nameof(ShowLibrarySection):
+				case nameof(ShowCloudDrivesSection):
+				case nameof(ShowNetworkDrivesSection):
+				case nameof(ShowWslSection):
+				case nameof(ShowFileTagsSection):
 					Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
 					break;
 			}

src/Files.App/Strings/en-US/Resources.resw

@@ -1501,9 +1501,6 @@
   <data name="BundlesOpenInNewPane.Text" xml:space="preserve">
     <value>Open in new Pane</value>
   </data>
-  <data name="SettingsShowLibrarySection.Title" xml:space="preserve">
-    <value>Show library section</value>
-  </data>
   <data name="Default" xml:space="preserve">
     <value>Default</value>
   </data>
@@ -2164,18 +2161,6 @@
   <data name="PropertyUncompressedSize" xml:space="preserve">
     <value>Uncompressed size</value>
   </data>
-  <data name="SettingsShowCloudDrivesSection.Title" xml:space="preserve">
-    <value>Show cloud drives section</value>
-  </data>
-  <data name="SettingsShowDrivesSection.Title" xml:space="preserve">
-    <value>Show drives section</value>
-  </data>
-  <data name="SettingsShowWslSection.Title" xml:space="preserve">
-    <value>Show WSL section</value>
-  </data>
-  <data name="SettingsShowNetworkDrivesSection.Title" xml:space="preserve">
-    <value>Show network section</value>
-  </data>
   <data name="WSL" xml:space="preserve">
     <value>WSL</value>
   </data>
@@ -2278,9 +2263,6 @@
   <data name="SettingsEditFileTagsExpander.Title" xml:space="preserve">
     <value>Edit tags</value>
   </data>
-  <data name="SettingsShowFavoritesSection.Title" xml:space="preserve">
-    <value>Show favorites section</value>
-  </data>
   <data name="ConfictingItemsDialogOptionApplyToAll.Text" xml:space="preserve">
     <value>Apply to all</value>
   </data>
@@ -2321,7 +2303,7 @@
     <value>Drives Widget</value>
   </data>
   <data name="FolderWidgetAutomationProperties.Name" xml:space="preserve">
-    <value>Libraries Widget</value>
+    <value>Folders Widget</value>
   </data>
   <data name="RecentFilesWidgetAutomationProperties.Name" xml:space="preserve">
     <value>Recent Files Widget</value>
@@ -2359,33 +2341,15 @@
   <data name="NavToolbarShowHiddenItemsHeader.Text" xml:space="preserve">
     <value>Show hidden items</value>
   </data>
-  <data name="SettingsShowFavoritesSectionSwitch.AutomationProperties.Name" xml:space="preserve">
-    <value>Show favorites section</value>
-  </data>
   <data name="SettingsOpenFoldersNewTabToggleSwitch.AutomationProperties.Name" xml:space="preserve">
     <value>Open folders in new tab</value>
   </data>
   <data name="SettingsPreferencesAppLanguageComboBox.AutomationProperties.Name" xml:space="preserve">
     <value>Language</value>
   </data>
-  <data name="SettingsShowCloudDrivesSectionSwitch.AutomationProperties.Name" xml:space="preserve">
-    <value>Show cloud drives section</value>
-  </data>
   <data name="SettingsShowConfirmDeleteDialogToggleSwitch.AutomationProperties.Name" xml:space="preserve">
     <value>Show a confirmation dialog when deleting files or folders</value>
   </data>
-  <data name="SettingsShowDrivesSectionSwitch.AutomationProperties.Name" xml:space="preserve">
-    <value>Show drives section</value>
-  </data>
-  <data name="SettingsShowLibrarySectionSwitch.AutomationProperties.Name" xml:space="preserve">
-    <value>Show library section</value>
-  </data>
-  <data name="SettingsShowNetworkDrivesSectionSwitch.AutomationProperties.Name" xml:space="preserve">
-    <value>Show network section</value>
-  </data>
-  <data name="SettingsShowWslSectionSwitch.AutomationProperties.Name" xml:space="preserve">
-    <value>Show WSL section</value>
-  </data>
   <data name="OngoingTasks" xml:space="preserve">
     <value>Ongoing Tasks</value>
   </data>
@@ -2659,12 +2623,6 @@
   <data name="FileTags" xml:space="preserve">
     <value>Tags</value>
   </data>
-  <data name="SettingsShowFileTagsSection.Title" xml:space="preserve">
-    <value>Show Tags section</value>
-  </data>
-  <data name="SettingsShowFileTagsSectionSwitch.AutomationProperties.Name" xml:space="preserve">
-    <value>Show Tags section</value>
-  </data>
   <data name="UseCompactSpacing" xml:space="preserve">
     <value>Use compact spacing in the details layout</value>
   </data>

src/Files.App/UserControls/SidebarControl.xaml.cs

@@ -331,25 +331,25 @@ private void HideSection()
 			switch (rightClickedItem.Section)
 			{
 				case SectionType.Favorites:
-					UserSettingsService.AppearanceSettingsService.ShowFavoritesSection = false;
+					UserSettingsService.PreferencesSettingsService.ShowFavoritesSection = false;
 					break;
 				case SectionType.Library:
-					UserSettingsService.AppearanceSettingsService.ShowLibrarySection = false;
+					UserSettingsService.PreferencesSettingsService.ShowLibrarySection = false;
 					break;
 				case SectionType.CloudDrives:
-					UserSettingsService.AppearanceSettingsService.ShowCloudDrivesSection = false;
+					UserSettingsService.PreferencesSettingsService.ShowCloudDrivesSection = false;
 					break;
 				case SectionType.Drives:
-					UserSettingsService.AppearanceSettingsService.ShowDrivesSection = false;
+					UserSettingsService.PreferencesSettingsService.ShowDrivesSection = false;
 					break;
 				case SectionType.Network:
-					UserSettingsService.AppearanceSettingsService.ShowNetworkDrivesSection = false;
+					UserSettingsService.PreferencesSettingsService.ShowNetworkDrivesSection = false;
 					break;
 				case SectionType.WSL:
-					UserSettingsService.AppearanceSettingsService.ShowWslSection = false;
+					UserSettingsService.PreferencesSettingsService.ShowWslSection = false;
 					break;
 				case SectionType.FileTag:
-					UserSettingsService.AppearanceSettingsService.ShowFileTagsSection = false;
+					UserSettingsService.PreferencesSettingsService.ShowFileTagsSection = false;
 					break;
 			}
 		}