Improve layout mode switching (#2887)

gave92 · web-flow · commit df45bdbc25de · 2021-01-07T19:58:43.000-05:00
diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs
@@ -56,10 +56,10 @@ public abstract class BaseLayout : Page, INotifyPropertyChanged
 
         public IShellPage ParentShellPageInstance { get; private set; } = null;
 
-        private bool isSearchResultPage = false;
-
         public bool IsRenamingItem { get; set; } = false;
 
+        private NavigationArguments navigationArguments;
+
         private bool isItemSelected = false;
 
         public bool IsItemSelected
@@ -286,14 +286,21 @@ private void FolderSettings_LayoutModeChangeRequested(object sender, EventArgs e
             {
                 var layoutType = FolderSettings.GetLayoutType(ParentShellPageInstance.FilesystemViewModel.WorkingDirectory);
 
-                ParentShellPageInstance.ContentFrame.Navigate(layoutType, new NavigationArguments()
+                if (layoutType != ParentShellPageInstance.CurrentPageType)
                 {
-                    NavPathParam = ParentShellPageInstance.FilesystemViewModel.WorkingDirectory,
-                    AssociatedTabInstance = ParentShellPageInstance
-                }, null);
+                    ParentShellPageInstance.ContentFrame.Navigate(layoutType, new NavigationArguments()
+                    {
+                        NavPathParam = navigationArguments.NavPathParam,
+                        IsSearchResultPage = navigationArguments.IsSearchResultPage,
+                        SearchPathParam = navigationArguments.SearchPathParam,
+                        SearchResults = navigationArguments.SearchResults,
+                        IsLayoutSwitch = true,
+                        AssociatedTabInstance = ParentShellPageInstance
+                    }, null);
 
-                // Remove old layout from back stack
-                ParentShellPageInstance.ContentFrame.BackStack.RemoveAt(ParentShellPageInstance.ContentFrame.BackStack.Count - 1);
+                    // Remove old layout from back stack
+                    ParentShellPageInstance.ContentFrame.BackStack.RemoveAt(ParentShellPageInstance.ContentFrame.BackStack.Count - 1);
+                }
             }
         }
 
@@ -309,24 +316,23 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
             base.OnNavigatedTo(eventArgs);
             // Add item jumping handler
             Window.Current.CoreWindow.CharacterReceived += Page_CharacterReceived;
-            var parameters = (NavigationArguments)eventArgs.Parameter;
-            isSearchResultPage = parameters.IsSearchResultPage;
-            ParentShellPageInstance = parameters.AssociatedTabInstance;
+            navigationArguments = (NavigationArguments)eventArgs.Parameter;
+            ParentShellPageInstance = navigationArguments.AssociatedTabInstance;
             IsItemSelected = false;
             FolderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested;
             ParentShellPageInstance.FilesystemViewModel.IsFolderEmptyTextDisplayed = false;
 
