Feature: Moved Settings button to the Sidebar (#16911)

marcelwgn · yaira2 · marcofranzen99 · web-flow · commit 26a1f7d8a432 · 2025-03-16T11:16:01.000-04:00
Signed-off-by: Marcel W. &lt;marcel.alex.wagner@outlook.com&gt;
Co-authored-by: Yair &lt;39923744+yaira2@users.noreply.github.com&gt;
Co-authored-by: Marco Franzen &lt;mail@marco-franzen.de&gt;
Co-authored-by: Lamparter &lt;71598437+Lamparter@users.noreply.github.com&gt;
diff --git a/src/Files.App.Controls/Sidebar/ISidebarItemModel.cs b/src/Files.App.Controls/Sidebar/ISidebarItemModel.cs
@@ -1,10 +1,7 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	public interface ISidebarItemModel : INotifyPropertyChanged
 	{
@@ -38,5 +35,10 @@ public interface ISidebarItemModel : INotifyPropertyChanged
 		/// The tooltip used when hovering over this item in the sidebar
 		/// </summary>
 		object ToolTip { get; }
+
+		/// <summary>
+		/// Indicates whether the children should have an indentation or not.
+		/// </summary>
+		bool PaddedItem { get; }
 	}
 }
diff --git a/src/Files.App.Controls/Sidebar/ISidebarViewModel.cs b/src/Files.App.Controls/Sidebar/ISidebarViewModel.cs
@@ -6,7 +6,7 @@
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
 
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	public record ItemDroppedEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { }
 	public record ItemDragOverEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { }
diff --git a/src/Files.App.Controls/Sidebar/SidebarDisplayMode.cs b/src/Files.App.Controls/Sidebar/SidebarDisplayMode.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	/// <summary>
 	/// The display mode of the <see cref="SidebarView"/>
