Code Quality: Renamed AddressToolbar and InnerNavigationToolbaar (#16927)

0x5bfa · web-flow · commit 2ea3dfee109c · 2025-03-16T11:21:59.000-04:00
diff --git a/src/Files.App.Controls/BladeView/BladeView.xaml b/src/Files.App.Controls/BladeView/BladeView.xaml
@@ -125,8 +125,8 @@
 							FontSize="14"
 							Foreground="{TemplateBinding CloseButtonForeground}"
 							Style="{StaticResource ButtonRevealStyle}"
-							Visibility="{TemplateBinding CloseButtonVisibility}"
-							TabIndex="0" />
+							TabIndex="0"
+							Visibility="{TemplateBinding CloseButtonVisibility}" />
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs
@@ -160,15 +160,15 @@ private void ToolbarViewModel_PropertyChanged(object? sender, PropertyChangedEve
 		{
 			switch (e.PropertyName)
 			{
-				case nameof(AddressToolbarViewModel.CanGoBack):
-				case nameof(AddressToolbarViewModel.CanGoForward):
-				case nameof(AddressToolbarViewModel.CanNavigateToParent):
-				case nameof(AddressToolbarViewModel.HasItem):
-				case nameof(AddressToolbarViewModel.CanRefresh):
-				case nameof(AddressToolbarViewModel.IsSearchBoxVisible):
+				case nameof(NavigationToolbarViewModel.CanGoBack):
+				case nameof(NavigationToolbarViewModel.CanGoForward):
+				case nameof(NavigationToolbarViewModel.CanNavigateToParent):
+				case nameof(NavigationToolbarViewModel.HasItem):
+				case nameof(NavigationToolbarViewModel.CanRefresh):
+				case nameof(NavigationToolbarViewModel.IsSearchBoxVisible):
 					OnPropertyChanged(e.PropertyName);
 					break;
-				case nameof(AddressToolbarViewModel.SelectedItems):
+				case nameof(NavigationToolbarViewModel.SelectedItems):
 					UpdateSelectedItems();
 					break;
 			}
diff --git a/src/Files.App/Data/Contracts/IShellPage.cs b/src/Files.App/Data/Contracts/IShellPage.cs
@@ -23,7 +23,7 @@ public interface IShellPage : ITabBarItemContent, IMultiPaneInfo, IDisposable, I
 
 		IFilesystemHelpers FilesystemHelpers { get; }
 
-		AddressToolbarViewModel ToolbarViewModel { get; }
+		NavigationToolbarViewModel ToolbarViewModel { get; }
 
 		bool CanNavigateBackward { get; }
 
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -1,6 +1,6 @@
 ﻿<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
 <UserControl
-	x:Class="Files.App.UserControls.AddressToolbar"
+	x:Class="Files.App.UserControls.NavigationToolbar"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml.cs b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
@@ -15,7 +15,7 @@
 
 namespace Files.App.UserControls
 {
-	public sealed partial class AddressToolbar : UserControl
+	public sealed partial class NavigationToolbar : UserControl
 	{
 		// Dependency injections
 
@@ -39,15 +39,15 @@ public sealed partial class AddressToolbar : UserControl
 		public partial bool ShowSearchBox { get; set; }
 
 		[GeneratedDependencyProperty]
-		public partial AddressToolbarViewModel ViewModel { get; set; }
+		public partial NavigationToolbarViewModel ViewModel { get; set; }
 
 		// Commands
 
 		private readonly ICommand historyItemClickedCommand;
 
 		// Constructor
 
-		public AddressToolbar()
+		public NavigationToolbar()
 		{
 			InitializeComponent();
 
diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml.cs b/src/Files.App/UserControls/PathBreadcrumb.xaml.cs
@@ -11,7 +11,7 @@ namespace Files.App.UserControls
 	public sealed partial class PathBreadcrumb : UserControl
 	{
 		[GeneratedDependencyProperty]
-		public partial AddressToolbarViewModel ViewModel { get; set; }
+		public partial NavigationToolbarViewModel ViewModel { get; set; }
 
 		public PathBreadcrumb()
 		{
diff --git a/src/Files.App/UserControls/Toolbar.xaml b/src/Files.App/UserControls/Toolbar.xaml
@@ -1,6 +1,6 @@
 ﻿<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
 <UserControl
-	x:Class="Files.App.UserControls.InnerNavigationToolbar"
+	x:Class="Files.App.UserControls.Toolbar"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:contract8Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,8)"
diff --git a/src/Files.App/UserControls/Toolbar.xaml.cs b/src/Files.App/UserControls/Toolbar.xaml.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
@@ -10,50 +11,27 @@
 
 namespace Files.App.UserControls
 {
-	public sealed partial class InnerNavigationToolbar : UserControl
+	public sealed partial class Toolbar : UserControl
 	{
-		public InnerNavigationToolbar()
-		{
-			InitializeComponent();
-		}
-
-		public IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
-		public ICommandManager Commands { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
-		public IModifiableCommandManager ModifiableCommands { get; } = Ioc.Default.GetRequiredService<IModifiableCommandManager>();
-
+		private readonly IUserSettingsService UserSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
+		private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
+		private readonly IModifiableCommandManager ModifiableCommands = Ioc.Default.GetRequiredService<IModifiableCommandManager>();
 		private readonly IAddItemService addItemService = Ioc.Default.GetRequiredService<IAddItemService>();
 
-		public AppModel AppModel => App.AppModel;
-
-		public AddressToolbarViewModel? ViewModel
-		{
-			get => (AddressToolbarViewModel)GetValue(ViewModelProperty);
-			set => SetValue(ViewModelProperty, value);
-		}
-
-		// Using a DependencyProperty as the backing store for ViewModel.  This enables animation, styling, binding, etc...
-		public static readonly DependencyProperty ViewModelProperty =
-			DependencyProperty.Register(nameof(ViewModel), typeof(AddressToolbarViewModel), typeof(InnerNavigationToolbar), new PropertyMetadata(null));
+		[GeneratedDependencyProperty]
+		public partial NavigationToolbarViewModel? ViewModel { get; set; }
 
-		public bool ShowViewControlButton
-		{
-			get { return (bool)GetValue(ShowViewControlButtonProperty); }
-			set { SetValue(ShowViewControlButtonProperty, value); }
-		}
+		[GeneratedDependencyProperty]
+		public partial bool ShowViewControlButton { get; set; }
 
-		// Using a DependencyProperty as the backing store for ShowViewControlButton.  This enables animation, styling, binding, etc...
-		public static readonly DependencyProperty ShowViewControlButtonProperty =
-			DependencyProperty.Register("ShowViewControlButton", typeof(bool), typeof(AddressToolbar), new PropertyMetadata(null));
+		[GeneratedDependencyProperty]
+		public partial bool ShowPreviewPaneButton { get; set; }
 
-		public bool ShowPreviewPaneButton
+		public Toolbar()
 		{
-			get { return (bool)GetValue(ShowPreviewPaneButtonProperty); }
-			set { SetValue(ShowPreviewPaneButtonProperty, value); }
+			InitializeComponent();
 		}
 
-		// Using a DependencyProperty as the backing store for ShowPreviewPaneButton.  This enables animation, styling, binding, etc...
-		public static readonly DependencyProperty ShowPreviewPaneButtonProperty =
-			DependencyProperty.Register("ShowPreviewPaneButton", typeof(bool), typeof(AddressToolbar), new PropertyMetadata(null));
 		private void NewEmptySpace_Opening(object sender, object e)
 		{
 			var shell = NewEmptySpace.Items.Where(x => (x.Tag as string) == "CreateNewFile").Reverse().ToList();
@@ -131,4 +109,4 @@ private void AppBarButton_AccessKeyInvoked(UIElement sender, AccessKeyInvokedEve
 				args.Handled = true;
 		}
 	}
-}
+}
diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
@@ -16,7 +16,7 @@
 
 namespace Files.App.ViewModels.UserControls
 {
-	public sealed partial class AddressToolbarViewModel : ObservableObject, IAddressToolbarViewModel, IDisposable
+	public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddressToolbarViewModel, IDisposable
 	{
 		private const int MAX_SUGGESTIONS = 10;
 
@@ -197,7 +197,7 @@ public Style LayoutThemedIcon
 
 		private PointerRoutedEventArgs? pointerRoutedEventArgs;
 
-		public AddressToolbarViewModel()
+		public NavigationToolbarViewModel()
 		{
 			dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 			dragOverTimer = dispatcherQueue.CreateTimer();
@@ -578,7 +578,7 @@ public void UpdateAdditionalActions()
 			OnPropertyChanged(nameof(HasAdditionalAction));
 		}
 
-		private AddressToolbar? AddressToolbar => (MainWindow.Instance.Content as Frame)?.FindDescendant<AddressToolbar>();
+		private NavigationToolbar? AddressToolbar => (MainWindow.Instance.Content as Frame)?.FindDescendant<NavigationToolbar>();
 
 		private void CloseSearchBox(bool doFocus = false)
 		{
diff --git a/src/Files.App/Views/Layouts/BaseLayoutPage.cs b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
@@ -76,8 +76,8 @@ public abstract class BaseLayoutPage : Page, IBaseLayoutPage, INotifyPropertyCha
 
 		// Properties
 
-		protected AddressToolbar? NavToolbar
-			=> (MainWindow.Instance.Content as Frame)?.FindDescendant<AddressToolbar>();
+		protected NavigationToolbar? NavToolbar
+			=> (MainWindow.Instance.Content as Frame)?.FindDescendant<NavigationToolbar>();
 
 		public LayoutPreferencesManager? FolderSettings
 			=> ParentShellPageInstance?.InstanceViewModel.FolderSettings;
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
@@ -143,7 +143,7 @@
 			TabIndex="0" />
 
 		<!--  Address Bar  -->
-		<uc:AddressToolbar
+		<uc:NavigationToolbar
 			x:Name="NavToolbar"
 			Grid.Row="1"
 			HorizontalAlignment="Stretch"
@@ -196,7 +196,7 @@
 					</Grid.ColumnDefinitions>
 
 					<!--  File Navigation Toolbar  -->
-					<uc:InnerNavigationToolbar
+					<uc:Toolbar
 						x:Name="InnerNavigationToolbar"
 						Grid.Row="0"
 						Grid.ColumnSpan="3"
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -47,7 +47,7 @@ public abstract class BaseShellPage : Page, IShellPage, INotifyPropertyChanged
 
 		protected readonly ICommandManager commands = Ioc.Default.GetRequiredService<ICommandManager>();
 
-		public AddressToolbarViewModel ToolbarViewModel { get; } = new AddressToolbarViewModel();
+		public NavigationToolbarViewModel ToolbarViewModel { get; } = new NavigationToolbarViewModel();
 
 		public IBaseLayoutPage SlimContentPage => ContentPage;
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`namespace Files.App.UserControls`
`17`	`17`	`{`
`18`		`- public sealed partial class AddressToolbar : UserControl`
	`18`	`+ public sealed partial class NavigationToolbar : UserControl`
`19`	`19`	`{`
`20`	`20`	`// Dependency injections`
`21`	`21`
`@@ -39,15 +39,15 @@ public sealed partial class AddressToolbar : UserControl`
`39`	`39`	`public partial bool ShowSearchBox { get; set; }`
`40`	`40`
`41`	`41`	`[GeneratedDependencyProperty]`
`42`		`- public partial AddressToolbarViewModel ViewModel { get; set; }`
	`42`	`+ public partial NavigationToolbarViewModel ViewModel { get; set; }`
`43`	`43`
`44`	`44`	`// Commands`
`45`	`45`
`46`	`46`	`private readonly ICommand historyItemClickedCommand;`
`47`	`47`
`48`	`48`	`// Constructor`
`49`	`49`
`50`		`- public AddressToolbar()`
	`50`	`+ public NavigationToolbar()`
`51`	`51`	`{`
`52`	`52`	`InitializeComponent();`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Files.App.UserControls`
`11`	`11`	`public sealed partial class PathBreadcrumb : UserControl`
`12`	`12`	`{`
`13`	`13`	`[GeneratedDependencyProperty]`
`14`		`- public partial AddressToolbarViewModel ViewModel { get; set; }`
	`14`	`+ public partial NavigationToolbarViewModel ViewModel { get; set; }`
`15`	`15`
`16`	`16`	`public PathBreadcrumb()`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace Files.App.ViewModels.UserControls`
`18`	`18`	`{`
`19`		`- public sealed partial class AddressToolbarViewModel : ObservableObject, IAddressToolbarViewModel, IDisposable`
	`19`	`+ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddressToolbarViewModel, IDisposable`
`20`	`20`	`{`
`21`	`21`	`private const int MAX_SUGGESTIONS = 10;`
`22`	`22`
`@@ -197,7 +197,7 @@ public Style LayoutThemedIcon`
`197`	`197`
`198`	`198`	`private PointerRoutedEventArgs? pointerRoutedEventArgs;`
`199`	`199`
`200`		`- public AddressToolbarViewModel()`
	`200`	`+ public NavigationToolbarViewModel()`
`201`	`201`	`{`
`202`	`202`	`dispatcherQueue = DispatcherQueue.GetForCurrentThread();`
`203`	`203`	`dragOverTimer = dispatcherQueue.CreateTimer();`
`@@ -578,7 +578,7 @@ public void UpdateAdditionalActions()`
`578`	`578`	`OnPropertyChanged(nameof(HasAdditionalAction));`
`579`	`579`	`}`
`580`	`580`
`581`		`- private AddressToolbar? AddressToolbar => (MainWindow.Instance.Content as Frame)?.FindDescendant<AddressToolbar>();`
	`581`	`+ private NavigationToolbar? AddressToolbar => (MainWindow.Instance.Content as Frame)?.FindDescendant<NavigationToolbar>();`
`582`	`582`
`583`	`583`	`private void CloseSearchBox(bool doFocus = false)`
`584`	`584`	`{`