-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Code Quality: Added design and basic functionality for the upcoming S…
…helf feature (#16673)
- Loading branch information
Showing
8 changed files
with
244 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| using Files.Shared.Utils; | ||
|
|
||
| namespace Files.App.Data.Items | ||
| { | ||
| [Bindable(true)] | ||
| public sealed partial class ShelfItem : ObservableObject, IWrapper<IStorable>, IAsyncInitialize | ||
| { | ||
| private readonly IImageService _imageService; | ||
| private readonly ICollection<ShelfItem> _sourceCollection; | ||
|
|
||
| [ObservableProperty] private IImage? _Icon; | ||
| [ObservableProperty] private string? _Name; | ||
| [ObservableProperty] private string? _Path; | ||
|
|
||
| /// <inheritdoc/> | ||
| public IStorable Inner { get; } | ||
|
|
||
| public ShelfItem(IStorable storable, ICollection<ShelfItem> sourceCollection, IImage? icon = null) | ||
| { | ||
| _imageService = Ioc.Default.GetRequiredService<IImageService>(); | ||
| _sourceCollection = sourceCollection; | ||
| Inner = storable; | ||
| Icon = icon; | ||
| Name = storable.Name; | ||
| Path = storable.Id; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public async Task InitAsync(CancellationToken cancellationToken = default) | ||
| { | ||
| Icon = await _imageService.GetIconAsync(Inner, cancellationToken); | ||
| } | ||
|
|
||
| [RelayCommand] | ||
| private void Remove() | ||
| { | ||
| _sourceCollection.Remove(this); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,103 @@ | ||
| // Copyright (c) Files Community | ||
| // Licensed under the MIT License. | ||
|
|
||
| using Microsoft.UI.Xaml; | ||
| using Microsoft.UI.Xaml.Controls; | ||
| using System.Runtime.InteropServices.ComTypes; | ||
| using System.Windows.Input; | ||
| using Vanara.PInvoke; | ||
| using Windows.ApplicationModel.DataTransfer; | ||
| using WinRT; | ||
|
|
||
| namespace Files.App.UserControls | ||
| { | ||
| public sealed partial class ShelfPane : UserControl | ||
| { | ||
| public ShelfPane() | ||
| { | ||
| // TODO: [Shelf] Remove once view model is connected | ||
| ItemsSource = new ObservableCollection<ShelfItem>(); | ||
|
|
||
| InitializeComponent(); | ||
| } | ||
|
|
||
| private void Shelf_DragOver(object sender, DragEventArgs e) | ||
| { | ||
| if (!FilesystemHelpers.HasDraggedStorageItems(e.DataView)) | ||
| return; | ||
|
|
||
| e.Handled = true; | ||
| e.DragUIOverride.Caption = Strings.AddToShelf.GetLocalizedResource(); | ||
| e.AcceptedOperation = DataPackageOperation.Link; | ||
| } | ||
|
|
||
| private async void Shelf_Drop(object sender, DragEventArgs e) | ||
| { | ||
| if (ItemsSource is null) | ||
| return; | ||
|
|
||
| // Get items | ||
| var storageService = Ioc.Default.GetRequiredService<IStorageService>(); | ||
| var storageItems = (await FilesystemHelpers.GetDraggedStorageItems(e.DataView)).ToArray(); | ||
|
|
||
| // Add to list | ||
| foreach (var item in storageItems) | ||
| { | ||
| var storable = item switch | ||
| { | ||
| StorageFileWithPath => (IStorable?)await storageService.TryGetFileAsync(item.Path), | ||
| StorageFolderWithPath => (IStorable?)await storageService.TryGetFolderAsync(item.Path), | ||
| _ => null | ||
| }; | ||
|
|
||
| if (storable is null) | ||
| continue; | ||
|
|
||
| var shelfItem = new ShelfItem(storable, ItemsSource); | ||
| _ = shelfItem.InitAsync(); | ||
|
|
||
| ItemsSource.Add(shelfItem); | ||
| } | ||
| } | ||
|
|
||
| private void ListView_DragItemsStarting(object sender, DragItemsStartingEventArgs e) | ||
| { | ||
| if (ItemsSource is null) | ||
| return; | ||
|
|
||
| var shellItemList = SafetyExtensions.IgnoreExceptions(() => ItemsSource.Select(x => new Vanara.Windows.Shell.ShellItem(x.Inner.Id)).ToArray()); | ||
| if (shellItemList?[0].FileSystemPath is not null) | ||
| { | ||
| var iddo = shellItemList[0].Parent?.GetChildrenUIObjects<IDataObject>(HWND.NULL, shellItemList); | ||
| if (iddo is null) | ||
| return; | ||
|
|
||
| shellItemList.ForEach(x => x.Dispose()); | ||
| var dataObjectProvider = e.Data.As<Shell32.IDataObjectProvider>(); | ||
| dataObjectProvider.SetDataObject(iddo); | ||
| } | ||
| else | ||
| { | ||
| // Only support IStorageItem capable paths | ||
| var storageItems = ItemsSource.Select(x => VirtualStorageItem.FromPath(x.Inner.Id)); | ||
| e.Data.SetStorageItems(storageItems, false); | ||
| } | ||
| } | ||
|
|
||
| public IList<ShelfItem>? ItemsSource | ||
| { | ||
| get => (IList<ShelfItem>?)GetValue(ItemsSourceProperty); | ||
| set => SetValue(ItemsSourceProperty, value); | ||
| } | ||
| public static readonly DependencyProperty ItemsSourceProperty = | ||
| DependencyProperty.Register(nameof(ItemsSource), typeof(IList<ShelfItem>), typeof(ShelfPane), new PropertyMetadata(null)); | ||
|
|
||
| public ICommand? ClearCommand | ||
| { | ||
| get => (ICommand?)GetValue(ClearCommandProperty); | ||
| set => SetValue(ClearCommandProperty, value); | ||
| } | ||
| public static readonly DependencyProperty ClearCommandProperty = | ||
| DependencyProperty.Register(nameof(ClearCommand), typeof(ICommand), typeof(ShelfPane), new PropertyMetadata(null)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| namespace Files.Shared.Utils | ||
| { | ||
| /// <summary> | ||
| /// Wraps and exposes <typeparamref name="T"/> implementation for access. | ||
| /// </summary> | ||
| /// <typeparam name="T">The wrapped type.</typeparam> | ||
| public interface IWrapper<out T> | ||
| { | ||
| /// <summary> | ||
| /// Gets the inner member wrapped by the implementation. | ||
| /// </summary> | ||
| T Inner { get; } | ||
| } | ||
| } |