Code Quality: Refactor Status Center code

src/Files.App/App.xaml.cs

@@ -314,7 +314,7 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 				UIHelpers.CloseAllDialogs();
 
 				// Close all notification banners except in progress
-				Ioc.Default.GetRequiredService<StatusCenterViewModel>().CloseAllBanner();
+				Ioc.Default.GetRequiredService<StatusCenterViewModel>().CloseAllCompletedItems();
 
 				// Cache the window instead of closing it
 				MainWindow.Instance.AppWindow.Hide();

src/Files.App/Converters/EnumToStringConverter.cs

@@ -0,0 +1,20 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Microsoft.UI.Xaml.Data;
+
+namespace Files.App.Converters
+{
+	internal sealed class EnumToStringConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, string language)
+		{
+			return value?.ToString() ?? string.Empty;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

src/Files.App/Helpers/UI/UIFilesystemHelpers.cs

@@ -17,7 +17,7 @@ namespace Files.App.Helpers
 {
 	public static class UIFilesystemHelpers
 	{
-		private static readonly StatusCenterViewModel ongoingTasksViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
+		private static readonly StatusCenterViewModel _statusCenterViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
 
 		public static async Task CutItem(IShellPage associatedInstance)
 		{
@@ -33,7 +33,7 @@ public static async Task CutItem(IShellPage associatedInstance)
 				associatedInstance.SlimContentPage.ItemManipulationModel.RefreshItemsOpacity();
 
 				var itemsCount = associatedInstance.SlimContentPage.SelectedItems!.Count;
-				var banner = itemsCount > 50 ? ongoingTasksViewModel.PostOperationBanner(
+				var banner = itemsCount > 50 ? _statusCenterViewModel.AddItem(
 					string.Empty,
 					string.Format("StatusPreparingItemsDetails_Plural".GetLocalizedResource(), itemsCount),
 					0,
@@ -98,15 +98,18 @@ await associatedInstance.SlimContentPage.SelectedItems.ToList().ParallelForEachA
 
 						await FileOperationsHelpers.SetClipboard(filePaths, DataPackageOperation.Move);
 
-						banner?.Remove();
+						_statusCenterViewModel.CloseItem(banner);
+
 						return;
 					}
 					associatedInstance.SlimContentPage.ItemManipulationModel.RefreshItemsOpacity();
-					banner?.Remove();
+
+					_statusCenterViewModel.CloseItem(banner);
+
 					return;
 				}
 
-				banner?.Remove();
+				_statusCenterViewModel.CloseItem(banner);
 			}
 
 			var onlyStandard = items.All(x => x is StorageFile || x is StorageFolder || x is SystemStorageFile || x is SystemStorageFolder);
@@ -141,7 +144,7 @@ public static async Task CopyItem(IShellPage associatedInstance)
 				associatedInstance.SlimContentPage.ItemManipulationModel.RefreshItemsOpacity();
 
 				var itemsCount = associatedInstance.SlimContentPage.SelectedItems!.Count;
-				var banner = itemsCount > 50 ? ongoingTasksViewModel.PostOperationBanner(
+				var banner = itemsCount > 50 ? _statusCenterViewModel.AddItem(
 					string.Empty,
 					string.Format("StatusPreparingItemsDetails_Plural".GetLocalizedResource(), itemsCount),
 					0,
@@ -195,14 +198,17 @@ await associatedInstance.SlimContentPage.SelectedItems.ToList().ParallelForEachA
 
 						await FileOperationsHelpers.SetClipboard(filePaths, DataPackageOperation.Copy);
 
-						banner?.Remove();
+						_statusCenterViewModel.CloseItem(banner);
+
 						return;
 					}
-					banner?.Remove();
+
+					_statusCenterViewModel.CloseItem(banner);
+
 					return;
 				}
 
-				banner?.Remove();
+				_statusCenterViewModel.CloseItem(banner);
 			}
 
 			var onlyStandard = items.All(x => x is StorageFile || x is StorageFolder || x is SystemStorageFile || x is SystemStorageFolder);

src/Files.App/UserControls/AddressToolbar.xaml

@@ -208,12 +208,7 @@
 		</ResourceDictionary>
 	</UserControl.Resources>
 
-	<Grid
-		x:Name="ToolbarGrid"
-		HorizontalAlignment="Stretch"
-		VerticalAlignment="Stretch"
-		Background="{ThemeResource App.Theme.AddressBar.BackgroundBrush}"
-		ColumnSpacing="0">
+	<Grid x:Name="RootGrid" Background="{ThemeResource App.Theme.AddressBar.BackgroundBrush}">
 		<Grid Padding="8" ColumnSpacing="4">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="Auto" />
@@ -222,6 +217,7 @@
 				<ColumnDefinition Width="Auto" />
 			</Grid.ColumnDefinitions>
 
+			<!--  Page Navigation Actions  -->
 			<StackPanel
 				Grid.Row="1"
 				Orientation="Horizontal"
@@ -278,6 +274,7 @@
 				</Button>
 			</StackPanel>
 
+			<!--  Path Box  -->
 			<AutoSuggestBox
 				x:Name="VisiblePath"
 				Grid.Column="1"
@@ -337,6 +334,7 @@
 				</AutoSuggestBox.ItemTemplate>
 			</AutoSuggestBox>
 
+			<!--  Path Breadcrumb Bar  -->
 			<Grid
 				x:Name="ClickablePath"
 				Grid.Column="1"
@@ -368,6 +366,7 @@
 					Glyph="&#xE70D;" />
 			</Grid>
 
+			<!--  Storage Search Box  -->
 			<uc:SearchBox
 				x:Name="SearchRegion"
 				Grid.Column="2"
@@ -384,9 +383,12 @@
 				SearchBoxViewModel="{x:Bind ViewModel.SearchBoxViewModel, Mode=OneWay}"
 				Visibility="{x:Bind converters:MultiBooleanConverter.OrConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}" />
 
+			<!--  Right Side Action Buttons  -->
 			<StackPanel Grid.Column="3" Orientation="Horizontal">
+
+				<!--  Search Button Shwon When The Window Is Small  -->
 				<Button
-					x:Name="SearchButton"
+					x:Name="ShowSearchButton"
 					AccessKey="I"
 					AutomationProperties.Name="{x:Bind ViewModel.Commands.Search.Label}"
 					Command="{x:Bind ViewModel.Commands.Search, Mode=OneWay}"
@@ -397,65 +399,70 @@
 					<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.SearchButtonGlyph, Mode=OneWay}" />
 				</Button>
 
-				<Grid Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
-					<Button
-						x:Name="OngoingTasks"
-						Padding="0"
-						AccessKey="T"
-						AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
-						Style="{StaticResource AddressToolbarButtonStyle}"
-						ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}">
-						<Button.Content>
-							<Grid>
-								<FontIcon
-									x:Name="OngoingTasksFontIcon"
-									x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-									FontSize="16"
-									Glyph="&#xF16A;" />
-
-								<ProgressRing
-									x:Name="MedianOperationProgressRing"
-									Width="20"
-									Height="20"
-									HorizontalAlignment="Center"
-									VerticalAlignment="Center"
-									x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
-									IsIndeterminate="False"
-									Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
-							</Grid>
-						</Button.Content>
-						<Button.Flyout>
-							<Flyout
-								contract8Present:ShouldConstrainToRootBounds="False"
-								AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
-								Placement="BottomEdgeAlignedRight">
-								<Flyout.FlyoutPresenterStyle>
-									<Style TargetType="FlyoutPresenter">
-										<Setter Property="Padding" Value="0" />
-										<Setter Property="CornerRadius" Value="{StaticResource OverlayCornerRadius}" />
-									</Style>
-								</Flyout.FlyoutPresenterStyle>
-
-								<uc:StatusCenter
-									x:Name="OngoingTasksControl"
-									Width="400"
-									MinHeight="300"
-									MaxHeight="500"
-									x:FieldModifier="public"
-									IsTabStop="True" />
-							</Flyout>
-						</Button.Flyout>
-					</Button>
-					<InfoBadge
-						x:Name="StatusInfoBadge"
-						HorizontalAlignment="Right"
-						VerticalAlignment="Top"
-						Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
-				</Grid>
-
-				<!--  Install Update Notification  -->
+				<!--  Statuc Center  -->
 				<Button
