Skip to content

Commit 5aefc47

Browse files
yaira2yaira2
committed
Cleanup
1 parent d196303 commit 5aefc47

File tree

5 files changed

+23
-26
lines changed

5 files changed

+23
-26
lines changed

‎src/Files.App/Filesystem/QuickAccessManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public sealed class QuickAccessManager
2020

2121
public event FileSystemEventHandler? PinnedItemsModified;
2222

23-
public EventHandler<ModifyQuickAccessEventArgs>? UpdateFolderWidget;
23+
public EventHandler<ModifyQuickAccessEventArgs>? UpdateQuickAccessWidget;
2424

2525
public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
2626

‎src/Files.App/ServicesImplementation/QuickAccessService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public async Task PinToSidebar(string[] folderPaths)
3636
await ContextMenu.InvokeVerb("pintohome", folderPaths);
3737
await App.QuickAccessManager.Model.LoadAsync();
3838

39-
App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
39+
App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
4040
}
4141

4242
public async Task UnpinFromSidebar(string folderPath)
@@ -56,7 +56,7 @@ await SafetyExtensions.IgnoreExceptions(async () => {
5656

5757
await App.QuickAccessManager.Model.LoadAsync();
5858

59-
App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
59+
App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
6060
}
6161
}
6262
}

‎src/Files.App/Strings/en-US/Resources.resw‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,9 +2289,6 @@
22892289
<data name="DrivesWidgetAutomationProperties.Name" xml:space="preserve">
22902290
<value>Drives Widget</value>
22912291
</data>
2292-
<data name="FolderWidgetAutomationProperties.Name" xml:space="preserve">
2293-
<value>Folders Widget</value>
2294-
</data>
22952292
<data name="RecentFilesWidgetAutomationProperties.Name" xml:space="preserve">
22962293
<value>Recent Files Widget</value>
22972294
</data>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ public QuickAccessWidget()
120120

121121
QuickAccessCardCommand = new AsyncRelayCommand<FolderCardItem>(OpenCard);
122122

123-
Loaded += FolderWidget_Loaded;
124-
Unloaded += FolderWidget_Unloaded;
123+
Loaded += QuickAccessWidget_Loaded;
124+
Unloaded += QuickAccessWidget_Unloaded;
125125
}
126126

127127
public delegate void LibraryCardInvokedEventHandler(object sender, QuickAccessCardInvokedEventArgs e);
@@ -168,7 +168,7 @@ public bool ShowMultiPaneControls
168168

169169
public string WidgetName => nameof(QuickAccessWidget);
170170

171-
public string AutomationProperties => "FolderWidgetAutomationProperties/Name".GetLocalizedResource();
171+
public string AutomationProperties => "QuickAccess".GetLocalizedResource();
172172

173173
public string WidgetHeader => "QuickAccess".GetLocalizedResource();
174174

@@ -198,9 +198,9 @@ private async void ModifyItem(object? sender, ModifyQuickAccessEventArgs? e)
198198
ItemsAdded.Remove(itemToRemove);
199199
}
200200

201-
private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
201+
private async void QuickAccessWidget_Loaded(object sender, RoutedEventArgs e)
202202
{
203-
Loaded -= FolderWidget_Loaded;
203+
Loaded -= QuickAccessWidget_Loaded;
204204

205205
var itemsToAdd = await QuickAccessService.GetPinnedFoldersAsync(true);
206206

@@ -219,16 +219,16 @@ private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
219219
idx++;
220220
}
221221

222-
App.QuickAccessManager.UpdateFolderWidget += ModifyItem;
222+
App.QuickAccessManager.UpdateQuickAccessWidget += ModifyItem;
223223

224224
var cardLoadTasks = ItemsAdded.Select(cardItem => cardItem.LoadCardThumbnailAsync());
225225
await Task.WhenAll(cardLoadTasks);
226226
}
227227

228-
private void FolderWidget_Unloaded(object sender, RoutedEventArgs e)
228+
private void QuickAccessWidget_Unloaded(object sender, RoutedEventArgs e)
229229
{
230-
Unloaded -= FolderWidget_Unloaded;
231-
App.QuickAccessManager.UpdateFolderWidget += ModifyItem;
230+
Unloaded -= QuickAccessWidget_Unloaded;
231+
App.QuickAccessManager.UpdateQuickAccessWidget += ModifyItem;
232232
}
233233

234234
private void MenuFlyout_Opening(object sender, object e)

