Connected actions to Omnibar modes

Author: yaira2

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

@@ -5,7 +5,8 @@ namespace Files.App.Actions
 {
 	internal sealed class EditPathAction : IAction
 	{
-		private readonly IContentPageContext context;
+		private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
+		private readonly IGeneralSettingsService GeneralSettingsService = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
 
 		public string Label
 			=> Strings.EditPath.GetLocalizedResource();
@@ -21,13 +22,18 @@ public HotKey SecondHotKey
 
 		public EditPathAction()
 		{
-			context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
 		}
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
 			if (context.ShellPage is not null)
-				context.ShellPage.ToolbarViewModel.IsEditModeEnabled = true;
+			{
+				if (GeneralSettingsService.EnableOmnibar)
+					context.ShellPage!.ToolbarViewModel.SwitchToPathhMode();
+				else
+					context.ShellPage.ToolbarViewModel.IsEditModeEnabled = true;
+			}
 
 			return Task.CompletedTask;
 		}

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

@@ -34,7 +34,7 @@ public SearchAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			context.ShellPage!.ToolbarViewModel.SwitchSearchBoxVisibility();
+			context.ShellPage!.ToolbarViewModel.SwitchToSearchMode();
 
 			return Task.CompletedTask;
 		}

src/Files.App/Actions/Open/OpenCommandPaletteAction.cs

@@ -23,7 +23,7 @@ public OpenCommandPaletteAction()
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			_context.ShellPage?.ToolbarViewModel.OpenCommandPalette();
+			_context.ShellPage?.ToolbarViewModel.SwitchToCommandPaletteMode();
 
 			return Task.CompletedTask;
 		}

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

@@ -42,7 +42,7 @@ public interface IAddressToolbarViewModel
 
 		public event EventHandler RefreshWidgetsRequested;
 
-		public void SwitchSearchBoxVisibility();
+		public void SwitchToSearchMode();
 
 		public ISearchBoxViewModel SearchBox { get; }
 	}

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using CommunityToolkit.WinUI;
-using Files.App.Actions;
 using Files.App.Controls;
 using Files.Shared.Helpers;
 using Microsoft.UI.Dispatching;
@@ -155,7 +154,7 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr
 
 		private bool _IsDynamicOverflowEnabled;
 		public bool IsDynamicOverflowEnabled { get => _IsDynamicOverflowEnabled; set => SetProperty(ref _IsDynamicOverflowEnabled, value); }
-		
+
 		private bool _IsUpdating;
 		public bool IsUpdating { get => _IsUpdating; set => SetProperty(ref _IsUpdating, value); }
 
@@ -228,7 +227,7 @@ public string? PathText
 		public string? OmnibarCommandPaletteModeText { get => _OmnibarCommandPaletteModeText; set => SetProperty(ref _OmnibarCommandPaletteModeText, value); }
 
 		private bool _IsOmnibarFocused;
-		public  bool IsOmnibarFocused
+		public bool IsOmnibarFocused
 		{
 			get => _IsOmnibarFocused;
 			set
@@ -237,7 +236,7 @@ public  bool IsOmnibarFocused
 				{
 					if (value)
 					{
-						switch(OmnibarCurrentSelectedMode.Name)
+						switch (OmnibarCurrentSelectedMode.Name)
 						{
 							case OmnibarPathModeName:
 								PathText =
@@ -741,59 +740,79 @@ public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			switch (e.Key)
 			{
 				case Windows.System.VirtualKey.Down:
-				{
-					var item = e.OriginalSource as ListViewItem;
-					var button = item?.FindDescendant<Button>();
-					button?.Flyout.ShowAt(button);
-					e.Handled = true;
-					break;
-				}
-				case Windows.System.VirtualKey.Space: 
+					{
+						var item = e.OriginalSource as ListViewItem;
+						var button = item?.FindDescendant<Button>();
+						button?.Flyout.ShowAt(button);
+						e.Handled = true;
+						break;
+					}
+				case Windows.System.VirtualKey.Space:
 				case Windows.System.VirtualKey.Enter:
-				{
-					var item = e.OriginalSource as ListViewItem;
-					var path = (item?.Content as PathBoxItem)?.Path;
-					if (path == PathControlDisplayText)
-						return;
-					ToolbarPathItemInvoked?.Invoke(this, new PathNavigationEventArgs()
 					{
-						ItemPath = path
-					});
-					e.Handled = true;
-					break;
-				}
+						var item = e.OriginalSource as ListViewItem;
+						var path = (item?.Content as PathBoxItem)?.Path;
+						if (path == PathControlDisplayText)
+							return;
+						ToolbarPathItemInvoked?.Invoke(this, new PathNavigationEventArgs()
+						{
+							ItemPath = path
+						});
+						e.Handled = true;
+						break;
+					}
 			}
 		}
 
-		public void OpenCommandPalette()
+		public void SwitchToCommandPaletteMode()
 		{
-			PathText = ">";
-			IsCommandPaletteOpen = true;
-			ManualEntryBoxLoaded = true;
-			ClickablePathLoaded = false;
+			if (EnableOmnibar)
+			{
+				OmnibarCurrentSelectedMode.Name = OmnibarPaletteModeName;
+				IsOmnibarFocused = true;
+			}
+			else
+			{
+				PathText = ">";
+				IsCommandPaletteOpen = true;
+				ManualEntryBoxLoaded = true;
+				ClickablePathLoaded = false;
 
-			var visiblePath = AddressToolbar?.FindDescendant<AutoSuggestBox>(x => x.Name == "VisiblePath");
-			AddressBarTextEntered?.Invoke(this, new AddressBarTextEnteredEventArgs() { AddressBarTextField = visiblePath });
+				var visiblePath = AddressToolbar?.FindDescendant<AutoSuggestBox>(x => x.Name == "VisiblePath");
+				AddressBarTextEntered?.Invoke(this, new AddressBarTextEnteredEventArgs() { AddressBarTextField = visiblePath });
+			}
 		}
 
-		public void SwitchSearchBoxVisibility()
+		public void SwitchToSearchMode()
 		{
-			if (IsSearchBoxVisible)
+			if (EnableOmnibar)
 			{
-				CloseSearchBox(true);
+				OmnibarCurrentSelectedMode.Name = OmnibarSearchModeName; 
+				IsOmnibarFocused = true;
 			}
 			else
 			{
-				IsSearchBoxVisible = true;
+				if (IsSearchBoxVisible)
+					CloseSearchBox(true);
+				else
+				{
+					IsSearchBoxVisible = true;
 
-				// Given that binding and layouting might take a few cycles, when calling UpdateLayout
-				// we can guarantee that the focus call will be able to find an open ASB
-				var searchbox = AddressToolbar?.FindDescendant("SearchRegion") as SearchBox;
-				searchbox?.UpdateLayout();
-				searchbox?.Focus(FocusState.Programmatic);
+					// Given that binding and layouting might take a few cycles, when calling UpdateLayout
+					// we can guarantee that the focus call will be able to find an open ASB
+					var searchbox = AddressToolbar?.FindDescendant("SearchRegion") as SearchBox;
+					searchbox?.UpdateLayout();
+					searchbox?.Focus(FocusState.Programmatic);
+				}
 			}
 		}
 
+		public void SwitchToPathhMode()
+		{
+			OmnibarCurrentSelectedMode.Name = OmnibarPathModeName;
+			IsOmnibarFocused = true;
+		}
+
 		public void UpdateAdditionalActions()
 		{
 			OnPropertyChanged(nameof(HasAdditionalAction));