-            if (!isSearchResultPage)
+            if (!navigationArguments.IsSearchResultPage)
             {
                 ParentShellPageInstance.NavigationToolbar.CanRefresh = true;
-                ParentShellPageInstance.NavigationToolbar.CanCopyPathInPage = true;
                 string previousDir = ParentShellPageInstance.FilesystemViewModel.WorkingDirectory;
-                await ParentShellPageInstance.FilesystemViewModel.SetWorkingDirectoryAsync(parameters.NavPathParam);
+                await ParentShellPageInstance.FilesystemViewModel.SetWorkingDirectoryAsync(navigationArguments.NavPathParam);
 
                 // pathRoot will be empty on recycle bin path
                 var workingDir = ParentShellPageInstance.FilesystemViewModel.WorkingDirectory;
                 string pathRoot = Path.GetPathRoot(workingDir);
-                if (string.IsNullOrEmpty(pathRoot) || workingDir == pathRoot)
+                if (string.IsNullOrEmpty(pathRoot) || workingDir == pathRoot 
+                    || workingDir.StartsWith(AppSettings.RecycleBinPath)) // Can't go up from recycle bin
                 {
                     ParentShellPageInstance.NavigationToolbar.CanNavigateToParent = false;
                 }
@@ -337,19 +343,30 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
 
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeRecycleBin = workingDir.StartsWith(App.AppSettings.RecycleBinPath);
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeMtpDevice = workingDir.StartsWith("\\\\?\\");
-                ParentShellPageInstance.FilesystemViewModel.RefreshItems(previousDir);
-                ParentShellPageInstance.NavigationToolbar.PathControlDisplayText = parameters.NavPathParam;
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeSearchResults = false;
+                ParentShellPageInstance.NavigationToolbar.PathControlDisplayText = navigationArguments.NavPathParam;
+                if (!navigationArguments.IsLayoutSwitch)
+                {
+                    ParentShellPageInstance.FilesystemViewModel.RefreshItems(previousDir);
+                }
+                else
+                {
+                    ParentShellPageInstance.NavigationToolbar.CanGoForward = false;
+                }
             }
             else
             {
                 ParentShellPageInstance.NavigationToolbar.CanRefresh = false;
-                ParentShellPageInstance.NavigationToolbar.CanCopyPathInPage = false;
+                ParentShellPageInstance.NavigationToolbar.CanGoForward = false;
+                ParentShellPageInstance.NavigationToolbar.CanGoBack = true;  // Impose no artificial restrictions on back navigation. Even in a search results page.
                 ParentShellPageInstance.NavigationToolbar.CanNavigateToParent = false;
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeRecycleBin = false;
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeMtpDevice = false;
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeSearchResults = true;
-                ParentShellPageInstance.FilesystemViewModel.AddSearchResultsToCollection(parameters.SearchResults, parameters.SearchPathParam);
+                if (!navigationArguments.IsLayoutSwitch)
+                {
+                    ParentShellPageInstance.FilesystemViewModel.AddSearchResultsToCollection(navigationArguments.SearchResults, navigationArguments.SearchPathParam);
+                }
             }
 
             ParentShellPageInstance.InstanceViewModel.IsPageTypeNotHome = true; // show controls that were hidden on the home page
@@ -364,12 +381,20 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         {
             base.OnNavigatingFrom(e);
-            ParentShellPageInstance.FilesystemViewModel.CancelLoadAndClearFiles(isSearchResultPage);
             // Remove item jumping handler
             Window.Current.CoreWindow.CharacterReceived -= Page_CharacterReceived;
             FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
         }
 
+        protected override void OnNavigatedFrom(NavigationEventArgs e)
+        {
+            var parameter = e.Parameter as NavigationArguments;
+            if (!parameter.IsLayoutSwitch)
+            {
+                ParentShellPageInstance.FilesystemViewModel.CancelLoadAndClearFiles();
+            }
+        }
+
         private void UnloadMenuFlyoutItemByName(string nameToUnload)
         {
             if (FindName(nameToUnload) is MenuFlyoutItemBase menuItem) // Prevent crash if the MenuFlyoutItem is missing
diff --git a/Files/ViewModels/FolderSettingsViewModel.cs b/Files/ViewModels/FolderSettingsViewModel.cs
@@ -30,6 +30,7 @@ public FolderLayoutModes LayoutMode
                 if (SetProperty(ref LayoutPreference.LayoutMode, value, nameof(LayoutMode)))
                 {
                     UpdateLayoutPreferencesForPath(associatedInstance.FilesystemViewModel.WorkingDirectory, LayoutPreference);
+                    LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                 }
             }
         }
@@ -82,40 +83,30 @@ public Type GetLayoutType(string folderPath)
             LayoutMode = FolderLayoutModes.GridView; // Grid View
 
             GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeLarge; // Size
-
-            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeGridViewMedium => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.GridView; // Grid View
 
             GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeMedium; // Size
-
-            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeGridViewSmall => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.GridView; // Grid View
 
             GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Size
-
-            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeTiles => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.TilesView; // Tiles View
-
-            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public RelayCommand ToggleLayoutModeDetailsView => new RelayCommand(() =>
         {
             LayoutMode = FolderLayoutModes.DetailsView; // Details View
-
-            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
         });
 
         public int GridViewSize
