Added properties to the context menu for items in the sidebar (#2089)

Author: Thomas1664

Files/Interacts/Interaction.cs

@@ -569,7 +569,7 @@ await OpenPropertiesWindow(App.AppSettings.DrivesManager.Drives
             }
         }
 
-        private async Task OpenPropertiesWindow(object item)
+        public async Task OpenPropertiesWindow(object item)
         {
             if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
             {

Files/UserControls/SidebarControl.xaml

@@ -201,6 +201,16 @@
                                     <FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xEB20;" />
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
+                            <MenuFlyoutItem
+                                x:Name="PropertiesFolder"
+                                x:Uid="BaseLayoutContextFlyoutPropertiesFolder"
+                                x:Load="{x:Bind ShowProperties, Mode=OneWay}"
+                                Click="Properties_Click"
+                                Text="Properties">
+                                <MenuFlyoutItem.Icon>
+                                    <FontIcon FontFamily="{StaticResource FluentUIGlyphs}" Glyph="&#xea8d;" />
+                                </MenuFlyoutItem.Icon>
+                            </MenuFlyoutItem>
                         </MenuFlyout.Items>
                     </MenuFlyout>
                 </ResourceDictionary>

Files/UserControls/SidebarControl.xaml.cs

@@ -60,6 +60,24 @@ public bool ShowUnpinItem
             }
         }
 
+        private bool _ShowProperties;
+
+        public bool ShowProperties
+        {
+            get
+            {
+                return _ShowProperties;
+            }
+            set
+            {
+                if (value != _ShowProperties)
+                {
+                    _ShowProperties = value;
+                    NotifyPropertyChanged(nameof(ShowProperties));
+                }
+            }
+        }
+
         private bool _ShowEmptyRecycleBin;
 
         public bool ShowEmptyRecycleBin
@@ -195,10 +213,19 @@ private async void NavigationViewLocationItem_RightTapped(object sender, RightTa
 
                 ShowEmptyRecycleBin = true;
                 ShowUnpinItem = true;
+                ShowProperties = false;
             }
             else
             {
                 ShowEmptyRecycleBin = false;
+                // Set to true if properties should be displayed for pinned folders
+                ShowProperties = false;
+            }
+
+            // Additional check needed because ShowProperties is set to true if not recycle bin
+            if (item.IsDefaultLocation)
+            {
+                ShowProperties = false;
             }
 
             SideBarItemContextFlyout.ShowAt(sidebarItem, e.GetPosition(sidebarItem));
@@ -211,6 +238,7 @@ private void NavigationViewDriveItem_RightTapped(object sender, RightTappedRoute
 
             ShowUnpinItem = false;
             ShowEmptyRecycleBin = false;
+            ShowProperties = true;
 
             SideBarItemContextFlyout.ShowAt(sidebarItem, e.GetPosition(sidebarItem));
 
@@ -259,19 +287,19 @@ private async void NavigationViewLocationItem_DragOver(object sender, DragEventA
                 locationItem.Path.Equals(App.AppSettings.RecycleBinPath, StringComparison.OrdinalIgnoreCase) ||
                 storageItems.AreItemsAlreadyInFolder(locationItem.Path))
             {
-                e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.None;
+                e.AcceptedOperation = DataPackageOperation.None;
             }
             else
             {
                 e.DragUIOverride.IsCaptionVisible = true;
                 if (storageItems.AreItemsInSameDrive(locationItem.Path))
                 {
-                    e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
+                    e.AcceptedOperation = DataPackageOperation.Move;
                     e.DragUIOverride.Caption = string.Format(ResourceController.GetTranslation("MoveToFolderCaptionText"), locationItem.Text);
                 }
                 else
                 {
-                    e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Copy;
+                    e.AcceptedOperation = DataPackageOperation.Copy;
                     e.DragUIOverride.Caption = string.Format(ResourceController.GetTranslation("CopyToFolderCaptionText"), locationItem.Text);
                 }
             }
@@ -302,19 +330,19 @@ private async void NavigationViewDriveItem_DragOver(object sender, DragEventArgs
                 "Unknown".Equals(driveItem.SpaceText, StringComparison.OrdinalIgnoreCase) ||
                 storageItems.AreItemsAlreadyInFolder(driveItem.Path))
             {
-                e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.None;
+                e.AcceptedOperation = DataPackageOperation.None;
             }
             else
             {
                 e.DragUIOverride.IsCaptionVisible = true;
                 if (storageItems.AreItemsInSameDrive(driveItem.Path))
                 {
-                    e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
+                    e.AcceptedOperation = DataPackageOperation.Move;
                     e.DragUIOverride.Caption = string.Format(ResourceController.GetTranslation("MoveToFolderCaptionText"), driveItem.Text);
                 }
                 else
                 {
-                    e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Copy;
+                    e.AcceptedOperation = DataPackageOperation.Copy;
                     e.DragUIOverride.Caption = string.Format(ResourceController.GetTranslation("CopyToFolderCaptionText"), driveItem.Text);
                 }
             }
@@ -331,6 +359,28 @@ private void NavigationViewDriveItem_Drop(object sender, DragEventArgs e)
             ItemOperations.PasteItemWithStatus(e.DataView, driveItem.Path, e.AcceptedOperation);
             deferral.Complete();
         }
+
+        private async void Properties_Click(object sender, RoutedEventArgs e)
+        {
+            var item = (sender as MenuFlyoutItem).DataContext;
+
+            if (item is DriveItem)
+            {
+                await App.CurrentInstance.InteractionOperations.OpenPropertiesWindow(item);
+            }
+            else if (item is LocationItem)
+            {
+                ListedItem listedItem = new ListedItem(null)
+                {
+                    ItemPath = (item as LocationItem).Path,
+                    ItemName = (item as LocationItem).Text,
+                    PrimaryItemAttribute = Windows.Storage.StorageItemTypes.Folder,
+                    ItemType = ResourceController.GetTranslation("FileFolderListItem"),
+                    LoadFolderGlyph = true
+                };
+                await App.CurrentInstance.InteractionOperations.OpenPropertiesWindow(listedItem);
+            }
+        }
     }
 
     public class NavItemDataTemplateSelector : DataTemplateSelector

Files/View Models/Properties/FolderProperties.cs

@@ -83,7 +83,17 @@ public async override void GetSpecialProperties()
             string returnformat = Enum.Parse<TimeStyle>(localSettings.Values[LocalSettings.DateTimeFormat].ToString()) == TimeStyle.Application ? "D" : "g";
 
             StorageFolder storageFolder;
-            var isItemSelected = await CoreApplication.MainView.ExecuteOnUIThreadAsync(() => App.CurrentInstance.ContentPage.IsItemSelected);
+            bool isItemSelected;
+
+            try
+            {
+                isItemSelected = await CoreApplication.MainView.ExecuteOnUIThreadAsync(() => App.CurrentInstance.ContentPage.IsItemSelected);
+            }
+            catch
+            {
+                isItemSelected = true;
+            }
+
             if (isItemSelected)
             {
                 storageFolder = await ItemViewModel.GetFolderFromPathAsync(Item.ItemPath);