Do not block while loading sidebar icons

Author: gave92

Files/DataModels/SidebarPinnedModel.cs

@@ -113,14 +113,18 @@ public async Task ShowHideRecycleBinItemAsync(bool show)
                 {
                     Text = ApplicationData.Current.LocalSettings.Values.Get("RecycleBin_Title", "Recycle Bin"),
                     IsDefaultLocation = true,
-                    Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIHelpers.GetIconResource(Constants.ImageRes.RecycleBin)),
+                    Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => new BitmapImage()),
                     Path = CommonPaths.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 == CommonPaths.RecycleBinPath))
                 {
-                    await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => favoriteSection.ChildItems.Add(recycleBinItem));
+                    await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
+                    {
+                        favoriteSection.ChildItems.Add(recycleBinItem);
+                        UIHelpers.LoadIconResource(recycleBinItem.Icon, Constants.ImageRes.RecycleBin);
+                    });
                 }
             }
             else
@@ -337,7 +341,7 @@ public async Task AddAllItemsToSidebar()
                     Text = "SidebarFavorites".GetLocalized(),
                     Section = SectionType.Favorites,
                     SelectsOnInvoked = false,
-                    Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIHelpers.GetIconResource(Constants.Shell32.QuickAccess)),
+                    Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => new BitmapImage()),
                     Font = MainViewModel.FontName,
                     ChildItems = new ObservableCollection<INavigationControlItem>()
                 };
@@ -352,7 +356,11 @@ public async Task AddAllItemsToSidebar()
                     SidebarControl.SideBarItems.BeginBulkOperation();
                     var index = 0; // First section
                     SidebarControl.SideBarItems.Insert(index, favoriteSection);
-                    await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => SidebarControl.SideBarItems.EndBulkOperation());
+                    await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
+                    {
+                        SidebarControl.SideBarItems.EndBulkOperation();
+                        UIHelpers.LoadIconResource(favoriteSection.Icon, Constants.Shell32.QuickAccess);
+                    });
                 }
             }
             finally

Files/Filesystem/Drives.cs

@@ -21,6 +21,7 @@
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.UI.Core;
+using Windows.UI.Xaml.Media.Imaging;
 using DriveType = Files.DataModels.NavigationControlItems.DriveType;
 
 namespace Files.Filesystem
@@ -141,14 +142,15 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                             Text = "SidebarDrives".GetLocalized(),
                             Section = SectionType.Drives,
                             SelectsOnInvoked = false,
-                            Icon = await UIHelpers.GetIconResource(Constants.ImageRes.ThisPC),
+                            Icon = new BitmapImage(),
                             ChildItems = new ObservableCollection<INavigationControlItem>()
                         };
                         var index = (SidebarControl.SideBarItems.Any(item => item.Section == SectionType.Favorites) ? 1 : 0) +
                                     (SidebarControl.SideBarItems.Any(item => item.Section == SectionType.Library) ? 1 : 0); // After libraries section
                         SidebarControl.SideBarItems.BeginBulkOperation();
                         SidebarControl.SideBarItems.Insert(Math.Min(index, SidebarControl.SideBarItems.Count), section);
                         SidebarControl.SideBarItems.EndBulkOperation();
+                        UIHelpers.LoadIconResource(section.Icon, Constants.ImageRes.ThisPC);
                     }
 
                     // Sync drives to sidebar

Files/Filesystem/LibraryManager.cs

@@ -17,6 +17,7 @@
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
+using Windows.UI.Xaml.Media.Imaging;
 
 namespace Files.Filesystem
 {
@@ -201,13 +202,14 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                             Text = "SidebarLibraries".GetLocalized(),
                             Section = SectionType.Library,
                             SelectsOnInvoked = false,
-                            Icon = await UIHelpers.GetIconResource(Constants.ImageRes.Libraries),
+                            Icon = new BitmapImage(),
                             ChildItems = new ObservableCollection<INavigationControlItem>()
                         };
                         var index = (SidebarControl.SideBarItems.Any(item => item.Section == SectionType.Favorites) ? 1 : 0); // After favorites section
                         SidebarControl.SideBarItems.BeginBulkOperation();
                         SidebarControl.SideBarItems.Insert(Math.Min(index, SidebarControl.SideBarItems.Count), librarySection);
                         SidebarControl.SideBarItems.EndBulkOperation();
+                        UIHelpers.LoadIconResource(section.Icon, Constants.ImageRes.Libraries);
                     }
                 }
                 finally

Files/Filesystem/NetworkDrivesManager.cs

@@ -16,6 +16,7 @@
 using Windows.ApplicationModel.Core;
 using Windows.Foundation.Collections;
 using Windows.UI.Core;
+using Windows.UI.Xaml.Media.Imaging;
 
 namespace Files.Filesystem
 {
@@ -129,7 +130,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                             Text = "SidebarNetworkDrives".GetLocalized(),
                             Section = SectionType.Network,
                             SelectsOnInvoked = false,
-                            Icon = await UIHelpers.GetIconResource(Constants.ImageRes.NetworkDrives),
+                            Icon = new BitmapImage(),
                             ChildItems = new ObservableCollection<INavigationControlItem>()
                         };
                         var index = (SidebarControl.SideBarItems.Any(item => item.Section == SectionType.Favorites) ? 1 : 0) +
@@ -139,6 +140,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                         SidebarControl.SideBarItems.BeginBulkOperation();
                         SidebarControl.SideBarItems.Insert(Math.Min(index, SidebarControl.SideBarItems.Count), section);
                         SidebarControl.SideBarItems.EndBulkOperation();
+                        UIHelpers.LoadIconResource(section.Icon, Constants.ImageRes.NetworkDrives);
                     }
 
                     if (section != null)

Files/Helpers/UIHelpers.cs

@@ -2,6 +2,7 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.AppService;
@@ -82,14 +83,17 @@ public static async Task<IconFileInfo> GetIconResourceInfo(int index)
             return null;
         }
 
-        public static async Task<BitmapImage> GetIconResource(int index)
+        public static async void LoadIconResource(BitmapImage image, int index)
         {
-            var iconInfo = await GetIconResourceInfo(index);
-            if (iconInfo != null)
+            await Common.Extensions.IgnoreExceptions(async () =>
             {
-                return await iconInfo.IconDataBytes.ToBitmapAsync();
-            }
-            return null;
+                var iconInfo = await GetIconResourceInfo(index);
+                if (iconInfo?.IconDataBytes is byte[] data)
+                {
+                    using var ms = new MemoryStream(data);
+                    await image.SetSourceAsync(ms.AsRandomAccessStream());
+                }
+            }, App.Logger);
         }
 
         private static async Task<IEnumerable<IconFileInfo>> LoadSidebarIconResources()
@@ -100,7 +104,7 @@ private static async Task<IEnumerable<IconFileInfo>> LoadSidebarIconResources()
                     Constants.ImageRes.NetworkDrives,
                     Constants.ImageRes.Libraries,
                     Constants.ImageRes.ThisPC,
-                    Constants.ImageRes.CloudDrives,
+                    //Constants.ImageRes.CloudDrives,
                     Constants.ImageRes.Folder
                 }, 32);