Merge branch 'file-jumping' into folder-properties

Author: jeffsieu

Files UWP/GenericFileBrowser.xaml

@@ -7,6 +7,7 @@
 using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -25,6 +26,7 @@ public class BaseLayout : Page
     {
         public ItemViewModel AssociatedViewModel = null;
         public Interaction AssociatedInteractions = null;
+        public bool isRenamingItem = false;
         public List<ListedItem> selectedItems 
         { 
             get
@@ -53,6 +55,8 @@ public BaseLayout()
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
             base.OnNavigatedTo(eventArgs);
+            // Add item jumping handler
+            Window.Current.CoreWindow.CharacterReceived += Page_CharacterReceived;
             var parameters = (string)eventArgs.Parameter;
             if (App.FormFactor == Enums.FormFactorMode.Regular)
             {
@@ -121,6 +125,8 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         {
             base.OnNavigatingFrom(e);
+            // Remove item jumping handler
+            Window.Current.CoreWindow.CharacterReceived -= Page_CharacterReceived;
             if (App.OccupiedInstance.instanceViewModel._fileQueryResult != null)
             {
                 App.OccupiedInstance.instanceViewModel._fileQueryResult.ContentsChanged -= App.OccupiedInstance.instanceViewModel.FileContentsChanged;
@@ -205,5 +211,15 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
                 }
             }
         }
+
+        protected virtual void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)
+        {
+            var focusedElement = FocusManager.GetFocusedElement(XamlRoot) as FrameworkElement;
+            if (focusedElement is TextBox)
+                return;
+
+            char letterPressed = Convert.ToChar(args.KeyCode);
+            App.OccupiedInstance.instanceInteraction.PushJumpChar(letterPressed);
+        }
     }
 }

Files UWP/GenericFileBrowser.xaml.cs

@@ -47,6 +47,9 @@ public class ItemViewModel : INotifyPropertyChanged
         private const int _step = 250;
         public event PropertyChangedEventHandler PropertyChanged;
 
+        private string _jumpString = "";
+        private DispatcherTimer jumpTimer = new DispatcherTimer();
+
         private SortOption _directorySortOption = SortOption.Name;
         private SortDirection _directorySortDirection = SortDirection.Ascending;
 
@@ -170,6 +173,66 @@ public bool IsSortedDescending
             }
         }
 
