Improved Properties Dialog codebase (#4468)

d2dyno1 · web-flow · commit 6de9ff0ea2fa · 2021-04-14T13:14:41.000-05:00
diff --git a/Files/ViewModels/Properties/FileProperties.cs b/Files/ViewModels/Properties/FileProperties.cs
@@ -27,15 +27,15 @@ namespace Files.ViewModels.Properties
 {
     public class FileProperties : BaseProperties
     {
-        private ProgressBar ProgressBar;
+        private IProgress<float> hashProgress;
 
         public ListedItem Item { get; }
 
-        public FileProperties(SelectedItemsPropertiesViewModel viewModel, CancellationTokenSource tokenSource, CoreDispatcher coreDispatcher, ProgressBar progressBar, ListedItem item, IShellPage instance)
+        public FileProperties(SelectedItemsPropertiesViewModel viewModel, CancellationTokenSource tokenSource, CoreDispatcher coreDispatcher, IProgress<float> hashProgress, ListedItem item, IShellPage instance)
         {
             ViewModel = viewModel;
             TokenSource = tokenSource;
-            ProgressBar = progressBar;
+            this.hashProgress = hashProgress;
             Dispatcher = coreDispatcher;
             Item = item;
             AppInstance = instance;
@@ -148,7 +148,7 @@ public override async void GetSpecialProperties()
             ViewModel.ItemMD5HashVisibility = Visibility.Visible;
             try
             {
-                ViewModel.ItemMD5Hash = await GetHashForFileAsync(Item, hashAlgTypeName, TokenSource.Token, ProgressBar, AppInstance);
+                ViewModel.ItemMD5Hash = await GetHashForFileAsync(Item, hashAlgTypeName, TokenSource.Token, hashProgress, AppInstance);
             }
             catch (Exception ex)
             {
@@ -341,7 +341,7 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
             }
         }
 
-        private async Task<string> GetHashForFileAsync(ListedItem fileItem, string nameOfAlg, CancellationToken token, ProgressBar progress, IShellPage associatedInstance)
+        private async Task<string> GetHashForFileAsync(ListedItem fileItem, string nameOfAlg, CancellationToken token, IProgress<float> progress, IShellPage associatedInstance)
         {
             HashAlgorithmProvider algorithmProvider = HashAlgorithmProvider.OpenAlgorithm(nameOfAlg);
             StorageFile file = await StorageItemHelpers.ToStorageItem<StorageFile>((fileItem as ShortcutItem)?.TargetPath ?? fileItem.ItemPath, associatedInstance);
@@ -382,10 +382,7 @@ private async Task<string> GetHashForFileAsync(ListedItem fileItem, string nameO
                 {
                     break;
                 }
-                if (progress != null)
-                {
-                    progress.Value = (double)str.Position / str.Length * 100;
-                }
+                progress?.Report((float)str.Position / str.Length * 100.0f);
             }
             inputStream.Dispose();
             stream.Dispose();
diff --git a/Files/ViewModels/Properties/PropertiesTab.cs b/Files/ViewModels/Properties/PropertiesTab.cs
@@ -1,21 +1,23 @@
 ﻿using Files.Filesystem;
+using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
 namespace Files.ViewModels.Properties
 {
-    public abstract class PropertiesTab : Page
+    public abstract class PropertiesTab : Page, IDisposable
     {
         public IShellPage AppInstance = null;
 
         public BaseProperties BaseProperties { get; set; }
 
         public SelectedItemsPropertiesViewModel ViewModel { get; set; }
 
-        protected Microsoft.UI.Xaml.Controls.ProgressBar ItemMD5HashProgress = null;
+        protected IProgress<float> hashProgress;
 
         protected virtual void Properties_Loaded(object sender, RoutedEventArgs e)
         {
@@ -40,7 +42,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
             {
                 if (item.PrimaryItemAttribute == StorageItemTypes.File)
                 {
-                    BaseProperties = new FileProperties(ViewModel, np.tokenSource, Dispatcher, ItemMD5HashProgress, item, AppInstance);
+                    BaseProperties = new FileProperties(ViewModel, np.tokenSource, Dispatcher, hashProgress, item, AppInstance);
                 }
                 else if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
                 {
@@ -68,5 +70,13 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
 
             base.OnNavigatedFrom(e);
         }
+
+        /// <summary>
+        /// Tries to save changed properties to file.
+        /// </summary>
+        /// <returns>Returns true if properties have been saved successfully.</returns>
+        public abstract Task<bool> SaveChangesAsync(ListedItem item);
+
+        public abstract void Dispose();
     }
 }
diff --git a/Files/Views/Pages/Properties.xaml.cs b/Files/Views/Pages/Properties.xaml.cs
@@ -2,6 +2,7 @@
 using Files.Helpers;
 using Files.Helpers.XamlHelpers;
 using Files.ViewModels;
+using Files.ViewModels.Properties;
 using Microsoft.Toolkit.Uwp.Helpers;
 using System;
 using System.Threading;
@@ -141,21 +142,15 @@ private async void OKButton_Click(object sender, RoutedEventArgs e)
             {
                 await propertiesGeneral.SaveChangesAsync(listedItem);
             }
-            else if (contentFrame.Content is PropertiesLibrary propertiesLibrary)
-            {
-                if (!await propertiesLibrary.SaveChangesAsync())
-                {
-                    return;
-                }
-            }
-            else if (contentFrame.Content is PropertiesDetails propertiesDetails)
+            else
             {
-                if (!await propertiesDetails.SaveChangesAsync())
+                if (!await (contentFrame.Content as PropertiesTab).SaveChangesAsync(listedItem))
                 {
                     return;
                 }
             }
 
+            (contentFrame.Content as PropertiesTab).Dispose();
             if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
             {
                 await ApplicationView.GetForCurrentView().TryConsolidateAsync();
diff --git a/Files/Views/Pages/PropertiesDetails.xaml.cs b/Files/Views/Pages/PropertiesDetails.xaml.cs
@@ -1,5 +1,6 @@
 ﻿using Files.Dialogs;
 using Files.Enums;
+using Files.Filesystem;
 using Files.Helpers;
 using Files.ViewModels.Properties;
 using System;
@@ -29,11 +30,7 @@ protected override void Properties_Loaded(object sender, RoutedEventArgs e)
             }
         }
 
-        /// <summary>
-        /// Tries to save changed properties to file.
-        /// </summary>
-        /// <returns>Returns true if properties have been saved successfully.</returns>
-        public async Task<bool> SaveChangesAsync()
+        public override async Task<bool> SaveChangesAsync(ListedItem item)
         {
             while (true)
             {
@@ -72,5 +69,9 @@ private async void ClearPropertiesConfirmation_Click(object sender, RoutedEventA
             ClearPropertiesFlyout.Hide();
             await (BaseProperties as FileProperties).ClearPropertiesAsync();
         }
+
+        public override void Dispose()
+        {
+        }
     }
 }
diff --git a/Files/Views/Pages/PropertiesGeneral.xaml.cs b/Files/Views/Pages/PropertiesGeneral.xaml.cs
@@ -3,6 +3,7 @@
 using Files.Helpers;
 using Files.ViewModels.Properties;
 using Microsoft.Toolkit.Uwp;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
@@ -15,10 +16,17 @@ public sealed partial class PropertiesGeneral : PropertiesTab
         public PropertiesGeneral()
         {
             this.InitializeComponent();
-            base.ItemMD5HashProgress = ItemMD5HashProgress;
+            base.hashProgress = new Progress<float>();
+
+            (base.hashProgress as Progress<float>).ProgressChanged += PropertiesGeneral_ProgressChanged;
         }
 
-        public async Task SaveChangesAsync(ListedItem item)
+        private void PropertiesGeneral_ProgressChanged(object sender, float e)
+        {
+            ItemMD5HashProgress.Value = (double)e;
+        }
+
+        public override async Task<bool> SaveChangesAsync(ListedItem item)
         {
             if (BaseProperties is DriveProperties driveProps)
             {
@@ -38,6 +46,7 @@ public async Task SaveChangesAsync(ListedItem item)
                             await drive.UpdateLabelAsync();
                             await AppInstance.FilesystemViewModel?.SetWorkingDirectoryAsync(drive.Path);
                         });
+                        return true;
                     }
                 }
             }
@@ -58,6 +67,7 @@ public async Task SaveChangesAsync(ListedItem item)
                             {
                                 await AppInstance.FilesystemViewModel?.SetWorkingDirectoryAsync(newPath);
                             });
+                            return true;
                         }
                     }
                 }