diff --git a/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs b/src/Files.App.Controls/Sidebar/SidebarItem.Properties.cs
@@ -1,10 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	public sealed partial class SidebarItem : Control
 	{
diff --git a/src/Files.App.Controls/Sidebar/SidebarItem.cs b/src/Files.App.Controls/Sidebar/SidebarItem.cs
@@ -3,15 +3,12 @@
 
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Input;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation;
 using Microsoft.UI.Xaml.Automation.Peers;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
 using System.Collections.Specialized;
 using Windows.ApplicationModel.DataTransfer;
 
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	public sealed partial class SidebarItem : Control
 	{
@@ -21,9 +18,6 @@ public sealed partial class SidebarItem : Control
 		public bool IsGroupHeader => Item?.Children is not null;
 		public bool CollapseEnabled => DisplayMode != SidebarDisplayMode.Compact;
 
-		// TODO: Do not use localized text for comparison. This is a workaround to avoid major refactoring for now, it should be done any time soon
-		public bool IsHomeItem => Item?.Text == "Home".GetLocalizedResource() && Owner?.MenuItemsSource is IList enumerable && enumerable.IndexOf(Item) == 0;
-
 		private bool hasChildSelection => selectedChildItem != null;
 		private bool isPointerOver = false;
 		private bool isClicking = false;
@@ -323,7 +317,7 @@ private void UpdateExpansionState(bool useAnimations = true)
 		{
 			if (Item?.Children is null || !CollapseEnabled)
 			{
-				VisualStateManager.GoToState(this, IsHomeItem ? "NoExpansionWithPadding" : "NoExpansion", useAnimations);
+				VisualStateManager.GoToState(this, Item?.PaddedItem == true ? "NoExpansionWithPadding" : "NoExpansion", useAnimations);
 			}
 			else if (!HasChildren)
 			{
diff --git a/src/Files.App.Controls/Sidebar/SidebarItemAutomationPeer.cs b/src/Files.App.Controls/Sidebar/SidebarItemAutomationPeer.cs
@@ -7,7 +7,7 @@
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Automation.Provider;
 
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	public sealed partial class SidebarItemAutomationPeer : FrameworkElementAutomationPeer, IInvokeProvider, IExpandCollapseProvider, ISelectionItemProvider
 	{
diff --git a/src/Files.App.Controls/Sidebar/SidebarItemDropPosition.cs b/src/Files.App.Controls/Sidebar/SidebarItemDropPosition.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	/// <summary>
 	/// The position of the item that was dropped on the sidebar item.
diff --git a/src/Files.App.Controls/Sidebar/SidebarStyles.xaml b/src/Files.App.Controls/Sidebar/SidebarStyles.xaml
@@ -4,8 +4,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:controls="using:Files.App.Controls"
-	xmlns:local="using:Files.App.UserControls.Sidebar"
-	xmlns:usercontrols="using:Files.App.UserControls">
+	xmlns:local="using:Files.App.Controls">
 
 	<x:Double x:Key="SidebarOpenPaneLength">300</x:Double>
 	<x:Double x:Key="SidebarNegativeOpenPaneLength">-300</x:Double>
diff --git a/src/Files.App.Controls/Sidebar/SidebarView.Properties.cs b/src/Files.App.Controls/Sidebar/SidebarView.Properties.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Microsoft.UI.Xaml;
-
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	public sealed partial class SidebarView
 	{
diff --git a/src/Files.App.Controls/Sidebar/SidebarView.xaml b/src/Files.App.Controls/Sidebar/SidebarView.xaml
@@ -1,10 +1,9 @@
 ﻿<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
 <UserControl
-	x:Class="Files.App.UserControls.Sidebar.SidebarView"
+	x:Class="Files.App.Controls.SidebarView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	HorizontalAlignment="Stretch"
 	Loaded="SidebarView_Loaded"
@@ -118,7 +117,6 @@
 			Visibility="{Binding ElementName=PaneRoot, Path=Visibility, Mode=OneWay}">
 			<UserControl
 				x:Name="SidebarResizerControl"
-				AutomationProperties.Name="{helpers:ResourceString Name=ResizeElementControl/AutomationProperties/Name}"
 				IsTabStop="True"
 				KeyDown="SidebarResizerControl_KeyDown"
 				UseSystemFocusVisuals="True" />
diff --git a/src/Files.App.Controls/Sidebar/SidebarView.xaml.cs b/src/Files.App.Controls/Sidebar/SidebarView.xaml.cs
@@ -2,15 +2,13 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Input;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Markup;
 using Windows.Foundation;
 using Windows.System;
 using Windows.UI.Core;
 
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	[ContentProperty(Name = "InnerContent")]
 	public sealed partial class SidebarView : UserControl, INotifyPropertyChanged
diff --git a/src/Files.App.Controls/Sidebar/SidebarViewAutomationPeer.cs b/src/Files.App.Controls/Sidebar/SidebarViewAutomationPeer.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Automation.Provider;
 
-namespace Files.App.UserControls.Sidebar
+namespace Files.App.Controls
 {
 	public sealed partial class SidebarViewAutomationPeer : FrameworkElementAutomationPeer, ISelectionProvider
 	{
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
@@ -54,6 +54,8 @@
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/GridSplitter/GridSplitter.xaml" />
 		<!--#endregion-->
 
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Sidebar/SidebarStyles.xaml" />
+
 	</ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
diff --git a/src/Files.App.Controls/Util.cs b/src/Files.App.Controls/Util.cs
@@ -0,0 +1,26 @@
+﻿using Microsoft.UI.Input;
+using System.Reflection;
+
+namespace Files.App.Controls
+{
+	public static class Util
+	{
+		/// <summary>
+		/// Sets cursor when hovering on a specific element.
+		/// </summary>
+		/// <param name="uiElement">An element to be changed.</param>
+		/// <param name="cursor">Cursor to change.</param>
+		public static void ChangeCursor(this UIElement uiElement, InputCursor cursor)
+		{
+			Type type = typeof(UIElement);
+
+			type.InvokeMember(
+				"ProtectedCursor",
+				BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.SetProperty | BindingFlags.Instance,
+				null,
+				uiElement,
+				[cursor]
+			);
+		}
+	}
+}
diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
@@ -55,7 +55,6 @@
 
 				<!--  Styles for the custom icons  -->
 				<ResourceDictionary Source="ms-appx:///Styles/PathIcons.xaml" />
-				<ResourceDictionary Source="ms-appx:///Styles/SideBarStyles.xaml" />
 				<ResourceDictionary Source="ms-appx:///Styles/TextBlockStyles.xaml" />
 				<ResourceDictionary Source="ms-appx:///Styles/ShimmerStyles.xaml" />
 				<ResourceDictionary Source="ms-appx:///Styles/MenuFlyoutSubItemWithImageStyle.xaml" />
diff --git a/src/Files.App/Data/Contracts/INavigationControlItem.cs b/src/Files.App/Data/Contracts/INavigationControlItem.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Files.App.UserControls.Sidebar;
+using Files.App.Controls;
 
 namespace Files.App.Data.Contracts
 {
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
@@ -227,6 +227,8 @@ public FrameworkElement? ItemDecorator
 			}
 		}
 
+		public bool PaddedItem => false;
+
 		private void ItemDecorator_Click(object sender, RoutedEventArgs e)
 		{
 			DriveHelpers.EjectDeviceAsync(Path);
diff --git a/src/Files.App/Data/Items/FileTagItem.cs b/src/Files.App/Data/Items/FileTagItem.cs
@@ -53,5 +53,7 @@ public IconSource? IconSource
 		public object ToolTip => Text;
 
 		public bool IsExpanded { get => false; set { } }
+
+		public bool PaddedItem => false;
 	}
 }
diff --git a/src/Files.App/Data/Items/LocationItem.cs b/src/Files.App/Data/Items/LocationItem.cs
@@ -113,6 +113,8 @@ public FrameworkElement? ItemDecorator
 			}
 		}
 
+		public bool PaddedItem => Section == SectionType.Home;
+
 		public int CompareTo(INavigationControlItem other)
 			=> Text.CompareTo(other.Text);
 
diff --git a/src/Files.App/Data/Items/WslDistroItem.cs b/src/Files.App/Data/Items/WslDistroItem.cs
@@ -61,6 +61,8 @@ public IconSource? IconSource
 			};
 		}
 
+		public bool PaddedItem => false;
+
 		public int CompareTo(INavigationControlItem other) => Text.CompareTo(other.Text);
 	}
 }
