Added a toolbar button to empty recycle bin (#6693)

cinqmilleans · web-flow · commit c67f2415a603 · 2021-11-06T22:07:55.000-04:00
diff --git a/Files/BaseLayout.cs b/Files/BaseLayout.cs
@@ -26,6 +26,7 @@
 using Windows.ApplicationModel.DataTransfer;
 using Windows.ApplicationModel.DataTransfer.DragDrop;
 using Windows.Foundation;
+using Windows.Foundation.Collections;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
@@ -108,10 +109,19 @@ public CollectionViewSource CollectionViewSource
             get => collectionViewSource;
             set
             {
-                if (collectionViewSource != value)
+                if (collectionViewSource == value)
                 {
-                    collectionViewSource = value;
-                    NotifyPropertyChanged(nameof(CollectionViewSource));
+                    return;
+                }
+                if (collectionViewSource?.View is not null)
+                {
+                    collectionViewSource.View.VectorChanged -= View_VectorChanged;
+                }
+                collectionViewSource = value;
+                NotifyPropertyChanged(nameof(CollectionViewSource));
+                if (collectionViewSource?.View is not null)
+                {
+                    collectionViewSource.View.VectorChanged += View_VectorChanged;
                 }
             }
         }
@@ -1098,6 +1108,11 @@ private void ItemManipulationModel_RefreshItemsOpacityInvoked(object sender, Eve
             }
         }
 
+        private void View_VectorChanged(IObservableVector<object> sender, IVectorChangedEventArgs @event)
+        {
+            ParentShellPageInstance.NavToolbarViewModel.HasItem = CollectionViewSource.View.Any();
+        }
+
         virtual public void StartRenameItem() { }
 
         private ListedItem preRenamingItem = null;
diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -2779,7 +2779,10 @@ We use App Center to keep track of app usage, find bugs, and fix crashes. All in
   <data name="SettingsImportErrorTitle" xml:space="preserve">
     <value>Error importing settings</value>
   </data>
-   <data name="Sidebar" xml:space="preserve">
+  <data name="EmptyRecycleBin" xml:space="preserve">
+    <value>Empty Recycle Bin</value>
+  </data>
+  <data name="Sidebar" xml:space="preserve">
     <value>Sidebar</value>
   </data>
   <data name="ChooseCustomIcon" xml:space="preserve">
diff --git a/Files/UserControls/InnerNavigationToolbar.xaml b/Files/UserControls/InnerNavigationToolbar.xaml
@@ -180,6 +180,18 @@
                         <local:ColoredIcon BaseLayerGlyph="&#xF035;" OverlayLayerGlyph="&#xF036;" />
                     </AppBarButton.Content>
                 </AppBarButton>
+                <AppBarSeparator x:Name="AdditionalActionSeparator" x:Load="{x:Bind ViewModel.HasAdditionnalAction, Mode=OneWay}" />
+                <AppBarButton
+                    x:Name="EmptyRecycleBinButton"
+                    Label="{helpers:ResourceString Name=EmptyRecycleBin}"
+                    ToolTipService.ToolTip="{helpers:ResourceString Name=EmptyRecycleBin}"
+                    IsEnabled="{x:Bind ViewModel.CanEmptyRecycleBin, Mode=OneWay}"
+                    Command="{x:Bind ViewModel.EmptyRecycleBinCommand, Mode=OneWay}"
+                    Visibility="{x:Bind ViewModel.InstanceViewModel.IsPageTypeRecycleBin, Mode=OneWay}">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xEF88;" FontFamily="{StaticResource RecycleBinIcons}" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
             </CommandBar.PrimaryCommands>
         </CommandBar>
         <CommandBar
diff --git a/Files/ViewModels/NavToolbarViewModel.cs b/Files/ViewModels/NavToolbarViewModel.cs
@@ -632,6 +632,12 @@ public void SwitchSearchBoxVisibility()
             }
         }
 
+        public void UpdateAdditionnalActions()
+        {
+            OnPropertyChanged(nameof(HasAdditionnalAction));
+            OnPropertyChanged(nameof(CanEmptyRecycleBin));
+        }
+
         private NavigationToolbar NavToolbar => (Window.Current.Content as Frame).FindDescendant<NavigationToolbar>();
 
         #region WidgetsPage Widgets
