Feature: Added option to hide the Send To menu (#12674)

yaira2 · web-flow · commit 0e5691a5ab0f · 2023-06-22T00:13:44.000-04:00
diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Commands;
+using Files.App.ServicesImplementation.Settings;
 using Files.Backend.Helpers;
 using Files.Backend.Services;
 using Microsoft.UI.Xaml.Media.Imaging;
@@ -551,7 +552,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					Tag = "SendTo",
 					CollapseLabel = true,
 					ShowInSearchPage = true,
-					ShowItem = itemsSelected
+					ShowItem = itemsSelected && userSettingsService.GeneralSettingsService.ShowSendToMenu
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
@@ -567,7 +568,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						}
 					},
 					ShowInSearchPage = true,
-					ShowItem = itemsSelected
+					ShowItem = itemsSelected && userSettingsService.GeneralSettingsService.ShowSendToMenu
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
diff --git a/src/Files.App/Helpers/ShellContextMenuHelper.cs b/src/Files.App/Helpers/ShellContextMenuHelper.cs
@@ -264,10 +264,13 @@ public static async Task LoadShellMenuItems(
 				if (openWithItem is not null)
 					shellMenuItems.Remove(openWithItem);
 
-				var sendToItem = showSendToMenu ? shellMenuItems.Where(x => (x.Tag as Win32ContextMenuItem)?.CommandString == "sendto").ToList().FirstOrDefault() : null;
-				if (sendToItem is not null)
+				var sendToItem = shellMenuItems.Where(x => (x.Tag as Win32ContextMenuItem)?.CommandString == "sendto").ToList().FirstOrDefault();
+				if (sendToItem is not null &&
+					(showSendToMenu || !UserSettingsService.GeneralSettingsService.ShowSendToMenu))
 					shellMenuItems.Remove(sendToItem);
 
+				sendToItem = showSendToMenu && UserSettingsService.GeneralSettingsService.ShowSendToMenu ? sendToItem : null;
+
 				if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu)
 				{
 					var (_, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(shellMenuItems);
diff --git a/src/Files.App/ServicesImplementation/Settings/GeneralSettingsService.cs b/src/Files.App/ServicesImplementation/Settings/GeneralSettingsService.cs
@@ -186,6 +186,12 @@ public bool ShowEditTagsMenu
 			set => Set(value);
 		}
 
+		public bool ShowSendToMenu
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
 		public bool ShowOpenInNewTab
 		{
 			get => Get(true);
@@ -246,6 +252,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(ShowFileTagsSection):
 				case nameof(MoveShellExtensionsToSubMenu):
 				case nameof(ShowEditTagsMenu):
+				case nameof(ShowSendToMenu):
 				case nameof(ShowOpenInNewTab):
 				case nameof(ShowOpenInNewWindow):
 				case nameof(ShowOpenInNewPane):
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -2391,6 +2391,9 @@
   <data name="ShowEditTagsMenu" xml:space="preserve">
     <value>Show edit tags flyout</value>
   </data>
+  <data name="ShowSendToMenu" xml:space="preserve">
+    <value>Show Send To menu</value>
+  </data>
   <data name="ShowOpenInNewTab" xml:space="preserve">
     <value>Show option to open folders in a new tab</value>
   </data>
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -136,7 +136,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				{
 					Text = "SendTo".GetLocalizedResource(),
 					Tag = "SendToPlaceholder",
-					ShowItem = !isFolder
+					ShowItem = !isFolder && userSettingsService.GeneralSettingsService.ShowSendToMenu
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -49,6 +49,8 @@ public sealed partial class RecentFilesWidget : HomePageWidget, IWidgetItemModel
 
 		private CancellationTokenSource refreshRecentsCTS;
 
+		private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
+
 		public string WidgetName => nameof(RecentFilesWidget);
 
 		public string AutomationProperties => "RecentFilesWidgetAutomationProperties/Name".GetLocalizedResource();
@@ -157,6 +159,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				{
 					Text = "SendTo".GetLocalizedResource(),
 					Tag = "SendToPlaceholder",
+					ShowItem = userSettingsService.GeneralSettingsService.ShowSendToMenu
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
@@ -202,7 +205,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 					Tag = "ItemOverflow",
 					IsEnabled = false,
 				}
-			};
+			}.Where(x => x.ShowItem).ToList();
 		}
 
 		public async Task RefreshWidget()
