Code Quality: Properly dispose events in layout pages (#17437)

Author: yaira2

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

@@ -37,6 +37,8 @@ public sealed partial class DetailsLayoutPage : BaseGroupableLayoutPage
 		/// </summary>
 		private uint currentIconSize;
 
+		private RectangleSelection? _rectangleSelection;
+
 		// Properties
 
 		protected override ListViewBase ListViewBase => FileList;
@@ -77,8 +79,8 @@ public DetailsLayoutPage() : base()
 		{
 			InitializeComponent();
 			DataContext = this;
-			var selectionRectangle = RectangleSelection.Create(FileList, SelectionRectangle, FileList_SelectionChanged);
-			selectionRectangle.SelectionEnded += SelectionRectangle_SelectionEnded;
+			_rectangleSelection = RectangleSelection.Create(FileList, SelectionRectangle, FileList_SelectionChanged);
+			_rectangleSelection.SelectionEnded += SelectionRectangle_SelectionEnded;
 
 			UpdateSortOptionsCommand = new RelayCommand<string>(x =>
 			{
@@ -202,6 +204,11 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 			FolderSettings.SortOptionPreferenceUpdated -= FolderSettings_SortOptionPreferenceUpdated;
 			ParentShellPageInstance.ShellViewModel.PageTypeUpdated -= FilesystemViewModel_PageTypeUpdated;
 			UserSettingsService.LayoutSettingsService.PropertyChanged -= LayoutSettingsService_PropertyChanged;
+			if (_rectangleSelection is not null)
+			{
+				_rectangleSelection.SelectionEnded -= SelectionRectangle_SelectionEnded;
+				_rectangleSelection = null;
+			}
 		}
 
 		private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -1053,4 +1060,4 @@ private static GitProperties GetEnabledGitProperties(ColumnsViewModel columnsVie
 			};
 		}
 	}
-}
+}

src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

@@ -31,6 +31,8 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage
 
 		private volatile bool shouldSetVerticalScrollMode;
 
+		private RectangleSelection? _rectangleSelection;
+
 		// Properties
 
 		public ScrollViewer? ContentScroller { get; private set; }
@@ -149,8 +151,8 @@ public GridLayoutPage() : base()
 			InitializeComponent();
 			DataContext = this;
 
-			var selectionRectangle = RectangleSelection.Create(ListViewBase, SelectionRectangle, FileList_SelectionChanged);
-			selectionRectangle.SelectionEnded += SelectionRectangle_SelectionEnded;
+			_rectangleSelection = RectangleSelection.Create(ListViewBase, SelectionRectangle, FileList_SelectionChanged);
+			_rectangleSelection.SelectionEnded += SelectionRectangle_SelectionEnded;
 		}
 
 		// Methods
@@ -222,6 +224,12 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 				FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
 
 			UserSettingsService.LayoutSettingsService.PropertyChanged -= LayoutSettingsService_PropertyChanged;
+
+			if (_rectangleSelection is not null)
+			{
+				_rectangleSelection.SelectionEnded -= SelectionRectangle_SelectionEnded;
+				_rectangleSelection = null;
+			}
 		}
 
 		private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -827,4 +835,4 @@ private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
 			}
 		}
 	}
-}
+}