Skip to content

Commit d31aab5

Browse files
authored
Feature: Sync pinned favorites with File Explorer (#11120)
1 parent c93841e commit d31aab5

File tree

14 files changed

+220
-454
lines changed

14 files changed

+220
-454
lines changed

src/Files.App/App.xaml.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public partial class App : Application
6060
public static PreviewPaneViewModel PreviewPaneViewModel { get; private set; }
6161
public static JumpListManager JumpList { get; private set; }
6262
public static RecentItems RecentItemsManager { get; private set; }
63-
public static SidebarPinnedController SidebarPinnedController { get; private set; }
63+
public static QuickAccessManager QuickAccessManager { get; private set; }
6464
public static CloudDrivesManager CloudDrivesManager { get; private set; }
6565
public static NetworkDrivesManager NetworkDrivesManager { get; private set; }
6666
public static DrivesManager DrivesManager { get; private set; }
@@ -144,6 +144,7 @@ private IServiceProvider ConfigureServices()
144144
// (IFilesystemHelpersService, IFilesystemOperationsService)
145145
// (IStorageEnumerator, IFallbackStorageEnumerator)
146146
.AddSingleton<ISizeProvider, UserSizeProvider>()
147+
.AddSingleton<IQuickAccessService, QuickAccessService>()
147148

148149
; // End of service configuration
149150

@@ -164,7 +165,7 @@ private static void EnsureSettingsAndConfigurationAreBootstrapped()
164165
CloudDrivesManager ??= new CloudDrivesManager();
165166
WSLDistroManager ??= new WSLDistroManager();
166167
FileTagsManager ??= new FileTagsManager();
167-
SidebarPinnedController ??= new SidebarPinnedController();
168+
QuickAccessManager ??= new QuickAccessManager();
168169
}
169170

170171
private static async Task StartAppCenter()
@@ -203,7 +204,7 @@ await Task.WhenAll(
203204
OptionalTask(NetworkDrivesManager.UpdateDrivesAsync(), preferencesSettingsService.ShowNetworkDrivesSection),
204205
OptionalTask(WSLDistroManager.UpdateDrivesAsync(), preferencesSettingsService.ShowWslSection),
205206
OptionalTask(FileTagsManager.UpdateFileTagsAsync(), preferencesSettingsService.ShowFileTagsSection),
206-
SidebarPinnedController.InitializeAsync()
207+
QuickAccessManager.InitializeAsync()
207208
);
208209
await Task.WhenAll(
209210
JumpList.InitializeAsync(),

src/Files.App/Controllers/SidebarPinnedController.cs

Lines changed: 0 additions & 188 deletions
This file was deleted.

src/Files.App/DataModels/NavigationControlItems/DriveItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public string Path
4444

4545
public bool IsRemovable => Type == DriveType.Removable || Type == DriveType.CDRom;
4646
public bool IsNetwork => Type == DriveType.Network;
47-
public bool IsPinned => App.SidebarPinnedController.Model.FavoriteItems.Contains(path);
47+
public bool IsPinned => App.QuickAccessManager.Model.FavoriteItems.Contains(path);
4848

4949
public string MaxSpaceText => MaxSpace.ToSizeString();
5050
public string FreeSpaceText => FreeSpace.ToSizeString();

0 commit comments

Comments
 (0)