Feature: Added option to show check boxes next to file names (#11017)

Author: marcelwgn

src/Files.App/DataModels/AppModel.cs

@@ -1,6 +1,9 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Files.App.ServicesImplementation.Settings;
 using Files.App.ViewModels;
 using Files.App.Views;
+using Files.Backend.Services.Settings;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using System;
@@ -11,14 +14,32 @@ namespace Files.App.DataModels
 {
 	public class AppModel : ObservableObject
 	{
+		private IFoldersSettingsService FoldersSettings;
+
+		public bool ShowSelectionCheckboxes
+		{
+			get => FoldersSettings.ShowSelectionCheckboxes;
+			set => FoldersSettings.ShowSelectionCheckboxes = value;
+		}
+
 		public AppModel()
 		{
+			FoldersSettings = Ioc.Default.GetRequiredService<IUserSettingsService>().FoldersSettingsService;
+			FoldersSettings.PropertyChanged += FoldersSettings_PropertyChanged; ;
 			Clipboard.ContentChanged += Clipboard_ContentChanged;
 
 			//todo: this doesn't belong here
 			DetectFontName();
 		}
 
+		private void FoldersSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == nameof(FoldersSettingsService.ShowSelectionCheckboxes))
+			{
+				OnPropertyChanged(nameof(ShowSelectionCheckboxes));
+			}
+		}
+
 		//todo: refactor this method
 		public void Clipboard_ContentChanged(object sender, object e)
 		{
@@ -70,13 +91,6 @@ public bool IsPasteEnabled
 			set => SetProperty(ref isPasteEnabled, value);
 		}
 
-		private bool multiselectEnabled;
-		public bool MultiselectEnabled
-		{
-			get => multiselectEnabled;
-			set => SetProperty(ref multiselectEnabled, value);
-		}
-
 		private bool isQuickLookAvailable;
 		public bool IsQuickLookAvailable
 		{

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

@@ -20,6 +20,12 @@ public bool EnableOverridingFolderPreferences
 			set => Set(value);
 		}
 
+		public bool ShowSelectionCheckboxes
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
 		public FolderLayoutModes DefaultLayoutMode
 		{
 			get => (FolderLayoutModes)Get((long)FolderLayoutModes.Adaptive);
@@ -273,6 +279,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(ShowThumbnails):
 				case nameof(ShowConfirmDeleteDialog):
 				case nameof(SelectFilesOnHover):
+				case nameof(ShowSelectionCheckboxes):
 					Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
 					break;
 			}

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

@@ -1425,8 +1425,8 @@
   <data name="CloudDriveSyncStatus_Unknown" xml:space="preserve">
     <value>Unknown</value>
   </data>
-  <data name="NavToolbarMultiselect.Text" xml:space="preserve">
-    <value>Multiselect</value>
+  <data name="SettingsCheckboxesToSelectItems" xml:space="preserve">
+    <value>Show selection checkbox next to file names</value>
   </data>
   <data name="RenameFileDialog.Text" xml:space="preserve">
     <value>If you change a file extension, the file might become unusable. Are you sure you want to change it?</value>

src/Files.App/UserControls/InnerNavigationToolbar.xaml

@@ -423,14 +423,6 @@
 				ToolTipService.ToolTip="{helpers:ResourceString Name=NavToolbarSelectionOptions/ToolTipService/ToolTip}">
 				<AppBarButton.Flyout>
 					<MenuFlyout Placement="Bottom">
-						<ToggleMenuFlyoutItem
-							x:Name="MultiselectMFI"
-							IsChecked="{x:Bind AppModel.MultiselectEnabled, Mode=TwoWay}"
-							Text="{helpers:ResourceString Name=NavToolbarMultiselect/Text}">
-							<MenuFlyoutItem.Icon>
-								<FontIcon Glyph="&#xE762;" />
-							</MenuFlyoutItem.Icon>
-						</ToggleMenuFlyoutItem>
 						<MenuFlyoutItem
 							x:Name="SelectAllMFI"
 							Command="{x:Bind ViewModel.SelectAllContentPageItemsCommand, Mode=OneWay}"

src/Files.App/UserControls/Selection/RectangleSelection_ListViewBase.cs

@@ -64,6 +64,8 @@ private void RectangleSelection_PointerMoved(object sender, PointerRoutedEventAr
 				// Selected area considering scrolled offset
 				var rect = new System.Drawing.Rectangle((int)Canvas.GetLeft(selectionRectangle), (int)Math.Min(originDragPoint.Y, currentPoint.Position.Y + verticalOffset), (int)selectionRectangle.Width, (int)Math.Abs(originDragPoint.Y - (currentPoint.Position.Y + verticalOffset)));
 
+				var selectedItemsBeforeChange = uiElement.SelectedItems.ToArray();
+
 				foreach (var item in itemsPosition.ToList())
 				{
 					try
@@ -102,7 +104,8 @@ private void RectangleSelection_PointerMoved(object sender, PointerRoutedEventAr
 					if (prevSelectedItemsDrag is null || !prevSelectedItemsDrag.SequenceEqual(currentSelectedItemsDrag))
 					{
 						// Trigger SelectionChanged event if the selection has changed
-						selectionChanged(sender, null);
+						var removedItems = selectedItemsBeforeChange.Except(currentSelectedItemsDrag).ToList();
+						selectionChanged(sender, new SelectionChangedEventArgs(removedItems, currentSelectedItemsDrag));
 						prevSelectedItemsDrag = currentSelectedItemsDrag;
 					}
 				}

src/Files.App/ViewModels/SettingsViewModels/FoldersViewModel.cs

@@ -129,6 +129,20 @@ public bool ShowDateColumn
 				}
 			}
 		}
+
+		public bool ShowSelectionCheckboxes
+		{
+			get => UserSettingsService.FoldersSettingsService.ShowSelectionCheckboxes;
+			set
+			{
+				if (value != UserSettingsService.FoldersSettingsService.ShowSelectionCheckboxes)
+				{
+					UserSettingsService.FoldersSettingsService.ShowSelectionCheckboxes = value;
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		public FolderLayoutModes DefaultLayoutMode
 		{
 			get => UserSettingsService.FoldersSettingsService.DefaultLayoutMode;

src/Files.App/Views/LayoutModes/ColumnViewBase.xaml

@@ -166,7 +166,7 @@
 					RightTapped="FileList_RightTapped"
 					ScrollViewer.IsScrollInertiaEnabled="True"
 					SelectionChanged="FileList_SelectionChanged"
-					SelectionMode="{x:Bind AppModel.MultiselectEnabled, Mode=OneWay, Converter={StaticResource BoolToSelectionModeConverter}}"
+					SelectionMode="Extended"
 					Tapped="FileList_ItemTapped">
 
 					<ListView.ItemContainerTransitions>