‎src/Files.App/Views/WidgetsPage.xaml.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,23 @@ private void ViewModel_WidgetListRefreshRequestedInvoked(object? sender, EventAr
6262

6363
public void ReloadWidgets()
6464
{
65-
quickAccessWidget = WidgetsHelpers.TryGetWidget<QuickAccessWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFolderWidget, quickAccessWidget);
65+
quickAccessWidget = WidgetsHelpers.TryGetWidget<QuickAccessWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadQuickAccessWidget, quickAccessWidget);
6666
drivesWidget = WidgetsHelpers.TryGetWidget<DrivesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadDrivesWidget, drivesWidget);
6767
bundlesWidget = WidgetsHelpers.TryGetWidget<BundlesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadBundles, bundlesWidget);
6868
fileTagsWidget = WidgetsHelpers.TryGetWidget<FileTagsWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFileTags, fileTagsWidget);
6969
recentFilesWidget = WidgetsHelpers.TryGetWidget<RecentFilesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadRecentFiles, recentFilesWidget);
7070

71-
if (shouldReloadFolderWidget && quickAccessWidget is not null)
71+
if (shouldReloadQuickAccessWidget && quickAccessWidget is not null)
7272
{
7373
Widgets.ViewModel.InsertWidget(new(quickAccessWidget, (value) => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded = value, () => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded), 0);
7474

75-
quickAccessWidget.CardInvoked -= FolderWidget_CardInvoked;
76-
quickAccessWidget.CardNewPaneInvoked -= FolderWidget_CardNewPaneInvoked;
77-
quickAccessWidget.CardPropertiesInvoked -= FolderWidget_CardPropertiesInvoked;
75+
quickAccessWidget.CardInvoked -= QuickAccessWidget_CardInvoked;
76+
quickAccessWidget.CardNewPaneInvoked -= QuickAccessWidget_CardNewPaneInvoked;
77+
quickAccessWidget.CardPropertiesInvoked -= QuickAccessWidget_CardPropertiesInvoked;
7878
quickAccessWidget.QuickAccessWidgetShowMultiPaneControlsInvoked -= QuickAccessWidget_QuickAccessWidgetShowMultiPaneControlsInvoked;
79-
quickAccessWidget.CardInvoked += FolderWidget_CardInvoked;
80-
quickAccessWidget.CardNewPaneInvoked += FolderWidget_CardNewPaneInvoked;
81-
quickAccessWidget.CardPropertiesInvoked += FolderWidget_CardPropertiesInvoked;
79+
quickAccessWidget.CardInvoked += QuickAccessWidget_CardInvoked;
80+
quickAccessWidget.CardNewPaneInvoked += QuickAccessWidget_CardNewPaneInvoked;
81+
quickAccessWidget.CardPropertiesInvoked += QuickAccessWidget_CardPropertiesInvoked;
8282
quickAccessWidget.QuickAccessWidgetShowMultiPaneControlsInvoked += QuickAccessWidget_QuickAccessWidgetShowMultiPaneControlsInvoked;
8383
}
8484
if (shouldReloadDrivesWidget && drivesWidget is not null)
@@ -177,7 +177,7 @@ private void RecentFilesWidget_RecentFilesOpenLocationInvoked(object sender, Use
177177
});
178178
}
179179

180-
private void FolderWidget_CardInvoked(object sender, QuickAccessCardInvokedEventArgs e)
180+
private void QuickAccessWidget_CardInvoked(object sender, QuickAccessCardInvokedEventArgs e)
181181
{
182182
AppInstance.NavigateWithArguments(FolderSettings.GetLayoutType(e.Path), new NavigationArguments()
183183
{
@@ -186,12 +186,12 @@ private void FolderWidget_CardInvoked(object sender, QuickAccessCardInvokedEvent
186186
AppInstance.InstanceViewModel.IsPageTypeNotHome = true; // show controls that were hidden on the home page
187187
}
188188

189-
private void FolderWidget_CardNewPaneInvoked(object sender, QuickAccessCardInvokedEventArgs e)
189+
private void QuickAccessWidget_CardNewPaneInvoked(object sender, QuickAccessCardInvokedEventArgs e)
190190
{
191191
AppInstance.PaneHolder?.OpenPathInNewPane(e.Path);
192192
}
193193

194-
private async void FolderWidget_CardPropertiesInvoked(object sender, QuickAccessCardEventArgs e)
194+
private async void QuickAccessWidget_CardPropertiesInvoked(object sender, QuickAccessCardEventArgs e)
195195
{
196196
ListedItem listedItem = new(null!)
197197
{

0 commit comments

Comments
 (0)