Added collapsible sections to the sidebar

Files/DataModels/SidebarPinnedModel.cs

@@ -1,14 +1,19 @@
-using Files.Controllers;
+using Files.Common;
+using Files.Controllers;
 using Files.Filesystem;
 using Files.ViewModels;
 using Files.Views;
+using Microsoft.Toolkit.Uwp.Extensions;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Windows.Storage;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
 
 namespace Files.DataModels
@@ -17,6 +22,8 @@ public class SidebarPinnedModel
     {
         private SidebarPinnedController controller;
 
+        private LocationItem favoriteSection, homeSection;
+
         [JsonIgnore]
         public SettingsViewModel AppSettings => App.AppSettings;
 
@@ -28,6 +35,26 @@ public void SetController(SidebarPinnedController controller)
             this.controller = controller;
         }
 
+        public SidebarPinnedModel()
+        {
+            homeSection = new LocationItem()
+            {
+                Text = "SidebarHome".GetLocalized(),
+                Font = App.Current.Resources["FluentUIGlyphs"] as FontFamily,
+                Glyph = "\uea80",
+                IsDefaultLocation = true,
+                Path = "Home",
+                ChildItems = new ObservableCollection<INavigationControlItem>()
+            };
+            favoriteSection = new LocationItem()
+            {
+                Text = "SidebarFavorites".GetLocalized(),
+                Font = App.Current.Resources["FluentUIGlyphs"] as FontFamily,
+                Glyph = "\ueb83",
+                ChildItems = new ObservableCollection<INavigationControlItem>()
+            };
+        }
+
         /// <summary>
         /// Adds the default items to the navigation page
         /// </summary>
@@ -63,6 +90,45 @@ public async void AddItem(string item)
             }
         }
 
+        public async Task ShowHideRecycleBinItemAsync(bool show)
+        {
+            await MainPage.SideBarItemsSemaphore.WaitAsync();
+            try
+            {
+                if (show)
+                {
+                    var recycleBinItem = new LocationItem
+                    {
+                        Text = ApplicationData.Current.LocalSettings.Values.Get("RecycleBin_Title", "Recycle Bin"),
+                        Font = Application.Current.Resources["RecycleBinIcons"] as FontFamily,
+                        Glyph = "\uEF87",
+                        IsDefaultLocation = true,
+                        Path = App.AppSettings.RecycleBinPath
+                    };
+                    // Add recycle bin to sidebar, title is read from LocalSettings (provided by the fulltrust process)
+                    // TODO: the very first time the app is launched localized name not available
+                    if (!favoriteSection.ChildItems.Any(x => x.Path == App.AppSettings.RecycleBinPath))
+                    {
+                        favoriteSection.ChildItems.Add(recycleBinItem);
+                    }
+                }
+                else
+                {
+                    foreach (INavigationControlItem item in favoriteSection.ChildItems.ToList())
+                    {
+                        if (item is LocationItem && item.Path == App.AppSettings.RecycleBinPath)
+                        {
+                            favoriteSection.ChildItems.Remove(item);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                MainPage.SideBarItemsSemaphore.Release();
+            }
+        }
+
         /// <summary>
         /// Removes the item from the navigation page
         /// </summary>
@@ -93,8 +159,8 @@ public bool MoveItem(INavigationControlItem locationItem, int oldIndex, int newI
 
             if (oldIndex >= 0 && newIndex >= 0)
             {
-                MainPage.SideBarItems.RemoveAt(oldIndex);
-                MainPage.SideBarItems.Insert(newIndex, locationItem);
+                favoriteSection.ChildItems.RemoveAt(oldIndex);
+                favoriteSection.ChildItems.Insert(newIndex, locationItem);
                 return true;
             }
 
@@ -159,7 +225,7 @@ public void SwapItems(INavigationControlItem firstLocationItem, INavigationContr
         /// <returns>Index of the item</returns>
         public int IndexOfItem(INavigationControlItem locationItem)
         {
-            return MainPage.SideBarItems.IndexOf(locationItem);
+            return favoriteSection.ChildItems.IndexOf(locationItem);
         }
 
         /// <summary>
@@ -189,8 +255,8 @@ public async Task AddItemToSidebarAsync(string path)
             var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, item));
             if (res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path))
             {
-                int insertIndex = MainPage.SideBarItems.IndexOf(MainPage.SideBarItems.Last(x => x.ItemType == NavigationControlItemType.Location
-                && !x.Path.Equals(App.AppSettings.RecycleBinPath))) + 1;
+                var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(App.AppSettings.RecycleBinPath));
+                int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;
                 var locationItem = new LocationItem
                 {
                     Font = App.Current.Resources["FluentUIGlyphs"] as FontFamily,
@@ -200,9 +266,9 @@ public async Task AddItemToSidebarAsync(string path)
                     Text = res.Result?.DisplayName ?? Path.GetFileName(path.TrimEnd('\\'))
                 };
 
-                if (!MainPage.SideBarItems.Contains(locationItem))
+                if (!favoriteSection.ChildItems.Contains(locationItem))
                 {
-                    MainPage.SideBarItems.Insert(insertIndex, locationItem);
+                    favoriteSection.ChildItems.Insert(insertIndex, locationItem);
                 }
             }
             else
@@ -212,6 +278,21 @@ public async Task AddItemToSidebarAsync(string path)
             }
         }
 