-					x:Name="UpdateButton"
+					x:Name="ShowStatusCenterButton"
+					Padding="0"
+					AccessKey="T"
+					AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
+					Style="{StaticResource AddressToolbarButtonStyle}"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}"
+					Visibility="{x:Bind OngoingTasksViewModel.HasAnyItem, Mode=OneWay}">
+
+					<Grid Margin="-16">
+
+						<FontIcon
+							x:Name="OngoingTasksFontIcon"
+							x:Load="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+							FontSize="16"
+							Glyph="&#xF16A;" />
+
+						<ProgressRing
+							x:Name="MedianOperationProgressRing"
+							Width="20"
+							Height="20"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							x:Load="{x:Bind OngoingTasksViewModel.HasAnyItemInProgress, Mode=OneWay}"
+							Background="{ThemeResource SubtleFillColorSecondaryBrush}"
+							IsIndeterminate="False"
+							Value="{x:Bind OngoingTasksViewModel.AverageOperationProgressValue, Mode=OneWay}" />
+
+						<InfoBadge
+							x:Name="StatusInfoBadge"
+							HorizontalAlignment="Right"
+							VerticalAlignment="Top"
+							Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
+
+					</Grid>
+
+					<Button.Flyout>
+						<Flyout
+							contract8Present:ShouldConstrainToRootBounds="False"
+							AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
+							Placement="BottomEdgeAlignedRight">
+							<Flyout.FlyoutPresenterStyle>
+								<Style TargetType="FlyoutPresenter">
+									<Setter Property="Padding" Value="0" />
+									<Setter Property="CornerRadius" Value="{StaticResource OverlayCornerRadius}" />
+								</Style>
+							</Flyout.FlyoutPresenterStyle>
+
+							<uc:StatusCenter
+								x:Name="OngoingTasksControl"
+								Width="400"
+								MinHeight="300"
+								MaxHeight="500"
+								x:FieldModifier="public"
+								IsTabStop="True" />
+						</Flyout>
+					</Button.Flyout>
+
+				</Button>
+
+				<!--  Update The Files App Button When An Update Available  -->
+				<Button
+					x:Name="UpdateAppButton"
 					HorizontalContentAlignment="Stretch"
 					VerticalContentAlignment="Stretch"
 					x:Load="{x:Bind ViewModel.IsUpdateAvailable, Mode=OneWay}"