@@ -745,6 +751,8 @@ public void SearchRegion_LostFocus(object sender, RoutedEventArgs e)
 
         public ICommand CutCommand { get; set; }
 
+        public ICommand EmptyRecycleBinCommand { get; set; }
+
         public async Task SetPathBoxDropDownFlyoutAsync(MenuFlyout flyout, PathBoxItem pathItem, IShellPage shellPage)
         {
             var nextPathItemTitle = PathComponents[PathComponents.IndexOf(pathItem) + 1].Title;
@@ -1001,6 +1009,20 @@ public async void SetAddressBarSuggestions(AutoSuggestBox sender, IShellPage she
             }
         }
 
+        private bool hasItem = true;
+        public bool HasItem
+        {
+            get => hasItem;
+            set
+            {
+                if (SetProperty(ref hasItem, value))
+                {
+                    OnPropertyChanged(nameof(CanEmptyRecycleBin));
+                }
+            }
+
+        }
+
         private List<ListedItem> selectedItems;
 
         public List<ListedItem> SelectedItems
@@ -1017,9 +1039,12 @@ public List<ListedItem> SelectedItems
             }
         }
 
+        public bool HasAdditionnalAction => InstanceViewModel.IsPageTypeRecycleBin;
+
         public bool CanCopy => SelectedItems is not null && SelectedItems.Any();
         public bool CanShare => SelectedItems is not null && SelectedItems.Any() && DataTransferManager.IsSupported() && !SelectedItems.Any(x => (x.IsShortcutItem && !x.IsLinkItem) || x.IsHiddenItem || (x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsZipItem));
         public bool CanRename => SelectedItems is not null && SelectedItems.Count == 1;
+        public bool CanEmptyRecycleBin => InstanceViewModel.IsPageTypeRecycleBin && HasItem;
 
         public void Dispose()
         {
diff --git a/Files/Views/ColumnShellPage.xaml.cs b/Files/Views/ColumnShellPage.xaml.cs
@@ -220,6 +220,7 @@ private void InitToolbarCommands()
             NavToolbarViewModel.Share = new RelayCommand(() => SlimContentPage?.CommandsViewModel.ShareItemCommand.Execute(null));
             NavToolbarViewModel.DeleteCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.DeleteItemCommand.Execute(null));
             NavToolbarViewModel.CutCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.CutItemCommand.Execute(null));
+            NavToolbarViewModel.EmptyRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.EmptyRecycleBinCommand.Execute(null));
         }
 
         private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
diff --git a/Files/Views/ModernShellPage.xaml.cs b/Files/Views/ModernShellPage.xaml.cs
@@ -206,6 +206,7 @@ private void InitToolbarCommands()
             NavToolbarViewModel.Share = new RelayCommand(() => SlimContentPage?.CommandsViewModel.ShareItemCommand.Execute(null));
             NavToolbarViewModel.DeleteCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.DeleteItemCommand.Execute(null));
             NavToolbarViewModel.CutCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.CutItemCommand.Execute(null));
+            NavToolbarViewModel.EmptyRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.EmptyRecycleBinCommand.Execute(null));
         }
 
         private void ModernShellPage_RefreshWidgetsRequested(object sender, EventArgs e)
@@ -616,6 +617,7 @@ private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs
             ContentPage = await GetContentOrNullAsync();
             NavToolbarViewModel.SearchBox.Query = string.Empty;
             NavToolbarViewModel.IsSearchBoxVisible = false;
