Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Sync pinned favorites with File Explorer #11120

Merged
merged 33 commits into from
Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1f30b8d
Start introduciong explorer
hecksmosis Jan 26, 2023
ebbfa68
Sync favourites with explorer
hecksmosis Jan 30, 2023
4cafa72
Merge branch 'main' into pinned_items_explorer
hecksmosis Jan 30, 2023
639b30b
Update SidebarPinnedModel.cs
hecksmosis Jan 30, 2023
b65c5d3
Update LocationItem.cs
hecksmosis Jan 30, 2023
4b911c0
Little changes
hecksmosis Jan 30, 2023
7f0f4d6
Merge branch 'pinned_items_explorer' of https://github.com/hecksmosis…
hecksmosis Jan 30, 2023
872219a
Formatting
hecksmosis Jan 30, 2023
86aa7ba
Minor fixes
hecksmosis Jan 30, 2023
23b89d0
Add refreshing pinned items when they are modified in explorer
hecksmosis Jan 30, 2023
809cd7c
MoveItem
hecksmosis Jan 30, 2023
edfdf81
Merge branch 'main' into pinned_items_explorer
hecksmosis Jan 31, 2023
7738c26
Merge branch 'main' into pinned_items_explorer
hecksmosis Jan 31, 2023
4929ca5
Improvements
hecksmosis Jan 31, 2023
ffc6ace
Improvements
hecksmosis Jan 31, 2023
f263e6d
Merge branch 'main' into pinned_items_explorer
yaira2 Jan 31, 2023
adf0511
Update src/Files.App/ServicesImplementation/PinnedItemsService.cs
hecksmosis Feb 1, 2023
c4e4a09
Rename PinnedItems to QuickAccess
hecksmosis Feb 1, 2023
dd51522
Rename GetPinnedFilesAsync
hecksmosis Feb 1, 2023
d887d2e
Add interface
hecksmosis Feb 1, 2023
9f897be
Remove unnecessary extension methods
hecksmosis Feb 1, 2023
86b76d5
add whitespace
hecksmosis Feb 1, 2023
10e9bb9
Add move items
hecksmosis Feb 1, 2023
25afc1b
Revert "Add move items"
hecksmosis Feb 1, 2023
14cad25
Remove SidebarPinnedController
hecksmosis Feb 1, 2023
a0a8ac5
Merge branch 'main' into pinned_items_explorer
yaira2 Feb 1, 2023
973685c
Add docs
hecksmosis Feb 1, 2023
f7b8d0b
Merge branch 'main' into pinned_items_explorer
hecksmosis Feb 1, 2023
4d1307d
Merge branch 'main' into pinned_items_explorer
yaira2 Feb 2, 2023
7095cc8
Merge branch 'main' into pinned_items_explorer
yaira2 Feb 2, 2023
3261b10
Update IQuickAccessService.cs
yaira2 Feb 2, 2023
9e3f972
Remove unnecessary parameter
hecksmosis Feb 2, 2023
ece4456
Remove unnecessary parameter
hecksmosis Feb 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Files.App/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public partial class App : Application
public static PreviewPaneViewModel PreviewPaneViewModel { get; private set; }
public static JumpListManager JumpList { get; private set; }
public static RecentItems RecentItemsManager { get; private set; }
public static SidebarPinnedController SidebarPinnedController { get; private set; }
public static QuickAccessManager QuickAccessManager { get; private set; }
public static CloudDrivesManager CloudDrivesManager { get; private set; }
public static NetworkDrivesManager NetworkDrivesManager { get; private set; }
public static DrivesManager DrivesManager { get; private set; }
Expand Down Expand Up @@ -144,6 +144,7 @@ private IServiceProvider ConfigureServices()
// (IFilesystemHelpersService, IFilesystemOperationsService)
// (IStorageEnumerator, IFallbackStorageEnumerator)
.AddSingleton<ISizeProvider, UserSizeProvider>()
.AddSingleton<IQuickAccessService, QuickAccessService>()

; // End of service configuration

Expand All @@ -164,7 +165,7 @@ private static void EnsureSettingsAndConfigurationAreBootstrapped()
CloudDrivesManager ??= new CloudDrivesManager();
WSLDistroManager ??= new WSLDistroManager();
FileTagsManager ??= new FileTagsManager();
SidebarPinnedController ??= new SidebarPinnedController();
QuickAccessManager ??= new QuickAccessManager();
}

private static async Task StartAppCenter()
Expand Down Expand Up @@ -203,7 +204,7 @@ await Task.WhenAll(
OptionalTask(NetworkDrivesManager.UpdateDrivesAsync(), preferencesSettingsService.ShowNetworkDrivesSection),
OptionalTask(WSLDistroManager.UpdateDrivesAsync(), preferencesSettingsService.ShowWslSection),
OptionalTask(FileTagsManager.UpdateFileTagsAsync(), preferencesSettingsService.ShowFileTagsSection),
SidebarPinnedController.InitializeAsync()
QuickAccessManager.InitializeAsync()
);
await Task.WhenAll(
JumpList.InitializeAsync(),
Expand Down
188 changes: 0 additions & 188 deletions src/Files.App/Controllers/SidebarPinnedController.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public string Path

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

public string MaxSpaceText => MaxSpace.ToSizeString();
public string FreeSpaceText => FreeSpace.ToSizeString();
Expand Down
Loading