@@ -484,9 +491,9 @@
 					</Grid>
 				</Button>
 
-				<!--  Update Release Notes  -->
+				<!--  Show The Latest Version Release Note  -->
 				<Button
-					x:Name="ViewReleaseNotesButton"
+					x:Name="ShowReleaseNotesButton"
 					HorizontalContentAlignment="Stretch"
 					VerticalContentAlignment="Stretch"
 					x:Load="{x:Bind ViewModel.IsReleaseNotesVisible, Mode=OneWay}"
@@ -501,6 +508,7 @@
 						Glyph="&#xF133;" />
 				</Button>
 
+				<!--  Show The Files App Settings Dialog  -->
 				<Button
 					x:Name="SettingsButton"
 					AccessKey="I"
@@ -520,14 +528,16 @@
 						</AnimatedIcon.FallbackIconSource>
 					</AnimatedIcon>
 				</Button>
+
 			</StackPanel>
 
+			<!--  One-Time-Shown Statuc Center TeachingTip  -->
 			<TeachingTip
 				x:Name="StatusCenterTeachingTip"
 				Title="{helpers:ResourceString Name=OngoingTasksTeachingTip/Title}"
 				IsOpen="False"
 				Subtitle="{helpers:ResourceString Name=OngoingTasksTeachingTip/Subtitle}"
-				Target="{x:Bind OngoingTasks}" />
+				Target="{x:Bind ShowStatusCenterButton}" />
 		</Grid>
 
 		<VisualStateManager.VisualStateGroups>

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

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.StatusCenter;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -121,7 +120,7 @@ private void VisiblePath_LostFocus(object _, RoutedEventArgs e)
 		private void VisiblePath_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
 			=> ViewModel.VisiblePath_QuerySubmitted(sender, args);
 
-		private void OngoingTasksActions_ProgressBannerPosted(object? _, StatusCenterPostItem e)
+		private void OngoingTasksActions_ProgressBannerPosted(object? _, StatusCenterItem e)
 		{
 			if (OngoingTasksViewModel is not null)
 				OngoingTasksViewModel.ProgressBannerPosted -= OngoingTasksActions_ProgressBannerPosted;