+        /// <summary>
+        /// Adds the item to sidebar asynchronous.
+        /// </summary>
+        /// <param name="section">The section.</param>
+        private void AddItemToSidebarAsync(LocationItem section)
+        {
+            var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(App.AppSettings.RecycleBinPath));
+            int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;
+
+            if (!favoriteSection.ChildItems.Contains(section))
+            {
+                favoriteSection.ChildItems.Insert(insertIndex, section);
+            }
+        }
+
         /// <summary>
         /// Adds all items to the navigation sidebar
         /// </summary>
@@ -220,17 +301,32 @@ public async Task AddAllItemsToSidebar()
             await MainPage.SideBarItemsSemaphore.WaitAsync();
             try
             {
+                MainPage.SideBarItems.BeginBulkOperation();
+
+                if (homeSection != null)
+                {
+                    AddItemToSidebarAsync(homeSection);
+                }                    
+
                 for (int i = 0; i < Items.Count(); i++)
                 {
                     string path = Items[i];
                     await AddItemToSidebarAsync(path);
                 }
+
+                if (!MainPage.SideBarItems.Contains(favoriteSection))
+                {
+                    MainPage.SideBarItems.Add(favoriteSection);
+                }
+
                 MainPage.SideBarItems.EndBulkOperation();
             }
             finally
             {
                 MainPage.SideBarItemsSemaphore.Release();
             }
+
+            await ShowHideRecycleBinItemAsync(App.AppSettings.PinRecycleBinToSideBar);
         }
 
         /// <summary>