+        public string JumpString
+        {
+            get
+            {
+                return _jumpString;
+            }
+            set
+            {
+                // If current string is "a", and the next character typed is "a",
+                // search for next file that starts with "a" (a.k.a. _jumpString = "a")
+                if (_jumpString.Length == 1 && value == _jumpString + _jumpString)
+                {
+                    value = _jumpString;
+                }
+                if (value != "")
+                {
+                    ListedItem jumpedToItem = null;
+                    ListedItem previouslySelectedItem = null;
+                    var candidateItems = _filesAndFolders.Where(f => f.FileName.Length >= value.Length && f.FileName.Substring(0, value.Length).ToLower() == value);
+                    if (App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType == typeof(GenericFileBrowser))
+                    {
+                        previouslySelectedItem = (App.OccupiedInstance.ItemDisplayFrame.Content as GenericFileBrowser).AllView.SelectedItem as ListedItem;
+                    }
+                    else if (App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType == typeof(PhotoAlbum))
+                    {
+                        previouslySelectedItem = (App.OccupiedInstance.ItemDisplayFrame.Content as PhotoAlbum).FileList.SelectedItem as ListedItem;
+                    }
+
+                    // If the user is trying to cycle through items
+                    // starting with the same letter
+                    if (value.Length == 1 && previouslySelectedItem != null)
+                    {
+                        // Try to select item lexicographically bigger than the previous item
+                        jumpedToItem = candidateItems.FirstOrDefault(f => f.FileName.CompareTo(previouslySelectedItem.FileName) > 0);
+                    }
+                    if (jumpedToItem == null)
+                        jumpedToItem = candidateItems.FirstOrDefault();
+
+                    if (jumpedToItem != null)
+                    {
+                        if (App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType == typeof(GenericFileBrowser))
+                        {
+                            (App.OccupiedInstance.ItemDisplayFrame.Content as GenericFileBrowser).AllView.SelectedItem = jumpedToItem;
+                            (App.OccupiedInstance.ItemDisplayFrame.Content as GenericFileBrowser).AllView.ScrollIntoView(jumpedToItem, null);
+                        }
+                        else if (App.OccupiedInstance.ItemDisplayFrame.CurrentSourcePageType == typeof(PhotoAlbum))
+                        {
+                            (App.OccupiedInstance.ItemDisplayFrame.Content as PhotoAlbum).FileList.SelectedItem = jumpedToItem;
+                            (App.OccupiedInstance.ItemDisplayFrame.Content as PhotoAlbum).FileList.ScrollIntoView(jumpedToItem);
+                        }
+
+                    }
+
+                    // Restart the timer
+                    jumpTimer.Start();
+                }
+                _jumpString = value;
+            }
+        }
+
         public ItemViewModel()
         {
             _filesAndFolders = new ObservableCollection<ListedItem>();
@@ -181,14 +244,22 @@ public ItemViewModel()
             _cancellationTokenSource = new CancellationTokenSource();
 
             Universal.PropertyChanged += Universal_PropertyChanged;
+
+            jumpTimer.Interval = TimeSpan.FromSeconds(0.8);
+            jumpTimer.Tick += JumpTimer_Tick;
+        }
+
+        private void JumpTimer_Tick(object sender, object e)
+        {
+            _jumpString = "";
+            jumpTimer.Stop();
         }
 
         /*
          * Ensure that the path bar gets updated for user interaction
          * whenever the path changes. We will get the individual directories from
          * the updated, most-current path and add them to the UI.
          */
-
         private void Universal_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             // Clear the path UI

Files UWP/PhotoAlbum.xaml.cs

@@ -146,7 +146,7 @@
     <Grid ContextFlyout="{StaticResource BaseLayoutContextFlyout}" Background="Transparent" x:Name="RootGrid">
         <ProgressBar Visibility="{x:Bind AssociatedViewModel.LoadIndicator.isVisible,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" x:Name="progBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
         <TextBlock Visibility="{x:Bind AssociatedViewModel.EmptyTextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
-        <controls:DataGrid DoubleTapped="{x:Bind local:App.OccupiedInstance.instanceInteraction.List_ItemClick}" RightTapped="{x:Bind local:App.OccupiedInstance.instanceInteraction.AllView_RightTapped}" ItemsSource="{x:Bind AssociatedViewModel.FilesAndFolders}" PreviewKeyDown="AllView_PreviewKeyDown" ScrollViewer.IsScrollInertiaEnabled="True"  ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" 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 DoubleTapped="{x:Bind local:App.OccupiedInstance.instanceInteraction.List_ItemClick}" RightTapped="{x:Bind local:App.OccupiedInstance.instanceInteraction.AllView_RightTapped}" ItemsSource="{x:Bind AssociatedViewModel.FilesAndFolders}" PreviewKeyDown="AllView_PreviewKeyDown" ScrollViewer.IsScrollInertiaEnabled="True"  ClipboardCopyMode="None" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" PreparingCellForEdit="AllView_PreparingCellForEdit" CellEditEnding="AllView_CellEditEnding" 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" HorizontalAlignment="Left">
             <controls:DataGrid.Resources>
                 <SolidColorBrush x:Key="DataGridCellFocusVisualPrimaryBrush" Color="Transparent"/>
                 <SolidColorBrush x:Key="DataGridCellFocusVisualSecondaryBrush" Color="Transparent"/>

Files/BaseLayout.cs

@@ -10,6 +10,7 @@
 using Files.Filesystem;
 using Windows.System;
 using Windows.UI.Xaml.Input;
