Feature: Redesigned the left hand sidebar

src/Files.App/App.xaml

@@ -29,6 +29,7 @@
 			<ResourceDictionary.MergedDictionaries>
 				<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 				<ResourceDictionary Source="/ResourceDictionaries/PathIcons.xaml" />
+				<ResourceDictionary Source="/ResourceDictionaries/SidebarResources.xaml" />
 				<ResourceDictionary>
 					<ResourceDictionary.ThemeDictionaries>
 						<ResourceDictionary x:Key="Light">

src/Files.App/Data/Commands/CommandCodes.cs

@@ -23,7 +23,6 @@ public enum CommandCodes
 		ToggleShowHiddenItems,
 		ToggleShowFileExtensions,
 		TogglePreviewPane,
-		ToggleSidebar,
 
 		// File System
 		CopyItem,

src/Files.App/Data/Commands/Manager/CommandManager.cs

@@ -37,7 +37,6 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand ToggleShowHiddenItems => commands[CommandCodes.ToggleShowHiddenItems];
 		public IRichCommand ToggleShowFileExtensions => commands[CommandCodes.ToggleShowFileExtensions];
 		public IRichCommand TogglePreviewPane => commands[CommandCodes.TogglePreviewPane];
-		public IRichCommand ToggleSidebar => commands[CommandCodes.ToggleSidebar];
 		public IRichCommand SelectAll => commands[CommandCodes.SelectAll];
 		public IRichCommand InvertSelection => commands[CommandCodes.InvertSelection];
 		public IRichCommand ClearSelection => commands[CommandCodes.ClearSelection];
@@ -198,7 +197,6 @@ public CommandManager()
 			[CommandCodes.ToggleShowHiddenItems] = new ToggleShowHiddenItemsAction(),
 			[CommandCodes.ToggleShowFileExtensions] = new ToggleShowFileExtensionsAction(),
 			[CommandCodes.TogglePreviewPane] = new TogglePreviewPaneAction(),
-			[CommandCodes.ToggleSidebar] = new ToggleSidebarAction(),
 			[CommandCodes.SelectAll] = new SelectAllAction(),
 			[CommandCodes.InvertSelection] = new InvertSelectionAction(),
 			[CommandCodes.ClearSelection] = new ClearSelectionAction(),

src/Files.App/Data/Commands/Manager/ICommandManager.cs

@@ -24,7 +24,6 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand ToggleShowHiddenItems { get; }
 		IRichCommand ToggleShowFileExtensions { get; }
 		IRichCommand TogglePreviewPane { get; }
-		IRichCommand ToggleSidebar { get; }
 
 		IRichCommand CopyItem { get; }
 		IRichCommand CopyPath { get; }

src/Files.App/Data/Items/DriveItem.cs

@@ -6,7 +6,9 @@
 using Files.Core.Storage.Enums;
 using Files.Core.Storage.LocatableStorage;
 using Files.Core.Storage.NestedStorage;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;
@@ -20,7 +22,10 @@ public class DriveItem : ObservableObject, INavigationControlItem, ILocatableFol
 		public BitmapImage Icon
 		{
 			get => icon;
-			set => SetProperty(ref icon, value);
+			set
+			{
+				SetProperty(ref icon, value, nameof(Icon));
+			}
 		}
 
 		public byte[] IconData { get; set; }
@@ -152,6 +157,13 @@ public bool ShowStorageSense
 
 		public string Name => Root.DisplayName;
 
+		public BulkConcurrentObservableCollection<INavigationControlItem>? ChildItems => null;
+
+		public IconSource? GenerateIconSource() => new ImageIconSource()
+		{
+			ImageSource = Icon
+		};
+
 		public DriveItem()
 		{
 			ItemType = NavigationControlItemType.CloudDrive;
@@ -260,7 +272,6 @@ public async Task LoadThumbnailAsync(bool isSidebar = false)
 				}
 				IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData;
 			}
-
 			Icon ??= await IconData.ToBitmapAsync();
 		}
 

src/Files.App/Data/Items/FileTagItem.cs