@@ -239,14 +335,14 @@ public async Task AddAllItemsToSidebar()
         public void RemoveStaleSidebarItems()
         {
             // Remove unpinned items from sidebar
-            for (int i = 0; i < MainPage.SideBarItems.Count(); i++)
+            for (int i = 0; i < favoriteSection.ChildItems.Count(); i++)
             {
-                if (MainPage.SideBarItems[i] is LocationItem)
+                if (favoriteSection.ChildItems[i] is LocationItem)
                 {
-                    var item = MainPage.SideBarItems[i] as LocationItem;
+                    var item = favoriteSection.ChildItems[i] as LocationItem;
                     if (!item.IsDefaultLocation && !Items.Contains(item.Path))
                     {
-                        MainPage.SideBarItems.RemoveAt(i);
+                        favoriteSection.ChildItems.RemoveAt(i);
                     }
                 }
             }
@@ -260,7 +356,7 @@ public void RemoveStaleSidebarItems()
         public string GetItemIcon(string path)
         {
             string iconCode;
-
+            
             if (path.Equals(AppSettings.DesktopPath, StringComparison.OrdinalIgnoreCase))
             {
                 iconCode = "\ue9f1";

Files/Filesystem/CloudDrivesManager.cs

@@ -1,10 +1,12 @@
 using Files.Filesystem.Cloud;
+using Files.UserControls.Widgets;
 using Files.Views;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Uwp.Extensions;
 using NLog;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
@@ -88,55 +90,28 @@ private async Task SyncSideBarItemsUI()
                 {
                     MainPage.SideBarItems.BeginBulkOperation();
 
-                    var drivesSnapshot = Drives.ToList();
-                    var drivesSection = MainPage.SideBarItems.FirstOrDefault(x => x is HeaderTextItem && x.Text == "SidebarCloudDrives".GetLocalized());
-
-                    if (drivesSection != null && drivesSnapshot.Count == 0)
-                    {
-                        //No drives - remove the header
-                        MainPage.SideBarItems.Remove(drivesSection);
-                    }
-
-                    if (drivesSection == null && drivesSnapshot.Count > 0)
+                    var section = MainPage.SideBarItems.FirstOrDefault(x => x.Text == "SidebarCloudDrives".GetLocalized()) as LocationItem;
+                    if (section == null)
                     {
-                        drivesSection = new HeaderTextItem()
+                        section = new LocationItem()
                         {
-                            Text = "SidebarCloudDrives".GetLocalized()
+                            Text = "SidebarCloudDrives".GetLocalized(),
+                            Font = App.Current.Resources["FluentUIGlyphs"] as Windows.UI.Xaml.Media.FontFamily,
+                            Glyph = "\ue9b7",
+                            SelectsOnInvoked = false,
+                            ChildItems = new ObservableCollection<INavigationControlItem>()
                         };
-
-                        //Get the last location item in the sidebar
-                        var lastLocationItem = MainPage.SideBarItems.LastOrDefault(x => x is LocationItem);
-
-                        if (lastLocationItem != null)
-                        {
-                            //Get the index of the last location item
-                            var lastLocationItemIndex = MainPage.SideBarItems.IndexOf(lastLocationItem);
-                            //Insert the drives title beneath it
-                            MainPage.SideBarItems.Insert(lastLocationItemIndex + 1, drivesSection);
-                        }
-                        else
-                        {
-                            MainPage.SideBarItems.Add(drivesSection);
-                        }
+                        MainPage.SideBarItems.Add(section);
                     }
 
-                    var sectionStartIndex = MainPage.SideBarItems.IndexOf(drivesSection);
-
-                    //Remove all existing cloud drives from the sidebar
-                    foreach (var item in MainPage.SideBarItems
-                        .Where(x => x.ItemType == NavigationControlItemType.CloudDrive)
-                        .ToList())
+                    foreach (DriveItem drive in Drives.ToList())
                     {
-                        MainPage.SideBarItems.Remove(item);
+                        if (!section.ChildItems.Contains(drive))
+                        {
+                            section.ChildItems.Add(drive);
+                        }
                     }
 
-                    //Add all cloud drives to the sidebar
-                    var insertAt = sectionStartIndex + 1;
-                    foreach (var drive in drivesSnapshot.OrderBy(o => o.Text))
-                    {
-                        MainPage.SideBarItems.Insert(insertAt, drive);
-                        insertAt++;
-                    }
                     MainPage.SideBarItems.EndBulkOperation();
                 }
                 finally

Files/Filesystem/Drives.cs

@@ -8,6 +8,7 @@
 using NLog;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -126,49 +127,33 @@ private async Task SyncSideBarItemsUI()
                 {
                     MainPage.SideBarItems.BeginBulkOperation();
 
-                    var drivesSnapshot = Drives.ToList();
-                    var drivesSection = MainPage.SideBarItems.FirstOrDefault(x => x is HeaderTextItem && x.Text == "SidebarDrives".GetLocalized());
-
-                    if (drivesSection != null && drivesSnapshot.Count == 0)
-                    {
-                        //No drives - remove the header
-                        MainPage.SideBarItems.Remove(drivesSection);
-                    }
-
-                    drivesSection = MainPage.SideBarItems.FirstOrDefault(x => x is HeaderTextItem && x.Text == "SidebarDrives".GetLocalized());
-
-                    if (drivesSection == null && drivesSnapshot.Count > 0)
+                    var section = MainPage.SideBarItems.FirstOrDefault(x => x.Text == "SidebarDrives".GetLocalized()) as LocationItem;
+                    if (section == null)
                     {
-                        drivesSection = new HeaderTextItem()
+                        section = new LocationItem()
                         {
-                            Text = "SidebarDrives".GetLocalized()
+                            Text = "SidebarDrives".GetLocalized(),
+                            Font = App.Current.Resources["FluentUIGlyphs"] as Windows.UI.Xaml.Media.FontFamily,
+                            Glyph = "\uea9e",
+                            SelectsOnInvoked = false,
+                            ChildItems = new ObservableCollection<INavigationControlItem>()
                         };
-
-                        MainPage.SideBarItems.Add(drivesSection);
+                        MainPage.SideBarItems.Add(section);
                     }
 
-                    var sectionStartIndex = MainPage.SideBarItems.IndexOf(drivesSection);
-                    var insertAt = sectionStartIndex + 1;
-
-                    //Remove all existing drives from the sidebar
-                    while (insertAt < MainPage.SideBarItems.Count)
+                    foreach (DriveItem drive in Drives.ToList())
                     {
-                        var item = MainPage.SideBarItems[insertAt];
-                        if (item.ItemType != NavigationControlItemType.Drive)
+                        if (!section.ChildItems.Contains(drive))
                         {
-                            break;
+                            section.ChildItems.Add(drive);
+
+                            if (drive.Type != DriveType.VirtualDrive)
+                            {
+                                DrivesWidget.ItemsAdded.Add(drive);
+                            }
                         }
-                        MainPage.SideBarItems.Remove(item);
-                        DrivesWidget.ItemsAdded.Remove(item);
                     }
 
-                    //Add all drives to the sidebar
-                    foreach (var drive in drivesSnapshot)
-                    {
-                        MainPage.SideBarItems.Insert(insertAt, drive);
-                        DrivesWidget.ItemsAdded.Add(drive);
-                        insertAt++;
-                    }
                     MainPage.SideBarItems.EndBulkOperation();
                 }
                 finally
@@ -478,4 +463,4 @@ public void ResumeDeviceWatcher()
             }
         }
     }
-}
+}