diff --git a/src/Files.App/Helpers/Win32/Win32Helper.WindowManagement.cs b/src/Files.App/Helpers/Win32/Win32Helper.WindowManagement.cs
@@ -42,24 +42,6 @@ public static unsafe void BringToForegroundEx(Windows.Win32.Foundation.HWND hWnd
 			PInvoke.AttachThreadInput(dwCurID, dwMyID, false);
 		}
 
-		/// <summary>
-		/// Sets cursor when hovering on a specific element.
-		/// </summary>
-		/// <param name="uiElement">An element to be changed.</param>
-		/// <param name="cursor">Cursor to change.</param>
-		public static void ChangeCursor(this UIElement uiElement, InputCursor cursor)
-		{
-			Type type = typeof(UIElement);
-
-			type.InvokeMember(
-				"ProtectedCursor",
-				BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.SetProperty | BindingFlags.Instance,
-				null,
-				uiElement,
-				[cursor]
-			);
-		}
-
 		/// <summary>
 		/// Force window to stay at bottom of other upper windows.
 		/// </summary>
diff --git a/src/Files.App/UserControls/AddressToolbar.xaml b/src/Files.App/UserControls/AddressToolbar.xaml
@@ -620,28 +620,6 @@
 						Style="{StaticResource App.ThemedIcons.AppUpdatedBox}" />
 				</Button>
 
