Revert

Author: 0x5bfa

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -21,6 +21,7 @@
 	xmlns:ucs="using:Files.App.UserControls.StatusCenter"
 	xmlns:vm="using:Files.App.ViewModels.UserControls"
 	x:Name="NavToolbar"
+	Loading="NavToolbar_Loading"
 	mc:Ignorable="d">
 
 	<UserControl.Resources>
@@ -353,6 +354,7 @@
 				<controls:OmnibarMode.ContentOnInactive>
 					<controls:BreadcrumbBar
 						x:Name="BreadcrumbBar"
+						ItemClicked="BreadcrumbBar_ItemClicked"
 						ItemDropDownFlyoutClosed="BreadcrumbBar_ItemDropDownFlyoutClosed"
 						ItemDropDownFlyoutOpening="BreadcrumbBar_ItemDropDownFlyoutOpening"
 						ItemsSource="{x:Bind ViewModel.PathComponents, Mode=OneWay}">
@@ -551,7 +553,7 @@
 		<TeachingTip
 			x:Name="StatusCenterTeachingTip"
 			Title="{helpers:ResourceString Name=OngoingTasksTeachingTip/Title}"
-			IsOpen="{x:Bind OngoingTasksViewModel.ShowStatusCenterTeachingTip, Mode=OneWay}"
+			IsOpen="False"
 			Subtitle="{helpers:ResourceString Name=OngoingTasksTeachingTip/Subtitle}"
 			Target="{x:Bind ShowStatusCenterButton}" />
 

src/Files.App/UserControls/NavigationToolbar.xaml.cs

@@ -9,6 +9,7 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using System.Windows.Input;
 using Windows.System;
 
 namespace Files.App.UserControls
@@ -48,7 +49,13 @@ public NavigationToolbar()
 
 		// Methods
 
-		#region Legacy navigation box impl
+		private void NavToolbar_Loading(FrameworkElement _, object e)
+		{
+			Loading -= NavToolbar_Loading;
+			if (OngoingTasksViewModel is not null)
+				OngoingTasksViewModel.NewItemAdded += OngoingTasksActions_ProgressBannerPosted;
+		}
+
 		private void VisiblePath_Loaded(object _, RoutedEventArgs e)
 		{
 			// AutoSuggestBox won't receive focus unless it's fully loaded
@@ -123,26 +130,17 @@ private void SearchRegion_AccessKeyInvoked(UIElement sender, AccessKeyInvokedEve
 		private void VisiblePath_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
 			=> ViewModel.VisiblePath_QuerySubmitted(sender, args);
 
-		private void ClickablePath_GettingFocus(UIElement sender, GettingFocusEventArgs args)
-		{
-			if (args.InputDevice != FocusInputDeviceKind.Keyboard)
-				return;
-
-			var previousControl = args.OldFocusedElement as FrameworkElement;
-			if (previousControl?.Name == nameof(HomeButton) || previousControl?.Name == nameof(Refresh))
-				ViewModel.IsEditModeEnabled = true;
-		}
-		#endregion
-
-		private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, Controls.BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		private void OngoingTasksActions_ProgressBannerPosted(object? _, StatusCenterItem e)
 		{
-			await ViewModel.SetPathBoxDropDownFlyoutAsync(e.Flyout, ViewModel.PathComponents[e.Index]);
-		}
+			if (OngoingTasksViewModel is not null)
+				OngoingTasksViewModel.NewItemAdded -= OngoingTasksActions_ProgressBannerPosted;
 
-		private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, Controls.BreadcrumbBarItemDropDownFlyoutEventArgs e)
-		{
-			// Clear the flyout items to save memory
-			e.Flyout.Items.Clear();
+			// Displays a teaching tip the first time a banner is posted
+			if (userSettingsService.AppSettingsService.ShowStatusCenterTeachingTip)
+			{
+				StatusCenterTeachingTip.IsOpen = true;
+				userSettingsService.AppSettingsService.ShowStatusCenterTeachingTip = false;
+			}
 		}
 
 		private void Button_AccessKeyInvoked(UIElement sender, AccessKeyInvokedEventArgs args)
@@ -203,6 +201,14 @@ private async Task AddHistoryItemsAsync(IEnumerable<PageStackEntry> items, IList
 				// Start loading the thumbnail in the background
 				_ = LoadFlyoutItemIconAsync(flyoutItem, args.NavPathParam);
 
+				async Task LoadFlyoutItemIconAsync(MenuFlyoutItem flyoutItem, string path)
+				{
+					var imageSource = await NavigationHelpers.GetIconForPathAsync(path);
+
+					if (imageSource is not null)
+						flyoutItem.Icon = new ImageIcon() { Source = imageSource };
+				}
+
 				void HistoryItemClicked(ToolbarHistoryItemModel? itemModel)
 				{
 					if (itemModel is null)
@@ -235,15 +241,33 @@ void HistoryItemClicked(ToolbarHistoryItemModel? itemModel)
 						shellPage.Forward_Click();
 					}
 				}
+			}
+		}
 