@@ -128,12 +119,10 @@ public int GridViewSize
                     if (LayoutMode == FolderLayoutModes.TilesView) // Size down from tiles to list
                     {
                         LayoutMode = 0;
-                        LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                     }
                     else if (LayoutMode == FolderLayoutModes.GridView && value < Constants.Browser.GridViewBrowser.GridViewSizeSmall) // Size down from grid to tiles
                     {
                         LayoutMode = FolderLayoutModes.TilesView;
-                        LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                     }
                     else if (LayoutMode != FolderLayoutModes.DetailsView) // Resize grid view
                     {
@@ -143,7 +132,6 @@ public int GridViewSize
                         if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view
                         {
                             LayoutMode = FolderLayoutModes.GridView;
-                            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                         }
                         else
                         {
@@ -158,7 +146,6 @@ public int GridViewSize
                     if (LayoutMode == 0) // Size up from list to tiles
                     {
                         LayoutMode = FolderLayoutModes.TilesView;
-                        LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                     }
                     else // Size up from tiles to grid
                     {
@@ -168,7 +155,6 @@ public int GridViewSize
                         if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view
                         {
                             LayoutMode = FolderLayoutModes.GridView;
-                            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
                         }
                         else
                         {
diff --git a/Files/ViewModels/ItemViewModel.cs b/Files/ViewModels/ItemViewModel.cs
@@ -425,38 +425,15 @@ private void WorkingDirectoryChanged(string singleItemOverride = null)
             }
         }
 
-        public void CancelLoadAndClearFiles(bool isSearchResultPage = false)
+        public void CancelLoadAndClearFiles()
         {
             Debug.WriteLine("CancelLoadAndClearFiles");
-            if (!isSearchResultPage)
+            CloseWatcher();
+            if (IsLoadingItems)
             {
-                CloseWatcher();
-
-                AssociatedInstance.NavigationToolbar.CanRefresh = true;
-                if (IsLoadingItems == false)
-                {
-                    return;
-                }
-
                 _addFilesCTS.Cancel();
-                AssociatedInstance.NavigationToolbar.CanGoForward = true;
             }
-            else
-            {
-                AssociatedInstance.NavigationToolbar.CanRefresh = false;
-                AssociatedInstance.NavigationToolbar.CanGoForward = false;
-                AssociatedInstance.NavigationToolbar.CanNavigateToParent = false;
-                AssociatedInstance.NavigationToolbar.CanCopyPathInPage = false;
-            }
-
-            AssociatedInstance.NavigationToolbar.CanGoBack = true;  // Impose no artificial restrictions on back navigation. Even in a search results page.
             _filesAndFolders.Clear();
-
-            if (!(WorkingDirectory?.StartsWith(AppSettings.RecycleBinPath) ?? false) && !isSearchResultPage)
-            {
-                // Can't go up from recycle bin
-                AssociatedInstance.NavigationToolbar.CanNavigateToParent = true;
-            }
         }
 
         public void OrderFiles(IList<ListedItem> orderedList = null)
@@ -594,24 +571,39 @@ private IList<ListedItem> OrderFiles2(IList<ListedItem> listToSort)
             return orderedList;
         }
 
-        private bool _isLoadingItems = false;
+        private bool isLoadingIndicatorActive = false;
 
-        public bool IsLoadingItems
+        public bool IsLoadingIndicatorActive
         {
             get
             {
-                return _isLoadingItems;
+                return isLoadingIndicatorActive;
             }
-            internal set
+            set
             {
-                if (_isLoadingItems != value)
+                if (isLoadingIndicatorActive != value)
                 {
-                    _isLoadingItems = value;
-                    NotifyPropertyChanged(nameof(IsLoadingItems));
+                    isLoadingIndicatorActive = value;
+                    NotifyPropertyChanged(nameof(IsLoadingIndicatorActive));
                 }
             }
         }
 
+        private bool isLoadingItems = false;
+
+        public bool IsLoadingItems
+        {
+            get
+            {
+                return isLoadingItems;
+            }
+            set
+            {
+                isLoadingItems = value;
+                IsLoadingIndicatorActive = value;
+            }
+        }
+
         // This works for recycle bin as well as GetFileFromPathAsync/GetFolderFromPathAsync work
         // for file inside the recycle bin (but not on the recycle bin folder itself)
         public async void LoadExtendedItemProperties(ListedItem item, uint thumbnailSize = 20)
@@ -786,7 +778,7 @@ public async void RapidAddItemsToCollectionAsync(string path, string previousDir
                     var orderedList = OrderFiles2(cacheEntry.FileList);
                     OrderFiles(orderedList);
                     Debug.WriteLine($"Loading of items from cache in {WorkingDirectory} completed in {stopwatch.ElapsedMilliseconds} milliseconds.\n");
-                    IsLoadingItems = false;
+                    IsLoadingIndicatorActive = false;
                 }
 
                 if (path.StartsWith(AppSettings.RecycleBinPath))
diff --git a/Files/Views/LayoutModes/GenericFileBrowser.xaml b/Files/Views/LayoutModes/GenericFileBrowser.xaml
@@ -636,7 +636,7 @@
         <muxc:ProgressBar
             x:Name="progBar"
             VerticalAlignment="Top"
-            x:Load="{x:Bind ParentShellPageInstance.FilesystemViewModel.IsLoadingItems, Mode=OneWay}"
+            x:Load="{x:Bind ParentShellPageInstance.FilesystemViewModel.IsLoadingIndicatorActive, Mode=OneWay}"
             Background="Transparent"
             IsIndeterminate="True" />
         <TextBlock
diff --git a/Files/Views/LayoutModes/GenericFileBrowser.xaml.cs b/Files/Views/LayoutModes/GenericFileBrowser.xaml.cs
@@ -112,6 +112,26 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             AllView.LoadingRow += AllView_LoadingRow;
             AppSettings.ThemeModeChanged += AppSettings_ThemeModeChanged;
             ViewModel_PropertyChanged(null, new PropertyChangedEventArgs("DirectorySortOption"));
+            var parameters = (NavigationArguments)eventArgs.Parameter;
+            if (parameters.IsLayoutSwitch)
+            {
+                ReloadItemIcons();
+            }
+        }
+
+        private void ReloadItemIcons()
+        {
+            var rows = new List<DataGridRow>();
+            Interaction.FindChildren<DataGridRow>(rows, AllView);
+            foreach (ListedItem listedItem in ParentShellPageInstance.FilesystemViewModel.FilesAndFolders)
+            {
+                listedItem.ItemPropertiesInitialized = false;
+                if (rows.Any(x => x.DataContext == listedItem))
+                {
+                    ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemProperties(listedItem);
+                    listedItem.ItemPropertiesInitialized = true;
+                }
+            }
         }
 
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
diff --git a/Files/Views/LayoutModes/GridViewBrowser.xaml b/Files/Views/LayoutModes/GridViewBrowser.xaml
@@ -889,7 +889,7 @@
         <muxc:ProgressBar
             x:Name="progBar"
             VerticalAlignment="Top"
