Feature: Moved dual pane options to the preferences settings page (#10928)

Author: yaira2

src/Files.App/App.xaml.cs

@@ -105,7 +105,6 @@ private IServiceProvider ConfigureServices()
 				// Base IUserSettingsService as parent settings store (to get ISettingsSharingContext from)
 				.AddSingleton<IUserSettingsService, UserSettingsService>()
 				// Children settings (from IUserSettingsService)
-				.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()))

src/Files.App/Dialogs/SettingsDialog.xaml

@@ -21,7 +21,7 @@
 
 	<Grid
 		x:Name="ContainerGrid"
-		MaxHeight="640"
+		MaxHeight="690"
 		HorizontalAlignment="Stretch"
 		VerticalAlignment="Stretch"
 		Background="{ThemeResource SolidBackgroundFillColorBase}">
@@ -67,22 +67,12 @@
 						<FontIcon Glyph="&#xE8B7;" />
 					</NavigationViewItem.Icon>
 				</NavigationViewItem>
-				<NavigationViewItem
-					AccessKey="M"
-					AutomationProperties.AutomationId="SettingsItemMultitasking"
-					Content="{helpers:ResourceString Name=SettingsNavMultitasking/Content}"
-					CornerRadius="0"
-					Tag="3">
-					<NavigationViewItem.Icon>
-						<FontIcon FontSize="16" Glyph="&#xEE40;" />
-					</NavigationViewItem.Icon>
-				</NavigationViewItem>
 				<NavigationViewItem
 					AccessKey="E"
 					AutomationProperties.AutomationId="SettingsItemExperimental"
 					Content="{helpers:ResourceString Name=SettingsNavExperimental/Content}"
 					CornerRadius="0"
-					Tag="4">
+					Tag="3">
 					<NavigationViewItem.Icon>
 						<FontIcon Glyph="&#xF1AD;" />
 					</NavigationViewItem.Icon>
@@ -92,7 +82,7 @@
 					AutomationProperties.AutomationId="SettingsItemAbout"
 					Content="{helpers:ResourceString Name=About}"
 					CornerRadius="0,4,4,0"
-					Tag="5">
+					Tag="4">
 					<NavigationViewItem.Icon>
 						<FontIcon FontSize="16" Glyph="&#xE946;" />
 					</NavigationViewItem.Icon>

src/Files.App/Dialogs/SettingsDialog.xaml.cs

@@ -36,7 +36,7 @@ private void Current_SizeChanged(object sender, WindowSizeChangedEventArgs e)
 
 		private void UpdateDialogLayout()
 		{
-			ContainerGrid.Height = App.Window.Bounds.Height <= 710 ? App.Window.Bounds.Height - 70 : 640;
+			ContainerGrid.Height = App.Window.Bounds.Height <= 760 ? App.Window.Bounds.Height - 70 : 690;
 			ContainerGrid.Width = App.Window.Bounds.Width <= 800 ? App.Window.Bounds.Width : 800;
 		}
 
@@ -50,9 +50,8 @@ private void SettingsPane_SelectionChanged(NavigationView sender, NavigationView
 				0 => SettingsContentFrame.Navigate(typeof(Appearance)),
 				1 => SettingsContentFrame.Navigate(typeof(Preferences)),
 				2 => SettingsContentFrame.Navigate(typeof(Folders)),
-				3 => SettingsContentFrame.Navigate(typeof(Multitasking)),
-				4 => SettingsContentFrame.Navigate(typeof(Experimental)),
-				5 => SettingsContentFrame.Navigate(typeof(About)),
+				3 => SettingsContentFrame.Navigate(typeof(Experimental)),
+				4 => SettingsContentFrame.Navigate(typeof(About)),
 				_ => SettingsContentFrame.Navigate(typeof(Appearance))
 			};
 		}

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

@@ -691,7 +691,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
 					Glyph = "\uE117",
 					GlyphFontFamilyName = "CustomGlyph",
 					Command = commandsViewModel.OpenDirectoryInNewPaneCommand,
-					ShowItem = userSettingsService.MultitaskingSettingsService.IsDualPaneEnabled && selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.Folder),
+					ShowItem = userSettingsService.PreferencesSettingsService.IsDualPaneEnabled && selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.Folder),
 					SingleItemOnly = true,
 					ShowInSearchPage = true,
 					ShowInFtpPage = true,

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

@@ -93,6 +93,17 @@ public DateTimeFormats DateTimeFormat
 			set => Set(value);
 		}
 
+		public bool IsDualPaneEnabled
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
+		public bool AlwaysOpenDualPaneInNewTab
+		{
+			get => Get(false);
+			set => Set(value);
+		}
 		protected override void RaiseOnSettingChangedEvent(object sender, SettingChangedEventArgs e)
 		{
 			switch (e.SettingName)
@@ -105,6 +116,8 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(ContinueLastSessionOnStartUp):
 				case nameof(OpenNewTabOnStartup):
 				case nameof(AlwaysOpenNewInstance):
+				case nameof(IsDualPaneEnabled):
+				case nameof(AlwaysOpenDualPaneInNewTab):
 					Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
 					break;
 			}

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

@@ -24,12 +24,6 @@ public IFoldersSettingsService FoldersSettingsService
 			get => GetSettingsService(ref _FoldersSettingsService);
 		}
 
-		private IMultitaskingSettingsService _MultitaskingSettingsService;
-		public IMultitaskingSettingsService MultitaskingSettingsService
-		{
-			get => GetSettingsService(ref _MultitaskingSettingsService);
-		}
-
 		private IAppearanceSettingsService _AppearanceSettingsService;
 		public IAppearanceSettingsService AppearanceSettingsService
 		{

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

@@ -763,9 +763,6 @@
   <data name="SettingsMultitaskingTitle.Text" xml:space="preserve">
     <value>Multi-tasking</value>
   </data>
-  <data name="SettingsNavMultitasking.Content" xml:space="preserve">
-    <value>Multi-tasking</value>
-  </data>
   <data name="BaseLayoutItemContextFlyoutSetAs.Text" xml:space="preserve">
     <value>Set as</value>
   </data>

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

@@ -1247,7 +1247,7 @@
     <value>Remove</value>
   </data>
   <data name="SettingsMultitaskingAlwaysOpenDualPane" xml:space="preserve">
-    <value>Always open new tabs in dual pane mode</value>
+    <value>Open tabs in dual pane mode</value>
   </data>
   <data name="SettingsMultitaskingEnableDualPane" xml:space="preserve">
     <value>Enable dual pane view</value>
@@ -1261,9 +1261,6 @@
   <data name="SideBarOpenInNewPane.Text" xml:space="preserve">
     <value>Open in secondary pane</value>
   </data>
-  <data name="SettingsDualPane.Text" xml:space="preserve">
-    <value>Dual pane</value>
-  </data>
   <data name="Folders" xml:space="preserve">
     <value>Folders</value>
   </data>