Add sorting to PhotoAlbum

Also:
- Adds SortOption enum to represent
  current file attribute to sort by
- Moves sorting logic to ItemViewModel
  from GenericFileBrowser. This allows
  sorting options to persist through
  folder navigation

Issues:
- Navigating to another folder currently
  sorts its files only after all of them
  are loaded.

Author: jeffsieu

Files UWP/Enums/SortOption.cs

@@ -0,0 +1,10 @@
+namespace Files.Enums
+{
+    public enum SortOption
+    {
+        Name,
+        DateModified,
+        Size,
+        FileType
+    }
+}

Files UWP/FilesUWP.csproj

@@ -140,6 +140,7 @@
     <Compile Include="Dialogs\RenameDialog.xaml.cs">
       <DependentUpon>RenameDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Enums\SortOption.cs" />
     <Compile Include="Enums\ThemeStyle.cs" />
     <Compile Include="Enums\TimeStyle.cs" />
     <Compile Include="Filesystem\DriveItem.cs" />

Files UWP/Filesystem/ItemViewModel.cs

@@ -1,5 +1,5 @@
 using ByteSizeLib;
-using Files.Interacts;
+using Files.Enums;
 using Files.Navigation;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.UI.Xaml.Controls;
@@ -45,9 +45,43 @@ public class ItemViewModel
         private volatile bool _filesRefreshing;
         private const int _step = 250;
 
+        private SortOption _directorySortOption = SortOption.Name;
+        private SortDirection _directorySortDirection = SortDirection.Ascending;
+
+        public SortOption DirectorySortOption
+        {
+            get
+            {
+                return _directorySortOption;
+            }
+            set
+            {
+                if (value != _directorySortOption)
+                {
+                    _directorySortOption = value;
+                    OrderFiles();
+                }
+            }
+        }
+
+        public SortDirection DirectorySortDirection
+        {
+            get
+            {
+                return _directorySortDirection;
+            }
+            set
+            {
+                if (value != _directorySortDirection)
+                {
+                    _directorySortDirection = value;
+                    OrderFiles();
+                }
+            }
+        }
+
         public ItemViewModel()
         {
-            
             _filesAndFolders = new ObservableCollection<ListedItem>();
 
             FilesAndFolders = new ReadOnlyObservableCollection<ListedItem>(_filesAndFolders);
@@ -250,26 +284,27 @@ public void CancelLoadAndClearFiles()
 
         }
 
-        public void OrderFiles(string orderBy, bool ascending)
+        public void OrderFiles()
         {
-            Func<ListedItem, object> orderFunc;
+            if (_filesAndFolders.Count == 0)
+                return;
+
             object orderByNameFunc(ListedItem item) => item.FileName;
-            switch (orderBy)
+            Func<ListedItem, object> orderFunc = orderByNameFunc;
+            switch (DirectorySortOption)
             {
-                case "Name":
+                case SortOption.Name:
                     orderFunc = orderByNameFunc;
                     break;
-                case "Date":
+                case SortOption.DateModified:
                     orderFunc = item => item.FileDateReal;
                     break;
-                case "Type":
+                case SortOption.FileType:
                     orderFunc = item => item.FileType;
                     break;
-                case "Size":
+                case SortOption.Size:
                     orderFunc = item => item.FileSizeBytes;
                     break;
-                default:
-                    return;
             }
 
             // In ascending order, show folders first, then files.
@@ -278,20 +313,20 @@ public void OrderFiles(string orderBy, bool ascending)
             IOrderedEnumerable<ListedItem> ordered;
             List<ListedItem> orderedList;
 
-            if (ascending)
+            if (DirectorySortDirection == SortDirection.Ascending)
                 ordered = _filesAndFolders.OrderBy(folderThenFile).ThenBy(orderFunc);
             else
             {
-                if (orderBy == "Type")
+                if (DirectorySortOption == SortOption.FileType)
                     ordered = _filesAndFolders.OrderBy(folderThenFile).ThenByDescending(orderFunc);
                 else
                     ordered = _filesAndFolders.OrderByDescending(folderThenFile).ThenByDescending(orderFunc);
             }
 
             // Further order by name if applicable
-            if (orderBy != "Name")
+            if (DirectorySortOption != SortOption.Name)
             {
-                if (ascending)
+                if (DirectorySortDirection == SortDirection.Ascending)
                     ordered = ordered.ThenBy(orderByNameFunc);
                 else
                     ordered = ordered.ThenByDescending(orderByNameFunc);
@@ -487,6 +522,7 @@ public async void AddItemsToCollectionAsync(string path)
                         (App.selectedTabInstance.accessibleContentFrame.Content as PhotoAlbum).TextState.isVisible = Visibility.Visible;
                     }
                 }
