Merge branch 'main' into terminal

Author: yaira2

src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs

@@ -35,7 +35,7 @@ protected void GetDestination(out string[] sources, out string directory, out st
 			if (sources.Length is not 0)
 			{
 				// Get the current directory path
-				directory = context.ShellPage.FilesystemViewModel.WorkingDirectory.Normalize();
+				directory = context.ShellPage.ShellViewModel.WorkingDirectory.Normalize();
 
 				// Get the library save folder if the folder is library item
 				if (App.LibraryManager.TryGetLibrary(directory, out var library) && !library.IsEmpty)

src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs

@@ -55,7 +55,7 @@ protected async Task DecompressArchiveHereAsync(bool smart = false)
 			{
 				var password = string.Empty;
 				BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
-				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(context.ShellPage?.FilesystemViewModel.CurrentFolder?.ItemPath ?? string.Empty);
+				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(context.ShellPage?.ShellViewModel.CurrentFolder?.ItemPath ?? string.Empty);
 
 				if (archive?.Path is null)
 					return;

src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs

@@ -31,7 +31,7 @@ public override async Task ExecuteAsync(object? parameter = null)
 				var password = string.Empty;
 
 				BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
-				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(context.ShellPage?.FilesystemViewModel.CurrentFolder.ItemPath);
+				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(context.ShellPage?.ShellViewModel.CurrentFolder.ItemPath);
 				BaseStorageFolder destinationFolder = null;
 
 				if (archive?.Path is null)

src/Files.App/Actions/Content/Selection/SelectAllAction.cs

@@ -30,7 +30,7 @@ public bool IsExecutable
 				if (page is null)
 					return false;
 
-				int itemCount = page.FilesystemViewModel.FilesAndFolders.Count;
+				int itemCount = page.ShellViewModel.FilesAndFolders.Count;
 				int selectedItemCount = context.SelectedItems.Count;
 				if (itemCount == selectedItemCount)
 					return false;

src/Files.App/Actions/FileSystem/BaseDeleteAction.cs

@@ -37,7 +37,7 @@ item.PrimaryItemAttribute is StorageItemTypes.File
 			if (context.ShellPage is IShellPage shellPage)
 			{
 				await shellPage.FilesystemHelpers.DeleteItemsAsync(items, settings.DeleteConfirmationPolicy, permanently, true);
-				await shellPage.FilesystemViewModel.ApplyFilesAndFoldersChangesAsync();
+				await shellPage.ShellViewModel.ApplyFilesAndFoldersChangesAsync();
 			}
 		}
 

src/Files.App/Actions/FileSystem/CopyPathAction.cs

@@ -35,7 +35,7 @@ public Task ExecuteAsync(object? parameter = null)
 			{
 				var path = context.ShellPage.SlimContentPage.SelectedItems is not null
 					? context.ShellPage.SlimContentPage.SelectedItems.Select(x => x.ItemPath).Aggregate((accum, current) => accum + "\n" + current)
-					: context.ShellPage.FilesystemViewModel.WorkingDirectory;
+					: context.ShellPage.ShellViewModel.WorkingDirectory;
 
 				if (FtpHelpers.IsFtpPath(path))
 					path = path.Replace("\\", "/", StringComparison.Ordinal);

src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs

@@ -36,7 +36,7 @@ public Task ExecuteAsync(object? parameter = null)
 				var selectedItems = context.ShellPage.SlimContentPage.SelectedItems;
 				var path = selectedItems is not null
 					? string.Join("\n", selectedItems.Select(item => $"\"{item.ItemPath}\""))
-					: context.ShellPage.FilesystemViewModel.WorkingDirectory;
+					: context.ShellPage.ShellViewModel.WorkingDirectory;
 
 				if (FtpHelpers.IsFtpPath(path))
 					path = path.Replace("\\", "/", StringComparison.Ordinal);

src/Files.App/Actions/FileSystem/OpenFileLocationAction.cs

@@ -32,7 +32,7 @@ public OpenFileLocationAction()
 
 		public async Task ExecuteAsync(object? parameter = null)
 		{
-			if (context.ShellPage?.FilesystemViewModel is null)
+			if (context.ShellPage?.ShellViewModel is null)
 				return;
 
 			var item = context.SelectedItem as ShortcutItem;
@@ -42,7 +42,7 @@ public async Task ExecuteAsync(object? parameter = null)
 
 			// Check if destination path exists
 			var folderPath = Path.GetDirectoryName(item.TargetPath);
-			var destFolder = await context.ShellPage.FilesystemViewModel.GetFolderWithPathFromPathAsync(folderPath);
+			var destFolder = await context.ShellPage.ShellViewModel.GetFolderWithPathFromPathAsync(folderPath);
 
 			if (destFolder)
 			{

src/Files.App/Actions/FileSystem/PasteItemAction.cs

@@ -43,7 +43,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			if (context.ShellPage is null)
 				return;
 
-			string path = context.ShellPage.FilesystemViewModel.WorkingDirectory;
+			string path = context.ShellPage.ShellViewModel.WorkingDirectory;
 			await UIFilesystemHelpers.PasteItemAsync(path, context.ShellPage);
 		}
 

src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs

@@ -37,7 +37,7 @@ public async Task ExecuteAsync(object? parameter = null)
 
 			string path = context.SelectedItem is ListedItem selectedItem
 				? selectedItem.ItemPath
-				: context.ShellPage.FilesystemViewModel.WorkingDirectory;
+				: context.ShellPage.ShellViewModel.WorkingDirectory;
 
 			await UIFilesystemHelpers.PasteItemAsync(path, context.ShellPage);
 		}