Small refactor

Author: gave92

Files/DataModels/SidebarPinnedModel.cs

@@ -113,7 +113,6 @@ public async Task ShowHideRecycleBinItemAsync(bool show)
                 {
                     Text = ApplicationData.Current.LocalSettings.Values.Get("RecycleBin_Title", "Recycle Bin"),
                     IsDefaultLocation = true,
-                    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)
@@ -123,7 +122,7 @@ public async Task ShowHideRecycleBinItemAsync(bool show)
                     await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
                     {
                         favoriteSection.ChildItems.Add(recycleBinItem);
-                        UIHelpers.LoadIconResource(recycleBinItem.Icon, Constants.ImageRes.RecycleBin);
+                        UIHelpers.LoadIconResource(recycleBinItem, Constants.ImageRes.RecycleBin);
                     });
                 }
             }
@@ -341,7 +340,6 @@ public async Task AddAllItemsToSidebar()
                     Text = "SidebarFavorites".GetLocalized(),
                     Section = SectionType.Favorites,
                     SelectsOnInvoked = false,
-                    Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => new BitmapImage()),
                     Font = MainViewModel.FontName,
                     ChildItems = new ObservableCollection<INavigationControlItem>()
                 };
@@ -359,7 +357,7 @@ public async Task AddAllItemsToSidebar()
                     await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
                     {
                         SidebarControl.SideBarItems.EndBulkOperation();
-                        UIHelpers.LoadIconResource(favoriteSection.Icon, Constants.Shell32.QuickAccess);
+                        UIHelpers.LoadIconResource(favoriteSection, Constants.Shell32.QuickAccess);
                     });
                 }
             }

Files/Filesystem/Drives.cs

@@ -142,15 +142,15 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                             Text = "SidebarDrives".GetLocalized(),
                             Section = SectionType.Drives,
                             SelectsOnInvoked = false,
-                            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);
+
+                        UIHelpers.LoadIconResource(section, Constants.ImageRes.ThisPC);
                     }
 
                     // Sync drives to sidebar

Files/Filesystem/LibraryManager.cs

@@ -202,14 +202,14 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                             Text = "SidebarLibraries".GetLocalized(),
                             Section = SectionType.Library,
                             SelectsOnInvoked = false,
-                            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);
+
+                        UIHelpers.LoadIconResource(section, Constants.ImageRes.Libraries);
                     }
                 }
                 finally

Files/Filesystem/NetworkDrivesManager.cs

@@ -130,7 +130,6 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                             Text = "SidebarNetworkDrives".GetLocalized(),
                             Section = SectionType.Network,
                             SelectsOnInvoked = false,
-                            Icon = new BitmapImage(),
                             ChildItems = new ObservableCollection<INavigationControlItem>()
                         };
                         var index = (SidebarControl.SideBarItems.Any(item => item.Section == SectionType.Favorites) ? 1 : 0) +
@@ -140,7 +139,8 @@ 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);
+
+                        UIHelpers.LoadIconResource(section, Constants.ImageRes.NetworkDrives);
                     }
 
                     if (section != null)

Files/Helpers/UIHelpers.cs

@@ -1,4 +1,5 @@
 using Files.Common;
+using Files.DataModels.NavigationControlItems;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -83,15 +84,14 @@ public static async Task<IconFileInfo> GetIconResourceInfo(int index)
             return null;
         }
 
-        public static async void LoadIconResource(BitmapImage image, int index)
+        public static async void LoadIconResource(LocationItem item, int index)
         {
             await Common.Extensions.IgnoreExceptions(async () =>
             {
                 var iconInfo = await GetIconResourceInfo(index);
-                if (iconInfo?.IconDataBytes is byte[] data)
+                if (iconInfo != null)
                 {
-                    using var ms = new MemoryStream(data);
-                    await image.SetSourceAsync(ms.AsRandomAccessStream());
+                    item.Icon = await iconInfo.IconDataBytes.ToBitmapAsync();
                 }
             }, App.Logger);
         }