Implemented the ability to rename files/folders from the properties window (#1781)

Co-authored-by: Vladyslav <[email protected]>

Author: d2dyno1

Files/Interacts/Interaction.cs

@@ -971,7 +971,7 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
             {
                 return false;
             }
-
+            
             CurrentInstance.NavigationToolbar.CanGoForward = false;
             return true;
         }
@@ -1652,4 +1652,4 @@ public async Task<string> GetHashForFile(ListedItem fileItem, string nameOfAlg,
             return CryptographicBuffer.EncodeToHexString(hash.GetValueAndReset()).ToLower();
         }
     }
-}
+}

Files/View Models/Properties/DriveProperties.cs

@@ -60,4 +60,4 @@ public override void GetSpecialProperties()
             }
         }
     }
-}
+}

Files/View Models/Properties/FileProperties.cs

@@ -39,6 +39,7 @@ public override void GetBaseProperties()
             if (Item != null)
             {
                 ViewModel.ItemName = Item.ItemName;
+                ViewModel.OriginalItemName = Item.ItemName;
                 ViewModel.ItemType = Item.ItemType;
                 ViewModel.ItemPath = Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath;
                 ViewModel.ItemModifiedTimestamp = Item.ItemDateModified;

Files/View Models/Properties/FolderProperties.cs

@@ -35,6 +35,7 @@ public override void GetBaseProperties()
             if (Item != null)
             {
                 ViewModel.ItemName = Item.ItemName;
+                ViewModel.OriginalItemName = Item.ItemName;
                 ViewModel.ItemType = Item.ItemType;
                 ViewModel.ItemPath = Path.IsPathRooted(Item.ItemPath) ? Path.GetDirectoryName(Item.ItemPath) : Item.ItemPath;
                 ViewModel.ItemModifiedTimestamp = Item.ItemDateModified;

Files/View Models/SelectedItemsPropertiesViewModel.cs

@@ -80,6 +80,18 @@ public string ItemName
             }
         }
 
+        private string _OriginalItemName;
+
+        public string OriginalItemName
+        {
+            get => _OriginalItemName;
+            set
+            {
+                ItemNameVisibility = Visibility.Visible;
+                SetProperty(ref _OriginalItemName, value);
+            }
+        }
+
         private Visibility _ItemNameVisibility = Visibility.Collapsed;
 
         public Visibility ItemNameVisibility

Files/Views/Pages/Properties.xaml

@@ -74,7 +74,7 @@
                 Grid.Column="1"
                 MinWidth="100"
                 HorizontalAlignment="Right"
-                Click="Button_Click"
+                Click="OKButton_Click"
                 Content="OK"
                 Style="{ThemeResource ButtonRevealStyle}" />
         </Grid>

Files/Views/Pages/Properties.xaml.cs

@@ -27,6 +27,8 @@ public sealed partial class Properties : Page
 
         private object navParameter;
 
+        private ListedItem listedItem;
+
         public SettingsViewModel AppSettings => App.AppSettings;
 
         public Properties()
@@ -38,6 +40,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             this.navParameter = e.Parameter;
             this.TabShorcut.Visibility = e.Parameter is ShortcutItem ? Visibility.Visible : Visibility.Collapsed;
+            this.listedItem = e.Parameter as ListedItem;
             this.SetBackground();
             base.OnNavigatedTo(e);
         }
@@ -157,8 +160,13 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             });
         }
 
-        private async void Button_Click(object sender, RoutedEventArgs e)
+        private async void OKButton_Click(object sender, RoutedEventArgs e)
         {
+            if (contentFrame.Content is PropertiesGeneral)
+            {
+                (contentFrame.Content as PropertiesGeneral).SaveChanges(listedItem);
+            }
+
             if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
             {
                 await ApplicationView.GetForCurrentView().TryConsolidateAsync();

Files/Views/Pages/PropertiesGeneral.xaml

@@ -101,16 +101,15 @@
                     Source="{x:Bind ViewModel.FileIconSource, Mode=OneWay}" />
             </Grid>
             <TextBox
-                x:Name="itemFileName"
+                x:Name="ItemFileName"
                 x:Uid="PropertiesItemFileName"
                 Grid.Row="0"
                 Grid.Column="1"
                 Margin="20,0"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Center"
                 BorderThickness="1"
-                IsReadOnly="True"
-                Text="{x:Bind ViewModel.ItemName, Mode=OneWay}"
+                Text="{x:Bind ViewModel.ItemName, Mode=TwoWay}"
                 Visibility="{x:Bind ViewModel.ItemNameVisibility, Mode=OneWay}" />
 
             <MenuFlyoutSeparator

Files/Views/Pages/PropertiesGeneral.xaml.cs

@@ -1,11 +1,13 @@
-using Files.Filesystem;
+using Files.Filesystem;
 using Files.View_Models;
 using Files.View_Models.Properties;
 using System.Collections.Generic;
 using Windows.Storage;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
+using Windows.ApplicationModel.Core;
+using Microsoft.Toolkit.Uwp.Helpers;
 
 // Il modello di elemento Pagina vuota è documentato all'indirizzo https://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -61,5 +63,15 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
             base.OnNavigatedTo(e);
         }
+
+        public async void SaveChanges(ListedItem item)
+        {
+            if (ViewModel.OriginalItemName != null)
+            {
+                await CoreApplication.MainView.ExecuteOnUIThreadAsync(() => App.CurrentInstance.InteractionOperations.RenameFileItem(item,
+                      ViewModel.OriginalItemName,
+                      ViewModel.ItemName));
+            }
+        }
     }
-}
+}