diff --git a/src/Files.App/ViewModels/Settings/GeneralViewModel.cs b/src/Files.App/ViewModels/Settings/GeneralViewModel.cs
@@ -483,6 +483,19 @@ public bool ShowOpenInNewTab
 			}
 		}
 
+		public bool ShowSendToMenu
+		{
+			get => UserSettingsService.GeneralSettingsService.ShowSendToMenu;
+			set
+			{
+				if (value != UserSettingsService.GeneralSettingsService.ShowSendToMenu)
+				{
+					UserSettingsService.GeneralSettingsService.ShowSendToMenu = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		public bool ShowOpenInNewWindow
 		{
 			get => UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow;
diff --git a/src/Files.App/Views/LayoutModes/BaseLayout.cs b/src/Files.App/Views/LayoutModes/BaseLayout.cs
@@ -4,9 +4,7 @@
 using CommunityToolkit.WinUI.UI;
 using Files.App.Filesystem.StorageItems;
 using Files.App.Helpers.ContextFlyouts;
-using Files.App.UserControls;
 using Files.App.UserControls.Menus;
-using Files.App.Views;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -809,26 +807,29 @@ private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> s
 			}
 
 			// Add items to sendto dropdown
-			var sendToOverflow = contextMenuFlyout.SecondaryCommands.FirstOrDefault(x => x is AppBarButton abb && (abb.Tag as string) == "SendToOverflow") as AppBarButton;
-
-			var sendTo = contextMenuFlyout.SecondaryCommands.FirstOrDefault(x => x is AppBarButton abb && (abb.Tag as string) == "SendTo") as AppBarButton;
-			if (sendToMenuItem?.LoadSubMenuAction is not null && sendToOverflow is not null && sendTo is not null)
+			if (UserSettingsService.GeneralSettingsService.ShowSendToMenu)
 			{
-				await sendToMenuItem.LoadSubMenuAction();
-				var sendToSubItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(ShellContextmenuHelper.GetSendToItems(shellMenuItems));
+				var sendToOverflow = contextMenuFlyout.SecondaryCommands.FirstOrDefault(x => x is AppBarButton abb && (abb.Tag as string) == "SendToOverflow") as AppBarButton;
 
-				if (sendToSubItems is not null)
+				var sendTo = contextMenuFlyout.SecondaryCommands.FirstOrDefault(x => x is AppBarButton abb && (abb.Tag as string) == "SendTo") as AppBarButton;
+				if (sendToMenuItem?.LoadSubMenuAction is not null && sendToOverflow is not null && sendTo is not null)
 				{
-					var flyout = (MenuFlyout)sendToOverflow.Flyout;
+					await sendToMenuItem.LoadSubMenuAction();
+					var sendToSubItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(ShellContextmenuHelper.GetSendToItems(shellMenuItems));
 
-					flyout.Items.Clear();
+					if (sendToSubItems is not null)
+					{
+						var flyout = (MenuFlyout)sendToOverflow.Flyout;
 
-					foreach (var item in sendToSubItems)
-						flyout.Items.Add(item);
+						flyout.Items.Clear();
+
+						foreach (var item in sendToSubItems)
+							flyout.Items.Add(item);
 
-					sendToOverflow.Flyout = flyout;
-					sendTo.Visibility = Visibility.Collapsed;
-					sendToOverflow.Visibility = Visibility.Visible;
+						sendToOverflow.Flyout = flyout;
+						sendTo.Visibility = Visibility.Collapsed;
+						sendToOverflow.Visibility = Visibility.Visible;
+					}
 				}
 			}
 
diff --git a/src/Files.App/Views/Settings/GeneralPage.xaml b/src/Files.App/Views/Settings/GeneralPage.xaml
@@ -284,6 +284,14 @@
 								IsOn="{x:Bind ViewModel.ShowEditTagsMenu, Mode=TwoWay}"
 								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 						</local:SettingsBlockControl>
+
+						<!--  Send To  -->
+						<local:SettingsBlockControl Title="{helpers:ResourceString Name=ShowSendToMenu}" HorizontalAlignment="Stretch">
+							<ToggleSwitch
+								AutomationProperties.Name="{helpers:ResourceString Name=ShowSendToMenu}"
+								IsOn="{x:Bind ViewModel.ShowSendToMenu, Mode=TwoWay}"
+								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+						</local:SettingsBlockControl>
 					</StackPanel>
 				</local:SettingsBlockControl.ExpandableContent>
 			</local:SettingsBlockControl>
diff --git a/src/Files.Backend/Services/Settings/IGeneralSettingsService.cs b/src/Files.Backend/Services/Settings/IGeneralSettingsService.cs
@@ -159,12 +159,16 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		bool ShowOpenInNewWindow { get; set; }
 
-
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to show the option to open folders in a new pane.
 		/// </summary>
 		bool ShowOpenInNewPane { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether or not to show the Send To menu.
+		/// </summary>
+		bool ShowSendToMenu { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating the default option to resolve conflicts.
 		/// </summary>

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`136`	`136`	`{`
`137`	`137`	`Text = "SendTo".GetLocalizedResource(),`
`138`	`138`	`Tag = "SendToPlaceholder",`
`139`		`- ShowItem = !isFolder`
	`139`	`+ ShowItem = !isFolder && userSettingsService.GeneralSettingsService.ShowSendToMenu`
`140`	`140`	`},`
`141`	`141`	`new ContextMenuFlyoutItemViewModel()`
`142`	`142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public sealed partial class RecentFilesWidget : HomePageWidget, IWidgetItemModel`
`49`	`49`
`50`	`50`	`private CancellationTokenSource refreshRecentsCTS;`
`51`	`51`
	`52`	`+ private readonly IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();`
	`53`	`+`
`52`	`54`	`public string WidgetName => nameof(RecentFilesWidget);`
`53`	`55`
`54`	`56`	`public string AutomationProperties => "RecentFilesWidgetAutomationProperties/Name".GetLocalizedResource();`
`@@ -157,6 +159,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`157`	`159`	`{`
`158`	`160`	`Text = "SendTo".GetLocalizedResource(),`
`159`	`161`	`Tag = "SendToPlaceholder",`
	`162`	`+ ShowItem = userSettingsService.GeneralSettingsService.ShowSendToMenu`
`160`	`163`	`},`
`161`	`164`	`new ContextMenuFlyoutItemViewModel()`
`162`	`165`	`{`
`@@ -202,7 +205,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard`
`202`	`205`	`Tag = "ItemOverflow",`
`203`	`206`	`IsEnabled = false,`
`204`	`207`	`}`
`205`		`- };`
	`208`	`+ }.Where(x => x.ShowItem).ToList();`
`206`	`209`	`}`
`207`	`210`
`208`	`211`	`public async Task RefreshWidget()`
Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,19 @@ public bool ShowOpenInNewTab`
`483`	`483`	`}`
`484`	`484`	`}`
`485`	`485`
	`486`	`+ public bool ShowSendToMenu`
	`487`	`+ {`
	`488`	`+ get => UserSettingsService.GeneralSettingsService.ShowSendToMenu;`
	`489`	`+ set`
	`490`	`+ {`
	`491`	`+ if (value != UserSettingsService.GeneralSettingsService.ShowSendToMenu)`
	`492`	`+ {`
	`493`	`+ UserSettingsService.GeneralSettingsService.ShowSendToMenu = value;`
	`494`	`+ OnPropertyChanged();`
	`495`	`+ }`
	`496`	`+ }`
	`497`	`+ }`
	`498`	`+`
`486`	`499`	`public bool ShowOpenInNewWindow`
`487`	`500`	`{`
`488`	`501`	`get => UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow;`