+using Windows.UI.Core;
 
 namespace Files
 {
@@ -153,6 +154,11 @@ private async void AllView_CellEditEnding(object sender, DataGridCellEditEndingE
             }
         }
 
+        private void AllView_CellEditEnded(object sender, DataGridCellEditEndedEventArgs e)
+        {
+            isRenamingItem = false;
+        }
+
         private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
             AllView.SelectedItem = null;
@@ -192,9 +198,22 @@ private void AllView_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
         {
             if (e.Key == VirtualKey.Enter)
             {
-                App.OccupiedInstance.instanceInteraction.List_ItemClick(null, null);
+                if (isRenamingItem)
+                {
+                    AllView.CommitEdit();
+                }
+                else
+                {
+                    App.OccupiedInstance.instanceInteraction.List_ItemClick(null, null);
+                }
                 e.Handled = true;
             }
         }
+
+        protected override void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)
+        {
+            base.Page_CharacterReceived(sender, args);
+            AllView.Focus(FocusState.Keyboard);
+        }
     }
 }

Files/Filesystem/ItemViewModel.cs

@@ -1,27 +1,30 @@
-using System;
+using Files.Dialogs;
+using Files.Filesystem;
+using Files.Navigation;
+using Microsoft.Toolkit.Uwp.UI.Controls;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.Foundation;
 using Windows.Storage;
 using Windows.System;
+using Windows.UI.Popups;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Input;
-using Windows.UI.Popups;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Animation;
-using Files.Filesystem;
-using Microsoft.Toolkit.Uwp.UI.Controls;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
-using System.Collections;
-using Windows.Foundation;
-using System.IO;
-using System.Reflection;
-using Files.Dialogs;
-using System.IO.Compression;
-using System.Linq;
 
 namespace Files.Interacts
 {
@@ -985,5 +988,10 @@ public void ClearAllItems()
                 (currentInstance.ItemDisplayFrame.Content as BaseLayout).selectedItems.Clear();
             }
         }
+
+        public void PushJumpChar(char letter)
+        {
+            App.OccupiedInstance.instanceViewModel.JumpString += letter.ToString().ToLower();
+        }
     }
 }

Files/GenericFileBrowser.xaml

@@ -4,6 +4,7 @@
 using Windows.UI.Xaml.Input;
 using Windows.System;
 using Interaction = Files.Interacts.Interaction;
+using Windows.UI.Core;
 
 namespace Files
 {
@@ -81,6 +82,7 @@ public void StartRename()
             textBox.LostFocus += RenameTextBox_LostFocus;
             textBox.KeyDown += RenameTextBox_KeyDown;
             textBox.Select(0, renamingItem.FileName.Length - extensionLength);
+            isRenamingItem = true;
         }
 
         private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
@@ -90,11 +92,13 @@ private void RenameTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
                 TextBox textBox = sender as TextBox;
                 textBox.LostFocus -= RenameTextBox_LostFocus;
                 EndRename(textBox);
+                e.Handled = true;
             }
             else if (e.Key == VirtualKey.Enter)
             {
                 TextBox textBox = sender as TextBox;
                 CommitRename(textBox);
+                e.Handled = true;
             }
         }
 
@@ -125,15 +129,25 @@ private void EndRename(TextBox textBox)
             textBlock.Visibility = Visibility.Visible;
             textBox.LostFocus -= RenameTextBox_LostFocus;
             textBox.KeyDown += RenameTextBox_KeyDown;
+            isRenamingItem = false;
         }
 
         private void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
         {
             if (e.Key == VirtualKey.Enter)
             {
-                App.OccupiedInstance.instanceInteraction.List_ItemClick(null, null);
-                e.Handled = true;
+                if (!isRenamingItem)
+                {
+                    App.OccupiedInstance.instanceInteraction.List_ItemClick(null, null);
+                    e.Handled = true;
+                }
             }
         }
+
+        protected override void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)
+        {
+            base.Page_CharacterReceived(sender, args);
+            FileList.Focus(FocusState.Keyboard);
+        }
     }
 }