@@ -66,7 +76,7 @@ public async Task SaveChangesAsync(ListedItem item)
             {
                 if (!string.IsNullOrWhiteSpace(ViewModel.ItemName) && ViewModel.OriginalItemName != ViewModel.ItemName)
                 {
-                    await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.RenameFileItemAsync(item,
+                    return await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.RenameFileItemAsync(item,
                           ViewModel.OriginalItemName,
                           ViewModel.ItemName,
                           AppInstance));
@@ -80,13 +90,23 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHe
                     {
                         await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(fileOrFolder, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
                     }
+                    return true;
                 }
                 else
                 {
                     // Handle the visibility attribute for a single file
                     await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(item, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));
+
+                    return true;
                 }
             }
+
+            return false;
+        }
+
+        public override void Dispose()
+        {
+            (base.hashProgress as Progress<float>).ProgressChanged -= PropertiesGeneral_ProgressChanged;
         }
     }
 }
diff --git a/Files/Views/Pages/PropertiesLibrary.xaml.cs b/Files/Views/Pages/PropertiesLibrary.xaml.cs
@@ -170,11 +170,7 @@ private bool IsChanged(LibraryItem lib, out string newDefaultSaveFolder, out str
             return isChanged;
         }
 
-        /// <summary>
-        /// Tries to save changed properties to file.
-        /// </summary>
-        /// <returns>Returns true if properties have been saved successfully.</returns>
-        public async Task<bool> SaveChangesAsync()
+        public override async Task<bool> SaveChangesAsync(ListedItem item)
         {
             if (BaseProperties is LibraryProperties props)
             {
@@ -227,6 +223,10 @@ public async Task<bool> SaveChangesAsync()
             return false;
         }
 
+        public override void Dispose()
+        {
+        }
+
         public class LibraryFolder
         {
             public string Path { get; set; }
diff --git a/Files/Views/Pages/PropertiesShortcut.xaml.cs b/Files/Views/Pages/PropertiesShortcut.xaml.cs
@@ -1,4 +1,6 @@
-﻿using Files.ViewModels.Properties;
+﻿using Files.Filesystem;
+using Files.ViewModels.Properties;
+using System.Threading.Tasks;
 
 namespace Files.Views
 {
@@ -8,5 +10,13 @@ public PropertiesShortcut()
         {
             this.InitializeComponent();
         }
+
+        public async override Task<bool> SaveChangesAsync(ListedItem item)
+        {
+            return false;
+        }
+        public override void Dispose()
+        {
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@ namespace Files.ViewModels.Properties`
`27`	`27`	`{`
`28`	`28`	`public class FileProperties : BaseProperties`
`29`	`29`	`{`
`30`		`- private ProgressBar ProgressBar;`
	`30`	`+ private IProgress<float> hashProgress;`
`31`	`31`
`32`	`32`	`public ListedItem Item { get; }`
`33`	`33`
`34`		`- public FileProperties(SelectedItemsPropertiesViewModel viewModel, CancellationTokenSource tokenSource, CoreDispatcher coreDispatcher, ProgressBar progressBar, ListedItem item, IShellPage instance)`
	`34`	`+ public FileProperties(SelectedItemsPropertiesViewModel viewModel, CancellationTokenSource tokenSource, CoreDispatcher coreDispatcher, IProgress<float> hashProgress, ListedItem item, IShellPage instance)`
`35`	`35`	`{`
`36`	`36`	`ViewModel = viewModel;`
`37`	`37`	`TokenSource = tokenSource;`
`38`		`- ProgressBar = progressBar;`
	`38`	`+ this.hashProgress = hashProgress;`
`39`	`39`	`Dispatcher = coreDispatcher;`
`40`	`40`	`Item = item;`
`41`	`41`	`AppInstance = instance;`
`@@ -148,7 +148,7 @@ public override async void GetSpecialProperties()`
`148`	`148`	`ViewModel.ItemMD5HashVisibility = Visibility.Visible;`
`149`	`149`	`try`
`150`	`150`	`{`
`151`		`- ViewModel.ItemMD5Hash = await GetHashForFileAsync(Item, hashAlgTypeName, TokenSource.Token, ProgressBar, AppInstance);`
	`151`	`+ ViewModel.ItemMD5Hash = await GetHashForFileAsync(Item, hashAlgTypeName, TokenSource.Token, hashProgress, AppInstance);`
`152`	`152`	`}`
`153`	`153`	`catch (Exception ex)`
`154`	`154`	`{`
`@@ -341,7 +341,7 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`344`		`- private async Task<string> GetHashForFileAsync(ListedItem fileItem, string nameOfAlg, CancellationToken token, ProgressBar progress, IShellPage associatedInstance)`
	`344`	`+ private async Task<string> GetHashForFileAsync(ListedItem fileItem, string nameOfAlg, CancellationToken token, IProgress<float> progress, IShellPage associatedInstance)`
`345`	`345`	`{`
`346`	`346`	`HashAlgorithmProvider algorithmProvider = HashAlgorithmProvider.OpenAlgorithm(nameOfAlg);`
`347`	`347`	`StorageFile file = await StorageItemHelpers.ToStorageItem<StorageFile>((fileItem as ShortcutItem)?.TargetPath ?? fileItem.ItemPath, associatedInstance);`
`@@ -382,10 +382,7 @@ private async Task<string> GetHashForFileAsync(ListedItem fileItem, string nameO`
`382`	`382`	`{`
`383`	`383`	`break;`
`384`	`384`	`}`
`385`		`- if (progress != null)`
`386`		`- {`
`387`		`- progress.Value = (double)str.Position / str.Length * 100;`
`388`		`- }`
	`385`	`+ progress?.Report((float)str.Position / str.Length * 100.0f);`
`389`	`386`	`}`
`390`	`387`	`inputStream.Dispose();`
`391`	`388`	`stream.Dispose();`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,23 @@`
`1`	`1`	`using Files.Filesystem;`
	`2`	`+using System;`
`2`	`3`	`using System.Collections.Generic;`
	`4`	`+using System.Threading.Tasks;`
`3`	`5`	`using Windows.Storage;`
`4`	`6`	`using Windows.UI.Xaml;`
`5`	`7`	`using Windows.UI.Xaml.Controls;`
`6`	`8`	`using Windows.UI.Xaml.Navigation;`
`7`	`9`
`8`	`10`	`namespace Files.ViewModels.Properties`
`9`	`11`	`{`
`10`		`- public abstract class PropertiesTab : Page`
	`12`	`+ public abstract class PropertiesTab : Page, IDisposable`
`11`	`13`	`{`
`12`	`14`	`public IShellPage AppInstance = null;`
`13`	`15`
`14`	`16`	`public BaseProperties BaseProperties { get; set; }`
`15`	`17`
`16`	`18`	`public SelectedItemsPropertiesViewModel ViewModel { get; set; }`
`17`	`19`
`18`		`- protected Microsoft.UI.Xaml.Controls.ProgressBar ItemMD5HashProgress = null;`
	`20`	`+ protected IProgress<float> hashProgress;`
`19`	`21`
`20`	`22`	`protected virtual void Properties_Loaded(object sender, RoutedEventArgs e)`
`21`	`23`	`{`
`@@ -40,7 +42,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`40`	`42`	`{`
`41`	`43`	`if (item.PrimaryItemAttribute == StorageItemTypes.File)`
`42`	`44`	`{`
`43`		`- BaseProperties = new FileProperties(ViewModel, np.tokenSource, Dispatcher, ItemMD5HashProgress, item, AppInstance);`
	`45`	`+ BaseProperties = new FileProperties(ViewModel, np.tokenSource, Dispatcher, hashProgress, item, AppInstance);`
`44`	`46`	`}`
`45`	`47`	`else if (item.PrimaryItemAttribute == StorageItemTypes.Folder)`
`46`	`48`	`{`
`@@ -68,5 +70,13 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)`
`68`	`70`
`69`	`71`	`base.OnNavigatedFrom(e);`
`70`	`72`	`}`
	`73`	`+`
	`74`	`+ /// <summary>`
	`75`	`+ /// Tries to save changed properties to file.`
	`76`	`+ /// </summary>`
	`77`	`+ /// <returns>Returns true if properties have been saved successfully.</returns>`
	`78`	`+ public abstract Task<bool> SaveChangesAsync(ListedItem item);`
	`79`	`+`
	`80`	`+ public abstract void Dispose();`
`71`	`81`	`}`
`72`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Files.Helpers;`
`3`	`3`	`using Files.Helpers.XamlHelpers;`
`4`	`4`	`using Files.ViewModels;`
	`5`	`+using Files.ViewModels.Properties;`
`5`	`6`	`using Microsoft.Toolkit.Uwp.Helpers;`
`6`	`7`	`using System;`
`7`	`8`	`using System.Threading;`
`@@ -141,21 +142,15 @@ private async void OKButton_Click(object sender, RoutedEventArgs e)`
`141`	`142`	`{`
`142`	`143`	`await propertiesGeneral.SaveChangesAsync(listedItem);`
`143`	`144`	`}`
`144`		`- else if (contentFrame.Content is PropertiesLibrary propertiesLibrary)`
`145`		`- {`
`146`		`- if (!await propertiesLibrary.SaveChangesAsync())`
`147`		`- {`
`148`		`- return;`
`149`		`- }`
`150`		`- }`
`151`		`- else if (contentFrame.Content is PropertiesDetails propertiesDetails)`
	`145`	`+ else`
`152`	`146`	`{`
`153`		`- if (!await propertiesDetails.SaveChangesAsync())`
	`147`	`+ if (!await (contentFrame.Content as PropertiesTab).SaveChangesAsync(listedItem))`
`154`	`148`	`{`
`155`	`149`	`return;`
`156`	`150`	`}`
`157`	`151`	`}`
`158`	`152`
	`153`	`+ (contentFrame.Content as PropertiesTab).Dispose();`
`159`	`154`	`if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))`
`160`	`155`	`{`
`161`	`156`	`await ApplicationView.GetForCurrentView().TryConsolidateAsync();`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Files.Dialogs;`
`2`	`2`	`using Files.Enums;`
	`3`	`+using Files.Filesystem;`
`3`	`4`	`using Files.Helpers;`
`4`	`5`	`using Files.ViewModels.Properties;`
`5`	`6`	`using System;`
`@@ -29,11 +30,7 @@ protected override void Properties_Loaded(object sender, RoutedEventArgs e)`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`
`32`		`- /// <summary>`
`33`		`- /// Tries to save changed properties to file.`
`34`		`- /// </summary>`
`35`		`- /// <returns>Returns true if properties have been saved successfully.</returns>`
`36`		`- public async Task<bool> SaveChangesAsync()`
	`33`	`+ public override async Task<bool> SaveChangesAsync(ListedItem item)`
`37`	`34`	`{`
`38`	`35`	`while (true)`
`39`	`36`	`{`
`@@ -72,5 +69,9 @@ private async void ClearPropertiesConfirmation_Click(object sender, RoutedEventA`
`72`	`69`	`ClearPropertiesFlyout.Hide();`
`73`	`70`	`await (BaseProperties as FileProperties).ClearPropertiesAsync();`
`74`	`71`	`}`
	`72`	`+`
	`73`	`+ public override void Dispose()`
	`74`	`+ {`
	`75`	`+ }`
`75`	`76`	`}`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using Files.Helpers;`
`4`	`4`	`using Files.ViewModels.Properties;`
`5`	`5`	`using Microsoft.Toolkit.Uwp;`
	`6`	`+using System;`
`6`	`7`	`using System.IO;`
`7`	`8`	`using System.Threading.Tasks;`
`8`	`9`	`using Windows.ApplicationModel.Core;`
`@@ -15,10 +16,17 @@ public sealed partial class PropertiesGeneral : PropertiesTab`
`15`	`16`	`public PropertiesGeneral()`
`16`	`17`	`{`
`17`	`18`	`this.InitializeComponent();`
`18`		`- base.ItemMD5HashProgress = ItemMD5HashProgress;`
	`19`	`+ base.hashProgress = new Progress<float>();`
	`20`	`+`
	`21`	`+ (base.hashProgress as Progress<float>).ProgressChanged += PropertiesGeneral_ProgressChanged;`
`19`	`22`	`}`
`20`	`23`
`21`		`- public async Task SaveChangesAsync(ListedItem item)`
	`24`	`+ private void PropertiesGeneral_ProgressChanged(object sender, float e)`
	`25`	`+ {`
	`26`	`+ ItemMD5HashProgress.Value = (double)e;`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ public override async Task<bool> SaveChangesAsync(ListedItem item)`
`22`	`30`	`{`
`23`	`31`	`if (BaseProperties is DriveProperties driveProps)`
`24`	`32`	`{`
`@@ -38,6 +46,7 @@ public async Task SaveChangesAsync(ListedItem item)`
`38`	`46`	`await drive.UpdateLabelAsync();`
`39`	`47`	`await AppInstance.FilesystemViewModel?.SetWorkingDirectoryAsync(drive.Path);`
`40`	`48`	`});`
	`49`	`+ return true;`
`41`	`50`	`}`
`42`	`51`	`}`
`43`	`52`	`}`
`@@ -58,6 +67,7 @@ public async Task SaveChangesAsync(ListedItem item)`
`58`	`67`	`{`
`59`	`68`	`await AppInstance.FilesystemViewModel?.SetWorkingDirectoryAsync(newPath);`
`60`	`69`	`});`
	`70`	`+ return true;`
`61`	`71`	`}`
`62`	`72`	`}`
`63`	`73`	`}`
`@@ -66,7 +76,7 @@ public async Task SaveChangesAsync(ListedItem item)`
`66`	`76`	`{`
`67`	`77`	`if (!string.IsNullOrWhiteSpace(ViewModel.ItemName) && ViewModel.OriginalItemName != ViewModel.ItemName)`
`68`	`78`	`{`
`69`		`- await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.RenameFileItemAsync(item,`
	`79`	`+ return await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.RenameFileItemAsync(item,`
`70`	`80`	`ViewModel.OriginalItemName,`
`71`	`81`	`ViewModel.ItemName,`
`72`	`82`	`AppInstance));`
`@@ -80,13 +90,23 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHe`
`80`	`90`	`{`
`81`	`91`	`await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(fileOrFolder, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));`
`82`	`92`	`}`
	`93`	`+ return true;`
`83`	`94`	`}`
`84`	`95`	`else`
`85`	`96`	`{`
`86`	`97`	`// Handle the visibility attribute for a single file`
`87`	`98`	`await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => UIFilesystemHelpers.SetHiddenAttributeItem(item, ViewModel.IsHidden, AppInstance.SlimContentPage.ItemManipulationModel));`
	`99`	`+`
	`100`	`+ return true;`
`88`	`101`	`}`
`89`	`102`	`}`
	`103`	`+`
	`104`	`+ return false;`
	`105`	`+ }`
	`106`	`+`
	`107`	`+ public override void Dispose()`
	`108`	`+ {`
	`109`	`+ (base.hashProgress as Progress<float>).ProgressChanged -= PropertiesGeneral_ProgressChanged;`
`90`	`110`	`}`
`91`	`111`	`}`
`92`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,11 +170,7 @@ private bool IsChanged(LibraryItem lib, out string newDefaultSaveFolder, out str`
`170`	`170`	`return isChanged;`
`171`	`171`	`}`
`172`	`172`
`173`		`- /// <summary>`
`174`		`- /// Tries to save changed properties to file.`
`175`		`- /// </summary>`
`176`		`- /// <returns>Returns true if properties have been saved successfully.</returns>`
`177`		`- public async Task<bool> SaveChangesAsync()`
	`173`	`+ public override async Task<bool> SaveChangesAsync(ListedItem item)`
`178`	`174`	`{`
`179`	`175`	`if (BaseProperties is LibraryProperties props)`
`180`	`176`	`{`
`@@ -227,6 +223,10 @@ public async Task<bool> SaveChangesAsync()`
`227`	`223`	`return false;`
`228`	`224`	`}`
`229`	`225`
	`226`	`+ public override void Dispose()`
	`227`	`+ {`
	`228`	`+ }`
	`229`	`+`
`230`	`230`	`public class LibraryFolder`
`231`	`231`	`{`
`232`	`232`	`public string Path { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using Files.ViewModels.Properties;`
	`1`	`+using Files.Filesystem;`
	`2`	`+using Files.ViewModels.Properties;`
	`3`	`+using System.Threading.Tasks;`
`2`	`4`
`3`	`5`	`namespace Files.Views`
`4`	`6`	`{`
`@@ -8,5 +10,13 @@ public PropertiesShortcut()`
`8`	`10`	`{`
`9`	`11`	`this.InitializeComponent();`
`10`	`12`	`}`
	`13`	`+`
	`14`	`+ public async override Task<bool> SaveChangesAsync(ListedItem item)`
	`15`	`+ {`
	`16`	`+ return false;`
	`17`	`+ }`
	`18`	`+ public override void Dispose()`
	`19`	`+ {`
	`20`	`+ }`
`11`	`21`	`}`
`12`	`22`	`}`