Feature: Enabled Omnibar

Author: yaira2

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

@@ -32,7 +32,7 @@ public Task ExecuteAsync(object? parameter = null)
 		{
 			if (context.ShellPage is not null)
 			{
-				if (GeneralSettingsService.EnableOmnibar)
+				if (GeneralSettingsService.EnableOmnibarDesign)
 					context.ShellPage!.ToolbarViewModel.SwitchToPathMode();
 				else
 					context.ShellPage.ToolbarViewModel.IsEditModeEnabled = true;

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

@@ -308,6 +308,6 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to enable the Omnibar.
 		/// </summary>
-		bool EnableOmnibar { get; set; }
+		bool EnableOmnibarDesign { get; set; }
 	}
 }

src/Files.App/Services/Settings/GeneralSettingsService.cs

@@ -375,9 +375,9 @@ public bool ShowFilterHeader
 			set => Set(value);
 		}
 
-		public bool EnableOmnibar
+		public bool EnableOmnibarDesign
 		{
-			get => Get(false);
+			get => Get(true);
 			set => Set(value);
 		}
 

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -225,7 +225,7 @@
 		<Grid
 			x:Name="LegacyBreadcrumb"
 			Grid.Column="1"
-			x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+			x:Load="{x:Bind ViewModel.EnableOmnibarDesign, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
 			ColumnSpacing="4">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="*" />
@@ -340,7 +340,7 @@
 		<controls:Omnibar
 			x:Name="Omnibar"
 			Grid.Column="1"
-			x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}"
+			x:Load="{x:Bind ViewModel.EnableOmnibarDesign, Mode=OneWay}"
 			CurrentSelectedModeName="{x:Bind ViewModel.OmnibarCurrentSelectedModeName, Mode=TwoWay}"
 			IsFocusedChanged="Omnibar_IsFocusedChanged"
 			ModeChanged="Omnibar_ModeChanged"

src/Files.App/ViewModels/Settings/AdvancedViewModel.cs

@@ -357,15 +357,15 @@ public bool ShowFlattenOptions
 		}
 
 		// TODO remove when feature is marked as stable
-		public bool EnableOmnibar
+		public bool EnableOmnibarDesign
 		{
-			get => UserSettingsService.GeneralSettingsService.EnableOmnibar;
+			get => UserSettingsService.GeneralSettingsService.EnableOmnibarDesign;
 			set
 			{
-				if (value == UserSettingsService.GeneralSettingsService.EnableOmnibar)
+				if (value == UserSettingsService.GeneralSettingsService.EnableOmnibarDesign)
 					return;
 
-				UserSettingsService.GeneralSettingsService.EnableOmnibar = value;
+				UserSettingsService.GeneralSettingsService.EnableOmnibarDesign = value;
 				OnPropertyChanged();
 			}
 		}

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

@@ -85,7 +85,7 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr
 		[Obsolete("Superseded by Omnibar.")]
 		public bool SearchHasFocus { get; private set; }
 
-		public bool EnableOmnibar => GeneralSettingsService.EnableOmnibar;
+		public bool EnableOmnibarDesign => GeneralSettingsService.EnableOmnibarDesign;
 		public bool ShowStatusCenterButton =>
 			AppearanceSettingsService.StatusCenterVisibility == StatusCenterVisibility.Always ||
 			(AppearanceSettingsService.StatusCenterVisibility == StatusCenterVisibility.DuringOngoingFileOperations && OngoingTasksViewModel.HasAnyItem);
@@ -363,8 +363,8 @@ public NavigationToolbarViewModel()
 			{
 				switch (e.PropertyName)
 				{
-					case nameof(GeneralSettingsService.EnableOmnibar):
-						OnPropertyChanged(nameof(EnableOmnibar));
+					case nameof(GeneralSettingsService.EnableOmnibarDesign):
+						OnPropertyChanged(nameof(EnableOmnibarDesign));
 						break;
 				}
 			};
@@ -755,7 +755,7 @@ public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 
 		public void SwitchToCommandPaletteMode()
 		{
-			if (EnableOmnibar)
+			if (EnableOmnibarDesign)
 			{
 				OmnibarCurrentSelectedModeName = OmnibarPaletteModeName;
 			}
@@ -773,7 +773,7 @@ public void SwitchToCommandPaletteMode()
 
 		public void SwitchToSearchMode()
 		{
-			if (EnableOmnibar)
+			if (EnableOmnibarDesign)
 			{
 				OmnibarCurrentSelectedModeName = OmnibarSearchModeName;
 			}

src/Files.App/Views/Settings/AdvancedPage.xaml

@@ -170,11 +170,11 @@
 			</wctcontrols:SettingsCard>
 
 			<!--  Omnibar  -->
-			<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=EnableOmnibar}" IsEnabled="{x:Bind ViewModel.IsAppEnvironmentDev, Mode=OneWay}">
+			<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=EnableOmnibar}">
 				<wctcontrols:SettingsCard.HeaderIcon>
 					<FontIcon Glyph="&#xECAD;" />
 				</wctcontrols:SettingsCard.HeaderIcon>
-				<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=EnableOmnibar}" IsOn="{x:Bind ViewModel.EnableOmnibar, Mode=TwoWay}" />
+				<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=EnableOmnibar}" IsOn="{x:Bind ViewModel.EnableOmnibarDesign, Mode=TwoWay}" />
 			</wctcontrols:SettingsCard>
 		</StackPanel>
 	</Grid>