-				async Task LoadFlyoutItemIconAsync(MenuFlyoutItem flyoutItem, string path)
-				{
-					var imageSource = await NavigationHelpers.GetIconForPathAsync(path);
+		private void ClickablePath_GettingFocus(UIElement sender, GettingFocusEventArgs args)
+		{
+			if (args.InputDevice != FocusInputDeviceKind.Keyboard)
+				return;
 
-					if (imageSource is not null)
-						flyoutItem.Icon = new ImageIcon() { Source = imageSource };
-				}
-			}
+			var previousControl = args.OldFocusedElement as FrameworkElement;
+			if (previousControl?.Name == nameof(HomeButton) || previousControl?.Name == nameof(Refresh))
+				ViewModel.IsEditModeEnabled = true;
+		}
+
+		private void BreadcrumbBar_ItemClicked(Controls.BreadcrumbBar sender, Controls.BreadcrumbBarItemClickedEventArgs args)
+		{
+
+		}
+
+		private async void BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, Controls.BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		{
+			await ViewModel.SetPathBoxDropDownFlyoutAsync(e.Flyout, ViewModel.PathComponents[e.Index]);
+		}
+
+		private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, Controls.BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		{
+			// Clear the flyout items to save memory
+			e.Flyout.Items.Clear();
 		}
 	}
 }

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

@@ -5,15 +5,14 @@ namespace Files.App.ViewModels.UserControls
 {
 	public sealed partial class StatusCenterViewModel : ObservableObject
 	{
-		private readonly IAppSettingsService AppSettingsService = Ioc.Default.GetRequiredService<IAppSettingsService>();
-
 		public ObservableCollection<StatusCenterItem> StatusCenterItems { get; } = [];
 
 		private int _AverageOperationProgressValue = 0;
-		public int AverageOperationProgressValue { get => _AverageOperationProgressValue; private set => SetProperty(ref _AverageOperationProgressValue, value); }
-
-		private bool _ShowStatusCenterTeachingTip;
-		public bool ShowStatusCenterTeachingTip { get => _ShowStatusCenterTeachingTip; private set => SetProperty(ref _ShowStatusCenterTeachingTip, value); }
+		public int AverageOperationProgressValue
+		{
+			get => _AverageOperationProgressValue;
+			private set => SetProperty(ref _AverageOperationProgressValue, value);
+		}
 
 		public int InProgressItemCount
 		{
@@ -90,13 +89,7 @@ public StatusCenterItem AddItem(
 				cancellationTokenSource);
 
 			StatusCenterItems.Insert(0, banner);
-
-			// Displays a teaching tip the first time a banner is posted
-			if (AppSettingsService.ShowStatusCenterTeachingTip)
-			{
-				ShowStatusCenterTeachingTip = true;
-				AppSettingsService.ShowStatusCenterTeachingTip = false;
-			}
+			NewItemAdded?.Invoke(this, banner);
 
 
 			NotifyChanges();