merge main into here

Author: 0x5bfa

src/Files.App.BackgroundTasks/UpdateTask.cs

@@ -13,12 +13,14 @@ namespace Files.App.BackgroundTasks
 {
 	public sealed class UpdateTask : IBackgroundTask
 	{
-		public async void Run(IBackgroundTaskInstance taskInstance)
+		public async void Run(IBackgroundTaskInstance taskInstance) => await RunAsync(taskInstance);
+
+		private async Task RunAsync(IBackgroundTaskInstance taskInstance)
 		{
 			var deferral = taskInstance.GetDeferral();
 
 			// Refresh jump list to update string resources
-			try { await RefreshJumpList(); } catch { }
+			try { await RefreshJumpListAsync(); } catch { }
 
 			// Delete previous version log files
 			try { DeleteLogFiles(); } catch { }
@@ -32,7 +34,7 @@ private void DeleteLogFiles()
 			File.Delete(Path.Combine(ApplicationData.Current.LocalFolder.Path, "debug_fulltrust.log"));
 		}
 
-		private async Task RefreshJumpList()
+		private async Task RefreshJumpListAsync()
 		{
 			if (JumpList.IsSupported())
 			{

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

@@ -23,7 +23,7 @@ public DecompressArchive()
 
 		public override Task ExecuteAsync()
 		{
-			return DecompressHelper.DecompressArchive(context.ShellPage);
+			return DecompressHelper.DecompressArchiveAsync(context.ShellPage);
 		}
 
 		protected override bool CanDecompressInsideArchive()

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

@@ -17,7 +17,7 @@ public DecompressArchiveHere()
 
 		public override Task ExecuteAsync()
 		{
-			return DecompressHelper.DecompressArchiveHere(context.ShellPage);
+			return DecompressHelper.DecompressArchiveHereAsync(context.ShellPage);
 		}
 	}
 }

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

@@ -17,7 +17,7 @@ public DecompressArchiveToChildFolderAction()
 
 		public override Task ExecuteAsync()
 		{
-			return DecompressHelper.DecompressArchiveToChildFolder(context.ShellPage);
+			return DecompressHelper.DecompressArchiveToChildFolderAsync(context.ShellPage);
 		}
 
 		protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Actions/Content/Background/SetAsLockscreenBackgroundAction.cs

@@ -21,7 +21,7 @@ public override RichGlyph Glyph
 		public override Task ExecuteAsync()
 		{
 			if (context.SelectedItem is not null)
-				WallpaperHelpers.SetAsBackground(WallpaperType.LockScreen, context.SelectedItem.ItemPath);
+				WallpaperHelpers.SetAsBackgroundAsync(WallpaperType.LockScreen, context.SelectedItem.ItemPath);
 
 			return Task.CompletedTask;
 		}

src/Files.App/Actions/Content/Background/SetAsWallpaperBackgroundAction.cs

@@ -21,7 +21,7 @@ public override RichGlyph Glyph
 		public override Task ExecuteAsync()
 		{
 			if (context.SelectedItem is not null)
-				WallpaperHelpers.SetAsBackground(WallpaperType.Desktop, context.SelectedItem.ItemPath);
+				WallpaperHelpers.SetAsBackgroundAsync(WallpaperType.Desktop, context.SelectedItem.ItemPath);
 
 			return Task.CompletedTask;
 		}

src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs

@@ -34,11 +34,11 @@ public BaseRotateAction()
 		public async Task ExecuteAsync()
 		{
 			foreach (var image in context.SelectedItems)
-				await BitmapHelper.Rotate(PathNormalization.NormalizePath(image.ItemPath), Rotation);
+				await BitmapHelper.RotateAsync(PathNormalization.NormalizePath(image.ItemPath), Rotation);
 
 			context.ShellPage?.SlimContentPage?.ItemManipulationModel?.RefreshItemsThumbnail();
 
-			await _previewPaneViewModel.UpdateSelectedItemPreview();
+			await _previewPaneViewModel.UpdateSelectedItemPreviewAsync();
 		}
 
 		private bool IsContextPageTypeAdaptedToCommand()

src/Files.App/Actions/Content/PlayAllAction.cs

@@ -32,7 +32,7 @@ public PlayAllAction()
 
 		public Task ExecuteAsync()
 		{
-			return NavigationHelpers.OpenSelectedItems(context.ShellPage!);
+			return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage!);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Actions/Content/PreviewPopup/LaunchPreviewPopupAction.cs

@@ -37,18 +37,18 @@ public async Task ExecuteAsync()
 			if (provider is null)
 				return;
 
-			await provider.TogglePreviewPopup(context.SelectedItem!.ItemPath);
+			await provider.TogglePreviewPopupAsync(context.SelectedItem!.ItemPath);
 		}
 
-		private async Task SwitchPopupPreview()
+		private async Task SwitchPopupPreviewAsync()
 		{
 			if (IsExecutable)
 			{
 				var provider = await previewPopupService.GetProviderAsync();
 				if (provider is null)
 					return;
 
-				await provider.SwitchPreview(context.SelectedItem!.ItemPath);
+				await provider.SwitchPreviewAsync(context.SelectedItem!.ItemPath);
 			}
 		}
 
@@ -58,7 +58,7 @@ public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 			{
 				case nameof(IContentPageContext.SelectedItems):
 					OnPropertyChanged(nameof(IsExecutable));
-					var _ = SwitchPopupPreview();
+					var _ = SwitchPopupPreviewAsync();
 					break;
 			}
 		}

