Code Quality: Use view models in Widgets (#14926)

Co-authored-by: hishitetsu <66369541+hishitetsu@users.noreply.github.com>

Author: 0x5bfa

src/Files.App/Data/Contexts/HomePage/HomePageContext.cs

@@ -7,7 +7,7 @@
 
 namespace Files.App.Data.Contexts
 {
-	internal sealed class HomePageContext : ObservableObject, IHomePageContext
+	public sealed class HomePageContext : ObservableObject, IHomePageContext
 	{
 		private static readonly ImmutableList<WidgetFileTagCardItem> emptyTaggedItems = Enumerable.Empty<WidgetFileTagCardItem>().ToImmutableList();
 
@@ -29,7 +29,7 @@ public IReadOnlyList<WidgetFileTagCardItem> SelectedTaggedItems
 		public HomePageContext()
 		{
 			BaseWidgetViewModel.RightClickedItemChanged += HomePageWidget_RightClickedItemChanged;
-			FileTagsWidget.SelectedTaggedItemsChanged += FileTagsWidget_SelectedTaggedItemsChanged;
+			FileTagsWidgetViewModel.SelectedTaggedItemsChanged += FileTagsWidget_SelectedTaggedItemsChanged;
 		}
 
 		private void FileTagsWidget_SelectedTaggedItemsChanged(object? sender, IEnumerable<WidgetFileTagCardItem> e)

src/Files.App/Data/Contexts/HomePage/IHomePageContext.cs

@@ -5,7 +5,7 @@
 
 namespace Files.App.Data.Contexts
 {
-	internal interface IHomePageContext
+	public interface IHomePageContext
 	{
 		/// <summary>
 		/// The last right clicked item

src/Files.App/Data/Contracts/IFileTagsService.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.ViewModels.FileTags;
 using Files.Core.Storage.LocatableStorage;
 
 namespace Files.App.Data.Contracts

src/Files.App/Data/Contracts/IWidgetViewModel.cs

@@ -17,7 +17,7 @@ public interface IWidgetViewModel : IDisposable
 
 		bool ShowMenuFlyout { get; }
 
-		MenuFlyoutItem MenuFlyoutItem { get; }
+		MenuFlyoutItem? MenuFlyoutItem { get; }
 
 		Task RefreshWidgetAsync();
 	}

src/Files.App/Data/EventArguments/QuickAccessCardEventArgs.cs

@@ -3,16 +3,6 @@
 
 namespace Files.App.Data.EventArguments
 {
-	public sealed class QuickAccessCardEventArgs : EventArgs
-	{
-		public LocationItem? Item { get; set; }
-	}
-
-	public sealed class QuickAccessCardInvokedEventArgs : EventArgs
-	{
-		public string? Path { get; set; }
-	}
-
 	public sealed class ModifyQuickAccessEventArgs : EventArgs
 	{
 		public string[]? Paths { get; set; }

src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs

@@ -341,10 +341,14 @@ x.Tag is Win32ContextMenuItem menuItem &&
 						OpacityIconStyle = "ColorIconOpenWith",
 					};
 					var (_, openWithItems) = ContextFlyoutModelToElementHelper.GetAppBarItemsFromModel([openWithItem]);
+					var index = 0;
 					var placeholder = itemContextMenuFlyout.SecondaryCommands.FirstOrDefault(x => Equals((x as AppBarButton)?.Tag, "OpenWithPlaceholder")) as AppBarButton;
 					if (placeholder is not null)
+					{
 						placeholder.Visibility = Visibility.Collapsed;
-					itemContextMenuFlyout.SecondaryCommands.Insert(0, openWithItems.FirstOrDefault());
+						index = itemContextMenuFlyout.SecondaryCommands.IndexOf(placeholder);
+					}
+					itemContextMenuFlyout.SecondaryCommands.Insert(index, openWithItems.FirstOrDefault());
 				}
 
 				// Add items to sendto dropdown
@@ -353,10 +357,14 @@ x.Tag is Win32ContextMenuItem menuItem &&
 					await sendToItem.LoadSubMenuAction();
 
 					var (_, sendToItems) = ContextFlyoutModelToElementHelper.GetAppBarItemsFromModel([sendToItem]);
+					var index = 1;
 					var placeholder = itemContextMenuFlyout.SecondaryCommands.FirstOrDefault(x => Equals((x as AppBarButton)?.Tag, "SendToPlaceholder")) as AppBarButton;
 					if (placeholder is not null)
+					{
 						placeholder.Visibility = Visibility.Collapsed;
-					itemContextMenuFlyout.SecondaryCommands.Insert(1, sendToItems.FirstOrDefault());
+						index = itemContextMenuFlyout.SecondaryCommands.IndexOf(placeholder);
+					}
+					itemContextMenuFlyout.SecondaryCommands.Insert(index, sendToItems.FirstOrDefault());
 				}
 
 				// Add items to shell submenu

src/Files.App/Data/Items/WidgetContainerItem.cs

@@ -17,8 +17,12 @@ public sealed class WidgetContainerItem : ObservableObject, IDisposable
 
 		// Properties
 
+		public IWidgetViewModel _WidgetItemModel;
 		public IWidgetViewModel WidgetItemModel
-			=> WidgetControl as IWidgetViewModel;
+		{
+			get => _WidgetItemModel;
+			set => SetProperty(ref _WidgetItemModel, value);
+		}
 
 		public string WidgetAutomationProperties
 			=> WidgetItemModel.AutomationProperties;
@@ -48,11 +52,12 @@ public bool IsExpanded
 
 		// Constructor
 
-		public WidgetContainerItem(object widgetControl, Action<bool> expanderValueChangedCallback, Func<bool> expanderValueRequestedCallback)
+		public WidgetContainerItem(object widgetControl, IWidgetViewModel widgetItemModel, Action<bool> expanderValueChangedCallback, Func<bool> expanderValueRequestedCallback)
 		{
 			_expanderValueChangedCallback = expanderValueChangedCallback;
 			_expanderValueRequestedCallback = expanderValueRequestedCallback;
 
+			WidgetItemModel = widgetItemModel;
 			WidgetControl = widgetControl;
 		}
 

src/Files.App/Data/Items/WidgetFileTagCardItem.cs

@@ -9,14 +9,14 @@ namespace Files.App.Data.Items
 {
 	public sealed partial class WidgetFileTagCardItem : WidgetCardItem
 	{
+		// Dependency injections
+
+		private IContentPageContext ContentPageContext { get; } = Ioc.Default.GetRequiredService<IContentPageContext>();
+
 		// Fields
 
 		private readonly IStorable _associatedStorable;
 
-		// A workaround for lack of MVVM-compliant navigation support.
-		// This workaround must be kept until further refactor of navigation code is completed.
-		private readonly Func<string, Task> _openAction;
-
 		// Properties
 
 		public bool IsFolder
@@ -47,10 +47,9 @@ public override string Path
 
 		public ICommand ClickCommand { get; }
 
-		public WidgetFileTagCardItem(IStorable associatedStorable, Func<string, Task> openAction, IImage? icon)
+		public WidgetFileTagCardItem(IStorable associatedStorable, IImage? icon)
 		{
 			_associatedStorable = associatedStorable;
-			_openAction = openAction;
 			_Icon = icon;
 			_Name = associatedStorable.Name;
 			_Path = associatedStorable.TryGetPath();
@@ -61,7 +60,7 @@ public WidgetFileTagCardItem(IStorable associatedStorable, Func<string, Task> op
 
 		private Task ClickAsync()
 		{
-			return _openAction(_associatedStorable.Id);
+			return NavigationHelpers.OpenPath(_associatedStorable.Id, ContentPageContext.ShellPage!);
 		}
 	}
 }

src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs

@@ -13,11 +13,10 @@ public sealed partial class WidgetFileTagsContainerItem : ObservableObject, IAsy
 		private readonly IFileTagsService FileTagsService = Ioc.Default.GetRequiredService<IFileTagsService>();
 		private readonly IImageService ImageService = Ioc.Default.GetRequiredService<IImageService>();
 		private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
+		private IContentPageContext ContentPageContext { get; } = Ioc.Default.GetRequiredService<IContentPageContext>();
 
 		private readonly string _tagUid;
 
-		private readonly Func<string, Task> _openAction;
-
 		// Properties
 
 		public ObservableCollection<WidgetFileTagCardItem> Tags { get; }
@@ -46,11 +45,10 @@ public string? Name
 		public ICommand ViewMoreCommand { get; }
 		public ICommand OpenAllCommand { get; }
 
-		public WidgetFileTagsContainerItem(string tagUid, Func<string, Task> openAction)
+		public WidgetFileTagsContainerItem(string tagUid)
 		{
 			_tagUid = tagUid;
-			_openAction = openAction;
-			Tags = [];
+			Tags = new();
 
 			ViewMoreCommand = new AsyncRelayCommand(ViewMore);
 			OpenAllCommand = new AsyncRelayCommand(OpenAll);
@@ -59,21 +57,21 @@ public WidgetFileTagsContainerItem(string tagUid, Func<string, Task> openAction)
 		/// <inheritdoc/>
 		public async Task InitAsync(CancellationToken cancellationToken = default)
 		{
-			await foreach (var item in FileTagsService.GetItemsForTagAsync(_tagUid, cancellationToken))
+			await foreach (var item in FileTagsService.GetItemsForTagAsync(_tagUid))
 			{
-				var icon = await ImageService.GetIconAsync(item.Storable, cancellationToken);
-				Tags.Add(new(item.Storable, _openAction, icon));
+				var icon = await ImageService.GetIconAsync(item.Storable, default);
+				Tags.Add(new(item.Storable, icon));
 			}
 		}
 
-		private Task ViewMore()
+		private Task<bool> ViewMore()
 		{
-			return _openAction($"tag:{Name}");
+			return NavigationHelpers.OpenPath($"tag:{Name}", ContentPageContext.ShellPage!);
 		}
 
 		private Task OpenAll()
 		{
-			SelectedTagChanged?.Invoke(this, new SelectedTagChangedEventArgs(Tags.Select(tag => (tag.Path, tag.IsFolder))));
+			SelectedTagChanged?.Invoke(this, new(Tags.Select(tag => (tag.Path, tag.IsFolder))));
 
 			return Commands.OpenAllTaggedItems.ExecuteAsync();
 		}

src/Files.App/ViewModels/FileTags/ListedTagViewModel.cs renamed to src/Files.App/Data/Models/ListedTagViewModel.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.ViewModels.FileTags
+namespace Files.App.Data.Models
 {
 	public sealed class ListedTagViewModel : ObservableObject
 	{