+                OrderFiles();
                 stopwatch.Stop();
                 Debug.WriteLine("Loading of items in " + Universal.path + " completed in " + stopwatch.ElapsedMilliseconds + " milliseconds.\n");
                 App.selectedTabInstance.RefreshButton.IsEnabled = true;

Files UWP/GenericFileBrowser.xaml.cs

@@ -1,13 +1,14 @@
-using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.Toolkit.Uwp.UI;
+using Microsoft.Toolkit.Uwp.UI.Controls;
 using System;
 using System.ComponentModel;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
+using Files.Enums;
 using Files.Filesystem;
-using Files.Navigation;
 using Files.Interacts;
 using System.Diagnostics;
 using Windows.UI.Core;
@@ -21,7 +22,6 @@ public sealed partial class GenericFileBrowser : Page, INotifyPropertyChanged
         public TextBlock emptyTextGFB;
         public TextBlock textBlock;
         public DataGrid data;
-        public DataGridColumn sortedColumn;
         public MenuFlyout context;
         public MenuFlyout emptySpaceContext;
         public MenuFlyout HeaderContextMenu;
@@ -33,14 +33,74 @@ public sealed partial class GenericFileBrowser : Page, INotifyPropertyChanged
         public Flyout CopiedFlyout;
         public Grid grid;
         public ProgressBar progressBar;
+        private DataGridColumn _sortedColumn;
         ItemViewModel viewModelInstance;
         ProHome tabInstance;
-        bool isSortedAscending;
 
         public event PropertyChangedEventHandler PropertyChanged;
 
         public EmptyFolderTextState TextState { get; set; } = new EmptyFolderTextState();
 
+        public DataGridColumn SortedColumn
+        {
+            get
+            {
+                return _sortedColumn;
+            }
+            set
+            {
+                if (value == nameColumn)
+                    viewModelInstance.DirectorySortOption = SortOption.Name;
+                else if (value == dateColumn)
+                    viewModelInstance.DirectorySortOption = SortOption.DateModified;
+                else if (value == typeColumn)
+                    viewModelInstance.DirectorySortOption = SortOption.FileType;
+                else if (value == sizeColumn)
+                    viewModelInstance.DirectorySortOption = SortOption.Size;
+                else
+                    viewModelInstance.DirectorySortOption = SortOption.Name;
+
+                if (value != _sortedColumn)
+                {
+                    // Remove arrow on previous sorted column
+                    if (_sortedColumn != null)
+                        _sortedColumn.SortDirection = null;
+                    value.SortDirection = IsSortedAscending ? DataGridSortDirection.Ascending : DataGridSortDirection.Descending;
+                }
+                _sortedColumn = value;
+            }
+        }
+
+        private bool IsSortedByName { get { return SortedColumn == nameColumn; } set { if (value) SortedColumn = nameColumn; } }
+        private bool IsSortedByDate { get { return SortedColumn == dateColumn; } set { if (value) SortedColumn = dateColumn; } }
+        private bool IsSortedByType { get { return SortedColumn == typeColumn; } set { if (value) SortedColumn = typeColumn; } }
+        private bool IsSortedBySize { get { return SortedColumn == sizeColumn; } set { if (value) SortedColumn = sizeColumn; } }
+
+        private bool IsSortedAscending
+        {
+            get
+            {
+                return viewModelInstance.DirectorySortDirection == SortDirection.Ascending;
+            }
+            set
+            {
+                viewModelInstance.DirectorySortDirection = value ? SortDirection.Ascending : SortDirection.Descending;
+                _sortedColumn.SortDirection = value ? DataGridSortDirection.Ascending : DataGridSortDirection.Descending;
+            }
+        }
+
+        private bool IsSortedDescending
+        {
+            get
+            {
+                return !IsSortedAscending;
+            }
+            set
+            {
+                IsSortedAscending = !value;
+            }
+        }
+
         public GenericFileBrowser()
         {
             this.InitializeComponent();
@@ -49,9 +109,6 @@ public GenericFileBrowser()
             progressBar = progBar;
             progressBar.Visibility = Visibility.Collapsed;
             data = AllView;
-            sortedColumn = nameColumn;
-            sortedColumn.SortDirection = DataGridSortDirection.Ascending;
-            isSortedAscending = true;
             context = RightClickContextMenu;
             HeaderContextMenu = HeaderRightClickMenu;
             grid = RootGrid;
@@ -84,6 +141,22 @@ public GenericFileBrowser()
             NewTextDocument.Click += tabInstance.instanceInteraction.NewTextDocument_Click;
             PropertiesItem.Click += tabInstance.ShowPropertiesButton_Click;
             OpenInNewWindowItem.Click += tabInstance.instanceInteraction.OpenInNewWindowItem_Click;
+            
+            switch (viewModelInstance.DirectorySortOption)
+            {
+                case SortOption.Name:
+                    SortedColumn = nameColumn;
+                    break;
+                case SortOption.DateModified:
+                    SortedColumn = dateColumn;
+                    break;
+                case SortOption.FileType:
+                    SortedColumn = typeColumn;
+                    break;
+                case SortOption.Size:
+                    SortedColumn = nameColumn;
+                    break;
+            }
         }
 
         private void AddItem_Click(object sender, RoutedEventArgs e)