@@ -1,11 +1,17 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using CommunityToolkit.WinUI.Helpers;
+using Files.App.Converters;
 using Files.Core.ViewModels.FileTags;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
 
 namespace Files.App.Data.Items
 {
-	public class FileTagItem : INavigationControlItem
+	public class FileTagItem : ObservableObject, INavigationControlItem
 	{
 		public string Text { get; set; }
 
@@ -17,6 +23,7 @@ public string Path
 			{
 				path = value;
 				ToolTipText = Text;
+				OnPropertyChanged("Icon");
 			}
 		}
 
@@ -33,5 +40,13 @@ public int CompareTo(INavigationControlItem other)
 			=> Text.CompareTo(other.Text);
 
 		public TagViewModel FileTag { get; set; }
+
+		public BulkConcurrentObservableCollection<INavigationControlItem>? ChildItems => null;
+
+		public IconSource? GenerateIconSource() => new PathIconSource()
+		{
+			Data = (Geometry)XamlBindingHelper.ConvertValue(typeof(Geometry), (string)Application.Current.Resources["ColorIconFilledTag"]),
+			Foreground = new SolidColorBrush(FileTag.Color.ToColor())
+		};
 	}
 }

src/Files.App/Data/Items/INavigationControlItem.cs

@@ -1,9 +1,11 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Microsoft.UI.Xaml.Controls;
+
 namespace Files.App.Data.Items
 {
-	public interface INavigationControlItem : IComparable<INavigationControlItem>
+	public interface INavigationControlItem : IComparable<INavigationControlItem>, INotifyPropertyChanged
 	{
 		public string Text { get; }
 
@@ -16,6 +18,10 @@ public interface INavigationControlItem : IComparable<INavigationControlItem>
 		public NavigationControlItemType ItemType { get; }
 
 		public ContextMenuOptions MenuOptions { get; }
+
+		public BulkConcurrentObservableCollection<INavigationControlItem>? ChildItems { get; }
+
+		public IconSource? GenerateIconSource();
 	}
 
 	public enum NavigationControlItemType

src/Files.App/Data/Items/LocationItem.cs

@@ -3,6 +3,7 @@
 
 using CommunityToolkit.WinUI;
 using Files.App.Utils.Shell;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
 
@@ -14,11 +15,12 @@ public class LocationItem : ObservableObject, INavigationControlItem
 		public BitmapImage Icon
 		{
 			get => icon;
-			set => SetProperty(ref icon, value);
+			set
+			{
+				SetProperty(ref icon, value, nameof(Icon));
+			}
 		}
 
-		//public Uri IconSource { get; set; }
-
 		public byte[] IconData { get; set; }
 
 		public string Text { get; set; } = "";
@@ -48,6 +50,10 @@ public NavigationControlItemType ItemType
 		public bool IsDefaultLocation { get; set; }
 
 		public BulkConcurrentObservableCollection<INavigationControlItem> ChildItems { get; set; }
+		public IconSource? GenerateIconSource() => new ImageIconSource()
+		{
+			ImageSource = icon
+		};
 
 		public bool SelectsOnInvoked { get; set; } = true;
 

src/Files.App/Data/Items/WslDistroItem.cs

@@ -1,9 +1,11 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Microsoft.UI.Xaml.Controls;
+
 namespace Files.App.Data.Items
 {
-	public class WslDistroItem : INavigationControlItem
+	public class WslDistroItem : ObservableObject, INavigationControlItem
 	{
 		public string Text { get; set; }
 
@@ -23,12 +25,27 @@ public string Path
 		public NavigationControlItemType ItemType
 			=> NavigationControlItemType.LinuxDistro;
 
-		public Uri Logo { get; set; }
+		private Uri icon;
+		public Uri Icon
+		{
+			get => icon;
+			set
+			{
+				SetProperty(ref icon, value, nameof(Icon));
+			}
+		}
 
 		public SectionType Section { get; set; }
 
 		public ContextMenuOptions MenuOptions { get; set; }
 
+		public BulkConcurrentObservableCollection<INavigationControlItem>? ChildItems => null;
+		public IconSource? GenerateIconSource() => new BitmapIconSource()
+		{
+			UriSource = icon,
+			ShowAsMonochrome = false,
+		};
+
 		public int CompareTo(INavigationControlItem other) => Text.CompareTo(other.Text);
 	}
 }

src/Files.App/Files.App.csproj

@@ -68,6 +68,11 @@
         <Content Remove="Assets\FilesHome.png" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Remove="UserControls\Sidebar\SideBarItem.xaml" />
+      <None Remove="UserControls\Sidebar\SideBarView.xaml" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="ByteSize" Version="2.1.1" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
@@ -130,4 +135,13 @@
         <TrimmerRootAssembly Include="CommunityToolkit.WinUI.UI.Controls.Primitives" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Page Update="UserControls\SideBarControl\SideBarHost.xaml">
+        <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+      </Page>
+      <Page Update="UserControls\SideBarControl\SideBarItem.xaml">
+        <Generator>MSBuild:Compile</Generator>
+      </Page>
+    </ItemGroup>
+
 </Project>