Update

files-community · Mar 9, 2024 · f312f0e · f312f0e
1 parent e76a8d8
commit f312f0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -1701,9 +1701,6 @@
  <data name="DrivesWidgetAutomationProperties.Name" xml:space="preserve">
  <value>Drives widget</value>
  </data>
- <data name="RecentFilesWidgetAutomationProperties.Name" xml:space="preserve">
- <value>Recent Files widget</value>
- </data>
  <data name="NoSearchResultsFound" xml:space="preserve">
  <value>No items found</value>
  </data>

diff --git a/src/Files.App/ViewModels/HomeViewModel.cs b/src/Files.App/ViewModels/HomeViewModel.cs
@@ -38,50 +38,46 @@ public void ReloadWidgets()
 
  if (reloadQuickAccessWidget)
  {
- var quickAccessWidget = new QuickAccessWidget();
+  var quickAccessWidget = new QuickAccessWidget();
 
- InsertWidget(
+ AddWidget(
  new(
  quickAccessWidget,
  (value) => UserSettingsService.GeneralSettingsService.FoldersWidgetExpanded = value,
- () => UserSettingsService.GeneralSettingsService.FoldersWidgetExpanded),
- 0);
+ () => UserSettingsService.GeneralSettingsService.FoldersWidgetExpanded));
  }
 
  if (reloadDrivesWidget)
  {
  var drivesWidget = new DrivesWidget();
 
- InsertWidget(
+ AddWidget(
  new(
  drivesWidget,
  (value) => UserSettingsService.GeneralSettingsService.DrivesWidgetExpanded = value,
- () => UserSettingsService.GeneralSettingsService.DrivesWidgetExpanded),
- 1);
+ () => UserSettingsService.GeneralSettingsService.DrivesWidgetExpanded));
  }
 
  if (reloadFileTagsWidget)
  {
  var fileTagsWidget = new FileTagsWidget();
 
- InsertWidget(
+ AddWidget(
  new(
  fileTagsWidget,
  (value) => UserSettingsService.GeneralSettingsService.FileTagsWidgetExpanded = value,
- () => UserSettingsService.GeneralSettingsService.FileTagsWidgetExpanded),
- 2);
+ () => UserSettingsService.GeneralSettingsService.FileTagsWidgetExpanded));
  }
 
  if (reloadRecentFilesWidget)
  {
  var recentFilesWidget = new RecentFilesWidget();
 
- InsertWidget(
+ AddWidget(
  new(
  recentFilesWidget,
  (value) => UserSettingsService.GeneralSettingsService.RecentFilesWidgetExpanded = value,
- () => UserSettingsService.GeneralSettingsService.RecentFilesWidgetExpanded),
- 4);
+ () => UserSettingsService.GeneralSettingsService.RecentFilesWidgetExpanded));
  }
  }
 
@@ -160,12 +156,6 @@ public void RemoveWidgetAt(int index)
  RemoveWidgetAt(indexToRemove);
  }
 
- public void ReorderWidget(WidgetContainerItem widgetModel, int place)
- {
- int widgetIndex = WidgetItems.IndexOf(widgetModel);
- WidgetItems.Move(widgetIndex, place);
- }
-
  // Command methods
 
  private void ExecuteHomePageLoadedCommand(RoutedEventArgs? e)

diff --git a/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs
@@ -24,7 +24,7 @@ public class RecentFilesWidgetViewModel : BaseWidgetViewModel, IWidgetViewModel
  public ObservableCollection<RecentItem> Items { get; } = [];
 
  public string WidgetName => nameof(RecentFilesWidget);
- public string AutomationProperties => "RecentFilesWidgetAutomationProperties/Name".GetLocalizedResource();
+ public string AutomationProperties => "RecentFiles".GetLocalizedResource();
  public string WidgetHeader => "RecentFiles".GetLocalizedResource();
  public bool IsWidgetSettingEnabled => UserSettingsService.GeneralSettingsService.ShowRecentFilesWidget;
  public bool ShowMenuFlyout => false;