Skip to content

Commit e3f093b

Browse files
0x5bfa0x5bfa
authored
Code Quality: Introduced HomePageContext (#14115)
1 parent 3d6715a commit e3f093b

File tree

9 files changed

+251
-85
lines changed

9 files changed

+251
-85
lines changed

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// Copyright (c) 2023 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
using Files.App.UserControls.Widgets;
5+
using Files.App.ViewModels.Widgets;
6+
using Microsoft.UI.Xaml.Controls;
7+
using System.Collections.Immutable;
8+
9+
namespace Files.App.Data.Contexts
10+
{
11+
internal class HomePageContext : ObservableObject, IHomePageContext
12+
{
13+
private static readonly IImmutableList<FileTagsItemViewModel> emptyTaggedItems = Enumerable.Empty<FileTagsItemViewModel>().ToImmutableList();
14+
15+
public bool IsAnyItemRightClicked => rightClickedItem is not null;
16+
17+
private WidgetCardItem? rightClickedItem = null;
18+
public WidgetCardItem? RightClickedItem => rightClickedItem;
19+
20+
private CommandBarFlyout? itemContextFlyoutMenu = null;
21+
public CommandBarFlyout? ItemContextFlyoutMenu => itemContextFlyoutMenu;
22+
23+
private IReadOnlyList<FileTagsItemViewModel> selectedTaggedItems = emptyTaggedItems;
24+
public IReadOnlyList<FileTagsItemViewModel> SelectedTaggedItems
25+
{
26+
get => selectedTaggedItems;
27+
set => selectedTaggedItems = value ?? emptyTaggedItems;
28+
}
29+
30+
public HomePageContext()
31+
{
32+
HomePageWidget.RightClickedItemChanged += HomePageWidget_RightClickedItemChanged;
33+
FileTagsWidget.SelectedTaggedItemsChanged += FileTagsWidget_SelectedTaggedItemsChanged;
34+
}
35+
36+
private void FileTagsWidget_SelectedTaggedItemsChanged(object? sender, IEnumerable<FileTagsItemViewModel> e)
37+
{
38+
SetProperty(ref selectedTaggedItems, e.ToList());
39+
}
40+
41+
private void HomePageWidget_RightClickedItemChanged(object? sender, WidgetsRightClickedItemChangedEventArgs e)
42+
{
43+
if (SetProperty(ref rightClickedItem, e.Item, nameof(RightClickedItem)))
44+
OnPropertyChanged(nameof(IsAnyItemRightClicked));
45+
46+
SetProperty(ref itemContextFlyoutMenu, e.Flyout, nameof(ItemContextFlyoutMenu));
47+
}
48+
}
49+
}

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright (c) 2023 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
using Files.App.UserControls.Widgets;
5+
using Files.App.ViewModels.Widgets;
6+
using Microsoft.UI.Xaml.Controls;
7+
8+
namespace Files.App.Data.Contexts
9+
{
10+
internal interface IHomePageContext
11+
{
12+
/// <summary>
13+
/// The last right clicked item
14+
/// </summary>
15+
WidgetCardItem? RightClickedItem { get; }
16+
17+
/// <summary>
18+
/// The last opened widget's context menu instance
19+
/// </summary>
20+
CommandBarFlyout? ItemContextFlyoutMenu { get; }
21+
22+
/// <summary>
23+
/// An list containing all the selected tagged items
24+
/// </summary>
25+
IReadOnlyList<FileTagsItemViewModel> SelectedTaggedItems { get; }
26+
27+
/// <summary>
28+
/// Tells whether any item has been right clicked
29+
/// </summary>
30+
bool IsAnyItemRightClicked { get; }
31+
}
32+
}

‎src/Files.App/Data/EventArguments/WidgetsRightClickedItemChangedEventArgs.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright (c) 2023 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
using Files.App.UserControls.Widgets;
5+
using Microsoft.UI.Xaml.Controls;
6+
7+
namespace Files.App.Data.EventArguments
8+
{
9+
public class WidgetsRightClickedItemChangedEventArgs
10+
{
11+
public WidgetCardItem? Item { get; set; }
12+
13+
public CommandBarFlyout? Flyout { get; set; }
14+
15+
public WidgetsRightClickedItemChangedEventArgs(WidgetCardItem? item = null, CommandBarFlyout? flyout = null)
16+
{
17+
Item = item;
18+
Flyout = flyout;
19+
}
20+
}
21+
}

‎src/Files.App/Helpers/Application/AppLifecycleHelper.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public static IHost ConfigureHost()
122122
.AddSingleton<IPageContext, PageContext>()
123123
.AddSingleton<IContentPageContext, ContentPageContext>()
124124
.AddSingleton<IDisplayPageContext, DisplayPageContext>()
125+
.AddSingleton<IHomePageContext, HomePageContext>()
125126
.AddSingleton<IWindowContext, WindowContext>()
126127
.AddSingleton<IMultitaskingContext, MultitaskingContext>()
127128
.AddSingleton<ITagsContext, TagsContext>()

‎src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public async Task LoadCardThumbnailAsync()
6161
public sealed partial class DrivesWidget : HomePageWidget, IWidgetItem, INotifyPropertyChanged
6262
{
6363
public IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
64+
private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();
6465

6566
private DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
6667

@@ -294,13 +295,17 @@ private void FormatDrive(DriveCardItem? item)
294295

295296
private void OpenProperties(DriveCardItem item)
296297
{
298+
if (!HomePageContext.IsAnyItemRightClicked)
299+
return;
300+
297301
EventHandler<object> flyoutClosed = null!;
298-
flyoutClosed = async (s, e) =>
302+
flyoutClosed = (s, e) =>
299303
{
300-
ItemContextMenuFlyout.Closed -= flyoutClosed;
304+
HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
301305
FilePropertiesHelpers.OpenPropertiesWindow(item.Item, associatedInstance);
302306
};
303-
ItemContextMenuFlyout.Closed += flyoutClosed;
307+
308+
HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
304309
}
305310

306311
private async void Button_Click(object sender, RoutedEventArgs e)

‎src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
using System.Windows.Input;
1212
using Windows.Storage;
1313

14-
// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
15-
1614
namespace Files.App.UserControls.Widgets
1715
{
1816
public sealed partial class FileTagsWidget : HomePageWidget, IWidgetItem
1917
{
2018
private readonly IUserSettingsService userSettingsService;
19+
private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();
2120

2221
public FileTagsWidgetViewModel ViewModel
2322
{
@@ -32,6 +31,7 @@ public FileTagsWidgetViewModel ViewModel
3231
public delegate void FileTagsOpenLocationInvokedEventHandler(object sender, PathNavigationEventArgs e);
3332
public delegate void FileTagsNewPaneInvokedEventHandler(object sender, QuickAccessCardInvokedEventArgs e);
3433

34+
public static event EventHandler<IEnumerable<FileTagsItemViewModel>>? SelectedTaggedItemsChanged;
3535
public event FileTagsOpenLocationInvokedEventHandler FileTagsOpenLocationInvoked;
3636
public event FileTagsNewPaneInvokedEventHandler FileTagsNewPaneInvoked;
3737

@@ -69,10 +69,14 @@ public FileTagsWidget()
6969

7070
private void OpenProperties(WidgetCardItem? item)
7171
{
72+
if (!HomePageContext.IsAnyItemRightClicked)
73+
return;
74+
7275
EventHandler<object> flyoutClosed = null!;
7376
flyoutClosed = (s, e) =>
7477
{
75-
ItemContextMenuFlyout.Closed -= flyoutClosed;
78+
HomePageContext.ItemContextFlyoutMenu!.Closed -= flyoutClosed;
79+
7680
ListedItem listedItem = new(null!)
7781
{
7882
ItemPath = (item.Item as FileTagsItemViewModel)?.Path ?? string.Empty,
@@ -82,7 +86,8 @@ private void OpenProperties(WidgetCardItem? item)
8286
};
8387
FilePropertiesHelpers.OpenPropertiesWindow(listedItem, AppInstance);
8488
};
85-
ItemContextMenuFlyout.Closed += flyoutClosed;
89+
90+
HomePageContext.ItemContextFlyoutMenu!.Closed += flyoutClosed;
8691
}
8792

8893
private void OpenInNewPane(WidgetCardItem? item)
@@ -101,50 +106,45 @@ private async void FileTagItem_ItemClick(object sender, ItemClickEventArgs e)
101106

102107
private void AdaptiveGridView_RightTapped(object sender, RightTappedRoutedEventArgs e)
103108
{
109+
// Ensure values are not null
104110
if (e.OriginalSource is not FrameworkElement element ||
105111
element.DataContext is not FileTagsItemViewModel item)
106-
{
107112
return;
108-
}
109113

110-
LoadContextMenu(
111-
element,
112-
e,
113-
GetItemMenuItems(item, QuickAccessService.IsItemPinned(item.Path), item.IsFolder),
114-
rightClickedItem: item);
115-
}
114+
// Create a new Flyout
115+
var itemContextMenuFlyout = new CommandBarFlyout()
116+
{
117+
Placement = FlyoutPlacementMode.Full
118+
};
116119

117-
private void LoadContextMenu(
118-
FrameworkElement element,
119-
RightTappedRoutedEventArgs e,
120-
List<ContextMenuFlyoutItemViewModel> menuItems,
121-
FileTagsItemViewModel? rightClickedItem = null)
122-
{
123-
var itemContextMenuFlyout = new CommandBarFlyout { Placement = FlyoutPlacementMode.Full };
120+
// Hook events
124121
itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
122+
itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
123+
124+
FlyoutItemPath = item.Path;
125+
126+
// Notify of the change on right clicked item
127+
OnRightClickedItemChanged(item, itemContextMenuFlyout);
125128

129+
// Get items for the flyout
130+
var menuItems = GetItemMenuItems(item, QuickAccessService.IsItemPinned(item.Path), item.IsFolder);
126131
var (_, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(menuItems);
127132

128-
if (!UserSettingsService.GeneralSettingsService.MoveShellExtensionsToSubMenu)
129-
secondaryElements.OfType<FrameworkElement>()
130-
.ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth); // Set menu min width if the overflow menu setting is disabled
133+
// Set max width of the flyout
134+
secondaryElements
135+
.OfType<FrameworkElement>()
136+
.ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth);
131137

132-
secondaryElements.ForEach(i => itemContextMenuFlyout.SecondaryCommands.Add(i));
133-
ItemContextMenuFlyout = itemContextMenuFlyout;
134-
if (rightClickedItem is not null)
135-
{
136-
FlyouItemPath = rightClickedItem.Path;
137-
ItemContextMenuFlyout.Opened += ItemContextMenuFlyout_Opened;
138-
}
139-
itemContextMenuFlyout.ShowAt(element, new FlyoutShowOptions { Position = e.GetPosition(element) });
138+
// Add menu items to the secondary flyout
139+
secondaryElements.ForEach(itemContextMenuFlyout.SecondaryCommands.Add);
140140

141-
e.Handled = true;
142-
}
141+
// Show the flyout
142+
itemContextMenuFlyout.ShowAt(element, new() { Position = e.GetPosition(element) });
143143

144-
private async void ItemContextMenuFlyout_Opened(object? sender, object e)
145-
{
146-
ItemContextMenuFlyout.Opened -= ItemContextMenuFlyout_Opened;
147-
await ShellContextmenuHelper.LoadShellMenuItemsAsync(FlyouItemPath, ItemContextMenuFlyout, showOpenWithMenu: true, showSendToMenu: true);
144+
// Load shell menu items
145+
_ = ShellContextmenuHelper.LoadShellMenuItemsAsync(FlyoutItemPath, itemContextMenuFlyout);
146+
147+
e.Handled = true;
148148
}
149149

150150
public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCardItem item, bool isPinned, bool isFolder = false)

‎src/Files.App/UserControls/Widgets/HomePageWidget.cs‎

Lines changed: 61 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,81 @@ namespace Files.App.UserControls.Widgets
1313
{
1414
public abstract class HomePageWidget : UserControl
1515
{
16+
// Dependency injections
17+
1618
public IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
1719
public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
1820
public IStorageService StorageService { get; } = Ioc.Default.GetRequiredService<IStorageService>();
1921

20-
public ICommand RemoveRecentItemCommand;
21-
public ICommand ClearAllItemsCommand;
22-
public ICommand OpenFileLocationCommand;
23-
public ICommand OpenInNewTabCommand;
24-
public ICommand OpenInNewWindowCommand;
25-
public ICommand OpenPropertiesCommand;
26-
public ICommand PinToFavoritesCommand;
27-
public ICommand UnpinFromFavoritesCommand;
22+
// Fields
23+
24+
protected string? FlyoutItemPath;
25+
26+
// Commands
27+
28+
public ICommand? RemoveRecentItemCommand { get; protected set; }
29+
public ICommand? ClearAllItemsCommand { get; protected set; }
30+
public ICommand? OpenFileLocationCommand { get; protected set; }
31+
public ICommand? OpenInNewTabCommand { get; protected set; }
32+
public ICommand? OpenInNewWindowCommand { get; protected set; }
33+
public ICommand? OpenPropertiesCommand { get; protected set; }
34+
public ICommand? PinToFavoritesCommand { get; protected set; }
35+
public ICommand? UnpinFromFavoritesCommand { get; protected set; }
36+
37+
// Events
2838

29-
protected CommandBarFlyout ItemContextMenuFlyout;
30-
protected string FlyouItemPath;
39+
public static event EventHandler<WidgetsRightClickedItemChangedEventArgs>? RightClickedItemChanged;
40+
41+
// Abstract methods
3142

3243
public abstract List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCardItem item, bool isPinned, bool isFolder = false);
3344

45+
// Event methods
46+
3447
public void Button_RightTapped(object sender, RightTappedRoutedEventArgs e)
3548
{
36-
var itemContextMenuFlyout = new CommandBarFlyout { Placement = FlyoutPlacementMode.Full };
37-
itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
38-
if (sender is not Button widgetCardItem || widgetCardItem.DataContext is not WidgetCardItem item)
49+
// Ensure values are not null
50+
if (sender is not Button widgetCardItem ||
51+
widgetCardItem.DataContext is not WidgetCardItem item)
3952
return;
4053

54+
// Create a new Flyout
55+
var itemContextMenuFlyout = new CommandBarFlyout()
56+
{
57+
Placement = FlyoutPlacementMode.Full
58+
};
59+
60+
// Hook events
61+
itemContextMenuFlyout.Opening += (sender, e) => App.LastOpenedFlyout = sender as CommandBarFlyout;
62+
itemContextMenuFlyout.Opened += (sender, e) => OnRightClickedItemChanged(null, null);
63+
64+
FlyoutItemPath = item.Path;
65+
66+
// Notify of the change on right clicked item
67+
OnRightClickedItemChanged(item, itemContextMenuFlyout);
68+
69+
// Get items for the flyout
4170
var menuItems = GetItemMenuItems(item, QuickAccessService.IsItemPinned(item.Path));
4271
var (_, secondaryElements) = ItemModelListToContextFlyoutHelper.GetAppBarItemsFromModel(menuItems);
4372

44-
secondaryElements.OfType<FrameworkElement>()
45-
.ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth);
73+
// Set max width of the flyout
74+
secondaryElements
75+
.OfType<FrameworkElement>()
76+
.ForEach(i => i.MinWidth = Constants.UI.ContextMenuItemsMaxWidth);
77+
78+
// Add menu items to the secondary flyout
79+
secondaryElements.ForEach(itemContextMenuFlyout.SecondaryCommands.Add);
80+
81+
// Show the flyout
82+
itemContextMenuFlyout.ShowAt(widgetCardItem, new() { Position = e.GetPosition(widgetCardItem) });
4683

47-
secondaryElements.ForEach(i => itemContextMenuFlyout.SecondaryCommands.Add(i));
48-
ItemContextMenuFlyout = itemContextMenuFlyout;
49-
FlyouItemPath = item.Path;
50-
ItemContextMenuFlyout.Opened += ItemContextMenuFlyout_Opened;
51-
itemContextMenuFlyout.ShowAt(widgetCardItem, new FlyoutShowOptions { Position = e.GetPosition(widgetCardItem) });
84+
// Load shell menu items
85+
_ = ShellContextmenuHelper.LoadShellMenuItemsAsync(FlyoutItemPath, itemContextMenuFlyout);
5286

5387
e.Handled = true;
5488
}
5589

56-
private async void ItemContextMenuFlyout_Opened(object? sender, object e)
57-
{
58-
ItemContextMenuFlyout.Opened -= ItemContextMenuFlyout_Opened;
59-
await ShellContextmenuHelper.LoadShellMenuItemsAsync(FlyouItemPath, ItemContextMenuFlyout);
60-
}
90+
// Command methods
6191

6292
public async Task OpenInNewTabAsync(WidgetCardItem item)
6393
{
@@ -71,13 +101,17 @@ public async Task OpenInNewWindowAsync(WidgetCardItem item)
71101

72102
public virtual async Task PinToFavoritesAsync(WidgetCardItem item)
73103
{
74-
_ = QuickAccessService.PinToSidebarAsync(item.Path);
104+
await QuickAccessService.PinToSidebarAsync(item.Path);
75105
}
76106

77107
public virtual async Task UnpinFromFavoritesAsync(WidgetCardItem item)
78108
{
79-
_ = QuickAccessService.UnpinFromSidebarAsync(item.Path);
109+
await QuickAccessService.UnpinFromSidebarAsync(item.Path);
80110
}
81111

112+
protected void OnRightClickedItemChanged(WidgetCardItem? item, CommandBarFlyout? flyout)
113+
{
114+
RightClickedItemChanged?.Invoke(this, new WidgetsRightClickedItemChangedEventArgs(item, flyout));
115+
}
82116
}
83117
}

0 commit comments

Comments
 (0)