diff --git a/src/Files.App (Package)/Package.appxmanifest b/src/Files.App (Package)/Package.appxmanifest index baa16eb56734..8c8ac739b25a 100644 --- a/src/Files.App (Package)/Package.appxmanifest +++ b/src/Files.App (Package)/Package.appxmanifest @@ -16,7 +16,7 @@ + Version="2.5.22.0" /> Files - Dev diff --git a/src/Files.App.Storage/NativeStorage/NativeFile.cs b/src/Files.App.Storage/NativeStorage/NativeFile.cs index a22e9b6eab57..bb8fbea713f7 100644 --- a/src/Files.App.Storage/NativeStorage/NativeFile.cs +++ b/src/Files.App.Storage/NativeStorage/NativeFile.cs @@ -15,13 +15,13 @@ namespace Files.App.Storage.NativeStorage /// public class NativeFile : NativeStorable, ILocatableFile, IModifiableFile, IFileExtended, INestedFile { - public NativeFile(FileInfo fileInfo) - : base(fileInfo) + public NativeFile(FileInfo fileInfo, string? name = null) + : base(fileInfo, name) { } - public NativeFile(string path) - : this(new FileInfo(path)) + public NativeFile(string path, string? name = null) + : this(new FileInfo(path), name) { } diff --git a/src/Files.App.Storage/NativeStorage/NativeFolder.cs b/src/Files.App.Storage/NativeStorage/NativeFolder.cs index fedea9a05bfb..d59f2e02ef49 100644 --- a/src/Files.App.Storage/NativeStorage/NativeFolder.cs +++ b/src/Files.App.Storage/NativeStorage/NativeFolder.cs @@ -22,13 +22,13 @@ namespace Files.App.Storage.NativeStorage /// public class NativeFolder : NativeStorable, ILocatableFolder, IModifiableFolder, IMutableFolder, IFolderExtended, INestedFolder, IDirectCopy, IDirectMove { - public NativeFolder(DirectoryInfo directoryInfo) - : base(directoryInfo) + public NativeFolder(DirectoryInfo directoryInfo, string? name = null) + : base(directoryInfo, name) { } - public NativeFolder(string path) - : this(new DirectoryInfo(path)) + public NativeFolder(string path, string? name = null) + : this(new DirectoryInfo(path), name) { } diff --git a/src/Files.App.Storage/NativeStorage/NativeStorable.cs b/src/Files.App.Storage/NativeStorage/NativeStorable.cs index 1a8fbcc3ca7a..966dc97d3d32 100644 --- a/src/Files.App.Storage/NativeStorage/NativeStorable.cs +++ b/src/Files.App.Storage/NativeStorage/NativeStorable.cs @@ -17,19 +17,19 @@ public abstract class NativeStorable : ILocatableStorable, INestedStor protected readonly TStorage storage; /// - public virtual string Path { get; protected set; } + public string Path { get; protected set; } /// - public virtual string Name { get; protected set; } + public string Name { get; protected set; } /// public virtual string Id { get; } - protected NativeStorable(TStorage storage) + protected NativeStorable(TStorage storage, string? name = null) { this.storage = storage; Path = storage.FullName; - Name = storage.Name; + Name = name ?? storage.Name; Id = storage.FullName; } diff --git a/src/Files.App.Storage/NativeStorage/NativeStorageService.cs b/src/Files.App.Storage/NativeStorage/NativeStorageService.cs index 7e2326325dce..5812862ba8a9 100644 --- a/src/Files.App.Storage/NativeStorage/NativeStorageService.cs +++ b/src/Files.App.Storage/NativeStorage/NativeStorageService.cs @@ -2,10 +2,12 @@ // Licensed under the MIT License. See the LICENSE. using Files.Core.Storage; -using Files.Core.Storage.LocatableStorage; +using Files.Shared.Helpers; +using System; using System.IO; using System.Threading; using System.Threading.Tasks; +using Windows.Storage; namespace Files.App.Storage.NativeStorage { @@ -22,12 +24,31 @@ public Task GetFileAsync(string id, CancellationToken cancellationToken = } /// - public Task GetFolderAsync(string id, CancellationToken cancellationToken = default) + public async Task GetFolderAsync(string id, CancellationToken cancellationToken = default) { if (!Directory.Exists(id)) throw new DirectoryNotFoundException(); - return Task.FromResult(new NativeFolder(id)); + // A special folder should use the localized name + if (PathHelpers.IsSpecialFolder(id)) + { + var storageFolder = await TryGetStorageFolderAsync(id); + return new NativeFolder(id, storageFolder?.DisplayName); + } + + return new NativeFolder(id); + + async Task TryGetStorageFolderAsync(string path) + { + try + { + return await StorageFolder.GetFolderFromPathAsync(path); + } + catch (Exception) + { + return null; + } + } } } } diff --git a/src/Files.App/Actions/Content/Archives/DecompressArchiveHere.cs b/src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs similarity index 65% rename from src/Files.App/Actions/Content/Archives/DecompressArchiveHere.cs rename to src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs index 765a6698e2d0..e9e4cb06d6ba 100644 --- a/src/Files.App/Actions/Content/Archives/DecompressArchiveHere.cs +++ b/src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs @@ -3,32 +3,27 @@ namespace Files.App.Actions { - internal class DecompressArchiveHere : BaseUIAction, IAction + internal abstract class BaseCompressArchiveAction : BaseUIAction, IAction { - private readonly IContentPageContext context; + protected readonly IContentPageContext context; - public string Label - => "ExtractHere".GetLocalizedResource(); + public abstract string Label { get; } - public string Description - => "DecompressArchiveHereDescription".GetLocalizedResource(); + public abstract string Description { get; } public override bool IsExecutable => IsContextPageTypeAdaptedToCommand() && - ArchiveHelpers.CanDecompress(context.SelectedItems) && + ArchiveHelpers.CanCompress(context.SelectedItems) && UIHelpers.CanShowDialog; - public DecompressArchiveHere() + public BaseCompressArchiveAction() { context = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() - { - return ArchiveHelpers.DecompressArchiveHere(context.ShellPage); - } + public abstract Task ExecuteAsync(); private bool IsContextPageTypeAdaptedToCommand() { diff --git a/src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs new file mode 100644 index 000000000000..9455c0b42a15 --- /dev/null +++ b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoArchiveAction.cs @@ -0,0 +1,49 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Files.App.Dialogs; +using Microsoft.UI.Xaml.Controls; + +namespace Files.App.Actions +{ + internal sealed class CompressIntoArchiveAction : BaseCompressArchiveAction + { + public override string Label + => "CreateArchive".GetLocalizedResource(); + + public override string Description + => "CompressIntoArchiveDescription".GetLocalizedResource(); + + public CompressIntoArchiveAction() + { + } + + public override async Task ExecuteAsync() + { + var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage); + + var dialog = new CreateArchiveDialog + { + FileName = fileName, + }; + + var result = await dialog.TryShowAsync(); + + if (!dialog.CanCreate || result != ContentDialogResult.Primary) + return; + + IArchiveCreator creator = new ArchiveCreator + { + Sources = sources, + Directory = directory, + FileName = dialog.FileName, + Password = dialog.Password, + FileFormat = dialog.FileFormat, + CompressionLevel = dialog.CompressionLevel, + SplittingSize = dialog.SplittingSize, + }; + + await ArchiveHelpers.CompressArchiveAsync(creator); + } + } +} diff --git a/src/Files.App/Actions/Content/Archives/Compress/CompressIntoSevenZipAction.cs b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoSevenZipAction.cs new file mode 100644 index 000000000000..7f4a79e79819 --- /dev/null +++ b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoSevenZipAction.cs @@ -0,0 +1,33 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.App.Actions +{ + internal sealed class CompressIntoSevenZipAction : BaseCompressArchiveAction + { + public override string Label + => string.Format("CreateNamedArchive".GetLocalizedResource(), $"{ArchiveHelpers.DetermineArchiveNameFromSelection(context.SelectedItems)}.7z"); + + public override string Description + => "CompressIntoSevenZipDescription".GetLocalizedResource(); + + public CompressIntoSevenZipAction() + { + } + + public override Task ExecuteAsync() + { + var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage); + + IArchiveCreator creator = new ArchiveCreator + { + Sources = sources, + Directory = directory, + FileName = fileName, + FileFormat = ArchiveFormats.SevenZip, + }; + + return ArchiveHelpers.CompressArchiveAsync(creator); + } + } +} diff --git a/src/Files.App/Actions/Content/Archives/Compress/CompressIntoZipAction.cs b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoZipAction.cs new file mode 100644 index 000000000000..6c473f7beb82 --- /dev/null +++ b/src/Files.App/Actions/Content/Archives/Compress/CompressIntoZipAction.cs @@ -0,0 +1,33 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.App.Actions +{ + internal sealed class CompressIntoZipAction : BaseCompressArchiveAction + { + public override string Label + => string.Format("CreateNamedArchive".GetLocalizedResource(), $"{ArchiveHelpers.DetermineArchiveNameFromSelection(context.SelectedItems)}.zip"); + + public override string Description + => "CompressIntoZipDescription".GetLocalizedResource(); + + public CompressIntoZipAction() + { + } + + public override Task ExecuteAsync() + { + var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage); + + IArchiveCreator creator = new ArchiveCreator + { + Sources = sources, + Directory = directory, + FileName = fileName, + FileFormat = ArchiveFormats.Zip, + }; + + return ArchiveHelpers.CompressArchiveAsync(creator); + } + } +} diff --git a/src/Files.App/Actions/Content/Archives/CompressIntoArchiveAction.cs b/src/Files.App/Actions/Content/Archives/CompressIntoArchiveAction.cs deleted file mode 100644 index e2db95ccfc15..000000000000 --- a/src/Files.App/Actions/Content/Archives/CompressIntoArchiveAction.cs +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (c) 2023 Files Community -// Licensed under the MIT License. See the LICENSE. - -using Files.App.Dialogs; -using Files.App.Utils.Archives; -using Microsoft.UI.Xaml.Controls; - -namespace Files.App.Actions -{ - internal class CompressIntoArchiveAction : BaseUIAction, IAction - { - private readonly IContentPageContext context; - - public string Label - => "CreateArchive".GetLocalizedResource(); - - public string Description - => "CompressIntoArchiveDescription".GetLocalizedResource(); - - public override bool IsExecutable => - IsContextPageTypeAdaptedToCommand() && - ArchiveHelpers.CanCompress(context.SelectedItems) && - UIHelpers.CanShowDialog; - - public CompressIntoArchiveAction() - { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; - } - - public async Task ExecuteAsync() - { - var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage); - - var dialog = new CreateArchiveDialog - { - FileName = fileName, - }; - - var result = await dialog.TryShowAsync(); - - if (!dialog.CanCreate || result != ContentDialogResult.Primary) - return; - - IArchiveCreator creator = new ArchiveCreator - { - Sources = sources, - Directory = directory, - FileName = dialog.FileName, - Password = dialog.Password, - FileFormat = dialog.FileFormat, - CompressionLevel = dialog.CompressionLevel, - SplittingSize = dialog.SplittingSize, - }; - - await ArchiveHelpers.CompressArchiveAsync(creator); - } - - private bool IsContextPageTypeAdaptedToCommand() - { - return - context.PageType != ContentPageTypes.RecycleBin && - context.PageType != ContentPageTypes.ZipFolder && - context.PageType != ContentPageTypes.None; - } - - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) - { - switch (e.PropertyName) - { - case nameof(IContentPageContext.SelectedItems): - if (IsContextPageTypeAdaptedToCommand()) - OnPropertyChanged(nameof(IsExecutable)); - break; - } - } - } -} diff --git a/src/Files.App/Actions/Content/Archives/CompressIntoSevenZipAction.cs b/src/Files.App/Actions/Content/Archives/CompressIntoSevenZipAction.cs deleted file mode 100644 index a816ed9e6361..000000000000 --- a/src/Files.App/Actions/Content/Archives/CompressIntoSevenZipAction.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) 2023 Files Community -// Licensed under the MIT License. See the LICENSE. - -using Files.App.Utils.Archives; - -namespace Files.App.Actions -{ - internal class CompressIntoSevenZipAction : ObservableObject, IAction - { - private readonly IContentPageContext context; - - public string Label - => string.Format("CreateNamedArchive".GetLocalizedResource(), $"{ArchiveHelpers.DetermineArchiveNameFromSelection(context.SelectedItems)}.7z"); - - public string Description - => "CompressIntoSevenZipDescription".GetLocalizedResource(); - - public bool IsExecutable => - IsContextPageTypeAdaptedToCommand() && - ArchiveHelpers.CanCompress(context.SelectedItems); - - public CompressIntoSevenZipAction() - { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; - } - - public Task ExecuteAsync() - { - var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage); - - IArchiveCreator creator = new ArchiveCreator - { - Sources = sources, - Directory = directory, - FileName = fileName, - FileFormat = ArchiveFormats.SevenZip, - }; - - return ArchiveHelpers.CompressArchiveAsync(creator); - } - - private bool IsContextPageTypeAdaptedToCommand() - { - return - context.PageType != ContentPageTypes.RecycleBin && - context.PageType != ContentPageTypes.ZipFolder && - context.PageType != ContentPageTypes.None; - } - - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) - { - switch (e.PropertyName) - { - case nameof(IContentPageContext.SelectedItems): - if (IsContextPageTypeAdaptedToCommand()) - OnPropertyChanged(nameof(IsExecutable)); - break; - } - } - } -} diff --git a/src/Files.App/Actions/Content/Archives/CompressIntoZipAction.cs b/src/Files.App/Actions/Content/Archives/CompressIntoZipAction.cs deleted file mode 100644 index c38fae0c6af6..000000000000 --- a/src/Files.App/Actions/Content/Archives/CompressIntoZipAction.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (c) 2023 Files Community -// Licensed under the MIT License. See the LICENSE. - -using Files.App.Utils.Archives; - -namespace Files.App.Actions -{ - internal class CompressIntoZipAction : ObservableObject, IAction - { - private readonly IContentPageContext context; - - public string Label - => string.Format("CreateNamedArchive".GetLocalizedResource(), $"{ArchiveHelpers.DetermineArchiveNameFromSelection(context.SelectedItems)}.zip"); - - public string Description - => "CompressIntoZipDescription".GetLocalizedResource(); - - public bool IsExecutable => - IsContextPageTypeAdaptedToCommand() && - ArchiveHelpers.CanCompress(context.SelectedItems); - - public CompressIntoZipAction() - { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; - } - - public Task ExecuteAsync() - { - var (sources, directory, fileName) = ArchiveHelpers.GetCompressDestination(context.ShellPage); - - IArchiveCreator creator = new ArchiveCreator - { - Sources = sources, - Directory = directory, - FileName = fileName, - FileFormat = ArchiveFormats.Zip, - }; - - return ArchiveHelpers.CompressArchiveAsync(creator); - } - - private bool IsContextPageTypeAdaptedToCommand() - { - return - context.PageType != ContentPageTypes.RecycleBin && - context.PageType != ContentPageTypes.ZipFolder && - context.PageType != ContentPageTypes.None; - } - - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) - { - switch (e.PropertyName) - { - case nameof(IContentPageContext.SelectedItems): - if (IsContextPageTypeAdaptedToCommand()) - OnPropertyChanged(nameof(IsExecutable)); - break; - } - } - } -} diff --git a/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs b/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs new file mode 100644 index 000000000000..52075e7e7978 --- /dev/null +++ b/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs @@ -0,0 +1,55 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.App.Actions +{ + internal abstract class BaseDecompressArchiveAction : BaseUIAction, IAction + { + protected readonly IContentPageContext context; + + public abstract string Label { get; } + + public abstract string Description { get; } + + public virtual HotKey HotKey + => HotKey.None; + + public override bool IsExecutable => + (IsContextPageTypeAdaptedToCommand() && + ArchiveHelpers.CanDecompress(context.SelectedItems) || + CanDecompressInsideArchive()) && + UIHelpers.CanShowDialog; + + public BaseDecompressArchiveAction() + { + context = Ioc.Default.GetRequiredService(); + + context.PropertyChanged += Context_PropertyChanged; + } + + public abstract Task ExecuteAsync(); + + protected bool IsContextPageTypeAdaptedToCommand() + { + return + context.PageType != ContentPageTypes.RecycleBin && + context.PageType != ContentPageTypes.ZipFolder && + context.PageType != ContentPageTypes.None; + } + + protected virtual bool CanDecompressInsideArchive() + { + return false; + } + + protected virtual void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + { + switch (e.PropertyName) + { + case nameof(IContentPageContext.SelectedItems): + OnPropertyChanged(nameof(IsExecutable)); + break; + } + } + } +} diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs new file mode 100644 index 000000000000..62754bf93664 --- /dev/null +++ b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs @@ -0,0 +1,38 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Files.Shared.Helpers; +using System.IO; + +namespace Files.App.Actions +{ + internal sealed class DecompressArchive : BaseDecompressArchiveAction + { + public override string Label + => "ExtractFiles".GetLocalizedResource(); + + public override string Description + => "DecompressArchiveDescription".GetLocalizedResource(); + + public override HotKey HotKey + => new(Keys.E, KeyModifiers.Ctrl); + + public DecompressArchive() + { + } + + public override Task ExecuteAsync() + { + return ArchiveHelpers.DecompressArchive(context.ShellPage); + } + + protected override bool CanDecompressInsideArchive() + { + return + context.PageType == ContentPageTypes.ZipFolder && + !context.HasSelection && + context.Folder is not null && + FileExtensionHelpers.IsZipFile(Path.GetExtension(context.Folder.ItemPath)); + } + } +} diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHere.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHere.cs new file mode 100644 index 000000000000..7106d0a18bdd --- /dev/null +++ b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHere.cs @@ -0,0 +1,23 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.App.Actions +{ + internal sealed class DecompressArchiveHere : BaseDecompressArchiveAction + { + public override string Label + => "ExtractHere".GetLocalizedResource(); + + public override string Description + => "DecompressArchiveHereDescription".GetLocalizedResource(); + + public DecompressArchiveHere() + { + } + + public override Task ExecuteAsync() + { + return ArchiveHelpers.DecompressArchiveHere(context.ShellPage); + } + } +} diff --git a/src/Files.App/Actions/Content/Archives/DecompressArchiveToChildFolderAction.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs similarity index 57% rename from src/Files.App/Actions/Content/Archives/DecompressArchiveToChildFolderAction.cs rename to src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs index d1cb7d433017..7d1dbc3c4d35 100644 --- a/src/Files.App/Actions/Content/Archives/DecompressArchiveToChildFolderAction.cs +++ b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs @@ -3,52 +3,24 @@ namespace Files.App.Actions { - internal class DecompressArchiveToChildFolderAction : BaseUIAction, IAction + internal sealed class DecompressArchiveToChildFolderAction : BaseDecompressArchiveAction { - private readonly IContentPageContext context; - - public string Label + public override string Label => ComputeLabel(); - public string Description + public override string Description => "DecompressArchiveToChildFolderDescription".GetLocalizedResource(); - public override bool IsExecutable => - IsContextPageTypeAdaptedToCommand() && - ArchiveHelpers.CanDecompress(context.SelectedItems) && - UIHelpers.CanShowDialog; - public DecompressArchiveToChildFolderAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { return ArchiveHelpers.DecompressArchiveToChildFolder(context.ShellPage); } - private bool IsContextPageTypeAdaptedToCommand() - { - return - context.PageType != ContentPageTypes.RecycleBin && - context.PageType != ContentPageTypes.ZipFolder && - context.PageType != ContentPageTypes.None; - } - - private string ComputeLabel() - { - if (context.SelectedItems == null || context.SelectedItems.Count == 0) - return string.Empty; - - return context.SelectedItems.Count > 1 - ? string.Format("BaseLayoutItemContextFlyoutExtractToChildFolder".GetLocalizedResource(), "*") - : string.Format("BaseLayoutItemContextFlyoutExtractToChildFolder".GetLocalizedResource(), SystemIO.Path.GetFileNameWithoutExtension(context.SelectedItems.First().Name)); - } - - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { switch (e.PropertyName) { @@ -64,5 +36,15 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) } } } + + private string ComputeLabel() + { + if (context.SelectedItems == null || context.SelectedItems.Count == 0) + return string.Empty; + + return context.SelectedItems.Count > 1 + ? string.Format("BaseLayoutItemContextFlyoutExtractToChildFolder".GetLocalizedResource(), "*") + : string.Format("BaseLayoutItemContextFlyoutExtractToChildFolder".GetLocalizedResource(), SystemIO.Path.GetFileNameWithoutExtension(context.SelectedItems.First().Name)); + } } } diff --git a/src/Files.App/Actions/Content/Archives/DecompressArchive.cs b/src/Files.App/Actions/Content/Archives/DecompressArchive.cs deleted file mode 100644 index 23dbb1b5f816..000000000000 --- a/src/Files.App/Actions/Content/Archives/DecompressArchive.cs +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) 2023 Files Community -// Licensed under the MIT License. See the LICENSE. - -using System.IO; - -namespace Files.App.Actions -{ - internal class DecompressArchive : BaseUIAction, IAction - { - private readonly IContentPageContext context; - - public string Label - => "ExtractFiles".GetLocalizedResource(); - - public string Description - => "DecompressArchiveDescription".GetLocalizedResource(); - - public HotKey HotKey - => new(Keys.E, KeyModifiers.Ctrl); - - public override bool IsExecutable => - (IsContextPageTypeAdaptedToCommand() && - ArchiveHelpers.CanDecompress(context.SelectedItems) || - CanDecompressInsideArchive()) && - UIHelpers.CanShowDialog; - - public DecompressArchive() - { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; - } - - public Task ExecuteAsync() - { - return ArchiveHelpers.DecompressArchive(context.ShellPage); - } - - private bool IsContextPageTypeAdaptedToCommand() - { - return - context.PageType != ContentPageTypes.RecycleBin && - context.PageType != ContentPageTypes.ZipFolder && - context.PageType != ContentPageTypes.None; - } - - private bool CanDecompressInsideArchive() - { - return - context.PageType == ContentPageTypes.ZipFolder && - !context.HasSelection && - context.Folder is not null && - FileExtensionHelpers.IsZipFile(Path.GetExtension(context.Folder.ItemPath)); - } - - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) - { - switch (e.PropertyName) - { - case nameof(IContentPageContext.SelectedItems): - OnPropertyChanged(nameof(IsExecutable)); - break; - } - } - } -} diff --git a/src/Files.App/Actions/Content/Install/InstallCertificateAction.cs b/src/Files.App/Actions/Content/Install/InstallCertificateAction.cs index 1bd17ebe0476..7da225655641 100644 --- a/src/Files.App/Actions/Content/Install/InstallCertificateAction.cs +++ b/src/Files.App/Actions/Content/Install/InstallCertificateAction.cs @@ -1,7 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using Files.App.Utils.Shell; +using Files.Shared.Helpers; namespace Files.App.Actions { diff --git a/src/Files.App/Actions/Content/Install/InstallFontAction.cs b/src/Files.App/Actions/Content/Install/InstallFontAction.cs index 66a7cf8ada86..f0df08623624 100644 --- a/src/Files.App/Actions/Content/Install/InstallFontAction.cs +++ b/src/Files.App/Actions/Content/Install/InstallFontAction.cs @@ -1,7 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using Files.App.Utils.Shell; +using Files.Shared.Helpers; namespace Files.App.Actions { diff --git a/src/Files.App/Actions/Content/Install/InstallInfDriverAction.cs b/src/Files.App/Actions/Content/Install/InstallInfDriverAction.cs index 960f98d68b35..d2bbe004b551 100644 --- a/src/Files.App/Actions/Content/Install/InstallInfDriverAction.cs +++ b/src/Files.App/Actions/Content/Install/InstallInfDriverAction.cs @@ -1,7 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using Files.App.Utils.Shell; +using Files.Shared.Helpers; namespace Files.App.Actions { diff --git a/src/Files.App/Actions/Content/PlayAllAction.cs b/src/Files.App/Actions/Content/PlayAllAction.cs index 3d8a58d7f029..3fdfc3c872a8 100644 --- a/src/Files.App/Actions/Content/PlayAllAction.cs +++ b/src/Files.App/Actions/Content/PlayAllAction.cs @@ -1,6 +1,8 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; + namespace Files.App.Actions { internal class PlayAllAction : ObservableObject, IAction diff --git a/src/Files.App/Actions/Content/Run/BaseRunAsAction.cs b/src/Files.App/Actions/Content/Run/BaseRunAsAction.cs new file mode 100644 index 000000000000..002e6a91873a --- /dev/null +++ b/src/Files.App/Actions/Content/Run/BaseRunAsAction.cs @@ -0,0 +1,50 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Files.Shared.Helpers; + +namespace Files.App.Actions +{ + internal abstract class BaseRunAsAction : ObservableObject, IAction + { + private readonly IContentPageContext _context; + + private readonly string _verb; + + public abstract string Label { get; } + + public abstract string Description { get; } + + public abstract RichGlyph Glyph { get; } + + public bool IsExecutable => + _context.SelectedItem is not null && + (FileExtensionHelpers.IsExecutableFile(_context.SelectedItem.FileExtension) || + (_context.SelectedItem is ShortcutItem shortcut && + shortcut.IsExecutable)); + + public BaseRunAsAction(string verb) + { + _verb = verb; + _context = Ioc.Default.GetRequiredService(); + + _context.PropertyChanged += Context_PropertyChanged; + } + + public async Task ExecuteAsync() + { + await ContextMenu.InvokeVerb(_verb, _context.SelectedItem!.ItemPath); + } + + public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + { + switch (e.PropertyName) + { + case nameof(IContentPageContext.SelectedItems): + case nameof(IContentPageContext.Folder): + OnPropertyChanged(nameof(IsExecutable)); + break; + } + } + } +} diff --git a/src/Files.App/Actions/Content/Run/RunAsAdminAction.cs b/src/Files.App/Actions/Content/Run/RunAsAdminAction.cs index 8facd2f3807b..451988dd06f7 100644 --- a/src/Files.App/Actions/Content/Run/RunAsAdminAction.cs +++ b/src/Files.App/Actions/Content/Run/RunAsAdminAction.cs @@ -1,48 +1,23 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; + namespace Files.App.Actions { - internal class RunAsAdminAction : ObservableObject, IAction + internal sealed class RunAsAdminAction : BaseRunAsAction { - private readonly IContentPageContext context; - - public string Label + public override string Label => "RunAsAdministrator".GetLocalizedResource(); - public string Description + public override string Description => "RunAsAdminDescription".GetLocalizedResource(); - public RichGlyph Glyph + public override RichGlyph Glyph => new("\uE7EF"); - public bool IsExecutable => - context.SelectedItem is not null && - (FileExtensionHelpers.IsExecutableFile(context.SelectedItem.FileExtension) || - (context.SelectedItem is ShortcutItem shortcut && - shortcut.IsExecutable)); - - public RunAsAdminAction() - { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; - } - - public async Task ExecuteAsync() - { - await ContextMenu.InvokeVerb("runas", context.SelectedItem!.ItemPath); - } - - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + public RunAsAdminAction() : base("runas") { - switch (e.PropertyName) - { - case nameof(IContentPageContext.SelectedItems): - case nameof(IContentPageContext.Folder): - OnPropertyChanged(nameof(IsExecutable)); - break; - } } } } diff --git a/src/Files.App/Actions/Content/Run/RunAsAnotherUserAction.cs b/src/Files.App/Actions/Content/Run/RunAsAnotherUserAction.cs index f3e7b97df0a4..b42ee8008d7d 100644 --- a/src/Files.App/Actions/Content/Run/RunAsAnotherUserAction.cs +++ b/src/Files.App/Actions/Content/Run/RunAsAnotherUserAction.cs @@ -1,48 +1,23 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; + namespace Files.App.Actions { - internal class RunAsAnotherUserAction : ObservableObject, IAction + internal sealed class RunAsAnotherUserAction : BaseRunAsAction { - public IContentPageContext context; - - public bool IsExecutable => - context.SelectedItem is not null && - (FileExtensionHelpers.IsExecutableFile(context.SelectedItem.FileExtension) || - (context.SelectedItem is ShortcutItem shortcut && - shortcut.IsExecutable)); - - public string Label + public override string Label => "BaseLayoutContextFlyoutRunAsAnotherUser/Text".GetLocalizedResource(); - public string Description + public override string Description => "RunAsAnotherUserDescription".GetLocalizedResource(); - public RichGlyph Glyph + public override RichGlyph Glyph => new("\uE7EE"); - public RunAsAnotherUserAction() - { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; - } - - public async Task ExecuteAsync() - { - await ContextMenu.InvokeVerb("runasuser", context.SelectedItem!.ItemPath); - } - - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + public RunAsAnotherUserAction() : base("runasuser") { - switch (e.PropertyName) - { - case nameof(IContentPageContext.SelectedItems): - case nameof(IContentPageContext.Folder): - OnPropertyChanged(nameof(IsExecutable)); - break; - } } } } diff --git a/src/Files.App/Actions/Content/Run/RunWithPowershellAction.cs b/src/Files.App/Actions/Content/Run/RunWithPowershellAction.cs index 85f153f6802a..9cd6c2771455 100644 --- a/src/Files.App/Actions/Content/Run/RunWithPowershellAction.cs +++ b/src/Files.App/Actions/Content/Run/RunWithPowershellAction.cs @@ -1,7 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using Files.App.Utils.Shell; +using Files.Shared.Helpers; namespace Files.App.Actions { diff --git a/src/Files.App/Actions/Navigation/CloseOtherTabsCurrentAction.cs b/src/Files.App/Actions/Navigation/CloseOtherTabsCurrentAction.cs index 650cf05759ba..724704f1e4d9 100644 --- a/src/Files.App/Actions/Navigation/CloseOtherTabsCurrentAction.cs +++ b/src/Files.App/Actions/Navigation/CloseOtherTabsCurrentAction.cs @@ -3,48 +3,24 @@ namespace Files.App.Actions { - internal class CloseOtherTabsCurrentAction : ObservableObject, IAction + internal sealed class CloseOtherTabsCurrentAction : CloseTabBaseAction { - private readonly IMultitaskingContext context; - - public string Label + public override string Label => "CloseOtherTabs".GetLocalizedResource(); - public string Description + public override string Description => "CloseOtherTabsCurrentDescription".GetLocalizedResource(); - public bool IsExecutable - => GetIsExecutable(); - public CloseOtherTabsCurrentAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { if (context.Control is not null) MultitaskingTabsHelpers.CloseOtherTabs(context.CurrentTabItem, context.Control); return Task.CompletedTask; } - - private bool GetIsExecutable() - { - return context.Control is not null && context.TabCount > 1; - } - - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) - { - switch (e.PropertyName) - { - case nameof(IMultitaskingContext.Control): - case nameof(IMultitaskingContext.TabCount): - OnPropertyChanged(nameof(IsExecutable)); - break; - } - } } } diff --git a/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs b/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs index 97075fd19ccc..107ef00a4cc7 100644 --- a/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs +++ b/src/Files.App/Actions/Navigation/CloseOtherTabsSelectedAction.cs @@ -3,48 +3,23 @@ namespace Files.App.Actions { - internal class CloseOtherTabsSelectedAction : ObservableObject, IAction + internal sealed class CloseOtherTabsSelectedAction : CloseTabBaseAction { - private readonly IMultitaskingContext context; - - public string Label + public override string Label => "CloseOtherTabs".GetLocalizedResource(); - public string Description + public override string Description => "CloseOtherTabsSelectedDescription".GetLocalizedResource(); - public bool IsExecutable - => GetIsExecutable(); - public CloseOtherTabsSelectedAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { - if (context.Control is not null) - MultitaskingTabsHelpers.CloseOtherTabs(context.SelectedTabItem, context.Control); + MultitaskingTabsHelpers.CloseOtherTabs(context.SelectedTabItem, context.Control!); return Task.CompletedTask; } - - private bool GetIsExecutable() - { - return context.Control is not null && context.TabCount > 1; - } - - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) - { - switch (e.PropertyName) - { - case nameof(IMultitaskingContext.Control): - case nameof(IMultitaskingContext.TabCount): - OnPropertyChanged(nameof(IsExecutable)); - break; - } - } } } diff --git a/src/Files.App/Actions/Navigation/CloseSelectedTabAction.cs b/src/Files.App/Actions/Navigation/CloseSelectedTabAction.cs index 6a43bcd4b6b4..be16115d6cf7 100644 --- a/src/Files.App/Actions/Navigation/CloseSelectedTabAction.cs +++ b/src/Files.App/Actions/Navigation/CloseSelectedTabAction.cs @@ -3,45 +3,43 @@ namespace Files.App.Actions { - internal class CloseSelectedTabAction : ObservableObject, IAction + internal sealed class CloseSelectedTabAction : CloseTabBaseAction { - private readonly IMultitaskingContext context; - - public string Label + public override string Label => "CloseTab".GetLocalizedResource(); - public string Description + public override string Description => "CloseSelectedTabDescription".GetLocalizedResource(); - public HotKey HotKey + public override HotKey HotKey => new(Keys.W, KeyModifiers.Ctrl); - public HotKey SecondHotKey + public override HotKey SecondHotKey => new(Keys.F4, KeyModifiers.Ctrl); - public RichGlyph Glyph + public override RichGlyph Glyph => new(); - public bool IsExecutable => - context.Control is not null && - context.TabCount > 0 && - context.CurrentTabItem is not null; - public CloseSelectedTabAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { context.Control!.CloseTab(context.CurrentTabItem); return Task.CompletedTask; } - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + protected override bool GetIsExecutable() + { + return + context.Control is not null && + context.TabCount > 0 && + context.CurrentTabItem is not null; + } + + protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { switch (e.PropertyName) { diff --git a/src/Files.App/Actions/Navigation/CloseTabBaseAction.cs b/src/Files.App/Actions/Navigation/CloseTabBaseAction.cs new file mode 100644 index 000000000000..2a0062650c64 --- /dev/null +++ b/src/Files.App/Actions/Navigation/CloseTabBaseAction.cs @@ -0,0 +1,51 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.App.Actions +{ + internal abstract class CloseTabBaseAction : ObservableObject, IAction + { + protected readonly IMultitaskingContext context; + + public abstract string Label { get; } + + public abstract string Description { get; } + + public bool IsExecutable + => GetIsExecutable(); + + public virtual HotKey HotKey + => HotKey.None; + + public virtual HotKey SecondHotKey + => HotKey.None; + + public virtual RichGlyph Glyph + => RichGlyph.None; + + public CloseTabBaseAction() + { + context = Ioc.Default.GetRequiredService(); + + context.PropertyChanged += Context_PropertyChanged; + } + + public abstract Task ExecuteAsync(); + + protected virtual bool GetIsExecutable() + { + return context.Control is not null && context.TabCount > 1; + } + + protected virtual void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + { + switch (e.PropertyName) + { + case nameof(IMultitaskingContext.Control): + case nameof(IMultitaskingContext.TabCount): + OnPropertyChanged(nameof(IsExecutable)); + break; + } + } + } +} diff --git a/src/Files.App/Actions/Navigation/CloseTabsToTheLeftCurrentAction.cs b/src/Files.App/Actions/Navigation/CloseTabsToTheLeftCurrentAction.cs index 7602f9a72f37..07ae02c6aa17 100644 --- a/src/Files.App/Actions/Navigation/CloseTabsToTheLeftCurrentAction.cs +++ b/src/Files.App/Actions/Navigation/CloseTabsToTheLeftCurrentAction.cs @@ -3,40 +3,31 @@ namespace Files.App.Actions { - internal class CloseTabsToTheLeftCurrentAction : ObservableObject, IAction + internal sealed class CloseTabsToTheLeftCurrentAction : CloseTabBaseAction { - private readonly IMultitaskingContext context; - - public string Label + public override string Label => "CloseTabsToTheLeft".GetLocalizedResource(); - public string Description + public override string Description => "CloseTabsToTheLeftCurrentDescription".GetLocalizedResource(); - public bool IsExecutable - => GetIsExecutable(); - public CloseTabsToTheLeftCurrentAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { - if (context.Control is not null) - MultitaskingTabsHelpers.CloseTabsToTheLeft(context.CurrentTabItem, context.Control); + MultitaskingTabsHelpers.CloseTabsToTheLeft(context.CurrentTabItem, context.Control!); return Task.CompletedTask; } - private bool GetIsExecutable() + protected override bool GetIsExecutable() { return context.Control is not null && context.CurrentTabIndex > 0; } - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { switch (e.PropertyName) { diff --git a/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs b/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs index 1c93e244cd45..d08ee12dc2a9 100644 --- a/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs +++ b/src/Files.App/Actions/Navigation/CloseTabsToTheLeftSelectedAction.cs @@ -3,40 +3,31 @@ namespace Files.App.Actions { - internal class CloseTabsToTheLeftSelectedAction : ObservableObject, IAction + internal sealed class CloseTabsToTheLeftSelectedAction : CloseTabBaseAction { - private readonly IMultitaskingContext context; - - public string Label + public override string Label => "CloseTabsToTheLeft".GetLocalizedResource(); - public string Description + public override string Description => "CloseTabsToTheLeftSelectedDescription".GetLocalizedResource(); - public bool IsExecutable - => GetIsExecutable(); - public CloseTabsToTheLeftSelectedAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { - if (context.Control is not null) - MultitaskingTabsHelpers.CloseTabsToTheLeft(context.SelectedTabItem, context.Control); + MultitaskingTabsHelpers.CloseTabsToTheLeft(context.SelectedTabItem, context.Control!); return Task.CompletedTask; } - private bool GetIsExecutable() + protected override bool GetIsExecutable() { return context.Control is not null && context.SelectedTabIndex > 0; } - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { switch (e.PropertyName) { diff --git a/src/Files.App/Actions/Navigation/CloseTabsToTheRightCurrentAction.cs b/src/Files.App/Actions/Navigation/CloseTabsToTheRightCurrentAction.cs index f0ee3cad5c1c..ff434b7f6a84 100644 --- a/src/Files.App/Actions/Navigation/CloseTabsToTheRightCurrentAction.cs +++ b/src/Files.App/Actions/Navigation/CloseTabsToTheRightCurrentAction.cs @@ -3,40 +3,31 @@ namespace Files.App.Actions { - internal class CloseTabsToTheRightCurrentAction : ObservableObject, IAction + internal sealed class CloseTabsToTheRightCurrentAction : CloseTabBaseAction { - private readonly IMultitaskingContext context; - - public string Label + public override string Label => "CloseTabsToTheRight".GetLocalizedResource(); - public string Description + public override string Description => "CloseTabsToTheRightCurrentDescription".GetLocalizedResource(); - public bool IsExecutable - => GetIsExecutable(); - public CloseTabsToTheRightCurrentAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { - if (context.Control is not null) - MultitaskingTabsHelpers.CloseTabsToTheRight(context.CurrentTabItem, context.Control); + MultitaskingTabsHelpers.CloseTabsToTheRight(context.CurrentTabItem, context.Control!); return Task.CompletedTask; } - private bool GetIsExecutable() + protected override bool GetIsExecutable() { return context.Control is not null && context.CurrentTabIndex < context.TabCount - 1; } - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { switch (e.PropertyName) { diff --git a/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs b/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs index 4fd1c9e7dd2f..48474db4c0a3 100644 --- a/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs +++ b/src/Files.App/Actions/Navigation/CloseTabsToTheRightSelectedAction.cs @@ -3,40 +3,31 @@ namespace Files.App.Actions { - internal class CloseTabsToTheRightSelectedAction : ObservableObject, IAction + internal sealed class CloseTabsToTheRightSelectedAction : CloseTabBaseAction { - private readonly IMultitaskingContext context; - - public string Label + public override string Label => "CloseTabsToTheRight".GetLocalizedResource(); - public string Description + public override string Description => "CloseTabsToTheRightSelectedDescription".GetLocalizedResource(); - public bool IsExecutable - => GetIsExecutable(); - public CloseTabsToTheRightSelectedAction() { - context = Ioc.Default.GetRequiredService(); - - context.PropertyChanged += Context_PropertyChanged; } - public Task ExecuteAsync() + public override Task ExecuteAsync() { - if (context.Control is not null) - MultitaskingTabsHelpers.CloseTabsToTheRight(context.SelectedTabItem, context.Control); + MultitaskingTabsHelpers.CloseTabsToTheRight(context.SelectedTabItem, context.Control!); return Task.CompletedTask; } - private bool GetIsExecutable() + protected override bool GetIsExecutable() { return context.Control is not null && context.SelectedTabIndex < context.TabCount - 1; } - private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { switch (e.PropertyName) { diff --git a/src/Files.App/Actions/Show/ToggleSidebarAction.cs b/src/Files.App/Actions/Show/ToggleSidebarAction.cs deleted file mode 100644 index aea3b9a4daea..000000000000 --- a/src/Files.App/Actions/Show/ToggleSidebarAction.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2023 Files Community -// Licensed under the MIT License. See the LICENSE. - -using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.DependencyInjection; -using Files.App.Data.Commands; -using Files.App.Extensions; -using Files.App.ViewModels; -using System.ComponentModel; -using System.Threading.Tasks; - -namespace Files.App.Actions -{ - internal class ToggleSidebarAction : ObservableObject, IToggleAction - { - private readonly SidebarViewModel viewModel; - - public string Label - => "ToggleSidebar".GetLocalizedResource(); - - public string Description - => "ToggleSidebarDescription".GetLocalizedResource(); - - public HotKey HotKey - => new(Keys.B, KeyModifiers.Ctrl); - - public bool IsOn - => viewModel.IsSidebarOpen; - - public ToggleSidebarAction() - { - viewModel = Ioc.Default.GetRequiredService(); - - viewModel.PropertyChanged += ViewModel_PropertyChanged; - } - - public Task ExecuteAsync() - { - viewModel.IsSidebarOpen = !IsOn; - - return Task.CompletedTask; - } - - private void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e) - { - if (e.PropertyName is nameof(SidebarViewModel.IsSidebarOpen)) - OnPropertyChanged(nameof(IsOn)); - } - } -} diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml index 07eebc154f40..cbf0529fb60f 100644 --- a/src/Files.App/App.xaml +++ b/src/Files.App/App.xaml @@ -13,9 +13,6 @@ 0 - - 32 - @@ -34,9 +31,8 @@ - + - diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs index 62fbc622b672..0005b87a43cb 100644 --- a/src/Files.App/App.xaml.cs +++ b/src/Files.App/App.xaml.cs @@ -11,6 +11,11 @@ using Files.App.ViewModels.Settings; using Files.Core.Services.SizeProvider; using Files.Core.Storage; +#if STORE || STABLE || PREVIEW +using Microsoft.AppCenter; +using Microsoft.AppCenter.Analytics; +using Microsoft.AppCenter.Crashes; +#endif using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -340,7 +345,7 @@ await SafetyExtensions.IgnoreExceptions(async () => /// /// Enumerates through all tabs and gets the Path property and saves it to AppSettings.LastSessionPages. /// - public static void SaveSessionTabs() + public static void SaveSessionTabs() { IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService(); @@ -420,7 +425,7 @@ private static void AppUnhandledException(Exception? ex, bool shouldShowNotifica Debug.WriteLine(formattedException.ToString()); - // Please check "Output Window" for exception details (View -> Output Window) (CTRL + ALT + O) + // Please check "Output Window" for exception details (View -> Output Window) (CTRL + ALT + O) Debugger.Break(); SaveSessionTabs(); diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs index 61e1cf21d99b..d83a044f0f81 100644 --- a/src/Files.App/Data/Commands/CommandCodes.cs +++ b/src/Files.App/Data/Commands/CommandCodes.cs @@ -23,7 +23,6 @@ public enum CommandCodes ToggleShowHiddenItems, ToggleShowFileExtensions, TogglePreviewPane, - ToggleSidebar, // File System CopyItem, diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs index c9a0cc73e873..b8467816a643 100644 --- a/src/Files.App/Data/Commands/Manager/CommandManager.cs +++ b/src/Files.App/Data/Commands/Manager/CommandManager.cs @@ -51,7 +51,6 @@ public IRichCommand this[HotKey hotKey] public IRichCommand ToggleShowHiddenItems => commands[CommandCodes.ToggleShowHiddenItems]; public IRichCommand ToggleShowFileExtensions => commands[CommandCodes.ToggleShowFileExtensions]; public IRichCommand TogglePreviewPane => commands[CommandCodes.TogglePreviewPane]; - public IRichCommand ToggleSidebar => commands[CommandCodes.ToggleSidebar]; public IRichCommand SelectAll => commands[CommandCodes.SelectAll]; public IRichCommand InvertSelection => commands[CommandCodes.InvertSelection]; public IRichCommand ClearSelection => commands[CommandCodes.ClearSelection]; @@ -213,7 +212,6 @@ public CommandManager() [CommandCodes.ToggleShowHiddenItems] = new ToggleShowHiddenItemsAction(), [CommandCodes.ToggleShowFileExtensions] = new ToggleShowFileExtensionsAction(), [CommandCodes.TogglePreviewPane] = new TogglePreviewPaneAction(), - [CommandCodes.ToggleSidebar] = new ToggleSidebarAction(), [CommandCodes.SelectAll] = new SelectAllAction(), [CommandCodes.InvertSelection] = new InvertSelectionAction(), [CommandCodes.ClearSelection] = new ClearSelectionAction(), diff --git a/src/Files.App/Data/Commands/Manager/ICommandManager.cs b/src/Files.App/Data/Commands/Manager/ICommandManager.cs index 142952cda7a5..3b73d5c257fd 100644 --- a/src/Files.App/Data/Commands/Manager/ICommandManager.cs +++ b/src/Files.App/Data/Commands/Manager/ICommandManager.cs @@ -25,7 +25,6 @@ public interface ICommandManager : IEnumerable IRichCommand ToggleShowHiddenItems { get; } IRichCommand ToggleShowFileExtensions { get; } IRichCommand TogglePreviewPane { get; } - IRichCommand ToggleSidebar { get; } IRichCommand CopyItem { get; } IRichCommand CopyPath { get; } diff --git a/src/Files.App/Data/Contexts/Tags/TagsContext.cs b/src/Files.App/Data/Contexts/Tags/TagsContext.cs index f43e6329de5a..6564e22a4e16 100644 --- a/src/Files.App/Data/Contexts/Tags/TagsContext.cs +++ b/src/Files.App/Data/Contexts/Tags/TagsContext.cs @@ -30,7 +30,7 @@ sealed class TagsContext : ITagsContext public TagsContext() { FileTagsContainerViewModel.SelectedTagChanged += SelectedTagsChanged; - SidebarControl.SelectedTagChanged += SelectedTagsChanged; + SidebarViewModel.SelectedTagChanged += SelectedTagsChanged; } private void SelectedTagsChanged(object _, SelectedTagChangedEventArgs e) diff --git a/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs b/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs index 853e0cc3cd78..4c5753bcb44d 100644 --- a/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs +++ b/src/Files.App/Data/Factories/PropertiesNavigationViewItemFactory.cs @@ -4,6 +4,7 @@ using Files.Core.Helpers; using Microsoft.UI.Xaml; using Windows.Storage; +using Files.Shared.Helpers; namespace Files.App.Data.Factories { diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs index f076c379c6d7..78b533a86d53 100644 --- a/src/Files.App/Data/Items/DriveItem.cs +++ b/src/Files.App/Data/Items/DriveItem.cs @@ -6,7 +6,9 @@ using Files.Core.Storage.Enums; using Files.Core.Storage.LocatableStorage; using Files.Core.Storage.NestedStorage; +using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Imaging; using Windows.Storage; using Windows.Storage.Streams; @@ -20,7 +22,11 @@ public class DriveItem : ObservableObject, INavigationControlItem, ILocatableFol public BitmapImage Icon { get => icon; - set => SetProperty(ref icon, value); + set + { + SetProperty(ref icon, value, nameof(Icon)); + OnPropertyChanged(nameof(IconSource)); + } } public byte[] IconData { get; set; } @@ -32,8 +38,6 @@ public string Path set => path = value; } - public string ToolTipText { get; private set; } - public string DeviceID { get; set; } public StorageFolder Root { get; set; } @@ -68,7 +72,10 @@ public ByteSize MaxSpace { if (SetProperty(ref maxSpace, value)) { - ToolTipText = GetSizeString(); + if (Type != DriveType.CloudDrive) + { + ToolTip = GetSizeString(); + } OnPropertyChanged(nameof(MaxSpaceText)); OnPropertyChanged(nameof(ShowDriveDetails)); @@ -84,7 +91,10 @@ public ByteSize FreeSpace { if (SetProperty(ref freeSpace, value)) { - ToolTipText = GetSizeString(); + if (Type != DriveType.CloudDrive) + { + ToolTip = GetSizeString(); + } OnPropertyChanged(nameof(FreeSpaceText)); } @@ -107,7 +117,22 @@ public ByteSize SpaceUsed public bool ShowDriveDetails => MaxSpace.Bytes > 0d; - public DriveType Type { get; set; } + private DriveType type; + public DriveType Type + { + get => type; set + { + type = value; + if (value == DriveType.Network) + { + ToolTip = "Network".GetLocalizedResource(); + } + else if (value == DriveType.CloudDrive) + { + ToolTip = Text; + } + } + } private string text; public string Text @@ -152,6 +177,28 @@ public bool ShowStorageSense public string Name => Root.DisplayName; + public object? Children => null; + + private object toolTip = ""; + public object ToolTip + { + get => toolTip; + set + { + SetProperty(ref toolTip, value); + } + } + + public bool IsExpanded { get => false; set { } } + + public IconSource? IconSource + { + get => new ImageIconSource() + { + ImageSource = Icon + }; + } + public static async Task CreateFromPropertiesAsync(StorageFolder root, string deviceId, string label, DriveType type, IRandomAccessStream imageStream = null) { var item = new DriveItem(); @@ -255,7 +302,6 @@ public async Task LoadThumbnailAsync(bool isSidebar = false) } IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData; } - Icon ??= await IconData.ToBitmapAsync(); } diff --git a/src/Files.App/Data/Items/FileTagItem.cs b/src/Files.App/Data/Items/FileTagItem.cs index 7b18b3f76c81..3a74b7dbbfed 100644 --- a/src/Files.App/Data/Items/FileTagItem.cs +++ b/src/Files.App/Data/Items/FileTagItem.cs @@ -1,11 +1,17 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using CommunityToolkit.WinUI.Helpers; +using Files.App.Converters; using Files.Core.ViewModels.FileTags; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Markup; +using Microsoft.UI.Xaml.Media; namespace Files.App.Data.Items { - public class FileTagItem : INavigationControlItem + public class FileTagItem : ObservableObject, INavigationControlItem { public string Text { get; set; } @@ -16,7 +22,8 @@ public string Path set { path = value; - ToolTipText = Text; + OnPropertyChanged(nameof(IconSource)); + OnPropertyChanged(nameof(ToolTip)); } } @@ -33,5 +40,20 @@ public int CompareTo(INavigationControlItem other) => Text.CompareTo(other.Text); public TagViewModel FileTag { get; set; } + + public object? Children => null; + + public IconSource? IconSource + { + get => new PathIconSource() + { + Data = (Geometry)XamlBindingHelper.ConvertValue(typeof(Geometry), (string)Application.Current.Resources["ColorIconFilledTag"]), + Foreground = new SolidColorBrush(FileTag.Color.ToColor()) + }; + } + + public object ToolTip => Text; + + public bool IsExpanded { get => false; set { } } } } diff --git a/src/Files.App/Data/Items/INavigationControlItem.cs b/src/Files.App/Data/Items/INavigationControlItem.cs index 56da8d24c6ab..6d3802161eb1 100644 --- a/src/Files.App/Data/Items/INavigationControlItem.cs +++ b/src/Files.App/Data/Items/INavigationControlItem.cs @@ -1,18 +1,20 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.App.UserControls.Sidebar; +using Microsoft.UI.Xaml.Controls; + namespace Files.App.Data.Items { - public interface INavigationControlItem : IComparable + + public interface INavigationControlItem : IComparable, INotifyPropertyChanged, ISidebarItemModel { - public string Text { get; } + public new string Text { get; } public string Path { get; } public SectionType Section { get; } - public string ToolTipText { get; } - public NavigationControlItemType ItemType { get; } public ContextMenuOptions MenuOptions { get; } diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs index 01d3badddb8f..3da5ce0fc22e 100644 --- a/src/Files.App/Data/Items/ListedItem.cs +++ b/src/Files.App/Data/Items/ListedItem.cs @@ -1,14 +1,10 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using Files.App.Utils.Cloud; using Files.App.ViewModels.Properties; -using Files.Core.Helpers; -using Files.Core.ViewModels.FileTags; +using Files.Shared.Helpers; using FluentFTP; -using Microsoft.UI; using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; using System.IO; using System.Text; diff --git a/src/Files.App/Data/Items/LocationItem.cs b/src/Files.App/Data/Items/LocationItem.cs index e8bb1cce6524..8990698b5516 100644 --- a/src/Files.App/Data/Items/LocationItem.cs +++ b/src/Files.App/Data/Items/LocationItem.cs @@ -1,8 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using CommunityToolkit.WinUI; -using Files.App.Utils.Shell; +using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Imaging; using System.IO; @@ -14,14 +13,27 @@ public class LocationItem : ObservableObject, INavigationControlItem public BitmapImage Icon { get => icon; - set => SetProperty(ref icon, value); + set + { + SetProperty(ref icon, value, nameof(Icon)); + OnPropertyChanged(nameof(IconSource)); + } } - //public Uri IconSource { get; set; } - public byte[] IconData { get; set; } - public string Text { get; set; } = ""; + private string text = ""; + public string Text + { + get => text; + set + { + text = value; + // Just in case path hasn't been set + if (ToolTip is "") + ToolTip = value; + } + } private string path; public string Path @@ -30,7 +42,7 @@ public string Path set { path = value; - ToolTipText = string.IsNullOrEmpty(Path) || + ToolTip = string.IsNullOrEmpty(Path) || Path.Contains('?', StringComparison.Ordinal) || Path.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) || Path.EndsWith(ShellLibraryItem.EXTENSION, StringComparison.OrdinalIgnoreCase) || @@ -40,14 +52,20 @@ public string Path } } - public virtual string ToolTipText { get; set; } - public NavigationControlItemType ItemType => NavigationControlItemType.Location; public bool IsDefaultLocation { get; set; } - public BulkConcurrentObservableCollection ChildItems { get; set; } + public object? Children => Section == SectionType.Home ? null : ChildItems; + public BulkConcurrentObservableCollection? ChildItems { get; set; } + public IconSource? IconSource + { + get => new ImageIconSource() + { + ImageSource = icon + }; + } public bool SelectsOnInvoked { get; set; } = true; @@ -68,6 +86,16 @@ public bool IsExpanded public bool IsHeader { get; set; } + private object toolTip = ""; + public virtual object ToolTip + { + get => toolTip; + set + { + SetProperty(ref toolTip, value); + } + } + public int CompareTo(INavigationControlItem other) => Text.CompareTo(other.Text); @@ -81,7 +109,10 @@ public class RecycleBinLocationItem : LocationItem { public void RefreshSpaceUsed(object sender, FileSystemEventArgs e) { - SpaceUsed = RecycleBinHelpers.GetSize(); + MainWindow.Instance.DispatcherQueue.TryEnqueue(() => + { + SpaceUsed = RecycleBinHelpers.GetSize(); + }); } private ulong spaceUsed; @@ -90,14 +121,15 @@ public ulong SpaceUsed get => spaceUsed; set { - SetProperty(ref spaceUsed, value); - - MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => OnPropertyChanged(nameof(ToolTipText))); + if (SetProperty(ref spaceUsed, value)) + OnPropertyChanged(nameof(ToolTip)); } } - public override string ToolTipText - => SpaceUsed.ToSizeString(); + public override object ToolTip + { + get => SpaceUsed.ToSizeString(); + } public RecycleBinLocationItem() { diff --git a/src/Files.App/Data/Items/WslDistroItem.cs b/src/Files.App/Data/Items/WslDistroItem.cs index 2be4fd90d89e..6f373323d9df 100644 --- a/src/Files.App/Data/Items/WslDistroItem.cs +++ b/src/Files.App/Data/Items/WslDistroItem.cs @@ -1,9 +1,11 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Microsoft.UI.Xaml.Controls; + namespace Files.App.Data.Items { - public class WslDistroItem : INavigationControlItem + public class WslDistroItem : ObservableObject, INavigationControlItem { public string Text { get; set; } @@ -14,21 +16,51 @@ public string Path set { path = value; - ToolTipText = Path.Contains('?', StringComparison.Ordinal) ? Text : Path; + ToolTip = Path.Contains('?', StringComparison.Ordinal) ? Text : Path; } } - public string ToolTipText { get; private set; } - public NavigationControlItemType ItemType => NavigationControlItemType.LinuxDistro; - public Uri Logo { get; set; } + private Uri icon; + public Uri Icon + { + get => icon; + set + { + SetProperty(ref icon, value, nameof(Icon)); + OnPropertyChanged(nameof(IconSource)); + } + } public SectionType Section { get; set; } public ContextMenuOptions MenuOptions { get; set; } + public object? Children => null; + + private object toolTip = ""; + public object ToolTip + { + get => toolTip; + set + { + SetProperty(ref toolTip, value); + } + } + + public bool IsExpanded { get => false; set { } } + + public IconSource? IconSource + { + get => new BitmapIconSource() + { + UriSource = icon, + ShowAsMonochrome = false, + }; + } + public int CompareTo(INavigationControlItem other) => Text.CompareTo(other.Text); } } diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs index 0fbd16382b0a..6de883a990b0 100644 --- a/src/Files.App/Data/Models/ItemViewModel.cs +++ b/src/Files.App/Data/Models/ItemViewModel.cs @@ -3,6 +3,7 @@ using Files.App.ViewModels.Previews; using Files.Core.Services.SizeProvider; +using Files.Shared.Helpers; using LibGit2Sharp; using Microsoft.Extensions.Logging; using Microsoft.UI.Xaml.Data; diff --git a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs index 4338dec67433..3dc8693ab0f0 100644 --- a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs +++ b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See the LICENSE. using Files.App.ViewModels.Properties; +using Files.Shared.Helpers; namespace Files.App.Data.Models { diff --git a/src/Files.App/Data/Models/SidebarPinnedModel.cs b/src/Files.App/Data/Models/SidebarPinnedModel.cs index 15e8f26c2a55..f4fde71fe99f 100644 --- a/src/Files.App/Data/Models/SidebarPinnedModel.cs +++ b/src/Files.App/Data/Models/SidebarPinnedModel.cs @@ -1,9 +1,6 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using CommunityToolkit.WinUI; -using Files.App.Data.Items; -using Files.App.Services; using Files.App.UserControls.Widgets; using System.Collections.Specialized; using System.IO; diff --git a/src/Files.App/Dialogs/FileTooLargeDialog.xaml b/src/Files.App/Dialogs/FileTooLargeDialog.xaml new file mode 100644 index 000000000000..827187926bee --- /dev/null +++ b/src/Files.App/Dialogs/FileTooLargeDialog.xaml @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/src/Files.App/Dialogs/FileTooLargeDialog.xaml.cs b/src/Files.App/Dialogs/FileTooLargeDialog.xaml.cs new file mode 100644 index 000000000000..40a659b4b4b7 --- /dev/null +++ b/src/Files.App/Dialogs/FileTooLargeDialog.xaml.cs @@ -0,0 +1,35 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Xaml.Controls; + +namespace Files.App.Dialogs +{ + public sealed partial class FileTooLargeDialog : ContentDialog, IDialog + { + public FileTooLargeDialogViewModel ViewModel + { + get => (FileTooLargeDialogViewModel)DataContext; + set => DataContext = value; + } + + public FileTooLargeDialog() + { + InitializeComponent(); + } + + public new async Task ShowAsync() + { + return (DialogResult)await SetContentDialogRoot(this).TryShowAsync(); + } + + // WINUI3 + private ContentDialog SetContentDialogRoot(ContentDialog contentDialog) + { + if (Windows.Foundation.Metadata.ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8)) + contentDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot; + + return contentDialog; + } + } +} diff --git a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml index 084ad270b8cc..61a6129be386 100644 --- a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml +++ b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml @@ -30,7 +30,7 @@ DragStarting="ListViewItem_DragStarting" Drop="ListViewItem_Drop" Tag="{x:Bind Path}" - ToolTipService.ToolTip="{x:Bind ToolTipText, Mode=OneWay}"> + ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}"> diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj index 5e923acac12f..75b752a72284 100644 --- a/src/Files.App/Files.App.csproj +++ b/src/Files.App/Files.App.csproj @@ -68,6 +68,11 @@ + + + + + @@ -77,7 +82,7 @@ - + @@ -91,10 +96,10 @@ - + - - + + @@ -130,4 +135,13 @@ + + + $(DefaultXamlRuntime) + + + MSBuild:Compile + + + diff --git a/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs index aff373b7f986..f1f47994a8b6 100644 --- a/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs +++ b/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs @@ -1,8 +1,11 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using Files.App.Data.Commands; using Files.App.ViewModels.LayoutModes; +using Files.Shared.Helpers; +using Files.App.Helpers.ContextFlyouts; +using Files.App.ViewModels.LayoutModes; +using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Imaging; using System.IO; using Windows.Storage; @@ -75,7 +78,7 @@ public static List GetBaseItemMenuItems( SelectedItemsPropertiesViewModel? selectedItemsPropertiesViewModel, List selectedItems, CurrentInstanceViewModel currentInstanceViewModel, - ItemViewModel itemViewModel = null) + ItemViewModel? itemViewModel = null) { bool itemsSelected = itemViewModel is null; bool canDecompress = selectedItems.Any() && selectedItems.All(x => x.IsArchive) @@ -89,6 +92,8 @@ public static List GetBaseItemMenuItems( Path.GetFileName(selectedItems.Count is 1 ? selectedItems[0].ItemPath : Path.GetDirectoryName(selectedItems[0].ItemPath)) ?? string.Empty; + bool isDriveRoot = itemViewModel?.CurrentFolder is not null && (itemViewModel.CurrentFolder.ItemPath == Path.GetPathRoot(itemViewModel.CurrentFolder.ItemPath)); + return new List() { new ContextMenuFlyoutItemViewModel() @@ -541,6 +546,22 @@ public static List GetBaseItemMenuItems( ShowItem = itemsSelected && userSettingsService.GeneralSettingsService.ShowSendToMenu }, new ContextMenuFlyoutItemViewModel() + { + Text = "TurnOnBitLocker".GetLocalizedResource(), + Tag = "TurnOnBitLockerPlaceholder", + CollapseLabel = true, + IsEnabled = false, + ShowItem = isDriveRoot + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "ManageBitLocker".GetLocalizedResource(), + Tag = "ManageBitLockerPlaceholder", + CollapseLabel = true, + ShowItem = isDriveRoot, + IsEnabled = false + }, + new ContextMenuFlyoutItemViewModel() { ItemType = ContextMenuFlyoutItemType.Separator, Tag = "OverflowSeparator", @@ -616,5 +637,23 @@ public static List GetNewItemItems(BaseLayoutVie return list; } + + public static void SwapPlaceholderWithShellOption(CommandBarFlyout contextMenu, string placeholderName, ContextMenuFlyoutItemViewModel? replacingItem, int position) + { + var placeholder = contextMenu.SecondaryCommands + .Where(x => Equals((x as AppBarButton)?.Tag, placeholderName)) + .FirstOrDefault() as AppBarButton; + if (placeholder is not null) + placeholder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed; + + if (replacingItem is not null) + { + var (_, bitLockerCommands) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(new List() { replacingItem }); + contextMenu.SecondaryCommands.Insert( + position, + bitLockerCommands.FirstOrDefault() + ); + } + } } } \ No newline at end of file diff --git a/src/Files.App/Helpers/MenuFlyout/ShellContextMenuHelper.cs b/src/Files.App/Helpers/MenuFlyout/ShellContextMenuHelper.cs index 7cc9c758814b..06c36a3f3643 100644 --- a/src/Files.App/Helpers/MenuFlyout/ShellContextMenuHelper.cs +++ b/src/Files.App/Helpers/MenuFlyout/ShellContextMenuHelper.cs @@ -1,28 +1,14 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using CommunityToolkit.Mvvm.DependencyInjection; -using CommunityToolkit.Mvvm.Input; using CommunityToolkit.WinUI.UI; -using Files.App.Data.Items; -using Files.App.Extensions; using Files.App.Helpers.ContextFlyouts; -using Files.App.Utils.Shell; -using Files.App.ViewModels; -using Files.Core.Helpers; -using Files.Core.Services.Settings; -using Files.Shared; -using Files.Shared.Extensions; +using Files.Shared.Helpers; using Microsoft.UI.Input; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Imaging; -using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Vanara.PInvoke; using Windows.System; using Windows.UI.Core; @@ -119,7 +105,7 @@ private static void LoadMenuFlyoutItem(IList men break; // Avoid duplicate separators - if ((menuFlyoutItem.Type == MenuItemType.MFT_SEPARATOR) && (menuItemsListLocal.FirstOrDefault().ItemType == ContextMenuFlyoutItemType.Separator)) + if ((menuFlyoutItem.Type == MenuItemType.MFT_SEPARATOR) && (menuItemsListLocal.FirstOrDefault()?.ItemType == ContextMenuFlyoutItemType.Separator)) continue; BitmapImage? image = null; @@ -174,7 +160,7 @@ private static void LoadMenuFlyoutItem(IList men Text = menuFlyoutItem.Label.Replace("&", "", StringComparison.Ordinal), Tag = menuFlyoutItem, BitmapIcon = image, - Command = new RelayCommand(x => InvokeShellMenuItem(contextMenu, x)), + Command = new AsyncRelayCommand(x => InvokeShellMenuItem(contextMenu, x)), CommandParameter = menuFlyoutItem }; menuItemsListLocal.Insert(0, menuLayoutItem); @@ -243,7 +229,7 @@ async Task InvokeShellMenuItem(ContextMenu contextMenu, object? tag) public static async Task LoadShellMenuItems( string path, CommandBarFlyout itemContextMenuFlyout, - ContextMenuOptions options = null, + ContextMenuOptions? options = null, bool showOpenWithMenu = false, bool showSendToMenu = false) { @@ -269,6 +255,28 @@ public static async Task LoadShellMenuItems( (showSendToMenu || !UserSettingsService.GeneralSettingsService.ShowSendToMenu)) shellMenuItems.Remove(sendToItem); + var turnOnBitLocker = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "encrypt-bde-elev" }); + if (turnOnBitLocker is not null) + shellMenuItems.Remove(turnOnBitLocker); + + ContextFlyoutItemHelper.SwapPlaceholderWithShellOption( + itemContextMenuFlyout, + "TurnOnBitLockerPlaceholder", + turnOnBitLocker, + itemContextMenuFlyout.SecondaryCommands.Count - 2 + ); + + var manageBitLocker = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "manage-bde" }); + if (manageBitLocker is not null) + shellMenuItems.Remove(manageBitLocker); + + ContextFlyoutItemHelper.SwapPlaceholderWithShellOption( + itemContextMenuFlyout, + "ManageBitLockerPlaceholder", + manageBitLocker, + itemContextMenuFlyout.SecondaryCommands.Count - 2 + ); + sendToItem = showSendToMenu && UserSettingsService.GeneralSettingsService.ShowSendToMenu ? sendToItem : null; if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu) @@ -306,9 +314,9 @@ public static async Task LoadShellMenuItems( var flyoutItems = (overflowItem.Flyout as MenuFlyout)?.Items; if (flyoutItems is not null) - overflowItems.ForEach(i => flyoutItems.Add(i)); - overflowItem.Visibility = overflowItems.Any() ? Visibility.Visible : Visibility.Collapsed; - overflowSeparator.Visibility = overflowItems.Any() ? Visibility.Visible : Visibility.Collapsed; + overflowItems?.ForEach(i => flyoutItems.Add(i)); + overflowItem.Visibility = overflowItems?.Any() ?? false ? Visibility.Visible : Visibility.Collapsed; + overflowSeparator.Visibility = overflowItems?.Any() ?? false ? Visibility.Visible : Visibility.Collapsed; overflowItem.Label = "ShowMoreOptions".GetLocalizedResource(); overflowItem.IsEnabled = true; @@ -343,7 +351,8 @@ public static async Task LoadShellMenuItems( } // Add items to shell submenu - shellMenuItems.Where(x => x.LoadSubMenuAction is not null).ForEach(async x => { + shellMenuItems.Where(x => x.LoadSubMenuAction is not null).ForEach(async x => + { await x.LoadSubMenuAction(); if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu) diff --git a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs index ae0a93c54dba..420cbf9ccf64 100644 --- a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs +++ b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs @@ -1,20 +1,8 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using CommunityToolkit.Mvvm.DependencyInjection; -using Files.App.Extensions; -using Files.App.Utils; -using Files.App.Utils.Shell; -using Files.App.ViewModels; -using Files.App.Views; -using Files.Core.Helpers; -using Files.Core.Services.Settings; -using Files.Shared; +using Files.Shared.Helpers; using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Windows.Storage; using Windows.Storage.Search; using Windows.System; diff --git a/src/Files.App/Program.cs b/src/Files.App/Program.cs index 5c40f054606a..31fbf6c315fa 100644 --- a/src/Files.App/Program.cs +++ b/src/Files.App/Program.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml; using Microsoft.Windows.AppLifecycle; diff --git a/src/Files.App/ResourceDictionaries/SideBarResources.xaml b/src/Files.App/ResourceDictionaries/SideBarResources.xaml new file mode 100644 index 000000000000..a0b6502bb38f --- /dev/null +++ b/src/Files.App/ResourceDictionaries/SideBarResources.xaml @@ -0,0 +1,404 @@ + + + + + + 300 + -300 + 56 + -56 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Files.App/Services/DialogService.cs b/src/Files.App/Services/DialogService.cs index 186674b87d8a..3ec998102a92 100644 --- a/src/Files.App/Services/DialogService.cs +++ b/src/Files.App/Services/DialogService.cs @@ -32,6 +32,7 @@ public DialogService() { typeof(ReorderSidebarItemsDialogViewModel), () => new ReorderSidebarItemsDialog() }, { typeof(AddBranchDialogViewModel), () => new AddBranchDialog() }, { typeof(GitHubLoginDialogViewModel), () => new GitHubLoginDialog() }, + { typeof(FileTooLargeDialogViewModel), () => new FileTooLargeDialog() }, }; } diff --git a/src/Files.App/Services/FileTagsService.cs b/src/Files.App/Services/FileTagsService.cs index a0cc589a86ba..1770160059eb 100644 --- a/src/Files.App/Services/FileTagsService.cs +++ b/src/Files.App/Services/FileTagsService.cs @@ -42,7 +42,7 @@ public async IAsyncEnumerable GetItemsForTagAsync(string tagUid { foreach (var item in FileTagsHelper.GetDbInstance().GetAll()) { - if (!item.Tags.Contains(tagUid)) + if (!item.Tags.Contains(tagUid) || RecycleBinHelpers.IsPathUnderRecycleBin(item.FilePath)) continue; var storable = await StorageService.TryGetStorableAsync(item.FilePath, cancellationToken); diff --git a/src/Files.App/Services/QuickAccessService.cs b/src/Files.App/Services/QuickAccessService.cs index 71361da1ebf7..91d3c32a52bb 100644 --- a/src/Files.App/Services/QuickAccessService.cs +++ b/src/Files.App/Services/QuickAccessService.cs @@ -12,8 +12,9 @@ internal class QuickAccessService : IQuickAccessService public async Task> GetPinnedFoldersAsync() { - return (await Win32Shell.GetShellFolderAsync(guid, "Enumerate", 0, int.MaxValue, "System.Home.IsPinned")).Enumerate + var result = (await Win32Shell.GetShellFolderAsync(guid, "Enumerate", 0, int.MaxValue, "System.Home.IsPinned")).Enumerate .Where(link => link.IsFolder); + return result; } public Task PinToSidebar(string folderPath) diff --git a/src/Files.App/Services/ResourcesService.cs b/src/Files.App/Services/ResourcesService.cs index 162b234a066c..83eedca8e3c8 100644 --- a/src/Files.App/Services/ResourcesService.cs +++ b/src/Files.App/Services/ResourcesService.cs @@ -47,11 +47,9 @@ public void SetCompactSpacing(bool useCompactSpacing) { var listItemHeight = useCompactSpacing ? 28 : 36; var listItemMargin = useCompactSpacing ? "-2" : "0"; - var navigationViewItemOnLeftMinHeight = useCompactSpacing ? 20 : 32; Application.Current.Resources["ListItemHeight"] = listItemHeight; Application.Current.Resources["ListItemMargin"] = listItemMargin; - Application.Current.Resources["NavigationViewItemOnLeftMinHeight"] = navigationViewItemOnLeftMinHeight; } /// diff --git a/src/Files.App/Services/Settings/FoldersSettingsService.cs b/src/Files.App/Services/Settings/FoldersSettingsService.cs index d24ba7f1c0ec..b5e762127c27 100644 --- a/src/Files.App/Services/Settings/FoldersSettingsService.cs +++ b/src/Files.App/Services/Settings/FoldersSettingsService.cs @@ -27,7 +27,7 @@ public FolderLayoutModes DefaultLayoutMode public double GitStatusColumnWidth { - get => Get(50d); + get => Get(80d); set { if (ShowGitStatusColumn) @@ -123,7 +123,7 @@ public double DateCreatedColumnWidth public double SizeColumnWidth { - get => Get(140d); + get => Get(100d); set { if (ShowSizeColumn) @@ -203,13 +203,13 @@ public bool ShowGitStatusColumn public bool ShowGitLastCommitDateColumn { - get => Get(true); + get => Get(false); set => Set(value); } public bool ShowGitLastCommitMessageColumn { - get => Get(true); + get => Get(false); set => Set(value); } @@ -221,7 +221,7 @@ public bool ShowGitCommitAuthorColumn public bool ShowGitLastCommitShaColumn { - get => Get(true); + get => Get(false); set => Set(value); } diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw index 0c2aa40c2a8b..96f87f3f353b 100644 --- a/src/Files.App/Strings/en-US/Resources.resw +++ b/src/Files.App/Strings/en-US/Resources.resw @@ -3429,4 +3429,13 @@ Start in: + + Turn on BitLocker + + + Manage BitLocker + + + The following items are too large to be copied to this drive + \ No newline at end of file diff --git a/src/Files.App/UserControls/AddressToolbar.xaml b/src/Files.App/UserControls/AddressToolbar.xaml index 6ad32f8242f0..386c91b909a9 100644 --- a/src/Files.App/UserControls/AddressToolbar.xaml +++ b/src/Files.App/UserControls/AddressToolbar.xaml @@ -631,4 +631,4 @@ - + \ No newline at end of file diff --git a/src/Files.App/UserControls/DataGridHeader.xaml b/src/Files.App/UserControls/DataGridHeader.xaml index e616123d4536..665bf55a1c9e 100644 --- a/src/Files.App/UserControls/DataGridHeader.xaml +++ b/src/Files.App/UserControls/DataGridHeader.xaml @@ -23,7 +23,11 @@ - + + + + + diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml index fd617741e81d..1d0d268c3a9d 100644 --- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml +++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml @@ -41,7 +41,7 @@ @@ -795,7 +795,7 @@ Height="120" HorizontalAlignment="Center" VerticalAlignment="Center" - BorderBrush="{ThemeResource ControlStrokeColorDefault}" + BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" BorderThickness="1" /> @@ -836,7 +836,7 @@ diff --git a/src/Files.App/UserControls/MultitaskingControl/BaseMultitaskingControl.cs b/src/Files.App/UserControls/MultitaskingControl/BaseMultitaskingControl.cs index c86c938f495b..7361dca91208 100644 --- a/src/Files.App/UserControls/MultitaskingControl/BaseMultitaskingControl.cs +++ b/src/Files.App/UserControls/MultitaskingControl/BaseMultitaskingControl.cs @@ -145,18 +145,14 @@ public async void MoveTabToNewWindow(object sender, RoutedEventArgs e) public void CloseTab(TabItem tabItem) { - if (Items.Count == 1) - { - MainWindow.Instance.Close(); - } - else if (Items.Count > 1) - { - Items.Remove(tabItem); - tabItem?.Unload(); // Dispose and save tab arguments - RecentlyClosedTabs.Push(new TabItemArguments[] { + Items.Remove(tabItem); + tabItem?.Unload(); // Dispose and save tab arguments + RecentlyClosedTabs.Push(new TabItemArguments[] { tabItem.TabItemArguments - }); - } + }); + + if (Items.Count == 0) + MainWindow.Instance.Close(); } public void SetLoadingIndicatorStatus(ITabItem item, bool loading) diff --git a/src/Files.App/UserControls/Pane/PreviewPane.xaml b/src/Files.App/UserControls/Pane/PreviewPane.xaml index 182b448c3909..0b0c2eba7b85 100644 --- a/src/Files.App/UserControls/Pane/PreviewPane.xaml +++ b/src/Files.App/UserControls/Pane/PreviewPane.xaml @@ -138,15 +138,15 @@ - + - + @@ -160,7 +160,7 @@ HorizontalAlignment="Center" VerticalAlignment="Center" Background="{ThemeResource SubtleFillColorTertiaryBrush}" - BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" + BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Orientation="Horizontal"> diff --git a/src/Files.App/UserControls/SideBar/ISideBarViewModel.cs b/src/Files.App/UserControls/SideBar/ISideBarViewModel.cs new file mode 100644 index 000000000000..45f56570ea0a --- /dev/null +++ b/src/Files.App/UserControls/SideBar/ISideBarViewModel.cs @@ -0,0 +1,47 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Xaml; +using Windows.ApplicationModel.DataTransfer; +using Windows.Foundation; + +namespace Files.App.UserControls.Sidebar +{ + public record ItemDroppedEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { } + public record ItemDragOverEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { } + public record ItemContextInvokedArgs(object? Item, Point Position) { } + + public interface ISidebarViewModel + { + /// + /// The source/list of items that will be rendered in the sidebar + /// + object SidebarItems { get; } + + /// + /// Gets invoked when the context was requested for an item in the sidebar. + /// Also applies when context was requested for the pane itsself. + /// + /// The sender of this event + /// The for this event. + void HandleItemContextInvoked(object sender, ItemContextInvokedArgs args); + + /// + /// Gets invoked when an item drags over any item of the sidebar. + /// + /// The for this event. + void HandleItemDragOver(ItemDragOverEventArgs args); + + /// + /// Gets invoked when an item is dropped on any item of the sidebar. + /// + /// The for this event. + void HandleItemDropped(ItemDroppedEventArgs args); + + /// + /// Gets invoked when an item is invoked (double clicked) on any item of the sidebar. + /// + /// The item that was invoked. + void HandleItemInvoked(object item); + } +} diff --git a/src/Files.App/UserControls/SideBar/SideBarDisplayMode.cs b/src/Files.App/UserControls/SideBar/SideBarDisplayMode.cs new file mode 100644 index 000000000000..3ce0c62b1b71 --- /dev/null +++ b/src/Files.App/UserControls/SideBar/SideBarDisplayMode.cs @@ -0,0 +1,24 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.App.UserControls.Sidebar +{ + /// + /// The display mode of the + /// + public enum SidebarDisplayMode + { + /// + /// The sidebar is hidden and moves in from the side when the is set to true. + /// + Minimal, + /// + /// Only the icons of the top most sections are visible. + /// + Compact, + /// + /// The sidebar is expanded and items can also be expanded. + /// + Expanded + } +} diff --git a/src/Files.App/UserControls/SideBar/SideBarItem.cs b/src/Files.App/UserControls/SideBar/SideBarItem.cs new file mode 100644 index 000000000000..06355b4c4f61 --- /dev/null +++ b/src/Files.App/UserControls/SideBar/SideBarItem.cs @@ -0,0 +1,448 @@ +// Copyright (c) Microsoft Corporation and Contributors. +// Licensed under the MIT License. + +using CommunityToolkit.WinUI.UI; +using Microsoft.UI.Input; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Automation; +using Microsoft.UI.Xaml.Automation.Peers; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using Windows.ApplicationModel.DataTransfer; + +namespace Files.App.UserControls.Sidebar +{ + public sealed partial class SidebarItem : Control + { + private const double DROP_REPOSITION_THRESHOLD = 0.2; // Percentage of top/bottom at which we consider a drop to be a reposition/insertion + + public bool HasChildren => Item?.Children is IList enumerable && enumerable.Count > 0; + public bool IsGroupHeader => Item?.Children is not null; + public bool CollapseEnabled => DisplayMode != SidebarDisplayMode.Compact; + + private bool hasChildSelection => selectedChildItem != null; + private bool isPointerOver = false; + private object? selectedChildItem = null; + private ItemsRepeater? childrenRepeater; + private ISidebarItemModel? lastSubscriber; + + public SidebarItem() + { + DefaultStyleKey = typeof(SidebarItem); + + PointerReleased += Item_PointerReleased; + KeyDown += (sender, args) => + { + if (args.Key == Windows.System.VirtualKey.Enter) + { + Clicked(); + args.Handled = true; + } + }; + DragStarting += SidebarItem_DragStarting; + + Loaded += SidebarItem_Loaded; + } + + protected override AutomationPeer OnCreateAutomationPeer() + { + return new SidebarItemAutomationPeer(this); + } + + internal void Select() + { + if (Owner is not null) + Owner.SelectedItem = Item!; + } + + private void SidebarItem_Loaded(object sender, RoutedEventArgs e) + { + HookupOwners(); + + if (GetTemplateChild("ElementGrid") is Grid grid) + { + grid.PointerEntered += ItemGrid_PointerEntered; + grid.PointerExited += ItemGrid_PointerExited; + grid.PointerCanceled += ItemGrid_PointerCanceled; + grid.PointerPressed += ItemGrid_PointerPressed; + grid.ContextRequested += ItemGrid_ContextRequested; + grid.DragLeave += ItemGrid_DragLeave; + grid.DragOver += ItemGrid_DragOver; + grid.Drop += ItemGrid_Drop; + grid.AllowDrop = true; + grid.IsTabStop = true; + } + + if (GetTemplateChild("ChildrenPresenter") is ItemsRepeater repeater) + { + childrenRepeater = repeater; + repeater.ElementPrepared += ChildrenPresenter_ElementPrepared; + repeater.SizeChanged += ChildrenPresenter_SizeChanged; + } + if (GetTemplateChild("FlyoutChildrenPresenter") is ItemsRepeater flyoutRepeater) + { + flyoutRepeater.ElementPrepared += ChildrenPresenter_ElementPrepared; + } + + HandleItemChange(); + } + + public void HandleItemChange() + { + HookupItemChangeListener(null, Item); + UpdateExpansionState(); + ReevaluateSelection(); + } + + private void ChildrenPresenter_SizeChanged(object sender, SizeChangedEventArgs e) + { + if(e.NewSize.Height > 1) + { + ChildrenPresenterHeight = e.NewSize.Height; + } + } + + private void HookupOwners() + { + FrameworkElement resolvingTarget = this; + if (GetTemplateRoot(Parent) is FrameworkElement element) + { + resolvingTarget = element; + } + Owner = resolvingTarget.FindAscendant()!; + + Owner.RegisterPropertyChangedCallback(SidebarView.DisplayModeProperty, (sender, args) => + { + DisplayMode = Owner.DisplayMode; + }); + DisplayMode = Owner.DisplayMode; + + Owner.RegisterPropertyChangedCallback(SidebarView.SelectedItemProperty, (sender, args) => + { + ReevaluateSelection(); + }); + ReevaluateSelection(); + } + + private void HookupItemChangeListener(ISidebarItemModel? oldItem, ISidebarItemModel? newItem) + { + if (lastSubscriber != null) + { + lastSubscriber.PropertyChanged -= ItemPropertyChangedHandler; + if (lastSubscriber.Children is INotifyCollectionChanged observableCollection) + observableCollection.CollectionChanged -= ChildItems_CollectionChanged; + } + + if (oldItem != null) + { + oldItem.PropertyChanged -= ItemPropertyChangedHandler; + if (oldItem.Children is INotifyCollectionChanged observableCollection) + observableCollection.CollectionChanged -= ChildItems_CollectionChanged; + } + if (newItem != null) + { + newItem.PropertyChanged += ItemPropertyChangedHandler; + lastSubscriber = newItem; + if (newItem.Children is INotifyCollectionChanged observableCollection) + observableCollection.CollectionChanged += ChildItems_CollectionChanged; + } + UpdateIcon(); + } + + private void SidebarItem_DragStarting(UIElement sender, DragStartingEventArgs args) + { + args.Data.SetData(StandardDataFormats.Text, Item!.Text.ToString()); + } + + private void SetFlyoutOpen(bool isOpen = true) + { + if (Item?.Children is null) return; + + var flyoutOwner = (GetTemplateChild("ElementGrid") as FrameworkElement)!; + if (isOpen) + { + FlyoutBase.ShowAttachedFlyout(flyoutOwner); + } + else + { + FlyoutBase.GetAttachedFlyout(flyoutOwner).Hide(); + } + } + + private void ChildItems_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) + { + ReevaluateSelection(); + UpdateExpansionState(); + if(DisplayMode == SidebarDisplayMode.Compact && !HasChildren) + { + SetFlyoutOpen(false); + } + } + + void ItemPropertyChangedHandler(object? sender, PropertyChangedEventArgs args) + { + if (args.PropertyName == nameof(ISidebarItemModel.IconSource)) + { + UpdateIcon(); + } + } + + private void ReevaluateSelection() + { + if (!IsGroupHeader) + { + IsSelected = Item == Owner?.SelectedItem; + if (IsSelected) + { + Owner?.UpdateSelectedItemContainer(this); + } + } + else if (Item?.Children is IList list) + { + if (list.Contains(Owner?.SelectedItem)) + { + selectedChildItem = Owner?.SelectedItem; + SetFlyoutOpen(false); + } + else + { + selectedChildItem = null; + } + UpdateSelectionState(); + } + } + + private void ChildrenPresenter_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args) + { + if (args.Element is SidebarItem item) + { + if (Item?.Children is IList enumerable) + { + var newElement = enumerable[args.Index]; + if (newElement == selectedChildItem) + { + (args.Element as SidebarItem)!.IsSelected = true; + } + else + { + (args.Element as SidebarItem)!.IsSelected = false; + } + item.HandleItemChange(); + } + } + } + + internal void Clicked() + { + if (IsGroupHeader) + { + if (CollapseEnabled) + { + IsExpanded = !IsExpanded; + } + else if(HasChildren) + { + SetFlyoutOpen(true); + } + } + RaiseItemInvoked(); + } + + internal void RaiseItemInvoked() + { + Owner?.RaiseItemInvoked(this); + } + + private void SidebarDisplayModeChanged(SidebarDisplayMode oldValue) + { + var useAnimations = oldValue != SidebarDisplayMode.Minimal; + switch (DisplayMode) + { + case SidebarDisplayMode.Expanded: + UpdateExpansionState(useAnimations); + UpdateSelectionState(); + SetFlyoutOpen(false); + break; + case SidebarDisplayMode.Minimal: + UpdateExpansionState(useAnimations); + SetFlyoutOpen(false); + break; + case SidebarDisplayMode.Compact: + UpdateExpansionState(useAnimations); + UpdateSelectionState(); + break; + } + if (!IsInFlyout) + { + VisualStateManager.GoToState(this, DisplayMode == SidebarDisplayMode.Compact ? "Compact" : "NonCompact", true); + } + } + + private void UpdateSelectionState() + { + VisualStateManager.GoToState(this, ShouldShowSelectionIndicator() ? "Selected" : "Unselected", true); + UpdatePointerState(); + } + + private void UpdateIcon() + { + Icon = Item?.IconSource?.CreateIconElement(); + if (Icon is not null) + AutomationProperties.SetAccessibilityView(Icon, AccessibilityView.Raw); + } + + private bool ShouldShowSelectionIndicator() + { + if (IsExpanded && CollapseEnabled) + { + return IsSelected; + } + else + { + return IsSelected || hasChildSelection; + } + } + + private void UpdatePointerState(bool isPointerDown = false) + { + var useSelectedState = ShouldShowSelectionIndicator(); + if (isPointerDown) + { + VisualStateManager.GoToState(this, useSelectedState ? "PressedSelected" : "Pressed", true); + } + else if (isPointerOver) + { + VisualStateManager.GoToState(this, useSelectedState ? "PointerOverSelected" : "PointerOver", true); + } + else + { + VisualStateManager.GoToState(this, useSelectedState ? "NormalSelected" : "Normal", true); + } + } + + private void UpdateExpansionState(bool useAnimations = true) + { + if(Item?.Children is null || !CollapseEnabled) + { + VisualStateManager.GoToState(this, "NoExpansion", useAnimations); + } + else if (!HasChildren) + { + VisualStateManager.GoToState(this, "NoChildren", useAnimations); + } + else + { + if (childrenRepeater != null) + { + if (childrenRepeater.ActualHeight > ChildrenPresenterHeight) + { + ChildrenPresenterHeight = childrenRepeater.ActualHeight; + } + } + VisualStateManager.GoToState(this, IsExpanded ? "Expanded" : "Collapsed", useAnimations); + VisualStateManager.GoToState(this, IsExpanded ? "ExpandedIconNormal" : "CollapsedIconNormal", useAnimations); + } + UpdateSelectionState(); + } + + private void ItemGrid_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) + { + isPointerOver = true; + UpdatePointerState(); + } + + private void ItemGrid_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) + { + isPointerOver = false; + UpdatePointerState(); + } + + private void ItemGrid_PointerCanceled(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) + { + UpdatePointerState(); + } + + private void ItemGrid_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) + { + UpdatePointerState(true); + VisualStateManager.GoToState(this, IsExpanded ? "ExpandedIconPressed" : "CollapsedIconPressed", true); + } + + private void Item_PointerReleased(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) + { + e.Handled = true; + UpdatePointerState(); + + VisualStateManager.GoToState(this, IsExpanded ? "ExpandedIconNormal" : "CollapsedIconNormal", true); + var updateKind = e.GetCurrentPoint(null).Properties.PointerUpdateKind; + if (updateKind == PointerUpdateKind.LeftButtonReleased) + { + Clicked(); + } + } + + private void ItemGrid_DragOver(object sender, DragEventArgs e) + { + if (HasChildren) + { + IsExpanded = true; + } + + var insertsAbove = DetermineDropTargetPosition(e); + if (insertsAbove == SidebarItemDropPosition.Center) + { + VisualStateManager.GoToState(this, "DragOnTop", true); + } + else if (insertsAbove == SidebarItemDropPosition.Top) + { + VisualStateManager.GoToState(this, "DragInsertAbove", true); + } + else if (insertsAbove == SidebarItemDropPosition.Bottom) + { + VisualStateManager.GoToState(this, "DragInsertBelow", true); + } + + Owner?.RaiseItemDragOver(this, insertsAbove, e); + } + + private void ItemGrid_ContextRequested(UIElement sender, Microsoft.UI.Xaml.Input.ContextRequestedEventArgs args) + { + Owner?.RaiseContextRequested(this, args.TryGetPosition(this, out var point) ? point : default); + args.Handled = true; + } + + private void ItemGrid_DragLeave(object sender, DragEventArgs e) + { + UpdatePointerState(); + } + + private void ItemGrid_Drop(object sender, DragEventArgs e) + { + UpdatePointerState(); + Owner?.RaiseItemDropped(this, DetermineDropTargetPosition(e), e); + } + + private SidebarItemDropPosition DetermineDropTargetPosition(DragEventArgs args) + { + if (UseReorderDrop) + { + if (GetTemplateChild("ElementGrid") is Grid grid) + { + var position = args.GetPosition(grid); + if (position.Y < grid.ActualHeight * DROP_REPOSITION_THRESHOLD) + { + return SidebarItemDropPosition.Top; + } + if (position.Y > grid.ActualHeight * (1 - DROP_REPOSITION_THRESHOLD)) + { + return SidebarItemDropPosition.Bottom; + } + return SidebarItemDropPosition.Center; + } + } + return SidebarItemDropPosition.Center; + } + } +} diff --git a/src/Files.App/UserControls/SideBar/SideBarItem.properties.cs b/src/Files.App/UserControls/SideBar/SideBarItem.properties.cs new file mode 100644 index 000000000000..58cabe7a0d18 --- /dev/null +++ b/src/Files.App/UserControls/SideBar/SideBarItem.properties.cs @@ -0,0 +1,120 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; + +namespace Files.App.UserControls.Sidebar +{ + public sealed partial class SidebarItem : Control + { + public SidebarView? Owner + { + get { return (SidebarView?)GetValue(OwnerProperty); } + set { SetValue(OwnerProperty, value); } + } + public static readonly DependencyProperty OwnerProperty = + DependencyProperty.Register(nameof(Owner), typeof(SidebarView), typeof(SidebarItem), new PropertyMetadata(null)); + + public bool IsSelected + { + get { return (bool)GetValue(IsSelectedProperty); } + set { SetValue(IsSelectedProperty, value); } + } + public static readonly DependencyProperty IsSelectedProperty = + DependencyProperty.Register(nameof(IsSelected), typeof(bool), typeof(SidebarItem), new PropertyMetadata(false, OnPropertyChanged)); + + public bool IsExpanded + { + get { return (bool)GetValue(IsExpandedProperty); } + set { SetValue(IsExpandedProperty, value); } + } + public static readonly DependencyProperty IsExpandedProperty = + DependencyProperty.Register(nameof(IsExpanded), typeof(bool), typeof(SidebarItem), new PropertyMetadata(true, OnPropertyChanged)); + + public bool IsInFlyout + { + get { return (bool)GetValue(IsInFlyoutProperty); } + set { SetValue(IsInFlyoutProperty, value); } + } + public static readonly DependencyProperty IsInFlyoutProperty = + DependencyProperty.Register(nameof(IsInFlyout), typeof(bool), typeof(SidebarItem), new PropertyMetadata(false)); + + public double ChildrenPresenterHeight + { + get { return (double)GetValue(ChildrenPresenterHeightProperty); } + set { SetValue(ChildrenPresenterHeightProperty, value); } + } + // Using 30 as a default in case something goes wrong + public static readonly DependencyProperty ChildrenPresenterHeightProperty = + DependencyProperty.Register(nameof(ChildrenPresenterHeight), typeof(double), typeof(SidebarItem), new PropertyMetadata(30d)); + + public ISidebarItemModel? Item + { + get { return (ISidebarItemModel)GetValue(ItemProperty); } + set { SetValue(ItemProperty, value); } + } + public static readonly DependencyProperty ItemProperty = + DependencyProperty.Register(nameof(Item), typeof(ISidebarItemModel), typeof(SidebarItem), new PropertyMetadata(null)); + + public bool UseReorderDrop + { + get { return (bool)GetValue(UseReorderDropProperty); } + set { SetValue(UseReorderDropProperty, value); } + } + public static readonly DependencyProperty UseReorderDropProperty = + DependencyProperty.Register(nameof(UseReorderDrop), typeof(bool), typeof(SidebarItem), new PropertyMetadata(false)); + + public FrameworkElement? Icon + { + get { return (FrameworkElement?)GetValue(IconProperty); } + set { SetValue(IconProperty, value); } + } + public static readonly DependencyProperty IconProperty = + DependencyProperty.Register(nameof(Icon), typeof(FrameworkElement), typeof(SidebarItem), new PropertyMetadata(null)); + + public SidebarDisplayMode DisplayMode + { + get { return (SidebarDisplayMode)GetValue(DisplayModeProperty); } + set { SetValue(DisplayModeProperty, value); } + } + public static readonly DependencyProperty DisplayModeProperty = + DependencyProperty.Register(nameof(DisplayMode), typeof(SidebarDisplayMode), typeof(SidebarItem), new PropertyMetadata(SidebarDisplayMode.Expanded, OnPropertyChanged)); + + public static void SetTemplateRoot(DependencyObject target, FrameworkElement value) + { + target.SetValue(TemplateRootProperty, value); + } + public static FrameworkElement GetTemplateRoot(DependencyObject target) + { + return (FrameworkElement)target.GetValue(TemplateRootProperty); + } + public static readonly DependencyProperty TemplateRootProperty = + DependencyProperty.Register("TemplateRoot", typeof(FrameworkElement), typeof(FrameworkElement), new PropertyMetadata(null)); + + public static void OnPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) + { + if (sender is not SidebarItem item) return; + if (e.Property == DisplayModeProperty) + { + item.SidebarDisplayModeChanged((SidebarDisplayMode)e.OldValue); + } + else if (e.Property == IsSelectedProperty) + { + item.UpdateSelectionState(); + } + else if (e.Property == IsExpandedProperty) + { + item.UpdateExpansionState(); + } + else if(e.Property == ItemProperty) + { + item.HandleItemChange(); + } + else + { + Debug.Write(e.Property.ToString()); + } + } + } +} diff --git a/src/Files.App/UserControls/SideBar/SideBarResources.cs b/src/Files.App/UserControls/SideBar/SideBarResources.cs new file mode 100644 index 000000000000..95851b0168d6 --- /dev/null +++ b/src/Files.App/UserControls/SideBar/SideBarResources.cs @@ -0,0 +1,14 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Xaml; + +namespace Files.App.UserControls.Sidebar +{ + /// + /// Backing dictionary for Sidebar Resources to support x:Bind + /// + partial class SidebarResources : ResourceDictionary + { + } +} diff --git a/src/Files.App/UserControls/SideBar/SideBarView.properties.cs b/src/Files.App/UserControls/SideBar/SideBarView.properties.cs new file mode 100644 index 000000000000..9693af74871f --- /dev/null +++ b/src/Files.App/UserControls/SideBar/SideBarView.properties.cs @@ -0,0 +1,99 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Xaml; + +namespace Files.App.UserControls.Sidebar +{ + public sealed partial class SidebarView + { + public SidebarDisplayMode DisplayMode + { + get { return (SidebarDisplayMode)GetValue(DisplayModeProperty); } + set { SetValue(DisplayModeProperty, value); } + } + public static readonly DependencyProperty DisplayModeProperty = + DependencyProperty.Register(nameof(DisplayMode), typeof(SidebarDisplayMode), typeof(SidebarView), new PropertyMetadata(SidebarDisplayMode.Expanded, OnPropertyChanged)); + + public UIElement InnerContent + { + get { return (UIElement)GetValue(InnerContentProperty); } + set { SetValue(InnerContentProperty, value); } + } + public static readonly DependencyProperty InnerContentProperty = + DependencyProperty.Register(nameof(InnerContent), typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null)); + + public UIElement Footer + { + get { return (UIElement)GetValue(FooterProperty); } + set { SetValue(FooterProperty, value); } + } + public static readonly DependencyProperty FooterProperty = + DependencyProperty.Register("Footer", typeof(UIElement), typeof(SidebarView), new PropertyMetadata(null)); + + public bool IsPaneOpen + { + get { return (bool)GetValue(IsPaneOpenProperty); } + set { SetValue(IsPaneOpenProperty, value); } + } + public static readonly DependencyProperty IsPaneOpenProperty = + DependencyProperty.Register(nameof(IsPaneOpen), typeof(bool), typeof(SidebarView), new PropertyMetadata(false, OnPropertyChanged)); + + public double OpenPaneLength + { + get { return (double)GetValue(OpenPaneLengthProperty); } + set + { + SetValue(OpenPaneLengthProperty, value); + NegativeOpenPaneLength = -value; + } + } + public static readonly DependencyProperty OpenPaneLengthProperty = + DependencyProperty.Register(nameof(OpenPaneLength), typeof(double), typeof(SidebarView), new PropertyMetadata(240d, OnPropertyChanged)); + + public double NegativeOpenPaneLength + { + get { return (double)GetValue(NegativeOpenPaneLengthProperty); } + set { SetValue(NegativeOpenPaneLengthProperty, value); } + } + public static readonly DependencyProperty NegativeOpenPaneLengthProperty = + DependencyProperty.Register(nameof(NegativeOpenPaneLength), typeof(double), typeof(SidebarView), new PropertyMetadata(null)); + + public ISidebarViewModel ViewModel + { + get => (ISidebarViewModel)GetValue(ViewModelProperty); + set => SetValue(ViewModelProperty, value); + } + public static readonly DependencyProperty ViewModelProperty = + DependencyProperty.Register(nameof(ViewModel), typeof(ISidebarViewModel), typeof(SidebarView), new PropertyMetadata(null)); + + public ISidebarItemModel SelectedItem + { + get => (ISidebarItemModel)GetValue(SelectedItemProperty); + set + { + SetValue(SelectedItemProperty, value); + } + } + public static readonly DependencyProperty SelectedItemProperty = + DependencyProperty.Register(nameof(SelectedItem), typeof(ISidebarItemModel), typeof(SidebarView), new PropertyMetadata(null)); + + public static void OnPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e) + { + if (sender is not SidebarView control) return; + + if (e.Property == OpenPaneLengthProperty) + { + control.UpdateOpenPaneLengthColumn(); + } + else if (e.Property == DisplayModeProperty) + { + control.UpdateDisplayMode(); + } + else if (e.Property == IsPaneOpenProperty) + { + control.UpdateMinimalMode(); + } + } + } +} diff --git a/src/Files.App/UserControls/SideBar/SideBarView.xaml b/src/Files.App/UserControls/SideBar/SideBarView.xaml new file mode 100644 index 000000000000..7f9cc8d5c8ce --- /dev/null +++ b/src/Files.App/UserControls/SideBar/SideBarView.xaml @@ -0,0 +1,363 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Files.App/UserControls/SideBar/SideBarView.xaml.cs b/src/Files.App/UserControls/SideBar/SideBarView.xaml.cs new file mode 100644 index 000000000000..99109b1716f7 --- /dev/null +++ b/src/Files.App/UserControls/SideBar/SideBarView.xaml.cs @@ -0,0 +1,244 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Input; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Markup; +using Windows.Foundation; +using Windows.System; +using Windows.UI.Core; + +namespace Files.App.UserControls.Sidebar +{ + [ContentProperty(Name = "InnerContent")] + public sealed partial class SidebarView : UserControl, INotifyPropertyChanged + { + + private const double COMPACT_MAX_WIDTH = 200; + + public event EventHandler? ItemDropped; + public event EventHandler? ItemDragOver; + public event EventHandler? ItemInvoked; + public event EventHandler? ItemContextInvoked; + public event PropertyChangedEventHandler? PropertyChanged; + + internal SidebarItem? SelectedItemContainer = null; + + private bool draggingSidebarResizer; + private double preManipulationSidebarWidth = 0; + + public SidebarView() + { + InitializeComponent(); + } + + internal void UpdateSelectedItemContainer(SidebarItem container) + { + SelectedItemContainer = container; + } + + internal void RaiseItemInvoked(SidebarItem item) + { + // Only leaves can be selected + if (item.Item is null || item.IsGroupHeader) return; + + SelectedItem = item.Item; + ItemInvoked?.Invoke(item, item.Item); + ViewModel.HandleItemInvoked(item.Item); + } + + internal void RaiseContextRequested(SidebarItem item, Point e) + { + ItemContextInvoked?.Invoke(item, new ItemContextInvokedArgs(item.Item, e)); + ViewModel.HandleItemContextInvoked(item, new ItemContextInvokedArgs(item.Item, e)); + } + + internal void RaiseItemDropped(SidebarItem sideBarItem, SidebarItemDropPosition dropPosition, DragEventArgs rawEvent) + { + if (sideBarItem.Item is null) return; + ItemDropped?.Invoke(sideBarItem, new ItemDroppedEventArgs(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent)); + ViewModel.HandleItemDropped(new ItemDroppedEventArgs(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent)); + } + + internal void RaiseItemDragOver(SidebarItem sideBarItem, SidebarItemDropPosition dropPosition, DragEventArgs rawEvent) + { + if (sideBarItem.Item is null) return; + ItemDragOver?.Invoke(sideBarItem, new ItemDragOverEventArgs(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent)); + ViewModel.HandleItemDragOver(new ItemDragOverEventArgs(sideBarItem.Item, rawEvent.DataView, dropPosition, rawEvent)); + } + + private void UpdateMinimalMode() + { + if (DisplayMode != SidebarDisplayMode.Minimal) return; + + if (IsPaneOpen) + { + VisualStateManager.GoToState(this, "MinimalExpanded", true); + } + else + { + VisualStateManager.GoToState(this, "MinimalCollapsed", true); + } + } + + private void UpdateDisplayMode() + { + switch (DisplayMode) + { + case SidebarDisplayMode.Compact: + VisualStateManager.GoToState(this, "Compact", true); + return; + case SidebarDisplayMode.Expanded: + VisualStateManager.GoToState(this, "Expanded", true); + return; + case SidebarDisplayMode.Minimal: + IsPaneOpen = false; + UpdateMinimalMode(); + return; + } + } + + private void UpdateDisplayModeForPaneWidth(double newPaneWidth) + { + if (newPaneWidth < COMPACT_MAX_WIDTH) + { + DisplayMode = SidebarDisplayMode.Compact; + } + else if (newPaneWidth > COMPACT_MAX_WIDTH) + { + DisplayMode = SidebarDisplayMode.Expanded; + OpenPaneLength = newPaneWidth; + } + } + + private void UpdateOpenPaneLengthColumn() + { + DisplayColumn.Width = new GridLength(OpenPaneLength); + } + + private void SidebarView_Loaded(object sender, RoutedEventArgs e) + { + UpdateDisplayMode(); + UpdateOpenPaneLengthColumn(); + PaneColumnGrid.Translation = new System.Numerics.Vector3(0, 0, 32); + } + + private void SidebarResizer_ManipulationStarted(object sender, ManipulationStartedRoutedEventArgs e) + { + draggingSidebarResizer = true; + preManipulationSidebarWidth = PaneColumnGrid.ActualWidth; + VisualStateManager.GoToState(this, "ResizerPressed", true); + e.Handled = true; + } + + private void SidebarResizer_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e) + { + var newWidth = preManipulationSidebarWidth + e.Cumulative.Translation.X; + UpdateDisplayModeForPaneWidth(newWidth); + e.Handled = true; + } + + private void SidebarResizerControl_KeyDown(object sender, KeyRoutedEventArgs e) + { + var primaryInvocation = e.Key == VirtualKey.Space || e.Key == VirtualKey.Enter; + if (DisplayMode == SidebarDisplayMode.Expanded) + { + if (primaryInvocation) + { + DisplayMode = SidebarDisplayMode.Compact; + return; + } + + var ctrl = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control); + var increment = ctrl.HasFlag(CoreVirtualKeyStates.Down) ? 5 : 1; + + // Left makes the pane smaller so we invert the increment + if (e.Key == VirtualKey.Left) + { + increment = -increment; + } + var newWidth = OpenPaneLength + increment; + UpdateDisplayModeForPaneWidth(newWidth); + e.Handled = true; + return; + } + else if (DisplayMode == SidebarDisplayMode.Compact) + { + if (primaryInvocation || e.Key == VirtualKey.Right) + { + DisplayMode = SidebarDisplayMode.Expanded; + e.Handled = true; + } + } + } + + private void PaneLightDismissLayer_PointerPressed(object sender, PointerRoutedEventArgs e) + { + IsPaneOpen = false; + e.Handled = true; + } + + private void PaneLightDismissLayer_Tapped(object sender, TappedRoutedEventArgs e) + { + IsPaneOpen = false; + e.Handled = true; + } + + private void SidebarResizer_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e) + { + if (DisplayMode == SidebarDisplayMode.Expanded) + { + DisplayMode = SidebarDisplayMode.Compact; + e.Handled = true; + } + else + { + DisplayMode = SidebarDisplayMode.Expanded; + e.Handled = true; + } + } + + private void SidebarResizer_PointerEntered(object sender, PointerRoutedEventArgs e) + { + var sidebarResizer = (FrameworkElement)sender; + sidebarResizer.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast)); + VisualStateManager.GoToState(this, "ResizerPointerOver", true); + e.Handled = true; + } + + private void SidebarResizer_PointerExited(object sender, PointerRoutedEventArgs e) + { + if (draggingSidebarResizer) + return; + + var sidebarResizer = (FrameworkElement)sender; + sidebarResizer.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow)); + VisualStateManager.GoToState(this, "ResizerNormal", true); + e.Handled = true; + } + + private void SidebarResizer_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e) + { + draggingSidebarResizer = false; + VisualStateManager.GoToState(this, "ResizerNormal", true); + e.Handled = true; + } + + private void PaneColumnGrid_ContextRequested(UIElement sender, ContextRequestedEventArgs e) + { + var newArgs = new ItemContextInvokedArgs(null, e.TryGetPosition(this, out var point) ? point : default); + ViewModel.HandleItemContextInvoked(this, newArgs); + e.Handled = true; + } + + private void MenuItemsHost_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args) + { + if(args.Element is SidebarItem sidebarItem) + { + sidebarItem.HandleItemChange(); + } + } + } +} diff --git a/src/Files.App/UserControls/Sidebar/ISidebarItemModel.cs b/src/Files.App/UserControls/Sidebar/ISidebarItemModel.cs new file mode 100644 index 000000000000..1a18d58bf1e4 --- /dev/null +++ b/src/Files.App/UserControls/Sidebar/ISidebarItemModel.cs @@ -0,0 +1,36 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Xaml.Controls; + +namespace Files.App.UserControls.Sidebar +{ + public interface ISidebarItemModel : INotifyPropertyChanged + { + /// + /// The children of this item that will be rendered as child elements of the SidebarItem + /// + object? Children { get; } + + /// + /// The icon source used to generate the icon for the SidebarItem + /// + IconSource? IconSource { get; } + + /// + /// Determines whether the SidebarItem is expanded and the children are visible + /// or if it is collapsed and children are not visible. + /// + bool IsExpanded { get; set; } + + /// + /// The text of this item that will be rendered as the label of the SidebarItem + /// + string Text { get; } + + /// + /// The tooltip used when hovering over this item in the sidebar + /// + object ToolTip { get; } + } +} diff --git a/src/Files.App/UserControls/Sidebar/SidebarItemAutomationPeer.cs b/src/Files.App/UserControls/Sidebar/SidebarItemAutomationPeer.cs new file mode 100644 index 000000000000..4a981d0ea8b1 --- /dev/null +++ b/src/Files.App/UserControls/Sidebar/SidebarItemAutomationPeer.cs @@ -0,0 +1,118 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using CommunityToolkit.WinUI.UI; +using Microsoft.UI.Xaml.Automation; +using Microsoft.UI.Xaml.Automation.Peers; +using Microsoft.UI.Xaml.Automation.Provider; + +namespace Files.App.UserControls.Sidebar +{ + public class SidebarItemAutomationPeer : FrameworkElementAutomationPeer, IInvokeProvider, IExpandCollapseProvider, ISelectionItemProvider + { + public ExpandCollapseState ExpandCollapseState + { + get + { + if (Owner.HasChildren) + return Owner.IsExpanded ? ExpandCollapseState.Expanded : ExpandCollapseState.Collapsed; + return ExpandCollapseState.LeafNode; + } + } + public bool IsSelected => Owner.IsSelected; + public IRawElementProviderSimple SelectionContainer => ProviderFromPeer(CreatePeerForElement(Owner.Owner)); + + private new SidebarItem Owner { get; init; } + + public SidebarItemAutomationPeer(SidebarItem owner) : base(owner) + { + this.Owner = owner; + } + + protected override AutomationControlType GetAutomationControlTypeCore() + { + return AutomationControlType.ListItem; + } + + protected override string GetNameCore() + { + return Owner.Item?.Text ?? ""; + } + + protected override object GetPatternCore(PatternInterface patternInterface) + { + if (patternInterface == PatternInterface.Invoke || patternInterface == PatternInterface.SelectionItem) + { + return this; + } + else if (patternInterface == PatternInterface.ExpandCollapse) + { + if (Owner.CollapseEnabled) + { + return this; + } + } + return base.GetPatternCore(patternInterface); + } + + public void Collapse() + { + if (Owner.CollapseEnabled) + { + Owner.IsExpanded = false; + } + } + + public void Expand() + { + + if (Owner.CollapseEnabled) + { + Owner.IsExpanded = true; + } + } + + public void Invoke() + { + Owner.RaiseItemInvoked(); + } + + public void AddToSelection() + { + Owner.Select(); + } + + public void RemoveFromSelection() + { + // Intentionally left blank + } + + public void Select() + { + Owner.Select(); + } + + protected override int GetSizeOfSetCore() + { + return GetOwnerCollection().Count; + } + + protected override int GetPositionInSetCore() + { + return GetOwnerCollection().IndexOf(Owner.DataContext) + 1; + } + + private IList GetOwnerCollection() + { + if (Owner.FindAscendant() is SidebarItem parent && parent.Item?.Children is IList list) + { + return list; + } + if (Owner?.Owner is not null && Owner.Owner.ViewModel.SidebarItems is IList items) + { + return items; + } + return new List(); + } + } +} diff --git a/src/Files.App/UserControls/Sidebar/SidebarItemDropPosition.cs b/src/Files.App/UserControls/Sidebar/SidebarItemDropPosition.cs new file mode 100644 index 000000000000..d9fc1d760def --- /dev/null +++ b/src/Files.App/UserControls/Sidebar/SidebarItemDropPosition.cs @@ -0,0 +1,24 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.App.UserControls.Sidebar +{ + /// + /// The position of the item that was dropped on the sidebar item. + /// + public enum SidebarItemDropPosition + { + /// + /// The item was dropped on the top of the sidebar item indicating it should be moved/inserted above this item. + /// + Top, + /// + /// The item was dropped on the bottom of the sidebar item indicating it should be moved/inserted below this item. + /// + Bottom, + /// + /// The item was dropped on the center of the sidebar item indicating it should be moved/inserted as a child of this item. + /// + Center + } +} diff --git a/src/Files.App/UserControls/Sidebar/SidebarViewAutomationPeer.cs b/src/Files.App/UserControls/Sidebar/SidebarViewAutomationPeer.cs new file mode 100644 index 000000000000..279782dc62cd --- /dev/null +++ b/src/Files.App/UserControls/Sidebar/SidebarViewAutomationPeer.cs @@ -0,0 +1,40 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +using Microsoft.UI.Xaml.Automation.Peers; +using Microsoft.UI.Xaml.Automation.Provider; + +namespace Files.App.UserControls.Sidebar +{ + class SidebarViewAutomationPeer : FrameworkElementAutomationPeer, ISelectionProvider + { + public bool CanSelectMultiple => false; + public bool IsSelectionRequired => true; + + private new SidebarView Owner { get; init; } + + public SidebarViewAutomationPeer(SidebarView owner) : base(owner) + { + Owner = owner; + } + + protected override object GetPatternCore(PatternInterface patternInterface) + { + if (patternInterface == PatternInterface.Selection) + { + return this; + } + return base.GetPatternCore(patternInterface); + } + + public IRawElementProviderSimple[] GetSelection() + { + if (Owner.SelectedItemContainer != null) + return new IRawElementProviderSimple[] + { + ProviderFromPeer(CreatePeerForElement(Owner.SelectedItemContainer)) + }; + return Array.Empty(); + } + } +} diff --git a/src/Files.App/UserControls/SidebarControl.xaml b/src/Files.App/UserControls/SidebarControl.xaml deleted file mode 100644 index d38185de26b7..000000000000 --- a/src/Files.App/UserControls/SidebarControl.xaml +++ /dev/null @@ -1,1196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - 0,0,0,0 - 0,0,0,0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Files.App/UserControls/SidebarControl.xaml.cs b/src/Files.App/UserControls/SidebarControl.xaml.cs deleted file mode 100644 index 907276aaa24e..000000000000 --- a/src/Files.App/UserControls/SidebarControl.xaml.cs +++ /dev/null @@ -1,1088 +0,0 @@ -// Copyright (c) 2023 Files Community -// Licensed under the MIT License. See the LICENSE. - -using CommunityToolkit.WinUI.UI; -using Files.App.Helpers.ContextFlyouts; -using Files.App.Services; -using Files.App.ViewModels.Dialogs; -using Files.Core.Storage; -using Files.Core.Storage.Extensions; -using Microsoft.UI.Input; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Input; -using System.Runtime.CompilerServices; -using System.Windows.Input; -using Windows.ApplicationModel.DataTransfer; -using Windows.ApplicationModel.DataTransfer.DragDrop; -using Windows.System; -using Windows.UI.Core; -using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer; - -namespace Files.App.UserControls -{ - public sealed partial class SidebarControl : NavigationView, INotifyPropertyChanged - { - private readonly IUserSettingsService userSettingsService; - - private readonly ICommandManager commands; - - private readonly IFileTagsService _fileTagsService; - public IQuickAccessService QuickAccessService { get; } - - public delegate void SelectedTagChangedEventHandler(object sender, SelectedTagChangedEventArgs e); - - public static event SelectedTagChangedEventHandler? SelectedTagChanged; - - public delegate void SidebarItemInvokedEventHandler(object sender, SidebarItemInvokedEventArgs e); - - public event SidebarItemInvokedEventHandler SidebarItemInvoked; - - public delegate void SidebarItemNewPaneInvokedEventHandler(object sender, SidebarItemNewPaneInvokedEventArgs e); - - public event SidebarItemNewPaneInvokedEventHandler SidebarItemNewPaneInvoked; - - public delegate void SidebarItemPropertiesInvokedEventHandler(object sender, SidebarItemPropertiesInvokedEventArgs e); - - public event SidebarItemPropertiesInvokedEventHandler SidebarItemPropertiesInvoked; - - public delegate void SidebarItemDroppedEventHandler(object sender, SidebarItemDroppedEventArgs e); - - public event SidebarItemDroppedEventHandler SidebarItemDropped; - - private INavigationControlItem rightClickedItem; - - private object? dragOverSection, dragOverItem = null; - - private bool isDropOnProcess = false; - - /// - /// true if the user is currently resizing the sidebar - /// - private bool dragging; - - private double originalSize = 0; - - private bool lockFlag = false; - - public SidebarPinnedModel SidebarPinnedModel => App.QuickAccessManager.Model; - - // Using a DependencyProperty as the backing store for ViewModel. This enables animation, styling, binding, etc... - public static readonly DependencyProperty ViewModelProperty = - DependencyProperty.Register(nameof(ViewModel), typeof(SidebarViewModel), typeof(SidebarControl), new PropertyMetadata(null)); - - public static readonly DependencyProperty SelectedSidebarItemProperty = DependencyProperty.Register(nameof(SelectedSidebarItem), typeof(INavigationControlItem), typeof(SidebarControl), new PropertyMetadata(null)); - - public INavigationControlItem SelectedSidebarItem - { - get => (INavigationControlItem)GetValue(SelectedSidebarItemProperty); - set - { - if (IsLoaded) - SetValue(SelectedSidebarItemProperty, value); - } - } - - public static readonly DependencyProperty TabContentProperty = DependencyProperty.Register(nameof(TabContent), typeof(UIElement), typeof(SidebarControl), new PropertyMetadata(null)); - - public UIElement TabContent - { - get => (UIElement)GetValue(TabContentProperty); - set => SetValue(TabContentProperty, value); - } - - public readonly ICommand CreateLibraryCommand = new AsyncRelayCommand(LibraryManager.ShowCreateNewLibraryDialog); - - public readonly ICommand RestoreLibrariesCommand = new AsyncRelayCommand(LibraryManager.ShowRestoreDefaultLibrariesDialog); - - private ICommand HideSectionCommand { get; } - - private ICommand PinItemCommand { get; } - - private ICommand UnpinItemCommand { get; } - - private ICommand OpenInNewTabCommand { get; } - - private ICommand OpenInNewWindowCommand { get; } - - private ICommand OpenInNewPaneCommand { get; } - - private ICommand EjectDeviceCommand { get; } - - private ICommand FormatDriveCommand { get; } - - private ICommand OpenPropertiesCommand { get; } - - private ICommand ReorderItemsCommand { get; } - - private bool IsInPointerPressed = false; - - private readonly DispatcherQueueTimer dragOverSectionTimer, dragOverItemTimer; - - public SidebarControl() - { - userSettingsService = Ioc.Default.GetRequiredService(); - commands = Ioc.Default.GetRequiredService(); - _fileTagsService = Ioc.Default.GetRequiredService(); - QuickAccessService = Ioc.Default.GetRequiredService(); - - InitializeComponent(); - - dragOverSectionTimer = DispatcherQueue.CreateTimer(); - dragOverItemTimer = DispatcherQueue.CreateTimer(); - - HideSectionCommand = new RelayCommand(HideSection); - UnpinItemCommand = new RelayCommand(UnpinItem); - PinItemCommand = new RelayCommand(PinItem); - OpenInNewTabCommand = new AsyncRelayCommand(OpenInNewTab); - OpenInNewWindowCommand = new AsyncRelayCommand(OpenInNewWindow); - OpenInNewPaneCommand = new AsyncRelayCommand(OpenInNewPane); - EjectDeviceCommand = new AsyncRelayCommand(EjectDevice); - FormatDriveCommand = new RelayCommand(FormatDrive); - OpenPropertiesCommand = new RelayCommand(OpenProperties); - ReorderItemsCommand = new AsyncRelayCommand(ReorderItems); - } - - public SidebarViewModel ViewModel - { - get => (SidebarViewModel)GetValue(ViewModelProperty); - set => SetValue(ViewModelProperty, value); - } - - private bool canOpenInNewPane; - - public bool CanOpenInNewPane - { - get => canOpenInNewPane; - set - { - if (value != canOpenInNewPane) - { - canOpenInNewPane = value; - NotifyPropertyChanged(nameof(CanOpenInNewPane)); - } - } - } - - public event PropertyChangedEventHandler? PropertyChanged; - - private void NotifyPropertyChanged([CallerMemberName] string propertyName = "") - { - PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - } - - private List GetLocationItemMenuItems(INavigationControlItem item, CommandBarFlyout menu) - { - var options = item.MenuOptions; - - var favoriteModel = App.QuickAccessManager.Model; - var favoriteIndex = favoriteModel.IndexOfItem(item); - var favoriteCount = favoriteModel.FavoriteItems.Count; - - var isFavoriteItem = item.Section is SectionType.Favorites && favoriteIndex is not -1; - var showMoveItemUp = isFavoriteItem && favoriteIndex > 0; - var showMoveItemDown = isFavoriteItem && favoriteIndex < favoriteCount - 1; - - var isDriveItem = item is DriveItem; - var isDriveItemPinned = isDriveItem && ((DriveItem)item).IsPinned; - - var isTagItem = item is FileTagItem; - - return new List() - { - new ContextMenuFlyoutItemViewModel() - { - Text = "SideBarCreateNewLibrary/Text".GetLocalizedResource(), - Glyph = "\uE710", - Command = CreateLibraryCommand, - ShowItem = options.IsLibrariesHeader - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "SideBarRestoreLibraries/Text".GetLocalizedResource(), - Glyph = "\uE10E", - Command = RestoreLibrariesCommand, - ShowItem = options.IsLibrariesHeader - }, - new ContextMenuFlyoutItemViewModelBuilder(commands.EmptyRecycleBin) - { - IsVisible = options.ShowEmptyRecycleBin, - }.Build(), - new ContextMenuFlyoutItemViewModelBuilder(commands.RestoreAllRecycleBin) - { - IsVisible = options.ShowEmptyRecycleBin, - }.Build(), - new ContextMenuFlyoutItemViewModel() - { - Text = "OpenInNewTab".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconOpenInNewTab", - }, - Command = OpenInNewTabCommand, - ShowItem = options.IsLocationItem && userSettingsService.GeneralSettingsService.ShowOpenInNewTab - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "OpenInNewWindow".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconOpenInNewWindow", - }, - Command = OpenInNewWindowCommand, - ShowItem = options.IsLocationItem && userSettingsService.GeneralSettingsService.ShowOpenInNewTab - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "OpenInNewPane".GetLocalizedResource(), - Command = OpenInNewPaneCommand, - ShowItem = options.IsLocationItem && userSettingsService.GeneralSettingsService.ShowOpenInNewPane - }, - new ContextMenuFlyoutItemViewModelBuilder(commands.OpenAllTaggedItems) - { - IsVisible = isTagItem - }.Build(), - new ContextMenuFlyoutItemViewModel() - { - Text = "PinToFavorites".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconPinToFavorites", - }, - Command = PinItemCommand, - ShowItem = isDriveItem && !isDriveItemPinned - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "UnpinFromFavorites".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconUnpinFromFavorites", - }, - Command = UnpinItemCommand, - ShowItem = options.ShowUnpinItem || isDriveItemPinned - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "ReorderSidebarItemsDialogText".GetLocalizedResource(), - Glyph = "\uE8D8", - Command = ReorderItemsCommand, - // See issue #12390 on Github. Dragging makes the app crash when run as admin. - // Further reading: https://github.com/microsoft/terminal/issues/12017#issuecomment-1004129669 - ShowItem = (isFavoriteItem || item.Section is SectionType.Favorites) && - !ElevationHelpers.IsAppRunAsAdmin() - }, - new ContextMenuFlyoutItemViewModel() - { - Text = string.Format("SideBarHideSectionFromSideBar/Text".GetLocalizedResource(), rightClickedItem.Text), - Glyph = "\uE77A", - Command = HideSectionCommand, - ShowItem = options.ShowHideSection - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "SideBarEjectDevice/Text".GetLocalizedResource(), - Command = EjectDeviceCommand, - ShowItem = options.ShowEjectDevice - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "FormatDriveText".GetLocalizedResource(), - Command = FormatDriveCommand, - CommandParameter = item, - ShowItem = options.ShowFormatDrive - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "Properties".GetLocalizedResource(), - OpacityIcon = new OpacityIconModel() - { - OpacityIconStyle = "ColorIconProperties", - }, - Command = OpenPropertiesCommand, - CommandParameter = menu, - ShowItem = options.ShowProperties - }, - new ContextMenuFlyoutItemViewModel() - { - ItemType = ContextMenuFlyoutItemType.Separator, - Tag = "OverflowSeparator", - IsHidden = !options.ShowShellItems, - }, - new ContextMenuFlyoutItemViewModel() - { - Text = "Loading".GetLocalizedResource(), - Glyph = "\xE712", - Items = new List(), - ID = "ItemOverflow", - Tag = "ItemOverflow", - IsEnabled = false, - IsHidden = !options.ShowShellItems, - } - }.Where(x => x.ShowItem).ToList(); - } - - private void HideSection() - { - switch (rightClickedItem.Section) - { - case SectionType.Favorites: - userSettingsService.GeneralSettingsService.ShowFavoritesSection = false; - break; - case SectionType.Library: - userSettingsService.GeneralSettingsService.ShowLibrarySection = false; - break; - case SectionType.CloudDrives: - userSettingsService.GeneralSettingsService.ShowCloudDrivesSection = false; - break; - case SectionType.Drives: - userSettingsService.GeneralSettingsService.ShowDrivesSection = false; - break; - case SectionType.Network: - userSettingsService.GeneralSettingsService.ShowNetworkDrivesSection = false; - break; - case SectionType.WSL: - userSettingsService.GeneralSettingsService.ShowWslSection = false; - break; - case SectionType.FileTag: - userSettingsService.GeneralSettingsService.ShowFileTagsSection = false; - break; - } - } - - private async Task ReorderItems() - { - var dialog = new ReorderSidebarItemsDialogViewModel(); - var dialogService = Ioc.Default.GetRequiredService(); - var result = await dialogService.ShowDialogAsync(dialog); - } - - private async Task OpenInNewPane() - { - if (await DriveHelpers.CheckEmptyDrive(rightClickedItem.Path)) - return; - - SidebarItemNewPaneInvoked?.Invoke(this, new SidebarItemNewPaneInvokedEventArgs(rightClickedItem)); - } - - private async Task OpenInNewTab() - { - if (await DriveHelpers.CheckEmptyDrive(rightClickedItem.Path)) - return; - - await NavigationHelpers.OpenPathInNewTab(rightClickedItem.Path); - } - - private async Task OpenInNewWindow() - { - if (await DriveHelpers.CheckEmptyDrive(rightClickedItem.Path)) - return; - - await NavigationHelpers.OpenPathInNewWindowAsync(rightClickedItem.Path); - } - - private void PinItem() - { - if (rightClickedItem is DriveItem) - _ = QuickAccessService.PinToSidebar(new[] { rightClickedItem.Path }); - } - private void UnpinItem() - { - if (rightClickedItem.Section == SectionType.Favorites || rightClickedItem is DriveItem) - _ = QuickAccessService.UnpinFromSidebar(rightClickedItem.Path); - } - - private void OpenProperties(CommandBarFlyout menu) - { - EventHandler flyoutClosed = null!; - flyoutClosed = (s, e) => - { - menu.Closed -= flyoutClosed; - SidebarItemPropertiesInvoked?.Invoke(this, new SidebarItemPropertiesInvokedEventArgs(rightClickedItem)); - }; - menu.Closed += flyoutClosed; - } - - private async Task EjectDevice() - { - var result = await DriveHelpers.EjectDeviceAsync(rightClickedItem.Path); - await UIHelpers.ShowDeviceEjectResultAsync(rightClickedItem is DriveItem driveItem ? driveItem.Type : Data.Items.DriveType.Unknown, result); - } - - private void FormatDrive() - { - Win32API.OpenFormatDriveDialog(rightClickedItem.Path); - } - - private async void Sidebar_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) - { - try - { - if (args.InvokedItem is null || args.InvokedItemContainer is null) - return; - - var navigationPath = args.InvokedItemContainer.Tag?.ToString(); - - if (await DriveHelpers.CheckEmptyDrive(navigationPath)) - return; - - var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down); - if ((IsInPointerPressed || ctrlPressed) && navigationPath is not null) - { - await NavigationHelpers.OpenPathInNewTab(navigationPath); - return; - } - - SidebarItemInvoked?.Invoke(this, new SidebarItemInvokedEventArgs(args.InvokedItemContainer)); - } - finally - { - IsInPointerPressed = false; - } - } - - private async void Sidebar_PointerPressed(object sender, PointerRoutedEventArgs e) - { - var properties = e.GetCurrentPoint(null).Properties; - var context = (sender as NavigationViewItem)?.DataContext; - - if (!properties.IsMiddleButtonPressed || context is not INavigationControlItem item || await DriveHelpers.CheckEmptyDrive(item?.Path)) - return; - - IsInPointerPressed = true; - e.Handled = true; - } - - private void PaneRoot_RightTapped(object sender, RightTappedRoutedEventArgs e) - { - var contextMenu = FlyoutBase.GetAttachedFlyout(this); - contextMenu.ShowAt(this, new FlyoutShowOptions() { Position = e.GetPosition(this) }); - - e.Handled = true; - } - - private async void NavigationViewItem_RightTapped(object sender, RightTappedRoutedEventArgs e) - { - var itemContextMenuFlyout = new CommandBarFlyout { Placement = FlyoutPlacementMode.Full }; - itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout; - if (sender is not NavigationViewItem sidebarItem || - sidebarItem.DataContext is not INavigationControlItem item) - return; - - if (item is FileTagItem tagItem) - { - var cts = new CancellationTokenSource(); - var items = new List<(string path, bool isFolder)>(); - - await foreach (var taggedItem in _fileTagsService.GetItemsForTagAsync(tagItem.FileTag.Uid, cts.Token)) - { - items.Add(( - taggedItem.Storable.TryGetPath() ?? string.Empty, - taggedItem.Storable is IFolder)); - } - - SelectedTagChanged?.Invoke(this, new SelectedTagChangedEventArgs(items)); - } - - rightClickedItem = item; - - var menuItems = GetLocationItemMenuItems(item, itemContextMenuFlyout); - var (_, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(menuItems); - - secondaryElements.OfType() - .ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); - - secondaryElements.ForEach(i => itemContextMenuFlyout.SecondaryCommands.Add(i)); - itemContextMenuFlyout.ShowAt(sidebarItem, new FlyoutShowOptions { Position = e.GetPosition(sidebarItem) }); - - if (item.MenuOptions.ShowShellItems) - _ = ShellContextmenuHelper.LoadShellMenuItems(rightClickedItem.Path, itemContextMenuFlyout, item.MenuOptions); - - e.Handled = true; - } - - private void NavigationViewItem_DragEnter(object sender, DragEventArgs e) - { - var navView = sender as NavigationViewItem; - VisualStateManager.GoToState(navView, "DragEnter", false); - - if (navView?.DataContext is not INavigationControlItem iNavItem) - return; - - if (string.IsNullOrEmpty(iNavItem.Path)) - HandleDragOverSection(sender); - else - HandleDragOverItem(sender); - } - - private void HandleDragOverItem(object sender) - { - dragOverItem = sender; - dragOverItemTimer.Stop(); - dragOverItemTimer.Debounce(() => - { - if (dragOverItem is null) - return; - - dragOverItemTimer.Stop(); - SidebarItemInvoked?.Invoke(this, new SidebarItemInvokedEventArgs(dragOverItem as NavigationViewItemBase)); - dragOverItem = null; - }, TimeSpan.FromMilliseconds(1000), false); - } - - private void HandleDragOverSection(object sender) - { - dragOverSection = sender; - dragOverSectionTimer.Stop(); - dragOverSectionTimer.Debounce(() => - { - if (dragOverSection is null) - return; - - dragOverSectionTimer.Stop(); - if ((dragOverSection as NavigationViewItem)?.DataContext is LocationItem section) - section.IsExpanded = true; - - dragOverSection = null; - }, TimeSpan.FromMilliseconds(1000), false); - } - - private void NavigationViewItem_DragLeave(object sender, DragEventArgs e) - { - var navView = sender as NavigationViewItem; - VisualStateManager.GoToState(navView, "DragLeave", false); - - isDropOnProcess = false; - - if (navView?.DataContext is not INavigationControlItem) - return; - - if (sender == dragOverItem) - dragOverItem = null; // Reset dragged over item - - if (sender == dragOverSection) - dragOverSection = null; // Reset dragged over item - } - - private async void NavigationViewLocationItem_DragOver(object sender, DragEventArgs e) - { - if ((sender as NavigationViewItem)?.DataContext is not LocationItem locationItem) - return; - - var deferral = e.GetDeferral(); - - if (FilesystemHelpers.HasDraggedStorageItems(e.DataView)) - { - e.Handled = true; - isDropOnProcess = true; - - var isPathNull = string.IsNullOrEmpty(locationItem.Path); - var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView); - var hasStorageItems = storageItems.Any(); - - if (isPathNull && hasStorageItems && SectionType.Favorites.Equals(locationItem.Section)) - { - var haveFoldersToPin = storageItems.Any(item => item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.FavoriteItems.Contains(item.Path)); - - if (!haveFoldersToPin) - { - e.AcceptedOperation = DataPackageOperation.None; - } - else - { - var captionText = "PinToFavorites".GetLocalizedResource(); - CompleteDragEventArgs(e, captionText, DataPackageOperation.Move); - } - } - else if (isPathNull || - (hasStorageItems && storageItems.AreItemsAlreadyInFolder(locationItem.Path)) || - locationItem.Path.StartsWith("Home", StringComparison.OrdinalIgnoreCase)) - { - e.AcceptedOperation = DataPackageOperation.None; - } - else if (hasStorageItems is false) - { - e.AcceptedOperation = DataPackageOperation.None; - } - else - { - string captionText; - DataPackageOperation operationType; - if (locationItem.Path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal)) - { - captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text); - operationType = DataPackageOperation.Move; - } - else if (e.Modifiers.HasFlag(DragDropModifiers.Alt) || e.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift)) - { - captionText = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), locationItem.Text); - operationType = DataPackageOperation.Link; - } - else if (e.Modifiers.HasFlag(DragDropModifiers.Control)) - { - captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), locationItem.Text); - operationType = DataPackageOperation.Copy; - } - else if (e.Modifiers.HasFlag(DragDropModifiers.Shift)) - { - captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text); - operationType = DataPackageOperation.Move; - } - else if (storageItems.Any(x => x.Item is ZipStorageFile || x.Item is ZipStorageFolder) - || ZipStorageFolder.IsZipPath(locationItem.Path)) - { - captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), locationItem.Text); - operationType = DataPackageOperation.Copy; - } - else if (locationItem.IsDefaultLocation || storageItems.AreItemsInSameDrive(locationItem.Path)) - { - captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text); - operationType = DataPackageOperation.Move; - } - else - { - captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), locationItem.Text); - operationType = DataPackageOperation.Copy; - } - CompleteDragEventArgs(e, captionText, operationType); - } - } - - deferral.Complete(); - } - - private DragEventArgs CompleteDragEventArgs(DragEventArgs e, string captionText, DataPackageOperation operationType) - { - e.DragUIOverride.IsCaptionVisible = true; - e.DragUIOverride.Caption = captionText; - e.AcceptedOperation = operationType; - return e; - } - - private async void NavigationViewLocationItem_Drop(object sender, DragEventArgs e) - { - if (lockFlag) - return; - - lockFlag = true; - - dragOverItem = null; // Reset dragged over item - dragOverSection = null; // Reset dragged over section - - if (sender is not NavigationViewItem navView || navView.DataContext is not LocationItem locationItem) - return; - - // If the dropped item is a folder or file from a file system - if (FilesystemHelpers.HasDraggedStorageItems(e.DataView)) - { - VisualStateManager.GoToState(navView, "Drop", false); - - var deferral = e.GetDeferral(); - - if (string.IsNullOrEmpty(locationItem.Path) && isDropOnProcess && SectionType.Favorites.Equals(locationItem.Section)) // Pin to Favorites section - { - var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView); - foreach (var item in storageItems) - { - if (item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.FavoriteItems.Contains(item.Path)) - await QuickAccessService.PinToSidebar(item.Path); - } - } - else - { - var signal = new AsyncManualResetEvent(); - SidebarItemDropped?.Invoke(this, new SidebarItemDroppedEventArgs() - { - Package = e.DataView, - ItemPath = locationItem.Path, - AcceptedOperation = e.AcceptedOperation, - SignalEvent = signal - }); - await signal.WaitAsync(); - } - - isDropOnProcess = false; - deferral.Complete(); - } - - await Task.Yield(); - lockFlag = false; - } - - private async void NavigationViewDriveItem_DragOver(object sender, DragEventArgs e) - { - if ((sender as NavigationViewItem)?.DataContext is not DriveItem driveItem || - !FilesystemHelpers.HasDraggedStorageItems(e.DataView)) - return; - - var deferral = e.GetDeferral(); - e.Handled = true; - - var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView); - var hasStorageItems = storageItems.Any(); - - if ("Unknown".GetLocalizedResource().Equals(driveItem.SpaceText, StringComparison.OrdinalIgnoreCase) || - (hasStorageItems && storageItems.AreItemsAlreadyInFolder(driveItem.Path))) - { - e.AcceptedOperation = DataPackageOperation.None; - } - else if (!hasStorageItems) - { - e.AcceptedOperation = DataPackageOperation.None; - } - else - { - string captionText; - DataPackageOperation operationType; - if (e.Modifiers.HasFlag(DragDropModifiers.Alt) || e.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift)) - { - captionText = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), driveItem.Text); - operationType = DataPackageOperation.Link; - } - else if (e.Modifiers.HasFlag(DragDropModifiers.Control)) - { - captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), driveItem.Text); - operationType = DataPackageOperation.Copy; - } - else if (e.Modifiers.HasFlag(DragDropModifiers.Shift)) - { - captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text); - operationType = DataPackageOperation.Move; - } - else if (storageItems.AreItemsInSameDrive(driveItem.Path)) - { - captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text); - operationType = DataPackageOperation.Move; - } - else - { - captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), driveItem.Text); - operationType = DataPackageOperation.Copy; - } - CompleteDragEventArgs(e, captionText, operationType); - } - - deferral.Complete(); - } - - private async void NavigationViewDriveItem_Drop(object sender, DragEventArgs e) - { - if (lockFlag) - return; - - lockFlag = true; - - dragOverItem = null; // Reset dragged over item - dragOverSection = null; // Reset dragged over section - - if (sender is not NavigationViewItem navView || navView.DataContext is not DriveItem driveItem) - return; - - VisualStateManager.GoToState(navView, "Drop", false); - - var deferral = e.GetDeferral(); - - var signal = new AsyncManualResetEvent(); - SidebarItemDropped?.Invoke(this, new SidebarItemDroppedEventArgs() - { - Package = e.DataView, - ItemPath = driveItem.Path, - AcceptedOperation = e.AcceptedOperation, - SignalEvent = signal - }); - await signal.WaitAsync(); - - deferral.Complete(); - await Task.Yield(); - lockFlag = false; - } - - private async void NavigationViewFileTagItem_DragOver(object sender, DragEventArgs e) - { - if ((sender as NavigationViewItem)?.DataContext is not FileTagItem fileTagItem || - !FilesystemHelpers.HasDraggedStorageItems(e.DataView)) - return; - - var deferral = e.GetDeferral(); - e.Handled = true; - - var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView); - - if (!storageItems.Any()) - { - e.AcceptedOperation = DataPackageOperation.None; - } - else - { - e.DragUIOverride.IsCaptionVisible = true; - e.DragUIOverride.Caption = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), fileTagItem.Text); - e.AcceptedOperation = DataPackageOperation.Link; - } - - deferral.Complete(); - } - - private async void NavigationViewFileTag_Drop(object sender, DragEventArgs e) - { - if (lockFlag) - return; - - lockFlag = true; - - dragOverItem = null; // Reset dragged over item - dragOverSection = null; // Reset dragged over section - - if (sender is not NavigationViewItem navItem || navItem.DataContext is not FileTagItem fileTagItem) - return; - - VisualStateManager.GoToState(navItem, "Drop", false); - - var deferral = e.GetDeferral(); - - var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView); - foreach (var item in storageItems.Where(x => !string.IsNullOrEmpty(x.Path))) - { - var listedItem = new ListedItem(null) - { - ItemPath = item.Path, - FileFRN = await FileTagsHelper.GetFileFRN(item.Item), - FileTags = new[] { fileTagItem.FileTag.Uid } - }; - } - - deferral.Complete(); - await Task.Yield(); - lockFlag = false; - } - - private void SidebarNavView_Loaded(object sender, RoutedEventArgs e) - { - (this.FindDescendant("TabContentBorder") as Border)!.Child = TabContent; - } - - private void SidebarControl_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args) - { - IsPaneToggleButtonVisible = args.DisplayMode == NavigationViewDisplayMode.Minimal; - } - - private void Border_KeyDown(object sender, KeyRoutedEventArgs e) - { - var ctrl = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control); - var step = ctrl.HasFlag(CoreVirtualKeyStates.Down) ? 5 : 1; - originalSize = IsPaneOpen ? userSettingsService.AppearanceSettingsService.SidebarWidth : CompactPaneLength; - - if (e.Key == VirtualKey.Space || e.Key == VirtualKey.Enter) - { - IsPaneOpen = !IsPaneOpen; - return; - } - - if (IsPaneOpen) - { - if (e.Key == VirtualKey.Left) - { - SetSize(-step, true); - e.Handled = true; - } - else if (e.Key == VirtualKey.Right) - { - SetSize(step, true); - e.Handled = true; - } - } - else if (e.Key == VirtualKey.Right) - { - IsPaneOpen = !IsPaneOpen; - return; - } - - userSettingsService.AppearanceSettingsService.SidebarWidth = OpenPaneLength; - } - - private void Border_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e) - { - if (DisplayMode == NavigationViewDisplayMode.Expanded) - SetSize(e.Cumulative.Translation.X); - } - - private void Border_PointerExited(object sender, PointerRoutedEventArgs e) - { - if (dragging) - return; // keep showing pressed event if currently resizing the sidebar - - var border = (Border)sender; - border.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow)); - VisualStateManager.GoToState(border.FindAscendant(), "ResizerNormal", true); - } - - private void Border_PointerEntered(object sender, PointerRoutedEventArgs e) - { - if (DisplayMode != NavigationViewDisplayMode.Expanded) - return; - - var border = (Border)sender; - border.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast)); - VisualStateManager.GoToState(border.FindAscendant(), "ResizerPointerOver", true); - } - - private void SetSize(double val, bool closeImmediatelyOnOversize = false) - { - if (IsPaneOpen) - { - var newSize = originalSize + val; - var isNewSizeGreaterThanMinimum = newSize >= Constants.UI.MinimumSidebarWidth; - if (newSize <= Constants.UI.MaximumSidebarWidth && isNewSizeGreaterThanMinimum) - OpenPaneLength = newSize; // passing a negative value will cause an exception - - // if the new size is below the minimum, check whether to toggle the pane collapse the sidebar - IsPaneOpen = !(!isNewSizeGreaterThanMinimum && (Constants.UI.MinimumSidebarWidth + val <= CompactPaneLength || closeImmediatelyOnOversize)); - } - else - { - if (val < Constants.UI.MinimumSidebarWidth - CompactPaneLength && - !closeImmediatelyOnOversize) - return; - - OpenPaneLength = val + CompactPaneLength; // set open sidebar length to minimum value to keep it smooth - IsPaneOpen = true; - } - } - - private void ResizeElementBorder_ManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e) - { - var border = (Border)sender; - border.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow)); - VisualStateManager.GoToState(border.FindAscendant(), "ResizerNormal", true); - userSettingsService.AppearanceSettingsService.SidebarWidth = OpenPaneLength; - dragging = false; - } - - private void ResizeElementBorder_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e) - { - IsPaneOpen = !IsPaneOpen; - } - - private void ResizeElementBorder_ManipulationStarted(object sender, ManipulationStartedRoutedEventArgs e) - { - if (DisplayMode != NavigationViewDisplayMode.Expanded) - return; - - originalSize = IsPaneOpen ? userSettingsService.AppearanceSettingsService.SidebarWidth : CompactPaneLength; - var border = (Border)sender; - border.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.SizeWestEast)); - VisualStateManager.GoToState(border.FindAscendant(), "ResizerPressed", true); - dragging = true; - } - - public static GridLength GetSidebarCompactSize() - { - return App.Current.Resources.TryGetValue("NavigationViewCompactPaneLength", out object paneLength) && paneLength is double paneLengthDouble - ? new GridLength(paneLengthDouble) - : new GridLength(200); - } - - #region Sidebar sections expanded state management - - private async void NavigationView_Expanding(NavigationView sender, NavigationViewItemExpandingEventArgs args) - { - if (args.ExpandingItem is not LocationItem loc || loc.ChildItems is null) - return; - - await SetNavigationViewCollapse(sender, loc, true); - } - - private async void NavigationView_Collapsed(NavigationView sender, NavigationViewItemCollapsedEventArgs args) - { - if (args.CollapsedItem is not LocationItem loc || loc.ChildItems is null) - return; - - await SetNavigationViewCollapse(sender, loc, false); - } - - private static async Task SetNavigationViewCollapse(NavigationView sender, LocationItem loc, bool isCollapsed) - { - await Task.Delay(50); // Wait a little so IsPaneOpen tells the truth when in minimal mode - if (sender.IsPaneOpen) // Don't store expanded state if sidebar pane is closed - Ioc.Default.GetRequiredService().Set(isCollapsed, $"section:{loc.Text.Replace('\\', '_')}"); - } - - private void NavigationView_PaneOpened(NavigationView sender, object args) - { - // Restore expanded state when pane is opened - foreach (var loc in ViewModel.SideBarItems.OfType().Where(x => x.ChildItems is not null)) - loc.IsExpanded = Ioc.Default.GetRequiredService().Get(loc.Text == "SidebarFavorites".GetLocalizedResource(), $"section:{loc.Text.Replace('\\', '_')}"); - } - - private void NavigationView_PaneClosed(NavigationView sender, object args) - { - // Collapse all sections but do not store the state when pane is closed - foreach (var loc in ViewModel.SideBarItems.OfType().Where(x => x.ChildItems is not null)) - loc.IsExpanded = false; - } - - #endregion - } - - public class SidebarItemDroppedEventArgs : EventArgs - { - public DataPackageView Package { get; set; } - public string ItemPath { get; set; } - public DataPackageOperation AcceptedOperation { get; set; } - public AsyncManualResetEvent SignalEvent { get; set; } - } - - public class SidebarItemInvokedEventArgs : EventArgs - { - public NavigationViewItemBase InvokedItemContainer { get; set; } - - public SidebarItemInvokedEventArgs(NavigationViewItemBase ItemContainer) - { - InvokedItemContainer = ItemContainer; - } - } - - public class SidebarItemPropertiesInvokedEventArgs : EventArgs - { - public object InvokedItemDataContext { get; set; } - - public SidebarItemPropertiesInvokedEventArgs(object invokedItemDataContext) - { - InvokedItemDataContext = invokedItemDataContext; - } - } - - public class SidebarItemNewPaneInvokedEventArgs : EventArgs - { - public object InvokedItemDataContext { get; set; } - - public SidebarItemNewPaneInvokedEventArgs(object invokedItemDataContext) - { - InvokedItemDataContext = invokedItemDataContext; - } - } - - public class NavItemDataTemplateSelector : DataTemplateSelector - { - public DataTemplate LocationNavItemTemplate { get; set; } - public DataTemplate DriveNavItemTemplate { get; set; } - public DataTemplate LinuxNavItemTemplate { get; set; } - public DataTemplate FileTagNavItemTemplate { get; set; } - public DataTemplate HeaderNavItemTemplate { get; set; } - - protected override DataTemplate? SelectTemplateCore(object item) - { - if (item is null || item is not INavigationControlItem navControlItem) - return null; - - return navControlItem.ItemType switch - { - NavigationControlItemType.Location => LocationNavItemTemplate, - NavigationControlItemType.Drive => DriveNavItemTemplate, - NavigationControlItemType.LinuxDistro => LinuxNavItemTemplate, - NavigationControlItemType.FileTag => FileTagNavItemTemplate, - _ => null - }; - } - } -} diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml index 3605128e1c5c..086bbf5a898d 100644 --- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml +++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml @@ -1,4 +1,4 @@ - + GetItemMenuItems(WidgetCard CommandParameter = item }, new ContextMenuFlyoutItemViewModel() + { + Text = "TurnOnBitLocker".GetLocalizedResource(), + Tag = "TurnOnBitLockerPlaceholder", + IsEnabled = false + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "ManageBitLocker".GetLocalizedResource(), + Tag = "ManageBitLockerPlaceholder", + IsEnabled = false + }, + new ContextMenuFlyoutItemViewModel() { ItemType = ContextMenuFlyoutItemType.Separator, Tag = "OverflowSeparator", diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml index 3f67339bc0bf..e5e035a46b2f 100644 --- a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml +++ b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml @@ -8,7 +8,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:helpers="using:Files.App.Helpers" xmlns:local="using:Files.App.UserControls.Widgets" - xmlns:localcontrols="using:Files.App.UserControls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:Files.App.ViewModels.Widgets" d:DesignHeight="300" diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml index fee0802b0135..750714fb32c3 100644 --- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml +++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml @@ -4,7 +4,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:helpers="using:Files.App.Helpers" xmlns:local="using:Files.App.UserControls.Widgets" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> @@ -12,7 +11,6 @@ diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml index 68ae6129d054..c1fc2776e4af 100644 --- a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml +++ b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml @@ -1,4 +1,4 @@ - + - + \ No newline at end of file diff --git a/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml b/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml index b37be02acc94..7bdee43d072d 100644 --- a/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml +++ b/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml @@ -3,18 +3,27 @@ x:Class="Files.App.UserControls.Widgets.WidgetsListControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.UI.Xaml.Controls" + xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:helpers="using:Files.App.Helpers" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:Files.App.ViewModels.Widgets" - d:DesignHeight="300" - d:DesignWidth="400" + DataContext="{x:Bind ViewModel, Mode=OneWay}" mc:Ignorable="d"> - - + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + Content="{x:Bind WidgetControl, Mode=OneWay}" /> + + + + + + + + + - - + + + + + + + + + + - \ No newline at end of file + + diff --git a/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml.cs b/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml.cs index 5ec8637634a2..d9c1795616f0 100644 --- a/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml.cs +++ b/src/Files.App/UserControls/Widgets/WidgetsListControl.xaml.cs @@ -5,23 +5,17 @@ using Microsoft.UI.Xaml.Controls; using System; -// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 - namespace Files.App.UserControls.Widgets { public sealed partial class WidgetsListControl : UserControl, IDisposable { - public WidgetsListControlViewModel ViewModel - { - get => (WidgetsListControlViewModel)DataContext; - set => DataContext = value; - } + public WidgetsListControlViewModel ViewModel { get; set; } public WidgetsListControl() { InitializeComponent(); - ViewModel = new WidgetsListControlViewModel(); + ViewModel = new(); } public void Dispose() @@ -29,4 +23,4 @@ public void Dispose() ViewModel?.Dispose(); } } -} \ No newline at end of file +} diff --git a/src/Files.App/Utils/Archives/ArchiveHelpers.cs b/src/Files.App/Utils/Archives/ArchiveHelpers.cs index 1a3fb3e8e457..c76b86cddd31 100644 --- a/src/Files.App/Utils/Archives/ArchiveHelpers.cs +++ b/src/Files.App/Utils/Archives/ArchiveHelpers.cs @@ -2,8 +2,8 @@ // Licensed under the MIT License. See the LICENSE. using Files.App.Dialogs; -using Files.App.Utils.Archives; using Files.App.ViewModels.Dialogs; +using Files.Shared.Helpers; using Microsoft.UI.Xaml.Controls; using System.IO; using System.Text; diff --git a/src/Files.App/Utils/Global/WSLDistroManager.cs b/src/Files.App/Utils/Global/WSLDistroManager.cs index d289e1e86bd8..bdcb043de881 100644 --- a/src/Files.App/Utils/Global/WSLDistroManager.cs +++ b/src/Files.App/Utils/Global/WSLDistroManager.cs @@ -37,7 +37,7 @@ public async Task UpdateDrivesAsync() { Text = folder.DisplayName, Path = folder.Path, - Logo = logoURI, + Icon = logoURI, MenuOptions = new ContextMenuOptions { IsLocationItem = true }, }; diff --git a/src/Files.App/Utils/Shell/LaunchHelper.cs b/src/Files.App/Utils/Shell/LaunchHelper.cs index 73b73027d640..7bb34a51c441 100644 --- a/src/Files.App/Utils/Shell/LaunchHelper.cs +++ b/src/Files.App/Utils/Shell/LaunchHelper.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using Microsoft.Extensions.Logging; using System.IO; using System.Text.RegularExpressions; diff --git a/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs b/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs index 38eb5ed0a56c..2e4e74f0f880 100644 --- a/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs +++ b/src/Files.App/Utils/Storage/Enumerators/UniversalStorageEnumerator.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using Microsoft.Extensions.Logging; using Microsoft.UI.Xaml.Media.Imaging; using System.IO; diff --git a/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs b/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs index 18e64dc353af..d7128fc14ef7 100644 --- a/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs +++ b/src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See the LICENSE. using Files.Core.Services.SizeProvider; +using Files.Shared.Helpers; using Microsoft.UI.Xaml.Media.Imaging; using System.IO; using Vanara.PInvoke; diff --git a/src/Files.App/Utils/Storage/Helpers/FileOperationsHelpers.cs b/src/Files.App/Utils/Storage/Helpers/FileOperationsHelpers.cs index 13889e49319d..c5b41f4ca770 100644 --- a/src/Files.App/Utils/Storage/Helpers/FileOperationsHelpers.cs +++ b/src/Files.App/Utils/Storage/Helpers/FileOperationsHelpers.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using Microsoft.Extensions.Logging; using Microsoft.Win32; using System.Collections.Concurrent; diff --git a/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs b/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs index aa674e2a1241..77ecda3ff4d3 100644 --- a/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs +++ b/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using Windows.Storage; using Windows.Storage.FileProperties; diff --git a/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs b/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs index 8f5ebf0fe114..4f9f89066ccb 100644 --- a/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs +++ b/src/Files.App/Utils/Storage/Helpers/StorageHelpers.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using System.Runtime.InteropServices; using Windows.Storage; using Windows.Storage.FileProperties; diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs index 602cbb052a42..0742b8ab3882 100644 --- a/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs +++ b/src/Files.App/Utils/Storage/Operations/FilesystemOperations.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using Microsoft.UI.Xaml.Controls; using System.IO; using System.Text; diff --git a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs index 064ef2134eb8..4e9a0144ee30 100644 --- a/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs +++ b/src/Files.App/Utils/Storage/Operations/ShellFilesystemOperations.cs @@ -166,6 +166,14 @@ await sourceMatch.Select(x => x.dest).ToListAsync(), await sourceMatch.Select(x => FileNameConflictResolveOptionType.ReplaceExisting).ToListAsync(), progress, cancellationToken); } } + else if (copyResult.Items.Any(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.FileTooLarge)) + { + var failingItems = copyResult.Items + .Where(x => CopyEngineResult.Convert(x.HResult) == FileSystemStatusCode.FileTooLarge) + .Select(item => item.Source); + + await Ioc.Default.GetRequiredService().ShowDialogAsync(new FileTooLargeDialogViewModel(failingItems)); + } // ADS else if (copyResult.Items.All(x => x.HResult == -1)) { diff --git a/src/Files.App/Utils/Storage/Search/FolderSearch.cs b/src/Files.App/Utils/Storage/Search/FolderSearch.cs index ee04a3301878..d2f341d47d1b 100644 --- a/src/Files.App/Utils/Storage/Search/FolderSearch.cs +++ b/src/Files.App/Utils/Storage/Search/FolderSearch.cs @@ -198,6 +198,8 @@ private async Task SearchTagsAsync(string folder, IList results, Can var dbInstance = FileTagsHelper.GetDbInstance(); var matches = dbInstance.GetAllUnderPath(folder) .Where(x => tags.All(x.Tags.Contains)); + if (string.IsNullOrEmpty(folder)) + matches = matches.Where(x => !RecycleBinHelpers.IsPathUnderRecycleBin(x.FilePath)); foreach (var match in matches) { diff --git a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs index df396fef8352..df77aef87ebe 100644 --- a/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs +++ b/src/Files.App/Utils/Storage/StorageItems/NativeStorageFile.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using System.IO; using System.Runtime.InteropServices; using System.Runtime.InteropServices.WindowsRuntime; diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs index 53fe4a91de1d..2796042daa45 100644 --- a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs +++ b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFile.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using SevenZip; using System.IO; using System.Runtime.InteropServices.WindowsRuntime; diff --git a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs index ee0af2d40221..8ecf249e11da 100644 --- a/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs +++ b/src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs @@ -1,9 +1,8 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using SevenZip; -using SQLitePCL; -using System; using System.Collections.Concurrent; using System.IO; using System.Runtime.InteropServices.WindowsRuntime; diff --git a/src/Files.App/ViewModels/MainPageViewModel.cs b/src/Files.App/ViewModels/MainPageViewModel.cs index 5866f1116a09..67a7018c604c 100644 --- a/src/Files.App/ViewModels/MainPageViewModel.cs +++ b/src/Files.App/ViewModels/MainPageViewModel.cs @@ -225,7 +225,7 @@ public async Task UpdateTabInfo(TabItem tabItem, object navigationArg) else if (App.WSLDistroManager.TryGetDistro(currentPath, out WslDistroItem? wslDistro) && currentPath.Equals(wslDistro.Path)) { tabLocationHeader = wslDistro.Text; - iconSource.ImageSource = new BitmapImage(wslDistro.Logo); + iconSource.ImageSource = new BitmapImage(wslDistro.Icon); } else { diff --git a/src/Files.App/ViewModels/Properties/Items/FileProperties.cs b/src/Files.App/ViewModels/Properties/Items/FileProperties.cs index a346b83440dc..980c1651e2b8 100644 --- a/src/Files.App/ViewModels/Properties/Items/FileProperties.cs +++ b/src/Files.App/ViewModels/Properties/Items/FileProperties.cs @@ -1,6 +1,7 @@ // Copyright(c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using Files.Shared.Helpers; using Microsoft.UI.Dispatching; using System.IO; diff --git a/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs b/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs index c880b07cac0e..2801c1a99691 100644 --- a/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs +++ b/src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs @@ -22,8 +22,7 @@ public NavigationViewItemButtonStyleItem SelectedNavigationViewItem set { if (SetProperty(ref _SelectedNavigationViewItem, value) && - !_selectionChangedAutomatically && - _previousPageName != value.ItemType.ToString()) + !_selectionChangedAutomatically) { var parameter = new PropertiesPageNavigationParameter() { @@ -90,8 +89,6 @@ public NavigationViewItemButtonStyleItem SelectedNavigationViewItem private bool _selectionChangedAutomatically { get; set; } - private string _previousPageName { get; set; } - public IRelayCommand DoBackwardNavigationCommand { get; } public IAsyncRelayCommand SaveChangedPropertiesCommand { get; } public IRelayCommand CancelChangedPropertiesCommand { get; } @@ -127,12 +124,12 @@ private void ExecuteDoBackwardNavigationCommand() var pageTag = ((Page)_mainFrame.Content).Tag.ToString(); _selectionChangedAutomatically = true; - _previousPageName = pageTag; // Move selection indicator - SelectedNavigationViewItem = + _SelectedNavigationViewItem = NavigationViewItems.First(x => string.Equals(x.ItemType.ToString(), pageTag, StringComparison.CurrentCultureIgnoreCase)) ?? NavigationViewItems.First(); + OnPropertyChanged(nameof(SelectedNavigationViewItem)); } private async Task ExecuteSaveChangedPropertiesCommand() diff --git a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs index 5e1aaa9d5a7f..f8de7b4e10f2 100644 --- a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs @@ -3,6 +3,7 @@ using Files.App.UserControls.FilePreviews; using Files.App.ViewModels.Previews; +using Files.Shared.Helpers; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using System.Windows.Input; diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs index 92496aa659c3..bafd253284e3 100644 --- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs @@ -1,20 +1,34 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -using Microsoft.UI.Dispatching; +using Files.App.Helpers.ContextFlyouts; +using Files.App.UserControls.Sidebar; +using Files.App.ViewModels.Dialogs; +using Microsoft.UI.Input; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Media.Imaging; using System.Collections.Specialized; using System.IO; +using System.Windows.Input; +using Windows.ApplicationModel.DataTransfer.DragDrop; +using Windows.ApplicationModel.DataTransfer; +using Windows.Storage; +using Windows.System; +using Windows.UI.Core; +using Files.Core.Storage; +using Files.Core.Storage.Extensions; +using Files.App.Data.Items; namespace Files.App.ViewModels.UserControls { - public class SidebarViewModel : ObservableObject, IDisposable + public class SidebarViewModel : ObservableObject, IDisposable, ISidebarViewModel { private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService(); - + private ICommandManager Commands { get; } = Ioc.Default.GetRequiredService(); private readonly DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService(); + private readonly IFileTagsService fileTagsService; private readonly NetworkDrivesViewModel networkDrivesViewModel = Ioc.Default.GetRequiredService(); @@ -25,30 +39,40 @@ public IPaneHolder PaneHolder set => SetProperty(ref paneHolder, value); } + public MenuFlyout PaneFlyout; + public IFilesystemHelpers FilesystemHelpers => PaneHolder?.FilesystemHelpers; - private DispatcherQueue dispatcherQueue; - - public BulkConcurrentObservableCollection SideBarItems { get; init; } + private Microsoft.UI.Dispatching.DispatcherQueue dispatcherQueue; + private INavigationControlItem rightClickedItem; - public static readonly GridLength CompactSidebarWidth = SidebarControl.GetSidebarCompactSize(); + public object SidebarItems => sidebarItems; + public BulkConcurrentObservableCollection sidebarItems { get; init; } + public SidebarPinnedModel SidebarPinnedModel => App.QuickAccessManager.Model; + public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService(); - private NavigationViewDisplayMode sidebarDisplayMode; - public NavigationViewDisplayMode SidebarDisplayMode + private SidebarDisplayMode sidebarDisplayMode; + public SidebarDisplayMode SidebarDisplayMode { get => sidebarDisplayMode; set { + // We only want to track non minimal mode + if (value == SidebarDisplayMode.Minimal) return; if (SetProperty(ref sidebarDisplayMode, value)) { OnPropertyChanged(nameof(IsSidebarCompactSize)); - + IsSidebarOpen = sidebarDisplayMode == SidebarDisplayMode.Expanded; UpdateTabControlMargin(); } } } + public delegate void SelectedTagChangedEventHandler(object sender, SelectedTagChangedEventArgs e); + + public static event SelectedTagChangedEventHandler? SelectedTagChanged; + private readonly SectionType[] SectionOrder = new SectionType[] { @@ -63,7 +87,7 @@ public NavigationViewDisplayMode SidebarDisplayMode }; public bool IsSidebarCompactSize - => SidebarDisplayMode == NavigationViewDisplayMode.Compact || SidebarDisplayMode == NavigationViewDisplayMode.Minimal; + => SidebarDisplayMode == SidebarDisplayMode.Compact || SidebarDisplayMode == SidebarDisplayMode.Minimal; public void NotifyInstanceRelatedPropertiesChanged(string arg) { @@ -77,9 +101,9 @@ public void UpdateSidebarSelectedItemFromArgs(string arg) var value = arg; INavigationControlItem? item = null; - var sidebarItems = SideBarItems + var filteredItems = sidebarItems .Where(x => !string.IsNullOrWhiteSpace(x.Path)) - .Concat(SideBarItems.Where(x => (x as LocationItem)?.ChildItems is not null).SelectMany(x => ((LocationItem)x).ChildItems).Where(x => !string.IsNullOrWhiteSpace(x.Path))) + .Concat(sidebarItems.Where(x => (x as LocationItem)?.ChildItems is not null).SelectMany(x => ((LocationItem)x).ChildItems).Where(x => !string.IsNullOrWhiteSpace(x.Path))) .ToList(); if (string.IsNullOrEmpty(value)) @@ -88,13 +112,13 @@ public void UpdateSidebarSelectedItemFromArgs(string arg) return; } - item = sidebarItems.FirstOrDefault(x => x.Path.Equals(value, StringComparison.OrdinalIgnoreCase)); - item ??= sidebarItems.FirstOrDefault(x => x.Path.Equals(value + "\\", StringComparison.OrdinalIgnoreCase)); - item ??= sidebarItems.Where(x => value.StartsWith(x.Path, StringComparison.OrdinalIgnoreCase)).MaxBy(x => x.Path.Length); - item ??= sidebarItems.FirstOrDefault(x => x.Path.Equals(Path.GetPathRoot(value), StringComparison.OrdinalIgnoreCase)); + item = filteredItems.FirstOrDefault(x => x.Path.Equals(value, StringComparison.OrdinalIgnoreCase)); + item ??= filteredItems.FirstOrDefault(x => x.Path.Equals(value + "\\", StringComparison.OrdinalIgnoreCase)); + item ??= filteredItems.Where(x => value.StartsWith(x.Path, StringComparison.OrdinalIgnoreCase)).MaxBy(x => x.Path.Length); + item ??= filteredItems.FirstOrDefault(x => x.Path.Equals(Path.GetPathRoot(value), StringComparison.OrdinalIgnoreCase)); if (item is null && value == "Home") - item = sidebarItems.FirstOrDefault(x => x.Path.Equals("Home")); + item = filteredItems.FirstOrDefault(x => x.Path.Equals("Home")); if (SidebarSelectedItem != item) SidebarSelectedItem = item; @@ -209,9 +233,10 @@ public INavigationControlItem SidebarSelectedItem public SidebarViewModel() { - dispatcherQueue = DispatcherQueue.GetForCurrentThread(); + dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread(); + fileTagsService = Ioc.Default.GetRequiredService(); - SideBarItems = new BulkConcurrentObservableCollection(); + sidebarItems = new BulkConcurrentObservableCollection(); UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent; CreateItemHomeAsync(); @@ -230,6 +255,18 @@ public SidebarViewModel() networkDrivesViewModel.Drives.CollectionChanged += (x, args) => Manager_DataChanged(SectionType.Network, args); App.WSLDistroManager.DataChanged += Manager_DataChanged; App.FileTagsManager.DataChanged += Manager_DataChanged; + SidebarDisplayMode = UserSettingsService.AppearanceSettingsService.IsSidebarOpen ? SidebarDisplayMode.Expanded : SidebarDisplayMode.Compact; + + HideSectionCommand = new RelayCommand(HideSection); + UnpinItemCommand = new RelayCommand(UnpinItem); + PinItemCommand = new RelayCommand(PinItem); + OpenInNewTabCommand = new AsyncRelayCommand(OpenInNewTab); + OpenInNewWindowCommand = new AsyncRelayCommand(OpenInNewWindow); + OpenInNewPaneCommand = new AsyncRelayCommand(OpenInNewPane); + EjectDeviceCommand = new AsyncRelayCommand(EjectDevice); + FormatDriveCommand = new RelayCommand(FormatDrive); + OpenPropertiesCommand = new RelayCommand(OpenProperties); + ReorderItemsCommand = new AsyncRelayCommand(ReorderItems); } private Task CreateItemHomeAsync() @@ -363,10 +400,15 @@ await lib.CheckDefaultSaveFolderAccess() && } } - if (IsSidebarOpen) + section.IsExpanded = Ioc.Default.GetRequiredService().Get(section.Text == "SidebarFavorites".GetLocalizedResource(), $"section:{section.Text.Replace('\\', '_')}"); + section.PropertyChanged += Section_PropertyChanged; + } + + private void Section_PropertyChanged(object? sender, PropertyChangedEventArgs e) + { + if (sender is LocationItem section && e.PropertyName == nameof(section.IsExpanded)) { - // Restore expanded state when section has items - section.IsExpanded = Ioc.Default.GetRequiredService().Get(section.Text == "SidebarFavorites".GetLocalizedResource(), $"section:{section.Text.Replace('\\', '_')}"); + Ioc.Default.GetRequiredService().Set(section.IsExpanded, $"section:{section.Text.Replace('\\', '_')}"); } } @@ -378,7 +420,7 @@ private async Task GetOrCreateSection(SectionType sectionType) private LocationItem? GetSection(SectionType sectionType) { - return SideBarItems.FirstOrDefault(x => x.Section == sectionType) as LocationItem; + return sidebarItems.FirstOrDefault(x => x.Section == sectionType) as LocationItem; } private async Task CreateSection(SectionType sectionType) @@ -524,8 +566,8 @@ private LocationItem BuildSection(string sectionName, SectionType sectionType, C private void AddSectionToSideBar(LocationItem section) { - var index = SectionOrder.TakeWhile(x => x != section.Section).Select(x => SideBarItems.Any(item => item.Section == x) ? 1 : 0).Sum(); - SideBarItems.Insert(Math.Min(index, SideBarItems.Count), section); + var index = SectionOrder.TakeWhile(x => x != section.Section).Select(x => sidebarItems.Any(item => item.Section == x) ? 1 : 0).Sum(); + sidebarItems.Insert(Math.Min(index, sidebarItems.Count), section); } public async Task UpdateSectionVisibility(SectionType sectionType, bool show) @@ -552,7 +594,7 @@ public async Task UpdateSectionVisibility(SectionType sectionType, bool show) } else { - SideBarItems.Remove(SideBarItems.FirstOrDefault(x => x.Section == sectionType)); + sidebarItems.Remove(sidebarItems.FirstOrDefault(x => x.Section == sectionType)); } } @@ -610,21 +652,654 @@ public void Dispose() App.FileTagsManager.DataChanged -= Manager_DataChanged; } - public void SidebarControl_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args) - { - SidebarDisplayMode = args.DisplayMode; - } - public void UpdateTabControlMargin() { TabControlMargin = SidebarDisplayMode switch { // This prevents the pane toggle button from overlapping the tab control in minimal mode - NavigationViewDisplayMode.Minimal => new GridLength(44, GridUnitType.Pixel), + SidebarDisplayMode.Minimal => new GridLength(44, GridUnitType.Pixel), _ => new GridLength(0, GridUnitType.Pixel), }; } + public async void HandleItemContextInvoked(object sender, ItemContextInvokedArgs args) + + { + if (sender is not FrameworkElement sidebarItem) return; + + if (args.Item is not INavigationControlItem item) + { + // We are in the pane context requested path + PaneFlyout.ShowAt(sender as FrameworkElement, args.Position); + return; + } + + if (item is FileTagItem tagItem) + { + var cts = new CancellationTokenSource(); + var items = new List<(string path, bool isFolder)>(); + + await foreach (var taggedItem in fileTagsService.GetItemsForTagAsync(tagItem.FileTag.Uid, cts.Token)) + { + items.Add(( + taggedItem.Storable.TryGetPath() ?? string.Empty, + taggedItem.Storable is IFolder)); + } + + SelectedTagChanged?.Invoke(this, new SelectedTagChangedEventArgs(items)); + } + + rightClickedItem = item; + var itemContextMenuFlyout = new CommandBarFlyout { Placement = FlyoutPlacementMode.Full }; + itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout; + + var menuItems = GetLocationItemMenuItems(item, itemContextMenuFlyout); + var (_, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(menuItems); + + secondaryElements.OfType() + .ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); + + secondaryElements.ForEach(i => itemContextMenuFlyout.SecondaryCommands.Add(i)); + itemContextMenuFlyout.ShowAt(sidebarItem, new FlyoutShowOptions { Position = args.Position }); + + if (item.MenuOptions.ShowShellItems) + _ = ShellContextmenuHelper.LoadShellMenuItems(rightClickedItem.Path, itemContextMenuFlyout, item.MenuOptions); + } + + public async void HandleItemInvoked(object item) + { + if (item is not INavigationControlItem navigationControlItem) return; + var navigationPath = item as string; + + if (await DriveHelpers.CheckEmptyDrive(navigationPath)) + return; + + var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down); + if (ctrlPressed && navigationPath is not null) + { + await NavigationHelpers.OpenPathInNewTab(navigationPath); + return; + } + + // Type of page to navigate + Type? sourcePageType = null; + + switch (navigationControlItem.ItemType) + { + case NavigationControlItemType.Location: + { + // Get the path of the invoked item + var ItemPath = navigationControlItem.Path; + + if (ItemPath is null) + ItemPath = navigationControlItem.Text; + + // Home item + if (ItemPath != null && ItemPath.Equals("Home", StringComparison.OrdinalIgnoreCase)) + { + navigationPath = "Home"; + sourcePageType = typeof(HomePage); + } + else + { + navigationPath = navigationControlItem.Path; + } + break; + } + + case NavigationControlItemType.FileTag: + var tagPath = navigationControlItem.Path; // Get the path of the invoked item + if (PaneHolder?.ActivePane is IShellPage shp) + { + shp.NavigateToPath(tagPath, new NavigationArguments() + { + IsSearchResultPage = true, + SearchPathParam = "Home", + SearchQuery = tagPath, + AssociatedTabInstance = shp, + NavPathParam = tagPath + }); + } + return; + + default: + { + navigationPath = navigationControlItem.Path; + break; + } + } + + if (PaneHolder?.ActivePane is IShellPage shellPage) + shellPage.NavigateToPath(navigationPath, sourcePageType); + } + + public readonly ICommand CreateLibraryCommand = new AsyncRelayCommand(LibraryManager.ShowCreateNewLibraryDialog); + + public readonly ICommand RestoreLibrariesCommand = new AsyncRelayCommand(LibraryManager.ShowRestoreDefaultLibrariesDialog); + + private ICommand HideSectionCommand { get; } + + private ICommand PinItemCommand { get; } + + private ICommand UnpinItemCommand { get; } + + private ICommand OpenInNewTabCommand { get; } + + private ICommand OpenInNewWindowCommand { get; } + + private ICommand OpenInNewPaneCommand { get; } + + private ICommand EjectDeviceCommand { get; } + + private ICommand FormatDriveCommand { get; } + + private ICommand OpenPropertiesCommand { get; } + + private ICommand ReorderItemsCommand { get; } + + private async Task OpenInNewPane() + { + if (await DriveHelpers.CheckEmptyDrive(rightClickedItem.Path)) + return; + PaneHolder.OpenPathInNewPane(rightClickedItem.Path); + } + + private async Task OpenInNewTab() + { + if (await DriveHelpers.CheckEmptyDrive(rightClickedItem.Path)) + return; + + await NavigationHelpers.OpenPathInNewTab(rightClickedItem.Path); + } + + private async Task OpenInNewWindow() + { + if (await DriveHelpers.CheckEmptyDrive(rightClickedItem.Path)) + return; + + await NavigationHelpers.OpenPathInNewWindowAsync(rightClickedItem.Path); + } + + private void PinItem() + { + if (rightClickedItem is DriveItem) + _ = QuickAccessService.PinToSidebar(new[] { rightClickedItem.Path }); + } + private void UnpinItem() + { + if (rightClickedItem.Section == SectionType.Favorites || rightClickedItem is DriveItem) + _ = QuickAccessService.UnpinFromSidebar(rightClickedItem.Path); + } + + private void HideSection() + { + switch (rightClickedItem.Section) + { + case SectionType.Favorites: + UserSettingsService.GeneralSettingsService.ShowFavoritesSection = false; + break; + case SectionType.Library: + UserSettingsService.GeneralSettingsService.ShowLibrarySection = false; + break; + case SectionType.CloudDrives: + UserSettingsService.GeneralSettingsService.ShowCloudDrivesSection = false; + break; + case SectionType.Drives: + UserSettingsService.GeneralSettingsService.ShowDrivesSection = false; + break; + case SectionType.Network: + UserSettingsService.GeneralSettingsService.ShowNetworkDrivesSection = false; + break; + case SectionType.WSL: + UserSettingsService.GeneralSettingsService.ShowWslSection = false; + break; + case SectionType.FileTag: + UserSettingsService.GeneralSettingsService.ShowFileTagsSection = false; + break; + } + } + + private async Task ReorderItems() + { + var dialog = new ReorderSidebarItemsDialogViewModel(); + var dialogService = Ioc.Default.GetRequiredService(); + var result = await dialogService.ShowDialogAsync(dialog); + } + + private void OpenProperties(CommandBarFlyout menu) + { + EventHandler flyoutClosed = null!; + flyoutClosed = (s, e) => + { + menu.Closed -= flyoutClosed; + if (rightClickedItem is DriveItem) + FilePropertiesHelpers.OpenPropertiesWindow(rightClickedItem, PaneHolder.ActivePane); + else if (rightClickedItem is LibraryLocationItem library) + FilePropertiesHelpers.OpenPropertiesWindow(new LibraryItem(library), PaneHolder.ActivePane); + else if (rightClickedItem is LocationItem locationItem) + { + ListedItem listedItem = new ListedItem(null!) + { + ItemPath = locationItem.Path, + ItemNameRaw = locationItem.Text, + PrimaryItemAttribute = StorageItemTypes.Folder, + ItemType = "Folder".GetLocalizedResource(), + }; + + FilePropertiesHelpers.OpenPropertiesWindow(listedItem, PaneHolder.ActivePane); + } + }; + menu.Closed += flyoutClosed; + } + + private async Task EjectDevice() + { + var result = await DriveHelpers.EjectDeviceAsync(rightClickedItem.Path); + await UIHelpers.ShowDeviceEjectResultAsync(rightClickedItem is DriveItem driveItem ? driveItem.Type : Data.Items.DriveType.Unknown, result); + } + + private void FormatDrive() + { + Win32API.OpenFormatDriveDialog(rightClickedItem.Path); + } + + private List GetLocationItemMenuItems(INavigationControlItem item, CommandBarFlyout menu) + { + var options = item.MenuOptions; + + var favoriteModel = App.QuickAccessManager.Model; + var favoriteIndex = favoriteModel.IndexOfItem(item); + var favoriteCount = favoriteModel.FavoriteItems.Count; + + var isFavoriteItem = item.Section is SectionType.Favorites && favoriteIndex is not -1; + var showMoveItemUp = isFavoriteItem && favoriteIndex > 0; + var showMoveItemDown = isFavoriteItem && favoriteIndex < favoriteCount - 1; + + var isDriveItem = item is DriveItem; + var isDriveItemPinned = isDriveItem && ((DriveItem)item).IsPinned; + + return new List() + { + new ContextMenuFlyoutItemViewModel() + { + Text = "SideBarCreateNewLibrary/Text".GetLocalizedResource(), + Glyph = "\uE710", + Command = CreateLibraryCommand, + ShowItem = options.IsLibrariesHeader + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "SideBarRestoreLibraries/Text".GetLocalizedResource(), + Glyph = "\uE10E", + Command = RestoreLibrariesCommand, + ShowItem = options.IsLibrariesHeader + }, + new ContextMenuFlyoutItemViewModelBuilder(Commands.EmptyRecycleBin) + { + IsVisible = options.ShowEmptyRecycleBin, + }.Build(), + new ContextMenuFlyoutItemViewModelBuilder(Commands.RestoreAllRecycleBin) + { + IsVisible = options.ShowEmptyRecycleBin, + }.Build(), + new ContextMenuFlyoutItemViewModel() + { + Text = "OpenInNewTab".GetLocalizedResource(), + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconOpenInNewTab", + }, + Command = OpenInNewTabCommand, + ShowItem = options.IsLocationItem && UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "OpenInNewWindow".GetLocalizedResource(), + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconOpenInNewWindow", + }, + Command = OpenInNewWindowCommand, + ShowItem = options.IsLocationItem && UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "OpenInNewPane".GetLocalizedResource(), + Command = OpenInNewPaneCommand, + ShowItem = options.IsLocationItem && UserSettingsService.GeneralSettingsService.ShowOpenInNewPane + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "PinToFavorites".GetLocalizedResource(), + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconPinToFavorites", + }, + Command = PinItemCommand, + ShowItem = isDriveItem && !isDriveItemPinned + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "UnpinFromFavorites".GetLocalizedResource(), + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconUnpinFromFavorites", + }, + Command = UnpinItemCommand, + ShowItem = options.ShowUnpinItem || isDriveItemPinned + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "ReorderSidebarItemsDialogText".GetLocalizedResource(), + Glyph = "\uE8D8", + Command = ReorderItemsCommand, + ShowItem = isFavoriteItem || item.Section is SectionType.Favorites + }, + new ContextMenuFlyoutItemViewModel() + { + Text = string.Format("SideBarHideSectionFromSideBar/Text".GetLocalizedResource(), rightClickedItem.Text), + Glyph = "\uE77A", + Command = HideSectionCommand, + ShowItem = options.ShowHideSection + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "SideBarEjectDevice/Text".GetLocalizedResource(), + Command = EjectDeviceCommand, + ShowItem = options.ShowEjectDevice + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "FormatDriveText".GetLocalizedResource(), + Command = FormatDriveCommand, + CommandParameter = item, + ShowItem = options.ShowFormatDrive + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "Properties".GetLocalizedResource(), + OpacityIcon = new OpacityIconModel() + { + OpacityIconStyle = "ColorIconProperties", + }, + Command = OpenPropertiesCommand, + CommandParameter = menu, + ShowItem = options.ShowProperties + }, + new ContextMenuFlyoutItemViewModel() + { + ItemType = ContextMenuFlyoutItemType.Separator, + Tag = "OverflowSeparator", + IsHidden = !options.ShowShellItems, + }, + new ContextMenuFlyoutItemViewModel() + { + Text = "Loading".GetLocalizedResource(), + Glyph = "\xE712", + Items = new List(), + ID = "ItemOverflow", + Tag = "ItemOverflow", + IsEnabled = false, + IsHidden = !options.ShowShellItems, + } + }.Where(x => x.ShowItem).ToList(); + } + + public async void HandleItemDragOver(ItemDragOverEventArgs args) + { + if (args.DropTarget is LocationItem locationItem) + { + HandleLocationItemDragOver(locationItem, args); + } + else if (args.DropTarget is DriveItem driveItem) + { + HandleDriveItemDragOver(driveItem, args); + } + else if (args.DropTarget is FileTagItem fileTagItem) + { + HandleTagItemDragOver(fileTagItem, args); + } + } + + private async void HandleLocationItemDragOver(LocationItem locationItem, ItemDragOverEventArgs args) + { + var rawEvent = args.RawEvent; + var deferral = rawEvent.GetDeferral(); + + if (Utils.Storage.FilesystemHelpers.HasDraggedStorageItems(args.DroppedItem)) + { + args.RawEvent.Handled = true; + + var isPathNull = string.IsNullOrEmpty(locationItem.Path); + var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem); + var hasStorageItems = storageItems.Any(); + + if (isPathNull && hasStorageItems && SectionType.Favorites.Equals(locationItem.Section)) + { + var haveFoldersToPin = storageItems.Any(item => item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.FavoriteItems.Contains(item.Path)); + + if (!haveFoldersToPin) + { + rawEvent.AcceptedOperation = DataPackageOperation.None; + } + else + { + var captionText = "PinToFavorites".GetLocalizedResource(); + CompleteDragEventArgs(rawEvent, captionText, DataPackageOperation.Move); + } + } + else if (isPathNull || + (hasStorageItems && storageItems.AreItemsAlreadyInFolder(locationItem.Path)) || + locationItem.Path.StartsWith("Home", StringComparison.OrdinalIgnoreCase)) + { + rawEvent.AcceptedOperation = DataPackageOperation.None; + } + else if (hasStorageItems is false) + { + rawEvent.AcceptedOperation = DataPackageOperation.None; + } + else + { + string captionText; + DataPackageOperation operationType; + if (locationItem.Path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal)) + { + captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text); + operationType = DataPackageOperation.Move; + } + else if (rawEvent.Modifiers.HasFlag(DragDropModifiers.Alt) || rawEvent.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift)) + { + captionText = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), locationItem.Text); + operationType = DataPackageOperation.Link; + } + else if (rawEvent.Modifiers.HasFlag(DragDropModifiers.Control)) + { + captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), locationItem.Text); + operationType = DataPackageOperation.Copy; + } + else if (rawEvent.Modifiers.HasFlag(DragDropModifiers.Shift)) + { + captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text); + operationType = DataPackageOperation.Move; + } + else if (storageItems.Any(x => x.Item is ZipStorageFile || x.Item is ZipStorageFolder) + || ZipStorageFolder.IsZipPath(locationItem.Path)) + { + captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), locationItem.Text); + operationType = DataPackageOperation.Copy; + } + else if (locationItem.IsDefaultLocation || storageItems.AreItemsInSameDrive(locationItem.Path)) + { + captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), locationItem.Text); + operationType = DataPackageOperation.Move; + } + else + { + captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), locationItem.Text); + operationType = DataPackageOperation.Copy; + } + CompleteDragEventArgs(rawEvent, captionText, operationType); + } + } + + deferral.Complete(); + } + + private async void HandleDriveItemDragOver(DriveItem driveItem, ItemDragOverEventArgs args) + { + if (!Utils.Storage.FilesystemHelpers.HasDraggedStorageItems(args.DroppedItem)) + return; + + var deferral = args.RawEvent.GetDeferral(); + args.RawEvent.Handled = true; + + var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem); + var hasStorageItems = storageItems.Any(); + + if ("Unknown".GetLocalizedResource().Equals(driveItem.SpaceText, StringComparison.OrdinalIgnoreCase) || + (hasStorageItems && storageItems.AreItemsAlreadyInFolder(driveItem.Path))) + { + args.RawEvent.AcceptedOperation = DataPackageOperation.None; + } + else if (!hasStorageItems) + { + args.RawEvent.AcceptedOperation = DataPackageOperation.None; + } + else + { + string captionText; + DataPackageOperation operationType; + if (args.RawEvent.Modifiers.HasFlag(DragDropModifiers.Alt) || args.RawEvent.Modifiers.HasFlag(DragDropModifiers.Control | DragDropModifiers.Shift)) + { + captionText = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), driveItem.Text); + operationType = DataPackageOperation.Link; + } + else if (args.RawEvent.Modifiers.HasFlag(DragDropModifiers.Control)) + { + captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), driveItem.Text); + operationType = DataPackageOperation.Copy; + } + else if (args.RawEvent.Modifiers.HasFlag(DragDropModifiers.Shift)) + { + captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text); + operationType = DataPackageOperation.Move; + } + else if (storageItems.AreItemsInSameDrive(driveItem.Path)) + { + captionText = string.Format("MoveToFolderCaptionText".GetLocalizedResource(), driveItem.Text); + operationType = DataPackageOperation.Move; + } + else + { + captionText = string.Format("CopyToFolderCaptionText".GetLocalizedResource(), driveItem.Text); + operationType = DataPackageOperation.Copy; + } + CompleteDragEventArgs(args.RawEvent, captionText, operationType); + } + + deferral.Complete(); + } + + private async void HandleTagItemDragOver(FileTagItem tagItem, ItemDragOverEventArgs args) + { + if (!Utils.Storage.FilesystemHelpers.HasDraggedStorageItems(args.DroppedItem)) + return; + + var deferral = args.RawEvent.GetDeferral(); + args.RawEvent.Handled = true; + + var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem); + + if (!storageItems.Any()) + { + args.RawEvent.AcceptedOperation = DataPackageOperation.None; + } + else + { + args.RawEvent.DragUIOverride.IsCaptionVisible = true; + args.RawEvent.DragUIOverride.Caption = string.Format("LinkToFolderCaptionText".GetLocalizedResource(), tagItem.Text); + args.RawEvent.AcceptedOperation = DataPackageOperation.Link; + } + + deferral.Complete(); + } + + + public async void HandleItemDropped(ItemDroppedEventArgs args) + { + if (args.DropTarget is LocationItem locationItem) + { + HandleLocationItemDropped(locationItem, args); + } + else if (args.DropTarget is DriveItem driveItem) + { + HandleDriveItemDropped(driveItem, args); + } + else if (args.DropTarget is FileTagItem fileTagItem) + { + HandleTagItemDropped(fileTagItem, args); + } + } + + private async void HandleLocationItemDropped(LocationItem locationItem, ItemDroppedEventArgs args) + { + if (Utils.Storage.FilesystemHelpers.HasDraggedStorageItems(args.DroppedItem)) + { + var deferral = args.RawEvent.GetDeferral(); + if (string.IsNullOrEmpty(locationItem.Path) && SectionType.Favorites.Equals(locationItem.Section)) // Pin to Favorites section + { + var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem); + foreach (var item in storageItems) + { + if (item.ItemType == FilesystemItemType.Directory && !SidebarPinnedModel.FavoriteItems.Contains(item.Path)) + QuickAccessService.PinToSidebar(item.Path); + } + } + else + { + await FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.DroppedItem, locationItem.Path, false, true); + } + deferral.Complete(); + } + } + + private async void HandleDriveItemDropped(DriveItem driveItem, ItemDroppedEventArgs args) + { + var deferral = args.RawEvent.GetDeferral(); + + await FilesystemHelpers.PerformOperationTypeAsync(args.RawEvent.AcceptedOperation, args.RawEvent.DataView, driveItem.Path, false, true); + + deferral.Complete(); + await Task.Yield(); + } + + private async void HandleTagItemDropped(FileTagItem fileTagItem, ItemDroppedEventArgs args) + { + var deferral = args.RawEvent.GetDeferral(); + + var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem); + foreach (var item in storageItems.Where(x => !string.IsNullOrEmpty(x.Path))) + { + var listedItem = new ListedItem(null) + { + ItemPath = item.Path, + FileFRN = await FileTagsHelper.GetFileFRN(item.Item), + FileTags = new[] { fileTagItem.FileTag.Uid } + }; + } + + deferral.Complete(); + await Task.Yield(); + } + + private static DragEventArgs CompleteDragEventArgs(DragEventArgs e, string captionText, DataPackageOperation operationType) + { + e.DragUIOverride.IsCaptionVisible = true; + e.DragUIOverride.Caption = captionText; + e.AcceptedOperation = operationType; + return e; + } + private GridLength tabControlMargin; public GridLength TabControlMargin { diff --git a/src/Files.App/ViewModels/UserControls/ToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/ToolbarViewModel.cs index 9fa14d384e6a..5e6f735852a7 100644 --- a/src/Files.App/ViewModels/UserControls/ToolbarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/ToolbarViewModel.cs @@ -2,6 +2,7 @@ // Licensed under the MIT License. See the LICENSE. using CommunityToolkit.WinUI.UI; +using Files.Shared.Helpers; using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/src/Files.App/ViewModels/Widgets/FileTagsItemViewModel.cs b/src/Files.App/ViewModels/Widgets/FileTagsItemViewModel.cs index 5199b196e0b8..0c3f681efcd4 100644 --- a/src/Files.App/ViewModels/Widgets/FileTagsItemViewModel.cs +++ b/src/Files.App/ViewModels/Widgets/FileTagsItemViewModel.cs @@ -21,11 +21,11 @@ public sealed partial class FileTagsItemViewModel : WidgetCardItem [ObservableProperty] private string _Name; - private string path; + private string _Path; public override string Path { - get => path; - set => SetProperty(ref path, value); + get => _Path; + set => SetProperty(ref _Path, value); } public bool IsFolder => _associatedStorable is IFolder; @@ -35,8 +35,8 @@ public FileTagsItemViewModel(IStorable associatedStorable, Func op _associatedStorable = associatedStorable; _openAction = openAction; _Icon = icon; - _Name = PathHelpers.FormatName(associatedStorable.Id); - Path = associatedStorable.TryGetPath(); + _Name = associatedStorable.Name; + _Path = associatedStorable.TryGetPath(); Item = this; } diff --git a/src/Files.App/Views/LayoutModes/BaseLayout.cs b/src/Files.App/Views/LayoutModes/BaseLayout.cs index 8b99e96a2664..31d63aa29aaf 100644 --- a/src/Files.App/Views/LayoutModes/BaseLayout.cs +++ b/src/Files.App/Views/LayoutModes/BaseLayout.cs @@ -727,7 +727,9 @@ private async Task AddShellMenuItemsAsync(List s { var openWithMenuItem = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "openas" }); var sendToMenuItem = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "sendto" }); - var shellMenuItemsFiltered = shellMenuItems.Where(x => x != openWithMenuItem && x != sendToMenuItem).ToList(); + var turnOnBitLockerMenuItem = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "encrypt-bde-elev" }); + var manageBitLockerMenuItem = shellMenuItems.FirstOrDefault(x => x.Tag is Win32ContextMenuItem { CommandString: "manage-bde" }); + var shellMenuItemsFiltered = shellMenuItems.Where(x => x != openWithMenuItem && x != sendToMenuItem && x != turnOnBitLockerMenuItem && x != manageBitLockerMenuItem).ToList(); var mainShellMenuItems = shellMenuItemsFiltered.RemoveFrom(!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 0); var overflowShellMenuItemsUnfiltered = shellMenuItemsFiltered.Except(mainShellMenuItems).ToList(); var overflowShellMenuItems = overflowShellMenuItemsUnfiltered.Where( @@ -760,6 +762,19 @@ private async Task AddShellMenuItemsAsync(List s mainItems.OfType().ForEach(x => x.MaxWidth = itemsControl.ActualWidth - Constants.UI.ContextMenuLabelMargin); } + ContextFlyoutItemHelper.SwapPlaceholderWithShellOption( + contextMenuFlyout, + "TurnOnBitLockerPlaceholder", + turnOnBitLockerMenuItem, + contextMenuFlyout.SecondaryCommands.Count - 2 + ); + ContextFlyoutItemHelper.SwapPlaceholderWithShellOption( + contextMenuFlyout, + "ManageBitLockerPlaceholder", + manageBitLockerMenuItem, + contextMenuFlyout.SecondaryCommands.Count - 2 + ); + var overflowItem = contextMenuFlyout.SecondaryCommands.FirstOrDefault(x => x is AppBarButton appBarButton && (appBarButton.Tag as string) == "ItemOverflow") as AppBarButton; if (overflowItem is not null) { diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml b/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml index 22b1d739e270..ff90fa3f9017 100644 --- a/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml @@ -23,7 +23,7 @@ - + diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml index cba475336094..51d7389d2185 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml @@ -220,6 +220,7 @@ IsTabStop="True" ItemsSource="{x:Bind CollectionViewSource.View, Mode=OneWay}" Loaded="FileList_Loaded" + LosingFocus="FileList_LosingFocus" PreviewKeyDown="FileList_PreviewKeyDown" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollMode="Auto" @@ -242,7 +243,7 @@ Height="40" Margin="0" Padding="16,0,0,0" - BorderBrush="{ThemeResource ControlStrokeColorDefault}" + BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" BorderThickness="0,0,0,1" PointerPressed="Grid_PointerPressed"> diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs index f00734cdb9c4..6376b1f399f9 100644 --- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs +++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs @@ -876,5 +876,12 @@ private void SetToolTip(TextBlock textBlock) { ToolTipService.SetToolTip(textBlock, textBlock.IsTextTrimmed ? textBlock.Text : null); } + + private void FileList_LosingFocus(UIElement sender, LosingFocusEventArgs args) + { + // Fixes an issue where clicking an empty space would scroll to the top of the file list + if (args.NewFocusedElement == FileList) + args.TryCancel(); + } } } diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml index 4033825284f2..e79535b18c99 100644 --- a/src/Files.App/Views/MainPage.xaml +++ b/src/Files.App/Views/MainPage.xaml @@ -4,10 +4,13 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:helpers="using:Files.App.Helpers" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:icore="using:Microsoft.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:sidebar="using:Files.App.UserControls.Sidebar" xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls" + xmlns:triggers="using:CommunityToolkit.WinUI.UI.Triggers" xmlns:uc="using:Files.App.UserControls" xmlns:usercontrols="using:Files.App.UserControls.MultitaskingControl" xmlns:viewmodels="using:Files.App.ViewModels" @@ -32,6 +35,19 @@ + + + + + + + + + + @@ -108,82 +124,91 @@ - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + @@ -275,22 +300,22 @@ - - - - - - + - - + + + + + + + - + diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs index 3e4bb22d91e0..c066284102b8 100644 --- a/src/Files.App/Views/MainPage.xaml.cs +++ b/src/Files.App/Views/MainPage.xaml.cs @@ -4,6 +4,11 @@ using CommunityToolkit.WinUI.Helpers; using CommunityToolkit.WinUI.UI; using CommunityToolkit.WinUI.UI.Controls; +using Files.App.Data.Items; +using Files.App.Data.Models; +using Files.App.UserControls.MultitaskingControl; +using Files.App.UserControls.Sidebar; +using Files.Core.Extensions; using Files.App.UserControls.MultitaskingControl; using Microsoft.Extensions.Logging; using Microsoft.UI.Dispatching; @@ -13,6 +18,7 @@ using Microsoft.UI.Xaml.Input; using Microsoft.UI.Xaml.Navigation; using System.Runtime.CompilerServices; +using Vanara.Extensions.Reflection; using Windows.ApplicationModel; using Windows.Services.Store; using Windows.Storage; @@ -51,6 +57,7 @@ public MainPage() Commands = Ioc.Default.GetRequiredService(); WindowContext = Ioc.Default.GetRequiredService(); SidebarAdaptiveViewModel = Ioc.Default.GetRequiredService(); + SidebarAdaptiveViewModel.PaneFlyout = (MenuFlyout)Resources["SidebarContextMenu"]; ViewModel = Ioc.Default.GetRequiredService(); OngoingTasksViewModel = Ioc.Default.GetRequiredService(); @@ -198,11 +205,6 @@ private void UpdateNavToolbarProperties() protected override void OnNavigatedTo(NavigationEventArgs e) { ViewModel.OnNavigatedTo(e); - - SidebarControl.SidebarItemInvoked += SidebarControl_SidebarItemInvoked; - SidebarControl.SidebarItemPropertiesInvoked += SidebarControl_SidebarItemPropertiesInvoked; - SidebarControl.SidebarItemDropped += SidebarControl_SidebarItemDropped; - SidebarControl.SidebarItemNewPaneInvoked += SidebarControl_SidebarItemNewPaneInvoked; } protected override async void OnPreviewKeyDown(KeyRoutedEventArgs e) @@ -263,103 +265,6 @@ protected override void OnLostFocus(RoutedEventArgs e) keyReleased = true; } - private async void SidebarControl_SidebarItemDropped(object sender, SidebarItemDroppedEventArgs e) - { - await SidebarAdaptiveViewModel.FilesystemHelpers.PerformOperationTypeAsync(e.AcceptedOperation, e.Package, e.ItemPath, false, true); - e.SignalEvent?.Set(); - } - - private void SidebarControl_SidebarItemPropertiesInvoked(object sender, SidebarItemPropertiesInvokedEventArgs e) - { - if (e.InvokedItemDataContext is DriveItem) - FilePropertiesHelpers.OpenPropertiesWindow(e.InvokedItemDataContext, SidebarAdaptiveViewModel.PaneHolder.ActivePane); - else if (e.InvokedItemDataContext is LibraryLocationItem library) - FilePropertiesHelpers.OpenPropertiesWindow(new LibraryItem(library), SidebarAdaptiveViewModel.PaneHolder.ActivePane); - else if (e.InvokedItemDataContext is LocationItem locationItem) - { - ListedItem listedItem = new ListedItem(null!) - { - ItemPath = locationItem.Path, - ItemNameRaw = locationItem.Text, - PrimaryItemAttribute = StorageItemTypes.Folder, - ItemType = "Folder".GetLocalizedResource(), - }; - - FilePropertiesHelpers.OpenPropertiesWindow(listedItem, SidebarAdaptiveViewModel.PaneHolder.ActivePane); - } - } - - private void SidebarControl_SidebarItemNewPaneInvoked(object sender, SidebarItemNewPaneInvokedEventArgs e) - { - if (e.InvokedItemDataContext is INavigationControlItem navItem) - SidebarAdaptiveViewModel.PaneHolder.OpenPathInNewPane(navItem.Path); - } - - private void SidebarControl_SidebarItemInvoked(object sender, SidebarItemInvokedEventArgs e) - { - var invokedItemContainer = e.InvokedItemContainer; - - // Path to navigate - string? navigationPath; - - // Type of page to navigate - Type? sourcePageType = null; - - switch ((invokedItemContainer.DataContext as INavigationControlItem)?.ItemType) - { - case NavigationControlItemType.Location: - { - // Get the path of the invoked item - var ItemPath = (invokedItemContainer.DataContext as INavigationControlItem)?.Path; - - // Section item - if (string.IsNullOrEmpty(ItemPath)) - { - navigationPath = invokedItemContainer.Tag?.ToString(); - } - // Home item - else if (ItemPath.Equals("Home", StringComparison.OrdinalIgnoreCase)) - { - if (ItemPath.Equals(SidebarAdaptiveViewModel.SidebarSelectedItem?.Path, StringComparison.OrdinalIgnoreCase)) - return; // return if already selected - - navigationPath = "Home"; - sourcePageType = typeof(HomePage); - } - // Any other item - else - { - navigationPath = invokedItemContainer.Tag?.ToString(); - } - break; - } - - case NavigationControlItemType.FileTag: - var tagPath = (invokedItemContainer.DataContext as INavigationControlItem)?.Path; // Get the path of the invoked item - if (SidebarAdaptiveViewModel.PaneHolder?.ActivePane is IShellPage shp) - { - shp.NavigateToPath(tagPath, new NavigationArguments() - { - IsSearchResultPage = true, - SearchPathParam = "Home", - SearchQuery = tagPath, - AssociatedTabInstance = shp, - NavPathParam = tagPath - }); - } - return; - - default: - { - navigationPath = invokedItemContainer.Tag?.ToString(); - break; - } - } - - if (SidebarAdaptiveViewModel.PaneHolder?.ActivePane is IShellPage shellPage) - shellPage.NavigateToPath(navigationPath, sourcePageType); - } - private void Page_Loaded(object sender, RoutedEventArgs e) { // Defers the status bar loading until after the page has loaded to improve startup perf @@ -554,5 +459,13 @@ private void PaneSplitter_ManipulationStarted(object sender, ManipulationStarted this.ChangeCursor(InputSystemCursor.Create(PaneSplitter.GripperCursor == GridSplitter.GripperCursorType.SizeWestEast ? InputSystemCursorShape.SizeWestEast : InputSystemCursorShape.SizeNorthSouth)); } + + private void TogglePaneButton_Click(object sender, RoutedEventArgs e) + { + if (SidebarControl.DisplayMode == SidebarDisplayMode.Minimal) + { + SidebarControl.IsPaneOpen = !SidebarControl.IsPaneOpen; + } + } } } diff --git a/src/Files.App/Views/PaneHolderPage.xaml b/src/Files.App/Views/PaneHolderPage.xaml index bef476c41261..4b43ddbbb335 100644 --- a/src/Files.App/Views/PaneHolderPage.xaml +++ b/src/Files.App/Views/PaneHolderPage.xaml @@ -122,7 +122,7 @@ + Value="{ThemeResource DividerStrokeColorDefault}" /> + Value="{ThemeResource DividerStrokeColorDefault}" /> diff --git a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml index bd52485001f7..9eb1a74d6ad6 100644 --- a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml +++ b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml @@ -242,7 +242,7 @@ Height="32" Margin="0,4" Padding="32,0,0,4" - BorderBrush="{ThemeResource ControlStrokeColorDefault}" + BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" BorderThickness="0,0,0,1"> diff --git a/src/Files.Core.Storage/Extensions/StorageExtensions.Storable.cs b/src/Files.Core.Storage/Extensions/StorageExtensions.Storable.cs index 18d8fff10a86..405bb2f27afe 100644 --- a/src/Files.Core.Storage/Extensions/StorageExtensions.Storable.cs +++ b/src/Files.Core.Storage/Extensions/StorageExtensions.Storable.cs @@ -11,10 +11,10 @@ public static partial class StorageExtensions /// Tries to obtain path from the storable. /// /// The storable item to get the path from. - /// A path pointing to the item, otherwise null. - public static string? TryGetPath(this IStorable storable) + /// A path pointing to the item. + public static string TryGetPath(this IStorable storable) { - return (storable as ILocatableStorable)?.Path; + return (storable as ILocatableStorable)?.Path ?? storable.Id; } } } \ No newline at end of file diff --git a/src/Files.Core/Data/Enums/CopyEngineResult.cs b/src/Files.Core/Data/Enums/CopyEngineResult.cs index 149693b05311..93516e727c63 100644 --- a/src/Files.Core/Data/Enums/CopyEngineResult.cs +++ b/src/Files.Core/Data/Enums/CopyEngineResult.cs @@ -36,7 +36,7 @@ public struct CopyEngineResult public const int COPYENGINE_E_ALREADY_EXISTS_SYSTEM = -2144927701; public const int COPYENGINE_E_ALREADY_EXISTS_FOLDER = -2144927700; // File too big - //public const int COPYENGINE_E_FILE_TOO_LARGE = -2144927731; + public const int COPYENGINE_E_FILE_TOO_LARGE = -2144927731; //public const int COPYENGINE_E_REMOVABLE_FULL = -2144927730; //public const int COPYENGINE_E_DISK_FULL = -2144927694; //public const int COPYENGINE_E_DISK_FULL_CLEAN = -2144927693; @@ -78,6 +78,7 @@ public static FileSystemStatusCode Convert(int? hres) CopyEngineResult.COPYENGINE_E_ALREADY_EXISTS_READONLY => FileSystemStatusCode.AlreadyExists, CopyEngineResult.COPYENGINE_E_ALREADY_EXISTS_SYSTEM => FileSystemStatusCode.AlreadyExists, CopyEngineResult.COPYENGINE_E_ALREADY_EXISTS_FOLDER => FileSystemStatusCode.AlreadyExists, + CopyEngineResult.COPYENGINE_E_FILE_TOO_LARGE => FileSystemStatusCode.FileTooLarge, CopyEngineResult.COPYENGINE_E_FILE_IS_FLD_DEST => FileSystemStatusCode.NotAFile, CopyEngineResult.COPYENGINE_E_FLD_IS_FILE_DEST => FileSystemStatusCode.NotAFolder, CopyEngineResult.COPYENGINE_E_SHARING_VIOLATION_SRC => FileSystemStatusCode.InUse, diff --git a/src/Files.Core/Data/Enums/FileSystemStatusCode.cs b/src/Files.Core/Data/Enums/FileSystemStatusCode.cs index 65899fcadc28..17ae1cbc0cb6 100644 --- a/src/Files.Core/Data/Enums/FileSystemStatusCode.cs +++ b/src/Files.Core/Data/Enums/FileSystemStatusCode.cs @@ -64,6 +64,11 @@ public enum FileSystemStatusCode /// /// InProgress /// - InProgress = 1024 + InProgress = 1024, + + /// + /// FileTooLarge + /// + FileTooLarge = 2048 } } diff --git a/src/Files.Core/Helpers/PathHelpers.cs b/src/Files.Core/Helpers/PathHelpers.cs deleted file mode 100644 index 057c45f9b288..000000000000 --- a/src/Files.Core/Helpers/PathHelpers.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2023 Files Community -// Licensed under the MIT License. See the LICENSE. - -using System.IO; - -namespace Files.Core.Helpers -{ - public static class PathHelpers - { - public static string FormatName(string path) - { - string fileName; - string rootPath = Path.GetPathRoot(path) ?? string.Empty; - - if (rootPath == path && path.StartsWith(@"\\")) - { - // Network Share path - fileName = path.Substring(path.LastIndexOf(@"\", StringComparison.Ordinal) + 1); - } - else if (rootPath == path) - { - // Drive path - fileName = path; - } - else - { - // Standard file name - fileName = Path.GetFileName(path); - } - - // Check for link file name - if (FileExtensionHelpers.IsShortcutOrUrlFile(fileName)) - fileName = fileName.Remove(fileName.Length - 4); - - return fileName; - } - } -} diff --git a/src/Files.Core/ViewModels/Dialogs/FileTooLargeDialogViewModel.cs b/src/Files.Core/ViewModels/Dialogs/FileTooLargeDialogViewModel.cs new file mode 100644 index 000000000000..137295726db8 --- /dev/null +++ b/src/Files.Core/ViewModels/Dialogs/FileTooLargeDialogViewModel.cs @@ -0,0 +1,15 @@ +// Copyright (c) 2023 Files Community +// Licensed under the MIT License. See the LICENSE. + +namespace Files.Core.ViewModels.Dialogs +{ + public sealed class FileTooLargeDialogViewModel: ObservableObject + { + public IEnumerable Paths { get; private set; } + + public FileTooLargeDialogViewModel(IEnumerable paths) + { + Paths = paths; + } + } +} diff --git a/src/Files.Core/ViewModels/Widgets/FileTagsWidget/FileTagsItemViewModel.cs b/src/Files.Core/ViewModels/Widgets/FileTagsWidget/FileTagsItemViewModel.cs index 0a4058a68690..8a4f163ffa36 100644 --- a/src/Files.Core/ViewModels/Widgets/FileTagsWidget/FileTagsItemViewModel.cs +++ b/src/Files.Core/ViewModels/Widgets/FileTagsWidget/FileTagsItemViewModel.cs @@ -3,6 +3,7 @@ using Files.Core.Storage; using Files.Core.Storage.Extensions; +using Files.Shared.Helpers; namespace Files.Core.ViewModels.Widgets.FileTagsWidget { diff --git a/src/Files.Core/Helpers/FileExtensionHelpers.cs b/src/Files.Shared/Helpers/FileExtensionHelpers.cs similarity index 99% rename from src/Files.Core/Helpers/FileExtensionHelpers.cs rename to src/Files.Shared/Helpers/FileExtensionHelpers.cs index f33470e59241..233b5f1f98fb 100644 --- a/src/Files.Core/Helpers/FileExtensionHelpers.cs +++ b/src/Files.Shared/Helpers/FileExtensionHelpers.cs @@ -1,7 +1,10 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. -namespace Files.Core.Helpers +using System; +using System.Linq; + +namespace Files.Shared.Helpers { /// /// Provides static extension for path extension. diff --git a/src/Files.Shared/Helpers/PathHelpers.cs b/src/Files.Shared/Helpers/PathHelpers.cs index d23d5c837ef3..97d6e675692e 100644 --- a/src/Files.Shared/Helpers/PathHelpers.cs +++ b/src/Files.Shared/Helpers/PathHelpers.cs @@ -1,6 +1,7 @@ // Copyright (c) 2023 Files Community // Licensed under the MIT License. See the LICENSE. +using System; using System.IO; namespace Files.Shared.Helpers @@ -14,5 +15,53 @@ public static string Combine(string folder, string name) return folder.Contains('/') ? Path.Combine(folder, name).Replace('\\', '/') : Path.Combine(folder, name); } + + public static string FormatName(string path) + { + string fileName; + string rootPath = Path.GetPathRoot(path) ?? string.Empty; + + if (rootPath == path && path.StartsWith(@"\\")) + { + // Network Share path + fileName = path.Substring(path.LastIndexOf(@"\", StringComparison.Ordinal) + 1); + } + else if (rootPath == path) + { + // Drive path + fileName = path; + } + else + { + // Standard file name + fileName = Path.GetFileName(path); + } + + // Check for link file name + if (FileExtensionHelpers.IsShortcutOrUrlFile(fileName)) + fileName = fileName.Remove(fileName.Length - 4); + + return fileName; + } + + /// + /// Determines whether the points to any special system folders. + /// + /// + /// The term "Special folder" refers to any folders that may be natively supported by a certain platform (e.g. Libraries). + /// + /// The path to a folder to check. + /// If the path points to a special folder, returns true; otherwise false. + public static bool IsSpecialFolder(string path) + { + foreach (Environment.SpecialFolder specialFolder in Enum.GetValues(typeof(Environment.SpecialFolder))) + { + var specialFolderPath = Environment.GetFolderPath(specialFolder); + if (string.Equals(specialFolderPath, path, StringComparison.OrdinalIgnoreCase)) + return true; + } + + return false; + } } }