Add inline renaming support for PhotoGrid

Issues:
- Renaming files with long names will
  show a cut-off textbox

Author: jeffsieu

Files UWP/Interacts/Interaction.cs

@@ -825,13 +825,14 @@ public void RenameItem_Click(object sender, RoutedEventArgs e)
             if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
             {
                 var fileBrowser = App.selectedTabInstance.accessibleContentFrame.Content as GenericFileBrowser;
-                fileBrowser.AllView.CurrentColumn = fileBrowser.AllView.Columns[1];
+                if (fileBrowser.AllView.SelectedItem != null)
+                    fileBrowser.AllView.CurrentColumn = fileBrowser.AllView.Columns[1];
                 fileBrowser.AllView.BeginEdit();
             }
             else if (App.selectedTabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
             {
                 var photoAlbum = App.selectedTabInstance.accessibleContentFrame.Content as PhotoAlbum;
-                photoAlbum.ShowRenameDialog();
+                photoAlbum.StartRename();
             }
         }
 

Files UWP/PhotoAlbum.xaml

@@ -512,10 +512,10 @@
             </GridView.ItemContainerStyle>
             <GridView.ItemTemplate>
                 <DataTemplate x:DataType="local2:ListedItem">
-                    <Grid IsRightTapEnabled="True" RightTapped="StackPanel_RightTapped" Width="125" Height="125" Tag="{x:Bind RowIndex}" Padding="0" ToolTipService.ToolTip="{Binding FileName}" Background="Transparent" Margin="0, 0, 0, 0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <Grid IsRightTapEnabled="True" RightTapped="StackPanel_RightTapped" Width="125" Height="Auto" Tag="{x:Bind RowIndex}" Padding="0" ToolTipService.ToolTip="{Binding FileName}" Background="Transparent" Margin="0, 0, 0, 0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="100"/>
-                            <RowDefinition Height="25"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
                         <Grid Grid.Row="0" Tag="ItemImage" Width="125" Height="100">
                             <Grid Padding="12" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Name="Picture" Visibility="{x:Bind FileIconVis}">
@@ -532,9 +532,11 @@
                                 </Grid>
                             </Grid>
                         </Grid>
-                        <TextBlock Grid.Row="1" Margin="10,0" MaxHeight="25" HorizontalTextAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Text="{x:Bind FileName}" TextTrimming="CharacterEllipsis" TextWrapping="NoWrap"/>
+                        <StackPanel Grid.Row="1">
+                            <TextBlock Margin="0,0,0,10" HorizontalTextAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Text="{x:Bind FileName}" TextTrimming="CharacterEllipsis" TextWrapping="NoWrap"/>
+                            <TextBox Visibility="Collapsed" Margin="0" TextAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Text="{x:Bind FileName}" TextWrapping="Wrap"></TextBox>
+                        </StackPanel>
                     </Grid>
-
                 </DataTemplate>
             </GridView.ItemTemplate>
         </GridView>

Files UWP/PhotoAlbum.xaml.cs

@@ -42,6 +42,7 @@ public sealed partial class PhotoAlbum : Page
         public TextBlock EmptyTextPA;
         public string inputForRename;
         public ProgressBar progressBar;
+        public ListedItem renamingItem;
         ItemViewModel viewModelInstance;
         ProHome tabInstance;
         public EmptyFolderTextState TextState { get; set; } = new EmptyFolderTextState();
@@ -311,34 +312,73 @@ private void RightClickContextMenu_Opened(object sender, object e)
             }
         }
 
-        public async void ShowRenameDialog()
+        public void StartRename()
         {
-            try
+            renamingItem = gv.SelectedItem as ListedItem;
+            GridViewItem gridViewItem = gv.ContainerFromItem(renamingItem) as GridViewItem;
+            StackPanel stackPanel = (gridViewItem.ContentTemplateRoot as Grid).Children[1] as StackPanel;
+            TextBlock textBlock = stackPanel.Children[0] as TextBlock;
+            TextBox textBox = stackPanel.Children[1] as TextBox;
+            int extensionLength = renamingItem.DotFileExtension?.Length ?? 0;
+
+            textBlock.Visibility = Visibility.Collapsed;
+            textBox.Visibility = Visibility.Visible;
+            textBox.Focus(FocusState.Pointer);
+            textBox.LostFocus += RenameTextBox_LostFocus;
+            textBox.KeyDown += RenameTextBox_KeyDown;
+            textBox.Select(0, renamingItem.FileName.Length - extensionLength);
+        }
+
+        private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
+        {
+            if (e.Key == VirtualKey.Escape)
             {
-                var selectedItem = FileList.SelectedItem as ListedItem;
-                RenameDialog renameDialog = new RenameDialog();
-                var textBox = renameDialog.inputBox;
-                int extensionLength = selectedItem.DotFileExtension?.Length ?? 0;
+                TextBox textBox = sender as TextBox;
+                textBox.LostFocus -= RenameTextBox_LostFocus;
+                EndRename(textBox);
+            }
+            else if (e.Key == VirtualKey.Enter)
+            {
+                TextBox textBox = sender as TextBox;
+                CommitRename(textBox);
+            }
+        }
 
-                textBox.Text = selectedItem.FileName;
-                textBox.Select(0, selectedItem.FileName.Length - extensionLength);
+        private void RenameTextBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            TextBox textBox = e.OriginalSource as TextBox;
+            CommitRename(textBox);
+        }
 
-                await renameDialog.ShowAsync();
+        private async void CommitRename(TextBox textBox)
+        {
+            EndRename(textBox);
 
+            try
+            {
+                var selectedItem = renamingItem;
                 string currentName = selectedItem.FileName;
-                string newName = renameDialog.storedRenameInput;
+                string newName = textBox.Text;
 
                 if (newName == null)
                     return;
 
-                Debug.WriteLine(currentName);
-                Debug.WriteLine(newName);
                 await tabInstance.instanceInteraction.RenameFileItem(selectedItem, currentName, newName);
             }
             catch (Exception)
             {
 
             }
         }
+
+        private void EndRename(TextBox textBox)
+        {
+            StackPanel parentPanel = textBox.Parent as StackPanel;
+            TextBlock textBlock = parentPanel.Children[0] as TextBlock;
+            textBox.Visibility = Visibility.Collapsed;
+            textBlock.Visibility = Visibility.Visible;
+            textBox.LostFocus -= RenameTextBox_LostFocus;
+            textBox.KeyDown += RenameTextBox_KeyDown;
+        }
     }
 }