Merge pull request #288 from jeffsieu/folder-properties

Add folder properties to ribbon, right-click menu

Author: yaira2

Files/Controls/RibbonArea.xaml

@@ -981,6 +981,12 @@
                                     </AppBarButton.Icon>
                                 </AppBarButton>
                                 <AppBarButton MinWidth="40" LabelPosition="{x:Bind RibbonViewModel.ItemLabelPosition, Mode=OneWay}" Style="{StaticResource AppBarButtonRevealStyle}" CornerRadius="2" Click="{x:Bind parentPage.instanceInteraction.OpenItem_Click}" x:Name="OpenWithButton" IsEnabled="{x:Bind parentPage.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Open With" Icon="OpenWith"/>
+                                <AppBarSeparator/>
+                                <AppBarButton MinWidth="40" LabelPosition="{x:Bind RibbonViewModel.ItemLabelPosition, Mode=OneWay}" Style="{StaticResource AppBarButtonRevealStyle}" CornerRadius="2" Click="{x:Bind parentPage.instanceInteraction.ShowFolderPropertiesButton_Click}" x:Name="ShowFolderPropertiesButton" IsEnabled="{x:Bind parentPage.AlwaysPresentCommands.isEnabled, Mode=OneWay}" Label="Folder Properties">
+                                    <AppBarButton.Icon>
+                                        <FontIcon Glyph="&#xE946;"/>
+                                    </AppBarButton.Icon>
+                                </AppBarButton>
                             </controls:RibbonPage.PageContent>
                         </controls:RibbonPage>
                     </Custom:TabViewItem>

Files/Filesystem/ItemViewModel.cs

@@ -35,13 +35,15 @@ public class ItemViewModel : INotifyPropertyChanged
         public EmptyFolderTextState EmptyTextState { get; set; } = new EmptyFolderTextState();
         public LoadingIndicator LoadIndicator { get; set; } = new LoadingIndicator();
         public ReadOnlyObservableCollection<ListedItem> FilesAndFolders { get; }
+        public ListedItem currentFolder { get => _rootFolderItem; }
         public CollectionViewSource viewSource;
         public UniversalPath Universal { get; } = new UniversalPath();
         private ObservableCollection<ListedItem> _filesAndFolders;
         private StorageFolderQueryResult _folderQueryResult;
         public StorageFileQueryResult _fileQueryResult;
         private CancellationTokenSource _cancellationTokenSource;
         private StorageFolder _rootFolder;
+        private ListedItem _rootFolderItem;
         private QueryOptions _options;
         private volatile bool _filesRefreshing;
         private const int _step = 250;
@@ -519,6 +521,21 @@ public async void AddItemsToCollectionAsync(string path)
             try
             {
                 _rootFolder = await StorageFolder.GetFolderFromPathAsync(Universal.path);
+                var rootFolderProperties = await _rootFolder.GetBasicPropertiesAsync();
+
+                _rootFolderItem = new ListedItem(_rootFolder.FolderRelativeId)
+                {
+                    FileName = _rootFolder.Name,
+                    FileDateReal = rootFolderProperties.DateModified,
+                    FileType = "Folder",    //TODO: Take a look at folder.DisplayType
+                    FolderImg = Visibility.Visible,
+                    FileImg = null,
+                    FileIconVis = Visibility.Collapsed,
+                    FilePath = _rootFolder.Path,
+                    EmptyImgVis = Visibility.Collapsed,
+                    FileSize = null,
+                    FileSizeBytes = 0
+                };
 
                 App.OccupiedInstance.RibbonArea.Back.IsEnabled = App.OccupiedInstance.ItemDisplayFrame.CanGoBack;
                 App.OccupiedInstance.RibbonArea.Forward.IsEnabled = App.OccupiedInstance.ItemDisplayFrame.CanGoForward;

Files/GenericFileBrowser.xaml

@@ -64,6 +64,12 @@
                         <FontIcon Glyph="&#xE8A5;"/>
                     </MenuFlyoutItem.Icon>
                 </MenuFlyoutItem>
+                <MenuFlyoutSeparator/>
+                <MenuFlyoutItem Text="Properties" Click="{x:Bind AssociatedInteractions.ShowFolderPropertiesButton_Click}" x:Name="PropertiesFolder">
+                    <MenuFlyoutItem.Icon>
+                        <FontIcon Glyph="&#xE946;"/>
+                    </MenuFlyoutItem.Icon>
+                </MenuFlyoutItem>
             </MenuFlyoutSubItem>
         </MenuFlyout>
 

Files/Interacts/Interaction.cs

@@ -480,6 +480,13 @@ public async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
             await App.propertiesDialog.ShowAsync(ContentDialogPlacement.Popup);
         }
 
+        public async void ShowFolderPropertiesButton_Click(object sender, RoutedEventArgs e)
+        {
+            App.propertiesDialog.accessiblePropertiesFrame.Tag = App.propertiesDialog;
+            App.propertiesDialog.accessiblePropertiesFrame.Navigate(typeof(Properties), App.OccupiedInstance.instanceViewModel.currentFolder, new SuppressNavigationTransitionInfo());
+            await App.propertiesDialog.ShowAsync(ContentDialogPlacement.Popup);
+        }
+
         private async void Manager_DataRequested(DataTransferManager sender, DataRequestedEventArgs args)
         {
             DataRequestDeferral dataRequestDeferral = args.Request.GetDeferral();

Files/PhotoAlbum.xaml

@@ -67,6 +67,12 @@
                     </MenuFlyoutItem.Icon>
                 </MenuFlyoutItem>
             </MenuFlyoutSubItem>
+            <MenuFlyoutSeparator/>
+            <MenuFlyoutItem Text="Properties" Click="{x:Bind AssociatedInteractions.ShowFolderPropertiesButton_Click}" x:Name="PropertiesFolder">
+                <MenuFlyoutItem.Icon>
+                    <FontIcon Glyph="&#xE946;"/>
+                </MenuFlyoutItem.Icon>
+            </MenuFlyoutItem>
         </MenuFlyout>
 
         <MenuFlyout Opening="RightClickContextMenu_Opening" x:Key="BaseLayoutItemContextFlyout">

Files/Properties.xaml.cs

@@ -1,20 +1,5 @@
 using Files.Filesystem;
-using Files.Interacts;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
 namespace Files
@@ -31,9 +16,7 @@ public Properties()
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            var result = e.Parameter as IEnumerable;
-            IList<ListedItem> listedItems = result.OfType<ListedItem>().ToList();
-            Item = listedItems[0];
+            Item = e.Parameter as ListedItem;
             PropertiesDialog = Frame.Tag as ContentDialog;
             base.OnNavigatedTo(e);
         }