Merge branch 'master' into sort

Author: lukeblevins

Files UWP/GenericFileBrowser.xaml

@@ -212,7 +212,7 @@
         </Grid.ContextFlyout>
         <ProgressBar x:Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
         <TextBlock Visibility="{x:Bind Mode=TwoWay, Path=TextState.isVisible, UpdateSourceTrigger=PropertyChanged}" x:Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
-        <controls:DataGrid ItemsSource="{x:Bind viewModelInstance.FilesAndFolders}" ScrollViewer.IsScrollInertiaEnabled="True"  ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" CanUserSortColumns="True" Sorting="AllView_Sorting" IsReadOnly="True" HorizontalAlignment="Left">
+        <controls:DataGrid ItemsSource="{x:Bind viewModelInstance.FilesAndFolders}" PreviewKeyDown="AllView_PreviewKeyDown" ScrollViewer.IsScrollInertiaEnabled="True"  ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" PreparingCellForEdit="AllView_PreparingCellForEdit" CellEditEnding="AllView_CellEditEnding" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" CanUserSortColumns="True" Sorting="AllView_Sorting" HorizontalAlignment="Left">
             <controls:DataGrid.Resources>
                 <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="Transparent"/>
                 <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="Transparent"/>
@@ -339,7 +339,7 @@
                         </DataTemplate>
                     </controls:DataGridTemplateColumn.CellTemplate>
                 </controls:DataGridTemplateColumn>
-                <controls:DataGridTextColumn DisplayIndex="1" x:Name="nameColumn" IsReadOnly="True" Header="Name" Width="275" Binding="{Binding FileName}" Tag="Name"/>
+                <controls:DataGridTextColumn DisplayIndex="1" x:Name="nameColumn" Header="Name" Width="275" Binding="{Binding FileName}" Tag="Name"/>
                 <controls:DataGridTextColumn DisplayIndex="2" x:Name="dateColumn" IsReadOnly="True" Header="Date modified" Width="Auto" Binding="{Binding FileDate}" Tag="Date"/>
                 <controls:DataGridTextColumn DisplayIndex="3" x:Name="typeColumn" IsReadOnly="True" Header="Type" Width="150" Binding="{Binding FileType}" Tag="Type"/>
                 <controls:DataGridTextColumn DisplayIndex="4" x:Name="sizeColumn" IsReadOnly="True" Header="Size" Width="Auto" MinWidth="100" Binding="{Binding FileSize}" Tag="Size"/>

Files UWP/GenericFileBrowser.xaml.cs

@@ -12,6 +12,8 @@
 using Files.Interacts;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Windows.System;
+using Windows.UI.Xaml.Input;
 
 namespace Files
 {
@@ -26,6 +28,7 @@ public sealed partial class GenericFileBrowser : Page
         public Page GFBPageName;
         public ContentDialog AddItemBox;
         public ContentDialog NameBox;
+        public string previousFileName;
         public TextBox inputFromRename;
         public string inputForRename;
         public Flyout CopiedFlyout;
@@ -152,11 +155,6 @@ private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e
             }
         }
 
-        private void AddItem_Click(object sender, RoutedEventArgs e)
-        {
-            //await AddDialog.ShowAsync();
-        }
-
         private void Clipboard_ContentChanged(object sender, object e)
         {
             try
@@ -199,7 +197,6 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
             Clipboard_ContentChanged(null, null);
             tabInstance.AlwaysPresentCommands.isEnabled = true;
-            tabInstance.AddItemButton.Click += AddItem_Click;
 
             TextState.isVisible = Visibility.Collapsed;
 
@@ -298,37 +295,32 @@ private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialo
             this.progressBar.Visibility = Visibility.Collapsed;
         }
 
-        private async void AllView_CellEditEnded(object sender, DataGridCellEditEndedEventArgs e)
+        private void AllView_PreparingCellForEdit(object sender, DataGridPreparingCellForEditEventArgs e)
         {
-            var newCellText = (data.SelectedItem as ListedItem)?.FileName;
-            var selectedItem = tabInstance.instanceViewModel.FilesAndFolders[e.Row.GetIndex()];
-            if(selectedItem.FileType == "Folder")
-            {
-                StorageFolder FolderToRename = await StorageFolder.GetFolderFromPathAsync(selectedItem.FilePath);
-                if(FolderToRename.Name != newCellText)
-                {
-                    await FolderToRename.RenameAsync(newCellText);
-                    AllView.CommitEdit();
-                }
-                else
-                {
-                    AllView.CancelEdit();
-                }
-            }
-            else
+            var textBox = e.EditingElement as TextBox;
+            var selectedItem = data.SelectedItem as ListedItem;
+            int extensionLength = selectedItem.DotFileExtension?.Length ?? 0;
+
+            previousFileName = selectedItem.FileName;
+            textBox.Focus(FocusState.Programmatic); // Without this, cannot edit text box when renaming via right-click
+            textBox.Select(0, selectedItem.FileName.Length - extensionLength);
+        }
+
+        private async void AllView_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
+        {
+            if (e.EditAction == DataGridEditAction.Cancel)
+                return;
+
+            var selectedItem = data.SelectedItem as ListedItem;
+            string currentName = previousFileName;
+            string newName = (e.EditingElement as TextBox).Text;
+
+            bool successful = await tabInstance.instanceInteraction.RenameFileItem(selectedItem, currentName, newName);
+            if (!successful)
             {
-                StorageFile fileToRename = await StorageFile.GetFileFromPathAsync(selectedItem.FilePath);
-                if (fileToRename.Name != newCellText)
-                {
-                    await fileToRename.RenameAsync(newCellText);
-                    AllView.CommitEdit();
-                }
-                else
-                {
-                    AllView.CancelEdit();
-                }
+                selectedItem.FileName = currentName;
+                ((sender as DataGrid).Columns[1].GetCellContent(e.Row) as TextBlock).Text = currentName;
             }
-            //Navigation.NavigationActions.Refresh_Click(null, null);
         }
 
         private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
@@ -408,8 +400,17 @@ private void AllView_Sorting(object sender, DataGridColumnEventArgs e)
             else if (e.Column != iconColumn)
                 SortedColumn = e.Column;
         }
+        
+        private void AllView_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (e.Key == VirtualKey.Enter)
+            {
+                tabInstance.instanceInteraction.List_ItemClick(null, null);
+                e.Handled = true;
+            }
+        }
     }
-
+  
     public class EmptyFolderTextState : INotifyPropertyChanged
     {
         public Visibility _isVisible;