Code Quality: Removed old address bar code (#17286)

Author: yaira2

src/Files.App/Actions/Content/PreviewPopup/LaunchPreviewPopupAction.cs

@@ -20,7 +20,6 @@ public HotKey HotKey
 
 		public bool IsExecutable =>
 			context.SelectedItems.Count == 1 &&
-			(!context.ShellPage?.ToolbarViewModel?.IsEditModeEnabled ?? false) &&
 			(!context.ShellPage?.SlimContentPage?.IsRenamingItem ?? false);
 
 		public LaunchPreviewPopupAction()

src/Files.App/Actions/Content/Selection/ClearSelectionAction.cs

@@ -30,11 +30,9 @@ public bool IsExecutable
 				if (page is null)
 					return false;
 
-				bool isCommandPaletteOpen = page.ToolbarViewModel.IsCommandPaletteOpen;
-				bool isEditing = page.ToolbarViewModel.IsEditModeEnabled;
 				bool isRenaming = page.SlimContentPage.IsRenamingItem;
 
-				return isCommandPaletteOpen || (!isEditing && !isRenaming);
+				return !isRenaming;
 			}
 		}
 

src/Files.App/Actions/Content/Selection/InvertSelectionAction.cs

@@ -30,11 +30,8 @@ public bool IsExecutable
 				if (page is null)
 					return false;
 
-				bool isCommandPaletteOpen = page.ToolbarViewModel.IsCommandPaletteOpen;
-				bool isEditing = page.ToolbarViewModel.IsEditModeEnabled;
 				bool isRenaming = page.SlimContentPage.IsRenamingItem;
-
-				return isCommandPaletteOpen || (!isEditing && !isRenaming);
+				return !isRenaming;
 			}
 		}
 

src/Files.App/Actions/Content/Selection/SelectAllAction.cs

@@ -35,11 +35,9 @@ public bool IsExecutable
 				if (itemCount == selectedItemCount)
 					return false;
 
-				bool isCommandPaletteOpen = page.ToolbarViewModel.IsCommandPaletteOpen;
-				bool isEditing = page.ToolbarViewModel.IsEditModeEnabled;
 				bool isRenaming = page.SlimContentPage?.IsRenamingItem ?? false;
 
-				return isCommandPaletteOpen || (!isEditing && !isRenaming);
+				return !isRenaming;
 			}
 		}
 

src/Files.App/Actions/Global/EditPathAction.cs

@@ -31,12 +31,7 @@ public EditPathAction()
 		public Task ExecuteAsync(object? parameter = null)
 		{
 			if (context.ShellPage is not null)
-			{
-				if (GeneralSettingsService.EnableOmnibarDesign)
-					context.ShellPage!.ToolbarViewModel.SwitchToPathMode();
-				else
-					context.ShellPage.ToolbarViewModel.IsEditModeEnabled = true;
-			}
+				context.ShellPage!.ToolbarViewModel.SwitchToPathMode();
 
 			return Task.CompletedTask;
 		}

src/Files.App/Actions/Global/SearchAction.cs

@@ -22,14 +22,9 @@ public HotKey SecondHotKey
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.Omnibar.Search");
 
-		public bool IsExecutable
-			=> !context.IsSearchBoxVisible;
-
 		public SearchAction()
 		{
 			context = Ioc.Default.GetRequiredService<IContentPageContext>();
-
-			context.PropertyChanged += Context_PropertyChanged;
 		}
 
 		public Task ExecuteAsync(object? parameter = null)
@@ -38,15 +33,5 @@ public Task ExecuteAsync(object? parameter = null)
 
 			return Task.CompletedTask;
 		}
-
-		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
-		{
-			switch (e.PropertyName)
-			{
-				case nameof(IContentPageContext.IsSearchBoxVisible):
-					OnPropertyChanged(nameof(IsExecutable));
-					break;
-			}
-		}
 	}
 }

src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs

@@ -39,8 +39,6 @@ internal sealed partial class ContentPageContext : ObservableObject, IContentPag
 
 		public bool CanNavigateToParent => ShellPage is not null && ShellPage.ToolbarViewModel.CanNavigateToParent;
 
-		public bool IsSearchBoxVisible => ShellPage is not null && ShellPage.ToolbarViewModel.IsSearchBoxVisible;
-
 		public bool CanCreateItem => GetCanCreateItem();
 
 		public bool IsMultiPaneAvailable => ShellPage is not null && ShellPage.PaneHolder is not null && ShellPage.PaneHolder.IsMultiPaneAvailable;
@@ -167,7 +165,6 @@ private void ToolbarViewModel_PropertyChanged(object? sender, PropertyChangedEve
 				case nameof(NavigationToolbarViewModel.CanNavigateToParent):
 				case nameof(NavigationToolbarViewModel.HasItem):
 				case nameof(NavigationToolbarViewModel.CanRefresh):
-				case nameof(NavigationToolbarViewModel.IsSearchBoxVisible):
 					OnPropertyChanged(e.PropertyName);
 					break;
 				case nameof(NavigationToolbarViewModel.SelectedItems):

src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs

@@ -23,8 +23,6 @@ public interface IContentPageContext : INotifyPropertyChanged
 		bool CanGoForward { get; }
 		bool CanNavigateToParent { get; }
 
-		bool IsSearchBoxVisible { get; }
-
 		bool CanCreateItem { get; }
 
 		bool IsMultiPaneAvailable { get; }

src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs

@@ -10,8 +10,6 @@ namespace Files.App.Data.Contexts
 {
 	internal sealed partial class MultitaskingContext : ObservableObject, IMultitaskingContext
 	{
-		private readonly MainPageViewModel MainPageViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
-
 		private bool isPopupOpen = false;
 
 		private ITabBar? control;
@@ -72,9 +70,6 @@ private void FocusManager_GotFocus(object? sender, FocusManagerGotFocusEventArgs
 			{
 				int newSelectedIndex = MainPageViewModel.AppInstances.IndexOf(tabItem);
 				UpdateSelectedTabIndex(newSelectedIndex);
-
-				// Focus the content of the selected tab item (needed for pointer navigation)
-				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 			}
 		}
 

src/Files.App/Data/Contracts/IAddressToolbarViewModel.cs

@@ -5,15 +5,6 @@ namespace Files.App.Data.Contracts
 {
 	public interface IAddressToolbarViewModel
 	{
-		public bool IsSearchBoxVisible { get; set; }
-
-		public bool IsEditModeEnabled { get; set; }
-
-		/// <summary>
-		/// Gets or sets the value that indicates whether the command palette is open.
-		/// </summary>
-		public bool IsCommandPaletteOpen { get; set; }
-
 		public bool CanRefresh { get; set; }
 
 		public bool CanCopyPathInPage { get; set; }
@@ -36,14 +27,11 @@ public interface IAddressToolbarViewModel
 
 		public event ToolbarQuerySubmittedEventHandler PathBoxQuerySubmitted;
 
-		public event EventHandler EditModeEnabled;
 
 		public event ItemDraggedOverPathItemEventHandler ItemDraggedOverPathItem;
 
 		public event EventHandler RefreshWidgetsRequested;
 
 		public void SwitchToSearchMode();
-
-		public ISearchBoxViewModel SearchBox { get; }
 	}
 }