src/Files.App/Actions/Content/RefreshItemsAction.cs

@@ -34,7 +34,7 @@ public RefreshItemsAction()
 
 		public async Task ExecuteAsync()
 		{
-			context.ShellPage?.Refresh_Click();
+			context.ShellPage?.Refresh_ClickAsync();
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Actions/Favorites/PinItemAction.cs

@@ -40,11 +40,11 @@ public async Task ExecuteAsync()
 			{
 				var items = context.SelectedItems.Select(x => x.ItemPath).ToArray();
 
-				await service.PinToSidebar(items);
+				await service.PinToSidebarAsync(items);
 			}
 			else if (context.Folder is not null)
 			{
-				await service.PinToSidebar(context.Folder.ItemPath);
+				await service.PinToSidebarAsync(context.Folder.ItemPath);
 			}
 		}
 

src/Files.App/Actions/Favorites/UnpinItemAction.cs

@@ -38,11 +38,11 @@ public async Task ExecuteAsync()
 			if (context.HasSelection)
 			{
 				var items = context.SelectedItems.Select(x => x.ItemPath).ToArray();
-				await service.UnpinFromSidebar(items);
+				await service.UnpinFromSidebarAsync(items);
 			}
 			else if (context.Folder is not null)
 			{
-				await service.UnpinFromSidebar(context.Folder.ItemPath);
+				await service.UnpinFromSidebarAsync(context.Folder.ItemPath);
 			}
 		}
 

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

