From 8dd3971cba44971e0b51732fd4cd79d0df1366a1 Mon Sep 17 00:00:00 2001
From: Steven He <hez2010@outlook.com>
Date: Sat, 16 Oct 2021 18:23:37 +0800
Subject: [PATCH 1/2] Add InfoBadge to status center

---
 Files/UserControls/NavigationToolbar.xaml    | 39 +++++++++++++++++++-
 Files/UserControls/NavigationToolbar.xaml.cs |  1 +
 Files/ViewModels/StatusCenterViewModel.cs    | 37 ++++++++++++++++++-
 3 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/Files/UserControls/NavigationToolbar.xaml b/Files/UserControls/NavigationToolbar.xaml
index 75f7c6d14ef9..2bc1dac4fc55 100644
--- a/Files/UserControls/NavigationToolbar.xaml
+++ b/Files/UserControls/NavigationToolbar.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Files.UserControls.NavigationToolbar"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -335,6 +335,7 @@
         Background="{ThemeResource NavigationToolbarBackgroundBrush}"
         ColumnSpacing="0"
         CornerRadius="{StaticResource NavToolbarCornerRadius}">
+        
         <Grid Padding="8,0,8,8" ColumnSpacing="4">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -557,6 +558,7 @@
                             </Flyout>
                         </Button.Flyout>
                     </Button>
+                    <muxc:InfoBadge x:Name="StatusInfoBadge" HorizontalAlignment="Right" VerticalAlignment="Top" Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
                 </Grid>
 
                 <Button
@@ -602,6 +604,41 @@
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
+            <VisualStateGroup>
+                <VisualState x:Name="TasksSuccess">
+                    <VisualState.StateTriggers>
+                        <triggers:CompareStateTrigger Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}" Comparison="Equal" To="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="StatusInfoBadge.Style" Value="{StaticResource SuccessIconInfoBadgeStyle}" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="TasksOnging">
+                    <VisualState.StateTriggers>
+                        <triggers:CompareStateTrigger Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}" Comparison="Equal" To="1" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="StatusInfoBadge.Style" Value="{StaticResource AttentionValueInfoBadgeStyle}" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="TasksFailure">
+                    <VisualState.StateTriggers>
+                        <triggers:CompareStateTrigger Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}" Comparison="Equal" To="2" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalValueInfoBadgeStyle}" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="TasksCompletionWithFailure">
+                    <VisualState.StateTriggers>
+                        <triggers:CompareStateTrigger Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}" Comparison="Equal" To="3" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalIconInfoBadgeStyle}" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
+
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Files/UserControls/NavigationToolbar.xaml.cs b/Files/UserControls/NavigationToolbar.xaml.cs
index 76179f198e84..e20413535a3c 100644
--- a/Files/UserControls/NavigationToolbar.xaml.cs
+++ b/Files/UserControls/NavigationToolbar.xaml.cs
@@ -50,6 +50,7 @@ public NavigationToolbar()
         {
             InitializeComponent();
             Loading += NavigationToolbar_Loading;
+            DataContext = OngoingTasksViewModel;
         }
 
         private void NavigationToolbar_Loading(FrameworkElement sender, object args)
diff --git a/Files/ViewModels/StatusCenterViewModel.cs b/Files/ViewModels/StatusCenterViewModel.cs
index 52bde7d842ec..77f1c13c9b00 100644
--- a/Files/ViewModels/StatusCenterViewModel.cs
+++ b/Files/ViewModels/StatusCenterViewModel.cs
@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Threading;
 using System.Windows.Input;
+using Windows.ApplicationModel.Core;
 using Windows.UI;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -64,6 +65,27 @@ public bool AnyBannersPresent
             get => StatusBannersSource.Any();
         }
 
+        public int InfoBadgeState
+        {
+            get
+            {
+                var anyFailure = StatusBannersSource.Any(i => i.Status != ReturnResult.InProgress && i.Status != ReturnResult.Success);
+
+                return (anyFailure, AnyOperationsOngoing) switch
+                {
+                    (false, false) => 0, // all success
+                    (false, true) => 1, // ongoing
+                    (true, true) => 2, // onging with failure
+                    (true, false) => 3 // completed with failure
+                };
+            }
+        }
+
+        public int InfoBadgeValue
+        {
+            get => OngoingOperationsCount > 0 ? OngoingOperationsCount : -1;
+        }
+
         #endregion Public Properties
 
         #region Events
@@ -120,6 +142,8 @@ public void UpdateBanner(StatusBanner banner)
         {
             OnPropertyChanged(nameof(OngoingOperationsCount));
             OnPropertyChanged(nameof(AnyOperationsOngoing));
+            OnPropertyChanged(nameof(InfoBadgeState));
+            OnPropertyChanged(nameof(InfoBadgeValue));
         }
 
         public void UpdateMedianProgress()
@@ -203,6 +227,8 @@ private void ReportProgressToBanner(float value)
 
         private void ReportProgressToBanner(ReturnResult value)
         {
+            Banner.Status = value;
+            OngoingTasksActions.UpdateBanner(Banner);
         }
 
         #endregion Private Helpers
@@ -260,7 +286,16 @@ public bool IsProgressing
 
         public string Title { get; private set; }
 
-        public ReturnResult Status { get; private set; } = ReturnResult.InProgress;
+        private ReturnResult status = ReturnResult.InProgress;
+
+        public ReturnResult Status
+        {
+            get => status;
+            set
+            {
+                SetProperty(ref status, value);
+            }
+        }
 
         public FileOperationType Operation { get; private set; }
 

From 89b8ea5d3db7cc4a25e5154537304a452f2abdbe Mon Sep 17 00:00:00 2001
From: Steve <hez2010@outlook.com>
Date: Sat, 16 Oct 2021 18:27:47 +0800
Subject: [PATCH 2/2] Remove redundant BOM and DataContext assignment

---
 Files/UserControls/NavigationToolbar.xaml.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Files/UserControls/NavigationToolbar.xaml.cs b/Files/UserControls/NavigationToolbar.xaml.cs
index e20413535a3c..067d1ca59481 100644
--- a/Files/UserControls/NavigationToolbar.xaml.cs
+++ b/Files/UserControls/NavigationToolbar.xaml.cs
@@ -1,4 +1,4 @@
-using Files.Helpers.XamlHelpers;
+using Files.Helpers.XamlHelpers;
 using Files.ViewModels;
 using System.Windows.Input;
 using Windows.System;
@@ -50,7 +50,6 @@ public NavigationToolbar()
         {
             InitializeComponent();
             Loading += NavigationToolbar_Loading;
-            DataContext = OngoingTasksViewModel;
         }
 
         private void NavigationToolbar_Loading(FrameworkElement sender, object args)
@@ -173,4 +172,4 @@ public bool ShowSettingsButton
         public static readonly DependencyProperty ShowSettingsButtonProperty =
             DependencyProperty.Register(nameof(ShowSettingsButton), typeof(bool), typeof(NavigationToolbar), new PropertyMetadata(null));
     }
-}
\ No newline at end of file
+}