Allow to pin drives to favorites (#9380)

Author: IgorKordiukiewicz

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

@@ -48,6 +48,8 @@ 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);
+
         private ByteSize maxSpace;
         private ByteSize freeSpace;
         private ByteSize spaceUsed;

src/Files.Uwp/UserControls/SidebarControl.xaml.cs

@@ -109,6 +109,8 @@ public ICommand EmptyRecycleBinCommand
 
         private ICommand HideSectionCommand { get; }
 
+        private ICommand PinItemCommand { get; }
+
         private ICommand UnpinItemCommand { get; }
 
         private ICommand MoveItemToTopCommand { get; }
@@ -143,6 +145,7 @@ public SidebarControl()
 
             HideSectionCommand = new RelayCommand(HideSection);
             UnpinItemCommand = new RelayCommand(UnpinItem);
+            PinItemCommand = new RelayCommand(PinItem);
             MoveItemToTopCommand = new RelayCommand(MoveItemToTop);
             MoveItemUpCommand = new RelayCommand(MoveItemUp);
             MoveItemDownCommand = new RelayCommand(MoveItemDown);
@@ -193,6 +196,9 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
             bool showMoveItemUp = favoriteIndex > 0;
             bool showMoveItemDown = favoriteIndex < favoriteCount - 1;
 
+            bool isDriveItem = item is DriveItem;
+            bool isDriveItemPinned = isDriveItem && (item as DriveItem).IsPinned;
+
             return new List<ContextMenuFlyoutItemViewModel>()
             {
                 new ContextMenuFlyoutItemViewModel()
@@ -272,11 +278,18 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
                     ShowItem = showMoveItemDown
                 },
                 new ContextMenuFlyoutItemViewModel()
+                {
+                    Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalized(),
+                    Glyph = "\uE840",
+                    Command = PinItemCommand,
+                    ShowItem = isDriveItem && !isDriveItemPinned
+                },
+                new ContextMenuFlyoutItemViewModel()
                 {
                     Text = "SideBarUnpinFromFavorites/Text".GetLocalized(),
                     Glyph = "\uE77A",
                     Command = UnpinItemCommand,
-                    ShowItem = options.ShowUnpinItem
+                    ShowItem = options.ShowUnpinItem || isDriveItemPinned
                 },
                 new ContextMenuFlyoutItemViewModel()
                 {
@@ -367,14 +380,22 @@ private async void OpenInNewWindow()
             await NavigationHelpers.OpenPathInNewWindowAsync(rightClickedItem.Path);
         }
 
+        private void PinItem()
+        {
+            if(rightClickedItem is DriveItem)
+            {
+                App.SidebarPinnedController.Model.AddItem(rightClickedItem.Path);
+            }
+        }
+
         private void UnpinItem()
         {
             if (rightClickedItem.MenuOptions.ShowEmptyRecycleBin)
             {
                 UserSettingsService.AppearanceSettingsService.PinRecycleBinToSidebar = false;
                 App.SidebarPinnedController.Model.ShowHideRecycleBinItem(false);
             }
-            else if (rightClickedItem.Section == SectionType.Favorites)
+            else if (rightClickedItem.Section == SectionType.Favorites || rightClickedItem is DriveItem)
             {
                 App.SidebarPinnedController.Model.RemoveItem(rightClickedItem.Path);
             }

src/Files.Uwp/UserControls/Widgets/DrivesWidget.xaml

@@ -108,6 +108,26 @@
                                             <FontIcon Glyph="&#xE737;" />
                                         </MenuFlyoutItem.Icon>
                                     </MenuFlyoutItem>
+                                    <MenuFlyoutItem
+                                        x:Name="PinToFavorites"
+                                        Click="PinToFavorites_Click"
+                                        DataContext="{x:Bind Item}"
+                                        Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
+                                        Visibility="Collapsed">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon Glyph="&#xE840;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem
+                                        x:Name="UnpinFromFavorites"
+                                        Click="UnpinFromFavorites_Click"
+                                        DataContext="{x:Bind Item}"
+                                        Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
+                                        Visibility="Collapsed">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon Glyph="&#xE77A;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
                                     <MenuFlyoutItem
                                         x:Name="PropertiesItem"
                                         Click="OpenDriveProperties_Click"

src/Files.Uwp/UserControls/Widgets/DrivesWidget.xaml.cs

@@ -167,6 +167,26 @@ private async void OpenInNewWindow_Click(object sender, RoutedEventArgs e)
             await NavigationHelpers.OpenPathInNewWindowAsync(item.Path);
         }
 
+        private async void PinToFavorites_Click(object sender, RoutedEventArgs e)
+        {
+            var item = ((MenuFlyoutItem)sender).DataContext as DriveItem;
+            if (await CheckEmptyDrive(item.Path))
+            {
+                return;
+            }
+            App.SidebarPinnedController.Model.AddItem(item.Path);
+        }
+
+        private async void UnpinFromFavorites_Click(object sender, RoutedEventArgs e)
+        {
+            var item = ((MenuFlyoutItem)sender).DataContext as DriveItem;
+            if (await CheckEmptyDrive(item.Path))
+            {
+                return;
+            }
+            App.SidebarPinnedController.Model.RemoveItem(item.Path);
+        }
+
         private async void OpenDriveProperties_Click(object sender, RoutedEventArgs e)
         {
             var item = ((MenuFlyoutItem)sender).DataContext as DriveItem;
@@ -236,6 +256,12 @@ private void MenuFlyout_Opening(object sender, object e)
         {
             var newPaneMenuItem = (sender as MenuFlyout).Items.Single(x => x.Name == "OpenInNewPane");
             newPaneMenuItem.Visibility = ShowMultiPaneControls ? Visibility.Visible : Visibility.Collapsed;
+
+            var pinToFavoritesItem = (sender as MenuFlyout).Items.Single(x => x.Name == "PinToFavorites");
+            pinToFavoritesItem.Visibility = (pinToFavoritesItem.DataContext as DriveItem).IsPinned ? Visibility.Collapsed : Visibility.Visible;
+
+            var unpinFromFavoritesItem = (sender as MenuFlyout).Items.Single(x => x.Name == "UnpinFromFavorites");
+            unpinFromFavoritesItem.Visibility = (unpinFromFavoritesItem.DataContext as DriveItem).IsPinned ? Visibility.Visible : Visibility.Collapsed;
         }
 
         private async void MapNetworkDrive_Click(object sender, RoutedEventArgs e)