@@ -41,7 +41,7 @@ public async Task ExecuteAsync()
 			}
 			else if (viewModel.ResultType.ItemType != AddItemDialogItemType.Cancel)
 			{
-				await UIFilesystemHelpers.CreateFileFromDialogResultType(
+				await UIFilesystemHelpers.CreateFileFromDialogResultTypeAsync(
 					viewModel.ResultType.ItemType,
 					viewModel.ResultType.ItemInfo,
 					context.ShellPage!);

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

@@ -24,7 +24,7 @@ public BaseDeleteAction()
 			context.PropertyChanged += Context_PropertyChanged;
 		}
 
-		protected async Task DeleteItems(bool permanently)
+		protected async Task DeleteItemsAsync(bool permanently)
 		{
 			var items =
 				context.SelectedItems.Select(item =>

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

@@ -32,7 +32,7 @@ public CopyItemAction()
 		public Task ExecuteAsync()
 		{
 			if (context.ShellPage is not null)
-				return UIFilesystemHelpers.CopyItem(context.ShellPage);
+				return UIFilesystemHelpers.CopyItemAsync(context.ShellPage);
 
 			return Task.CompletedTask;
 		}

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

@@ -30,8 +30,8 @@ public Task ExecuteAsync()
 		{
 			if (context.ShellPage?.SlimContentPage is not null)
 			{
-				var path = context.ShellPage.SlimContentPage.SelectedItem is not null
-					? context.ShellPage.SlimContentPage.SelectedItem.ItemPath
+				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;
 
 				if (FtpHelpers.IsFtpPath(path))

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

@@ -33,7 +33,7 @@ public CreateFolderAction()
 		public Task ExecuteAsync()
 		{
 			if (context.ShellPage is not null)
-				UIFilesystemHelpers.CreateFileFromDialogResultType(AddItemDialogItemType.Folder, null!, context.ShellPage);
+				UIFilesystemHelpers.CreateFileFromDialogResultTypeAsync(AddItemDialogItemType.Folder, null!, context.ShellPage);
 
 			return Task.CompletedTask;
 		}

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

@@ -32,7 +32,7 @@ public CutItemAction()
 		public Task ExecuteAsync()
 		{
 			return context.ShellPage is not null
-				? UIFilesystemHelpers.CutItem(context.ShellPage)
+				? UIFilesystemHelpers.CutItemAsync(context.ShellPage)
 				: Task.CompletedTask;
 		}
 

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

@@ -22,7 +22,7 @@ public HotKey SecondHotKey
 
 		public Task ExecuteAsync()
 		{
-			return DeleteItems(false);
+			return DeleteItemsAsync(false);
 		}
 	}
 }

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

@@ -16,7 +16,7 @@ public HotKey HotKey
 
 		public Task ExecuteAsync()
 		{
-			return DeleteItems(true);
+			return DeleteItemsAsync(true);
 		}
 	}
 }

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

@@ -30,7 +30,7 @@ public EmptyRecycleBinAction()
 
 		public async Task ExecuteAsync()
 		{
-			await RecycleBinHelpers.EmptyRecycleBin();
+			await RecycleBinHelpers.EmptyRecycleBinAsync();
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

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

@@ -39,7 +39,7 @@ public OpenItemAction()
 
 		public Task ExecuteAsync()
 		{
-			return NavigationHelpers.OpenSelectedItems(context.ShellPage);
+			return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -77,7 +77,7 @@ public OpenItemWithApplicationPickerAction()
 
 		public Task ExecuteAsync()
 		{
-			return NavigationHelpers.OpenSelectedItems(context.ShellPage, true);
+			return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage, true);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

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

@@ -20,7 +20,7 @@ public RichGlyph Glyph
 
 		public async Task ExecuteAsync()
 		{
-			await RecycleBinHelpers.RestoreRecycleBin();
+			await RecycleBinHelpers.RestoreRecycleBinAsync();
 		}
 	}
 }

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

@@ -31,7 +31,7 @@ public RestoreRecycleBinAction()
 		public async Task ExecuteAsync()
 		{
 			if (context.ShellPage is not null)
-				await RecycleBinHelpers.RestoreSelectionRecycleBin(context.ShellPage);
+				await RecycleBinHelpers.RestoreSelectionRecycleBinAsync(context.ShellPage);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Actions/Git/GitInitAction.cs

@@ -27,7 +27,7 @@ public GitInitAction()
 
 		public Task ExecuteAsync()
 		{
-			return GitHelpers.InitializeRepository(_context.Folder?.ItemPath);
+			return GitHelpers.InitializeRepositoryAsync(_context.Folder?.ItemPath);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Actions/Git/GitPullAction.cs

@@ -28,7 +28,7 @@ public GitPullAction()
 
 		public Task ExecuteAsync()
 		{
-			return GitHelpers.PullOrigin(_context.ShellPage!.InstanceViewModel.GitRepositoryPath);
+			return GitHelpers.PullOriginAsync(_context.ShellPage!.InstanceViewModel.GitRepositoryPath);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/Actions/Git/GitPushAction.cs

@@ -25,7 +25,7 @@ public GitPushAction()
 
 		public Task ExecuteAsync()
 		{
-			return GitHelpers.PushToOrigin(
+			return GitHelpers.PushToOriginAsync(
 				_context.ShellPage?.InstanceViewModel.GitRepositoryPath,
 				_context.ShellPage?.InstanceViewModel.GitBranchName);
 		}

src/Files.App/Actions/Git/GitSyncAction.cs

@@ -27,8 +27,8 @@ public Task ExecuteAsync()
 		{
 			var instance = _context.ShellPage?.InstanceViewModel;
 
-			return GitHelpers.PullOrigin(instance?.GitRepositoryPath)
-				.ContinueWith(t => GitHelpers.PushToOrigin(
+			return GitHelpers.PullOriginAsync(instance?.GitRepositoryPath)
+				.ContinueWith(t => GitHelpers.PushToOriginAsync(
 					instance?.GitRepositoryPath,
 					instance?.GitBranchName));
 		}

src/Files.App/Actions/Navigation/DuplicateCurrentTabAction.cs

@@ -27,7 +27,7 @@ public async Task ExecuteAsync()
 			if (arguments is null)
 				await mainPageViewModel.AddNewTabByPathAsync(typeof(PaneHolderPage), "Home");
 			else
-				await mainPageViewModel.AddNewTabByParam(arguments.InitialPageType, arguments.NavigationParameter, context.CurrentTabIndex + 1);
+				await mainPageViewModel.AddNewTabByParamAsync(arguments.InitialPageType, arguments.NavigationParameter, context.CurrentTabIndex + 1);
 		}
 	}
 }

src/Files.App/Actions/Navigation/DuplicateSelectedTabAction.cs

@@ -30,7 +30,7 @@ public async Task ExecuteAsync()
 			if (arguments is null)
 				await mainPageViewModel.AddNewTabByPathAsync(typeof(PaneHolderPage), "Home");
 			else
-				await mainPageViewModel.AddNewTabByParam(arguments.InitialPageType, arguments.NavigationParameter, context.SelectedTabIndex + 1);
+				await mainPageViewModel.AddNewTabByParamAsync(arguments.InitialPageType, arguments.NavigationParameter, context.SelectedTabIndex + 1);
 		}
 	}
 }

src/Files.App/Actions/Navigation/ReopenClosedTabAction.cs

@@ -33,7 +33,7 @@ public ReopenClosedTabAction()
 
 		public Task ExecuteAsync()
 		{
-			context.Control!.ReopenClosedTab();
+			context.Control!.ReopenClosedTabAsync();
 
 			return Task.CompletedTask;
 		}

src/Files.App/App.xaml

@@ -46,8 +46,8 @@
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
 
-							<Color x:Key="AppThemeFillColorAttention">#0070CB</Color>
-							<SolidColorBrush x:Key="AppThemeFillColorAttentionBrush" Color="{StaticResource AppThemeFillColorAttention}" />
+							<Color x:Key="App.Theme.FillColorAttention">#0070CB</Color>
+							<SolidColorBrush x:Key="App.Theme.FillColorAttentionBrush" Color="{StaticResource App.Theme.FillColorAttention}" />
 						</ResourceDictionary>
 						<ResourceDictionary x:Key="Dark">
 							<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
@@ -60,8 +60,8 @@
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
 
-							<Color x:Key="AppThemeFillColorAttention">#50C0FF</Color>
-							<SolidColorBrush x:Key="AppThemeFillColorAttentionBrush" Color="{StaticResource AppThemeFillColorAttention}" />
+							<Color x:Key="App.Theme.FillColorAttention">#50C0FF</Color>
+							<SolidColorBrush x:Key="App.Theme.FillColorAttentionBrush" Color="{StaticResource App.Theme.FillColorAttention}" />
 						</ResourceDictionary>
 						<ResourceDictionary x:Key="HighContrast">
 							<SolidColorBrush x:Key="App.Theme.BackgroundBrush" Color="Transparent" />
@@ -74,8 +74,8 @@
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
 							<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
 
-							<Color x:Key="AppThemeFillColorAttention">#50C0FF</Color>
-							<SolidColorBrush x:Key="AppThemeFillColorAttentionBrush" Color="{StaticResource AppThemeFillColorAttention}" />
+							<Color x:Key="App.Theme.FillColorAttention">#50C0FF</Color>
+							<SolidColorBrush x:Key="App.Theme.FillColorAttentionBrush" Color="{StaticResource App.Theme.FillColorAttention}" />
 						</ResourceDictionary>
 					</ResourceDictionary.ThemeDictionaries>
 				</ResourceDictionary>