+            NavToolbarViewModel.UpdateAdditionnalActions();
             if (ItemDisplayFrame.CurrentSourcePageType == (typeof(DetailsLayoutBrowser))
                 || ItemDisplayFrame.CurrentSourcePageType == typeof(GridViewBrowser))
             {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`using Windows.ApplicationModel.DataTransfer;`
`27`	`27`	`using Windows.ApplicationModel.DataTransfer.DragDrop;`
`28`	`28`	`using Windows.Foundation;`
	`29`	`+using Windows.Foundation.Collections;`
`29`	`30`	`using Windows.Storage;`
`30`	`31`	`using Windows.System;`
`31`	`32`	`using Windows.UI.Core;`
`@@ -108,10 +109,19 @@ public CollectionViewSource CollectionViewSource`
`108`	`109`	`get => collectionViewSource;`
`109`	`110`	`set`
`110`	`111`	`{`
`111`		`- if (collectionViewSource != value)`
	`112`	`+ if (collectionViewSource == value)`
`112`	`113`	`{`
`113`		`- collectionViewSource = value;`
`114`		`- NotifyPropertyChanged(nameof(CollectionViewSource));`
	`114`	`+ return;`
	`115`	`+ }`
	`116`	`+ if (collectionViewSource?.View is not null)`
	`117`	`+ {`
	`118`	`+ collectionViewSource.View.VectorChanged -= View_VectorChanged;`
	`119`	`+ }`
	`120`	`+ collectionViewSource = value;`
	`121`	`+ NotifyPropertyChanged(nameof(CollectionViewSource));`
	`122`	`+ if (collectionViewSource?.View is not null)`
	`123`	`+ {`
	`124`	`+ collectionViewSource.View.VectorChanged += View_VectorChanged;`
`115`	`125`	`}`
`116`	`126`	`}`
`117`	`127`	`}`
`@@ -1098,6 +1108,11 @@ private void ItemManipulationModel_RefreshItemsOpacityInvoked(object sender, Eve`
`1098`	`1108`	`}`
`1099`	`1109`	`}`
`1100`	`1110`
	`1111`	`+ private void View_VectorChanged(IObservableVector<object> sender, IVectorChangedEventArgs @event)`
	`1112`	`+ {`
	`1113`	`+ ParentShellPageInstance.NavToolbarViewModel.HasItem = CollectionViewSource.View.Any();`
	`1114`	`+ }`
	`1115`	`+`
`1101`	`1116`	`virtual public void StartRenameItem() { }`
`1102`	`1117`
`1103`	`1118`	`private ListedItem preRenamingItem = null;`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@ private void InitToolbarCommands()`
`220`	`220`	`NavToolbarViewModel.Share = new RelayCommand(() => SlimContentPage?.CommandsViewModel.ShareItemCommand.Execute(null));`
`221`	`221`	`NavToolbarViewModel.DeleteCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.DeleteItemCommand.Execute(null));`
`222`	`222`	`NavToolbarViewModel.CutCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.CutItemCommand.Execute(null));`
	`223`	`+ NavToolbarViewModel.EmptyRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.EmptyRecycleBinCommand.Execute(null));`
`223`	`224`	`}`
`224`	`225`
`225`	`226`	`private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,7 @@ private void InitToolbarCommands()`
`206`	`206`	`NavToolbarViewModel.Share = new RelayCommand(() => SlimContentPage?.CommandsViewModel.ShareItemCommand.Execute(null));`
`207`	`207`	`NavToolbarViewModel.DeleteCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.DeleteItemCommand.Execute(null));`
`208`	`208`	`NavToolbarViewModel.CutCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.CutItemCommand.Execute(null));`
	`209`	`+ NavToolbarViewModel.EmptyRecycleBinCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.EmptyRecycleBinCommand.Execute(null));`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`private void ModernShellPage_RefreshWidgetsRequested(object sender, EventArgs e)`
`@@ -616,6 +617,7 @@ private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs`
`616`	`617`	`ContentPage = await GetContentOrNullAsync();`
`617`	`618`	`NavToolbarViewModel.SearchBox.Query = string.Empty;`
`618`	`619`	`NavToolbarViewModel.IsSearchBoxVisible = false;`
	`620`	`+ NavToolbarViewModel.UpdateAdditionnalActions();`
`619`	`621`	`if (ItemDisplayFrame.CurrentSourcePageType == (typeof(DetailsLayoutBrowser))`
`620`	`622`	`\|\| ItemDisplayFrame.CurrentSourcePageType == typeof(GridViewBrowser))`
`621`	`623`	`{`