@@ -339,64 +412,16 @@ private void AllView_Sorting(object sender, DataGridColumnEventArgs e)
         {
             if (e.Column == iconColumn)
                 return;
-            if (sortedColumn == e.Column)
-                isSortedAscending = e.Column.SortDirection == DataGridSortDirection.Descending;
+            if (SortedColumn == e.Column)
+                IsSortedAscending = !IsSortedAscending;
             else
             {
-                isSortedAscending = true;
+                IsSortedAscending = true;
+                SortedColumn = e.Column;
             }
 
             NotifyPropertyChanged("IsSortedAscending");
             NotifyPropertyChanged("IsSortedDescending");
-
-            SortBy(e.Column);
-        }
-
-        private void SortBy(DataGridColumn column)
-        {
-            var selectedItems = data.SelectedItems;
-
-            viewModelInstance.OrderFiles(column.Tag.ToString(), isSortedAscending);
-
-            // Remove arrow on previous sorted column
-            sortedColumn.SortDirection = null;
-            column.SortDirection = isSortedAscending ? DataGridSortDirection.Ascending : DataGridSortDirection.Descending;
-            sortedColumn = column;
-
-            if (selectedItems.Count == 1)
-            {
-                data.SelectedItem = selectedItems[0];
-            }
-        }
-
-        private bool IsSortedByName { get { return sortedColumn == nameColumn; } set { if (value) SortBy(nameColumn); } }
-        private bool IsSortedByDate { get { return sortedColumn == dateColumn; } set { if (value) SortBy(dateColumn); } }
-        private bool IsSortedByType { get { return sortedColumn == typeColumn; } set { if (value) SortBy(typeColumn); } }
-        private bool IsSortedBySize { get { return sortedColumn == sizeColumn; } set { if (value) SortBy(sizeColumn); } }
-        private bool IsSortedAscending
-        {
-            get
-            {
-                return isSortedAscending;
-            }
-            set
-            {
-                isSortedAscending = value;
-                if (value) SortBy(sortedColumn);
-            }
-        }
-
-        private bool IsSortedDescending
-        {
-            get
-            {
-                return !isSortedAscending;
-            }
-            set
-            {
-                isSortedAscending = !value;
-                if (value) SortBy(sortedColumn);
-            }
         }
 
         private void NotifyPropertyChanged(string info)

Files UWP/Interacts/Interaction.cs

@@ -43,10 +43,9 @@ public async void List_ItemClick(object sender, DoubleTappedRoutedEventArgs e)
             {
                 if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
                 {
-                    var index = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedIndex;
-                    if (index > -1)
+                    var clickedOnItem = (tabInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedItem as ListedItem;
+                    if (clickedOnItem != null)
                     {
-                        var clickedOnItem = tabInstance.instanceViewModel.FilesAndFolders[index];
                         // Access MRU List
                         var mostRecentlyUsed = Windows.Storage.AccessCache.StorageApplicationPermissions.MostRecentlyUsedList;
 
@@ -141,11 +140,10 @@ public async void List_ItemClick(object sender, DoubleTappedRoutedEventArgs e)
                 }
                 else if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
                 {
-                    var index = (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedIndex;
+                    var clickedOnItem = (tabInstance.accessibleContentFrame.Content as PhotoAlbum).gv.SelectedItem as ListedItem;
                     var CurrentInstance = App.selectedTabInstance;
-                    if (index > -1)
+                    if (clickedOnItem != null)
                     {
-                        var clickedOnItem = tabInstance.instanceViewModel.FilesAndFolders[index];
                         // Access MRU List
                         var mostRecentlyUsed = Windows.Storage.AccessCache.StorageApplicationPermissions.MostRecentlyUsedList;