-            x:Load="{x:Bind ParentShellPageInstance.FilesystemViewModel.IsLoadingItems, Mode=OneWay}"
+            x:Load="{x:Bind ParentShellPageInstance.FilesystemViewModel.IsLoadingIndicatorActive, Mode=OneWay}"
             Background="Transparent"
             IsIndeterminate="True" />
         <TextBlock
diff --git a/Files/Views/LayoutModes/GridViewBrowser.xaml.cs b/Files/Views/LayoutModes/GridViewBrowser.xaml.cs
diff --git a/Files/Views/ModernShellPage.xaml.cs b/Files/Views/ModernShellPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public FolderLayoutModes LayoutMode`
`30`	`30`	`if (SetProperty(ref LayoutPreference.LayoutMode, value, nameof(LayoutMode)))`
`31`	`31`	`{`
`32`	`32`	`UpdateLayoutPreferencesForPath(associatedInstance.FilesystemViewModel.WorkingDirectory, LayoutPreference);`
	`33`	`+ LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`}`
`@@ -82,40 +83,30 @@ public Type GetLayoutType(string folderPath)`
`82`	`83`	`LayoutMode = FolderLayoutModes.GridView; // Grid View`
`83`	`84`
`84`	`85`	`GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeLarge; // Size`
`85`		`-`
`86`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`87`	`86`	`});`
`88`	`87`
`89`	`88`	`public RelayCommand ToggleLayoutModeGridViewMedium => new RelayCommand(() =>`
`90`	`89`	`{`
`91`	`90`	`LayoutMode = FolderLayoutModes.GridView; // Grid View`
`92`	`91`
`93`	`92`	`GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeMedium; // Size`
`94`		`-`
`95`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`96`	`93`	`});`
`97`	`94`
`98`	`95`	`public RelayCommand ToggleLayoutModeGridViewSmall => new RelayCommand(() =>`
`99`	`96`	`{`
`100`	`97`	`LayoutMode = FolderLayoutModes.GridView; // Grid View`
`101`	`98`
`102`	`99`	`GridViewSize = Constants.Browser.GridViewBrowser.GridViewSizeSmall; // Size`
`103`		`-`
`104`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`105`	`100`	`});`
`106`	`101`
`107`	`102`	`public RelayCommand ToggleLayoutModeTiles => new RelayCommand(() =>`
`108`	`103`	`{`
`109`	`104`	`LayoutMode = FolderLayoutModes.TilesView; // Tiles View`
`110`		`-`
`111`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`112`	`105`	`});`
`113`	`106`
`114`	`107`	`public RelayCommand ToggleLayoutModeDetailsView => new RelayCommand(() =>`
`115`	`108`	`{`
`116`	`109`	`LayoutMode = FolderLayoutModes.DetailsView; // Details View`
`117`		`-`
`118`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`119`	`110`	`});`
`120`	`111`
`121`	`112`	`public int GridViewSize`
`@@ -128,12 +119,10 @@ public int GridViewSize`
`128`	`119`	`if (LayoutMode == FolderLayoutModes.TilesView) // Size down from tiles to list`
`129`	`120`	`{`
`130`	`121`	`LayoutMode = 0;`
`131`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`132`	`122`	`}`
`133`	`123`	`else if (LayoutMode == FolderLayoutModes.GridView && value < Constants.Browser.GridViewBrowser.GridViewSizeSmall) // Size down from grid to tiles`
`134`	`124`	`{`
`135`	`125`	`LayoutMode = FolderLayoutModes.TilesView;`
`136`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`137`	`126`	`}`
`138`	`127`	`else if (LayoutMode != FolderLayoutModes.DetailsView) // Resize grid view`
`139`	`128`	`{`
`@@ -143,7 +132,6 @@ public int GridViewSize`
`143`	`132`	`if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view`
`144`	`133`	`{`
`145`	`134`	`LayoutMode = FolderLayoutModes.GridView;`
`146`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`147`	`135`	`}`
`148`	`136`	`else`
`149`	`137`	`{`
`@@ -158,7 +146,6 @@ public int GridViewSize`
`158`	`146`	`if (LayoutMode == 0) // Size up from list to tiles`
`159`	`147`	`{`
`160`	`148`	`LayoutMode = FolderLayoutModes.TilesView;`
`161`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`162`	`149`	`}`
`163`	`150`	`else // Size up from tiles to grid`
`164`	`151`	`{`
`@@ -168,7 +155,6 @@ public int GridViewSize`
`168`	`155`	`if (LayoutMode != FolderLayoutModes.GridView) // Only update layout mode if it isn't already in grid view`
`169`	`156`	`{`
`170`	`157`	`LayoutMode = FolderLayoutModes.GridView;`
`171`		`- LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);`
`172`	`158`	`}`
`173`	`159`	`else`
`174`	`160`	`{`