-				<!--  Open the Settings dialog  -->
-				<Button
-					x:Name="SettingsButton"
-					AccessKey="I"
-					AccessKeyInvoked="Button_AccessKeyInvoked"
-					AutomationProperties.AutomationId="SettingsButton"
-					AutomationProperties.Name="{x:Bind ViewModel.Commands.OpenSettings.Label, Mode=OneWay}"
-					Command="{x:Bind ViewModel.Commands.OpenSettings, Mode=OneWay}"
-					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.Placement="Bottom"
-					ToolTipService.ToolTip="{x:Bind ViewModel.Commands.OpenSettings.LabelWithHotKey, Mode=OneWay}"
-					Visibility="{x:Bind ShowSettingsButton, Mode=OneWay}">
-					<AnimatedIcon x:Name="SettingAnimatedIcon" Height="16">
-						<AnimatedIcon.Source>
-							<animatedvisuals:AnimatedSettingsVisualSource />
-						</AnimatedIcon.Source>
-						<AnimatedIcon.FallbackIconSource>
-							<SymbolIconSource Symbol="Setting" />
-						</AnimatedIcon.FallbackIconSource>
-					</AnimatedIcon>
-				</Button>
-
 			</StackPanel>
 
 			<!--  Status Center TeachingTip  -->
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -1,8 +1,8 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Files.App.Controls;
 using Files.App.Helpers.ContextFlyouts;
-using Files.App.UserControls.Sidebar;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using CommunityToolkit.WinUI;
+using Files.App.Controls;
 using Files.App.UserControls.Selection;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs
diff --git a/tests/Files.App.UITests/App.xaml b/tests/Files.App.UITests/App.xaml
diff --git a/tests/Files.App.UITests/Files.App.UITests.csproj b/tests/Files.App.UITests/Files.App.UITests.csproj
diff --git a/tests/Files.App.UITests/MainWindow.xaml b/tests/Files.App.UITests/MainWindow.xaml
diff --git a/tests/Files.App.UITests/MainWindow.xaml.cs b/tests/Files.App.UITests/MainWindow.xaml.cs
diff --git a/tests/Files.App.UITests/TestData/TestSidebarModel.cs b/tests/Files.App.UITests/TestData/TestSidebarModel.cs
diff --git a/tests/Files.App.UITests/TestData/TestSidebarViewModel.cs b/tests/Files.App.UITests/TestData/TestSidebarViewModel.cs
diff --git a/tests/Files.App.UITests/Views/SidebarViewPage.xaml b/tests/Files.App.UITests/Views/SidebarViewPage.xaml
diff --git a/tests/Files.App.UITests/Views/SidebarViewPage.xaml.cs b/tests/Files.App.UITests/Views/SidebarViewPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`// Copyright (c) Files Community`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`		`-using Microsoft.UI.Xaml;`
`5`		`-using Microsoft.UI.Xaml.Controls;`
`6`		`-`
`7`		`-namespace Files.App.UserControls.Sidebar`
	`4`	`+namespace Files.App.Controls`
`8`	`5`	`{`
`9`	`6`	`public interface ISidebarItemModel : INotifyPropertyChanged`
`10`	`7`	`{`
`@@ -38,5 +35,10 @@ public interface ISidebarItemModel : INotifyPropertyChanged`
`38`	`35`	`/// The tooltip used when hovering over this item in the sidebar`
`39`	`36`	`/// </summary>`
`40`	`37`	`object ToolTip { get; }`
	`38`	`+`
	`39`	`+ /// <summary>`
	`40`	`+ /// Indicates whether the children should have an indentation or not.`
	`41`	`+ /// </summary>`
	`42`	`+ bool PaddedItem { get; }`
`41`	`43`	`}`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Windows.ApplicationModel.DataTransfer;`
`7`	`7`	`using Windows.Foundation;`
`8`	`8`
`9`		`-namespace Files.App.UserControls.Sidebar`
	`9`	`+namespace Files.App.Controls`
`10`	`10`	`{`
`11`	`11`	`public record ItemDroppedEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { }`
`12`	`12`	`public record ItemDragOverEventArgs(object DropTarget, DataPackageView DroppedItem, SidebarItemDropPosition dropPosition, DragEventArgs RawEvent) { }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Files Community`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`		`-namespace Files.App.UserControls.Sidebar`
	`4`	`+namespace Files.App.Controls`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// The display mode of the <see cref="SidebarView"/>`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,12 @@`
`3`	`3`
`4`	`4`	`using CommunityToolkit.WinUI;`
`5`	`5`	`using Microsoft.UI.Input;`
`6`		`-using Microsoft.UI.Xaml;`
`7`	`6`	`using Microsoft.UI.Xaml.Automation;`
`8`	`7`	`using Microsoft.UI.Xaml.Automation.Peers;`
`9`		`-using Microsoft.UI.Xaml.Controls;`
`10`		`-using Microsoft.UI.Xaml.Controls.Primitives;`
`11`	`8`	`using System.Collections.Specialized;`
`12`	`9`	`using Windows.ApplicationModel.DataTransfer;`
`13`	`10`
`14`		`-namespace Files.App.UserControls.Sidebar`
	`11`	`+namespace Files.App.Controls`
`15`	`12`	`{`
`16`	`13`	`public sealed partial class SidebarItem : Control`
`17`	`14`	`{`
`@@ -21,9 +18,6 @@ public sealed partial class SidebarItem : Control`
`21`	`18`	`public bool IsGroupHeader => Item?.Children is not null;`
`22`	`19`	`public bool CollapseEnabled => DisplayMode != SidebarDisplayMode.Compact;`
`23`	`20`
`24`		`- // TODO: Do not use localized text for comparison. This is a workaround to avoid major refactoring for now, it should be done any time soon`
`25`		`- public bool IsHomeItem => Item?.Text == "Home".GetLocalizedResource() && Owner?.MenuItemsSource is IList enumerable && enumerable.IndexOf(Item) == 0;`
`26`		`-`
`27`	`21`	`private bool hasChildSelection => selectedChildItem != null;`
`28`	`22`	`private bool isPointerOver = false;`
`29`	`23`	`private bool isClicking = false;`
`@@ -323,7 +317,7 @@ private void UpdateExpansionState(bool useAnimations = true)`
`323`	`317`	`{`
`324`	`318`	`if (Item?.Children is null \|\| !CollapseEnabled)`
`325`	`319`	`{`
`326`		`- VisualStateManager.GoToState(this, IsHomeItem ? "NoExpansionWithPadding" : "NoExpansion", useAnimations);`
	`320`	`+ VisualStateManager.GoToState(this, Item?.PaddedItem == true ? "NoExpansionWithPadding" : "NoExpansion", useAnimations);`
`327`	`321`	`}`
`328`	`322`	`else if (!HasChildren)`
`329`	`323`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Microsoft.UI.Xaml.Automation.Peers;`
`8`	`8`	`using Microsoft.UI.Xaml.Automation.Provider;`
`9`	`9`
`10`		`-namespace Files.App.UserControls.Sidebar`
	`10`	`+namespace Files.App.Controls`
`11`	`11`	`{`
`12`	`12`	`public sealed partial class SidebarItemAutomationPeer : FrameworkElementAutomationPeer, IInvokeProvider, IExpandCollapseProvider, ISelectionItemProvider`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`// Copyright (c) Files Community`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`		`-using Microsoft.UI.Xaml;`
`5`		`-`
`6`		`-namespace Files.App.UserControls.Sidebar`
	`4`	`+namespace Files.App.Controls`
`7`	`5`	`{`
`8`	`6`	`public sealed partial class SidebarView`
`9`	`7`	`{`