Enter/Exit folder

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Configuration/CommandBindingConfiguration.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Avalonia.Input;
 using FileTime.App.Core.Command;
 

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Configuration/KeyBindingConfiguration.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace FileTime.GuiApp.Configuration
 {
     public class KeyBindingConfiguration

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Configuration/KeyConfig.cs

@@ -11,12 +11,22 @@ namespace FileTime.GuiApp.Configuration
 
         public KeyConfig() { }
 
-        public KeyConfig(Key key, bool shift = false, bool alt = false, bool ctrl = false)
+        public KeyConfig(
+            Key key,
+            bool shift = false,
+            bool alt = false,
+            bool ctrl = false)
         {
             Key = key;
             Shift = shift;
             Alt = alt;
             Ctrl = ctrl;
         }
+
+        public bool AreEquals(KeyConfig otherKeyConfig) =>
+            Key == otherKeyConfig.Key
+            && Alt == otherKeyConfig.Alt
+            && Shift == otherKeyConfig.Shift
+            && Ctrl == otherKeyConfig.Ctrl;
     }
 }

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/FileTime.GuiApp.Abstractions.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="0.10.13" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\AppCommon\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
+  </ItemGroup>
+
+</Project>

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Models/SpecialKeysStatus.cs

@@ -0,0 +1,4 @@
+namespace FileTime.GuiApp.Models
+{
+    public record SpecialKeysStatus(bool IsAltPressed, bool IsShiftPressed, bool IsCtrlPressed);
+}

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Services/IDefaultModeKeyInputHandler.cs

@@ -0,0 +1,4 @@
+namespace FileTime.GuiApp.Services
+{
+    public interface IDefaultModeKeyInputHandler : IKeyInputHandler { }
+}

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Services/IKeyInputHandler.cs

@@ -0,0 +1,10 @@
+using Avalonia.Input;
+using FileTime.GuiApp.Models;
+
+namespace FileTime.GuiApp.Services
+{
+    public interface IKeyInputHandler
+    {
+        Task HandleInputKey(Key key, SpecialKeysStatus specialKeysStatus, Action<bool> setHandled);
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Services/IKeyInputHandlerService.cs

@@ -0,0 +1,9 @@
+using Avalonia.Input;
+
+namespace FileTime.GuiApp.Services
+{
+    public interface IKeyInputHandlerService
+    {
+        Task ProcessKeyDown(Key key, KeyModifiers keyModifiers, Action<bool> setHandled);
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Services/IKeyboardConfigurationService.cs

@@ -0,0 +1,11 @@
+using FileTime.GuiApp.Configuration;
+
+namespace FileTime.GuiApp.Services
+{
+    public interface IKeyboardConfigurationService
+    {
+        IReadOnlyList<CommandBindingConfiguration> CommandBindings { get; }
+        IReadOnlyList<CommandBindingConfiguration> UniversalCommandBindings { get; }
+        IReadOnlyList<CommandBindingConfiguration> AllShortcut { get; }
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/Services/IRapidTravelModeKeyInputHandler.cs

@@ -0,0 +1,4 @@
+namespace FileTime.GuiApp.Services
+{
+    public interface IRapidTravelModeKeyInputHandler : IKeyInputHandler { }
+}

src/GuiApp/Avalonia/FileTime.GuiApp.Abstractions/ViewModels/IGuiAppState.cs

@@ -0,0 +1,14 @@
+using FileTime.App.Core.ViewModels;
+using FileTime.GuiApp.Configuration;
+
+namespace FileTime.GuiApp.ViewModels
+{
+    public interface IGuiAppState : IAppState
+    {
+        List<KeyConfig> PreviousKeys { get; }
+        bool IsAllShortcutVisible { get; set; }
+        bool NoCommandFound { get; set; }
+        string? MessageBoxText { get; set; }
+        List<CommandBindingConfiguration> PossibleCommands { get; set; }
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp.App/App.axaml.cs

@@ -22,7 +22,7 @@ namespace FileTime.GuiApp
                 .InitSerilog();
 
             var logger = DI.ServiceProvider.GetRequiredService<ILogger<App>>();
-            logger.LogInformation("App initialization completed.");
+            logger.LogInformation("App initialization completed");
         }
         public override void Initialize()
         {

src/GuiApp/Avalonia/FileTime.GuiApp.App/Startup.cs

@@ -6,6 +6,7 @@ using FileTime.App.Core.ViewModels;
 using FileTime.Core.Services;
 using FileTime.GuiApp.Configuration;
 using FileTime.GuiApp.Logging;
+using FileTime.GuiApp.Services;
 using FileTime.GuiApp.ViewModels;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -20,14 +21,22 @@ namespace FileTime.GuiApp
         {
             return serviceCollection
                 .AddSingleton<MainWindowViewModel>()
-                .AddSingleton<AppState>()
-                .AddSingleton<IAppState, AppState>(s => s.GetRequiredService<AppState>())
+                .AddSingleton<GuiAppState>()
+                .AddSingleton<IAppState, GuiAppState>(s => s.GetRequiredService<GuiAppState>())
+                .AddSingleton<IGuiAppState, GuiAppState>(s => s.GetRequiredService<GuiAppState>())
+                .AddSingleton<DefaultModeKeyInputHandler>()
+                .AddSingleton<RapidTravelModeKeyInputHandler>()
                 //TODO: move??
                 .AddTransient<ITab, Tab>()
                 .AddTransient<ITabViewModel, TabViewModel>()
                 .AddTransient<IContainerViewModel, ContainerViewModel>()
                 .AddTransient<IElementViewModel, ElementViewModel>()
-                .AddTransient<IItemNameConverterService, ItemNameConverterService>();
+                .AddTransient<IItemNameConverterService, ItemNameConverterService>()
+                .AddSingleton<ICommandHandlerService, CommandHandlerService>()
+                .AddSingleton<IKeyInputHandlerService, KeyInputHandlerService>()
+                .AddSingleton<IDefaultModeKeyInputHandler, DefaultModeKeyInputHandler>()
+                .AddSingleton<IKeyboardConfigurationService, KeyboardConfigurationService>()
+                .AddSingleton<IRapidTravelModeKeyInputHandler, RapidTravelModeKeyInputHandler>();
         }
 
         internal static IServiceCollection RegisterLogging(this IServiceCollection serviceCollection)

src/GuiApp/Avalonia/FileTime.GuiApp.CustomImpl/FileTime.GuiApp.CustomImpl.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\AppCommon\FileTime.App.Core\FileTime.App.Core.csproj" />
+    <ProjectReference Include="..\FileTime.GuiApp.Abstractions\FileTime.GuiApp.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>

src/GuiApp/Avalonia/FileTime.GuiApp.CustomImpl/ViewModels/AppState.cs

@@ -1,6 +0,0 @@
-using FileTime.App.Core;
-
-namespace FileTime.GuiApp.ViewModels
-{
-    public class AppState : AppStateBase { }
-}

src/GuiApp/Avalonia/FileTime.GuiApp.CustomImpl/ViewModels/GuiAppState.cs

@@ -0,0 +1,24 @@
+using FileTime.App.Core.ViewModels;
+using FileTime.GuiApp.Configuration;
+using MvvmGen;
+
+namespace FileTime.GuiApp.ViewModels
+{
+    [ViewModel]
+    public partial class GuiAppState : AppStateBase, IGuiAppState
+    {
+        [Property]
+        private bool _isAllShortcutVisible;
+
+        [Property]
+        private bool _noCommandFound;
+
+        [Property]
+        private string? _messageBoxText;
+
+        [Property]
+        private List<CommandBindingConfiguration> _possibleCommands = new();
+
+        public List<KeyConfig> PreviousKeys { get; } = new();
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp/Extensions/KeyConfigExtensions.cs

@@ -0,0 +1,10 @@
+using FileTime.GuiApp.Configuration;
+
+namespace FileTime.GuiApp.Extensions
+{
+    public static class KeyConfigExtensions
+    {
+        public static bool AreKeysEqual(this IReadOnlyList<KeyConfig> collection1, IReadOnlyList<KeyConfig> collection2)
+        => collection1.Count == collection2.Count && collection1.Zip(collection2).All(t => t.First.AreEquals(t.Second));
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp/FileTime.GuiApp.csproj

@@ -33,6 +33,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\AppCommon\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
     <ProjectReference Include="..\..\..\Providers\FileTime.Providers.Local.Abstractions\FileTime.Providers.Local.Abstractions.csproj" />
+    <ProjectReference Include="..\FileTime.GuiApp.Abstractions\FileTime.GuiApp.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>

src/GuiApp/Avalonia/FileTime.GuiApp/Services/DefaultModeKeyInputHandler.cs

@@ -0,0 +1,151 @@
+using System.Reactive.Linq;
+using Avalonia.Input;
+using FileTime.App.Core.Command;
+using FileTime.App.Core.Services;
+using FileTime.App.Core.ViewModels;
+using FileTime.Core.Models;
+using FileTime.GuiApp.Configuration;
+using FileTime.GuiApp.Extensions;
+using FileTime.GuiApp.Models;
+using FileTime.GuiApp.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace FileTime.GuiApp.Services
+{
+    public class DefaultModeKeyInputHandler : IDefaultModeKeyInputHandler
+    {
+        private readonly IGuiAppState _appState;
+        private readonly IKeyboardConfigurationService _keyboardConfigurationService;
+        private readonly List<KeyConfig[]> _keysToSkip = new();
+        private ITabViewModel? _selectedTab;
+        private IContainer? _currentLocation;
+        private readonly ILogger<DefaultModeKeyInputHandler> _logger;
+        private readonly ICommandHandlerService _commandHandlerService;
+
+        public DefaultModeKeyInputHandler(
+            IGuiAppState appState,
+            IKeyboardConfigurationService keyboardConfigurationService,
+            ILogger<DefaultModeKeyInputHandler> logger,
+            ICommandHandlerService commandHandlerService)
+        {
+            _appState = appState;
+            _keyboardConfigurationService = keyboardConfigurationService;
+            _logger = logger;
+            _commandHandlerService = commandHandlerService;
+
+            _appState.SelectedTab.Subscribe(t => _selectedTab = t);
+            _appState.SelectedTab.Select(t => t == null ? Observable.Return<IContainer?>(null) : t.CurrentLocation!).Switch().Subscribe(l => _currentLocation = l);
+
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.Up) });
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.Down) });
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.Tab) });
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.PageDown) });
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.PageUp) });
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.F4, alt: true) });
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.LWin) });
+            _keysToSkip.Add(new KeyConfig[] { new KeyConfig(Key.RWin) });
+        }
+
+        public async Task HandleInputKey(Key key, SpecialKeysStatus specialKeysStatus, Action<bool> setHandled)
+        {
+            var keyWithModifiers = new KeyConfig(key, shift: specialKeysStatus.IsShiftPressed, alt: specialKeysStatus.IsAltPressed, ctrl: specialKeysStatus.IsCtrlPressed);
+            _appState.PreviousKeys.Add(keyWithModifiers);
+
+            var selectedCommandBinding = _keyboardConfigurationService.UniversalCommandBindings.FirstOrDefault(c => c.Keys.AreKeysEqual(_appState.PreviousKeys));
+            selectedCommandBinding ??= _keyboardConfigurationService.CommandBindings.FirstOrDefault(c => c.Keys.AreKeysEqual(_appState.PreviousKeys));
+
+            if (key == Key.Escape)
+            {
+                var doGeneralReset = false;
+                if (_appState.PreviousKeys.Count > 1 || _appState.IsAllShortcutVisible || _appState.MessageBoxText != null)
+                {
+                    doGeneralReset = true;
+                }
+                /*else if (_currentLocation.Container.CanHandleEscape)
+                {
+                    var escapeResult = await _currentLocation.Container.HandleEscape();
+                    if (escapeResult.NavigateTo != null)
+                    {
+                        setHandled(true);
+                        _appState.PreviousKeys.Clear();
+                        await _appState.SelectedTab.OpenContainer(escapeResult.NavigateTo);
+                    }
+                    else
+                    {
+                        if (escapeResult.Handled)
+                        {
+                            _appState.PreviousKeys.Clear();
+                        }
+                        else
+                        {
+                            doGeneralReset = true;
+                        }
+                    }
+                }*/
+
+                if (doGeneralReset)
+                {
+                    setHandled(true);
+                    _appState.IsAllShortcutVisible = false;
+                    _appState.MessageBoxText = null;
+                    _appState.PreviousKeys.Clear();
+                    _appState.PossibleCommands = new();
+                }
+            }
+            else if (key == Key.Enter
+                && _appState.MessageBoxText != null)
+            {
+                _appState.PreviousKeys.Clear();
+                //_dialogService.ProcessMessageBox();
+                setHandled(true);
+            }
+            else if (selectedCommandBinding != null)
+            {
+                setHandled(true);
+                _appState.PreviousKeys.Clear();
+                _appState.PossibleCommands = new();
+                await CallCommandAsync(selectedCommandBinding.Command);
+            }
+            else if (_keysToSkip.Any(k => k.AreKeysEqual(_appState.PreviousKeys)))
+            {
+                _appState.PreviousKeys.Clear();
+                _appState.PossibleCommands = new();
+                return;
+            }
+            else if (_appState.PreviousKeys.Count == 2)
+            {
+                setHandled(true);
+                _appState.NoCommandFound = true;
+                _appState.PreviousKeys.Clear();
+                _appState.PossibleCommands = new();
+            }
+            else
+            {
+                setHandled(true);
+                var possibleCommands = _keyboardConfigurationService.AllShortcut.Where(c => c.Keys[0].AreEquals(keyWithModifiers)).ToList();
+
+                if (possibleCommands.Count == 0)
+                {
+                    _appState.NoCommandFound = true;
+                    _appState.PreviousKeys.Clear();
+                }
+                else
+                {
+                    _appState.PossibleCommands = possibleCommands;
+                }
+            }
+        }
+
+        private async Task CallCommandAsync(Commands command)
+        {
+            try
+            {
+                await _commandHandlerService.HandleCommandAsync(command);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Unknown error while running command. {Command} {Error}", command, e);
+            }
+        }
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp/Services/KeyInputHandlerService.cs

@@ -0,0 +1,56 @@
+using Avalonia.Input;
+using FileTime.App.Core.Models.Enums;
+using FileTime.GuiApp.Configuration;
+using FileTime.GuiApp.Models;
+using FileTime.GuiApp.ViewModels;
+
+namespace FileTime.GuiApp.Services
+{
+    public class KeyInputHandlerService : IKeyInputHandlerService
+    {
+        private readonly IGuiAppState _appState;
+        private readonly IDefaultModeKeyInputHandler _defaultModeKeyInputHandler;
+        private readonly IRapidTravelModeKeyInputHandler _rapidTravelModeKeyInputHandler;
+
+        public KeyInputHandlerService(
+            IGuiAppState appState,
+            IDefaultModeKeyInputHandler defaultModeKeyInputHandler,
+            IRapidTravelModeKeyInputHandler rapidTravelModeKeyInputHandler
+        )
+        {
+            _appState = appState;
+            _defaultModeKeyInputHandler = defaultModeKeyInputHandler;
+            _rapidTravelModeKeyInputHandler = rapidTravelModeKeyInputHandler;
+        }
+
+        public async Task ProcessKeyDown(Key key, KeyModifiers keyModifiers, Action<bool> setHandled)
+        {
+            if (key == Key.LeftAlt
+                || key == Key.RightAlt
+                || key == Key.LeftShift
+                || key == Key.RightShift
+                || key == Key.LeftCtrl
+                || key == Key.RightCtrl)
+            {
+                return;
+            }
+
+            //_appState.NoCommandFound = false;
+
+            var isAltPressed = (keyModifiers & KeyModifiers.Alt) == KeyModifiers.Alt;
+            var isShiftPressed = (keyModifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
+            var isCtrlPressed = (keyModifiers & KeyModifiers.Control) == KeyModifiers.Control;
+
+            var specialKeyStatus = new SpecialKeysStatus(isAltPressed, isShiftPressed, isCtrlPressed);
+
+            if (_appState.ViewMode == ViewMode.Default)
+            {
+                await _defaultModeKeyInputHandler.HandleInputKey(key, specialKeyStatus, setHandled);
+            }
+            else
+            {
+                await _rapidTravelModeKeyInputHandler.HandleInputKey(key, specialKeyStatus, setHandled);
+            }
+        }
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp/Services/KeyboardConfigurationService.cs

@@ -0,0 +1,61 @@
+using FileTime.App.Core.Command;
+using FileTime.GuiApp.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace FileTime.GuiApp.Services
+{
+    public class KeyboardConfigurationService : IKeyboardConfigurationService
+    {
+        public IReadOnlyList<CommandBindingConfiguration> CommandBindings { get; }
+        public IReadOnlyList<CommandBindingConfiguration> UniversalCommandBindings { get; }
+        public IReadOnlyList<CommandBindingConfiguration> AllShortcut { get; }
+
+        public KeyboardConfigurationService(IOptions<KeyBindingConfiguration> keyBindingConfiguration)
+        {
+            var commandBindings = new List<CommandBindingConfiguration>();
+            var universalCommandBindings = new List<CommandBindingConfiguration>();
+            IEnumerable<CommandBindingConfiguration> keyBindings = keyBindingConfiguration.Value.KeyBindings;
+
+            if (keyBindingConfiguration.Value.UseDefaultBindings)
+            {
+                keyBindings = keyBindings.Concat(keyBindingConfiguration.Value.DefaultKeyBindings);
+            }
+
+            foreach (var keyBinding in keyBindings)
+            {
+                if (keyBinding.Command == Commands.None)
+                {
+                    throw new FormatException($"No command is set in keybinding for keys '{keyBinding.KeysDisplayText}'");
+                }
+                else if (keyBinding.Keys.Count == 0)
+                {
+                    throw new FormatException($"No keys set in keybinding for command '{keyBinding.Command}'.");
+                }
+
+                if (IsUniversal(keyBinding))
+                {
+                    universalCommandBindings.Add(keyBinding);
+                }
+                else
+                {
+                    commandBindings.Add(keyBinding);
+                }
+            }
+
+            CommandBindings = commandBindings.AsReadOnly();
+            UniversalCommandBindings = universalCommandBindings.AsReadOnly();
+            AllShortcut = new List<CommandBindingConfiguration>(CommandBindings.Concat(UniversalCommandBindings)).AsReadOnly();
+        }
+
+        private static bool IsUniversal(CommandBindingConfiguration keyMapping)
+        {
+            return keyMapping.Command == Commands.GoUp
+                || keyMapping.Command == Commands.Open
+                || keyMapping.Command == Commands.OpenOrRun
+                || keyMapping.Command == Commands.MoveCursorUp
+                || keyMapping.Command == Commands.MoveCursorDown
+                || keyMapping.Command == Commands.MoveCursorUpPage
+                || keyMapping.Command == Commands.MoveCursorDownPage;
+        }
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp/Services/RapidTravelModeKeyInputHandler.cs

@@ -0,0 +1,88 @@
+using Avalonia.Input;
+using FileTime.GuiApp.Models;
+
+namespace FileTime.GuiApp.Services
+{
+    public class RapidTravelModeKeyInputHandler : IRapidTravelModeKeyInputHandler
+    {
+        public async Task HandleInputKey(Key key, SpecialKeysStatus specialKeysStatus, Action<bool> setHandled)
+        {
+            /*var keyString = key.ToString();
+            var updateRapidTravelFilter = false;
+
+            if (key == Key.Escape)
+            {
+                setHandled(true);
+                if (_appState.IsAllShortcutVisible)
+                {
+                    _appState.IsAllShortcutVisible = false;
+                }
+                else if (_appState.MessageBoxText != null)
+                {
+                    _appState.MessageBoxText = null;
+                }
+                else
+                {
+                    await _appState.ExitRapidTravelMode();
+                }
+            }
+            else if (key == Key.Back)
+            {
+                if (_appState.RapidTravelText.Length > 0)
+                {
+                    setHandled(true);
+                    _appState.RapidTravelText = _appState.RapidTravelText.Substring(0, _appState.RapidTravelText.Length - 1);
+                    updateRapidTravelFilter = true;
+                }
+            }
+            else if (keyString.Length == 1)
+            {
+                setHandled(true);
+                _appState.RapidTravelText += keyString.ToLower();
+                updateRapidTravelFilter = true;
+            }
+            else
+            {
+                var currentKeyAsList = new List<KeyConfig>() { new KeyConfig(key) };
+                var selectedCommandBinding = _keyboardConfigurationService.UniversalCommandBindings.FirstOrDefault(c => AreKeysEqual(c.Keys, currentKeyAsList));
+                if (selectedCommandBinding != null)
+                {
+                    setHandled(true);
+                    await CallCommandAsync(selectedCommandBinding.Command);
+                }
+            }
+
+            if (updateRapidTravelFilter)
+            {
+                var currentLocation = await _appState.SelectedTab.CurrentLocation.Container.WithoutVirtualContainer(MainPageViewModel.RAPIDTRAVEL);
+                var newLocation = new VirtualContainer(
+                    currentLocation,
+                    new List<Func<IEnumerable<IContainer>, IEnumerable<IContainer>>>()
+                    {
+                            container => container.Where(c => c.Name.ToLower().Contains(_appState.RapidTravelText))
+                    },
+                    new List<Func<IEnumerable<IElement>, IEnumerable<IElement>>>()
+                    {
+                            element => element.Where(e => e.Name.ToLower().Contains(_appState.RapidTravelText))
+                    },
+                    virtualContainerName: MainPageViewModel.RAPIDTRAVEL
+                );
+
+                await newLocation.Init();
+
+                await _appState.SelectedTab.OpenContainer(newLocation);
+
+                var selectedItemName = _appState.SelectedTab.SelectedItem?.Item.Name;
+                var currentLocationItems = await _appState.SelectedTab.CurrentLocation.GetItems();
+                if (currentLocationItems.FirstOrDefault(i => string.Equals(i.Item.Name, _appState.RapidTravelText, StringComparison.OrdinalIgnoreCase)) is IItemViewModel matchItem)
+                {
+                    await _appState.SelectedTab.SetCurrentSelectedItem(matchItem.Item);
+                }
+                else if (!currentLocationItems.Select(i => i.Item.Name).Any(n => n == selectedItemName))
+                {
+                    await _appState.SelectedTab.MoveCursorToFirst();
+                }
+            }*/
+        }
+    }
+}

src/GuiApp/Avalonia/FileTime.GuiApp/ViewModels/MainWindowViewModel.cs

@@ -5,6 +5,7 @@ using FileTime.App.Core;
 using FileTime.App.Core.ViewModels;
 using FileTime.Core.Models;
 using FileTime.Core.Services;
+using FileTime.GuiApp.Services;
 using FileTime.Providers.Local;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -17,6 +18,7 @@ namespace FileTime.GuiApp.ViewModels
     [Inject(typeof(ILocalContentProvider), "_localContentProvider")]
     [Inject(typeof(IServiceProvider), PropertyName = "_serviceProvider")]
     [Inject(typeof(ILogger<MainWindowViewModel>), PropertyName = "_logger")]
+    [Inject(typeof(IKeyInputHandlerService), PropertyName = "_keyInputHandlerService")]
     public partial class MainWindowViewModel : IMainWindowViewModelBase
     {
         public bool Loading => false;
@@ -51,6 +53,7 @@ namespace FileTime.GuiApp.ViewModels
 
         public void ProcessKeyDown(Key key, KeyModifiers keyModifiers, Action<bool> setHandled)
         {
+            _keyInputHandlerService.ProcessKeyDown(key, keyModifiers, setHandled);
         }
     }
 }

src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml

@@ -14,14 +14,11 @@
 		TransparencyLevelHint="Blur"
 		Background="Transparent"
 		ExtendClientAreaToDecorationsHint="True"
-		x:DataType="vm:MainWindowViewModel"
+		x:DataType="vm:IMainWindowViewModelBase"
 		x:CompileBindings="True">
 
-	<Design.DataContext>
-		<vm:MainWindowViewModel/>
-	</Design.DataContext>
 	<Grid Background="{DynamicResource AppBackgroundBrush}">
-		<Grid IsVisible="{Binding Loading, Converter={x:Static BoolConverters.Not}}">
+		<Grid IsVisible="{Binding Loading, Converter={x:Static BoolConverters.Not}}" x:DataType="vm:MainWindowViewModel">
 			<Grid ColumnDefinitions="250,*" RowDefinitions="Auto,*">
 				<Grid PointerPressed="HeaderPointerPressed">
 					<Rectangle Fill="#01000000"/>
@@ -32,9 +29,9 @@
 					<Rectangle Fill="#01000000"/>
 
 					<StackPanel Margin="20,10" Orientation="Horizontal">
-						<!--local:PathPresenter DataContext="{Binding AppState.SelectedTab.CurrentLocation^.FullName.Path,Converter={StaticResource PathPreformatter}}"/-->
+						<!--local:PathPresenter DataContext="{Binding AppState.SelectedTab^.CurrentLocation^.FullName.Path,Converter={StaticResource PathPreformatter}}"/-->
 						<TextBlock
-							Text="{Binding AppState.SelectedTab.CurrentSelectedItem^.DisplayNameText}" Foreground="{StaticResource AccentBrush}" />
+							Text="{Binding AppState.SelectedTab^.CurrentSelectedItem^.DisplayNameText}" Foreground="{StaticResource AccentBrush}" />
 					</StackPanel>
 				</Grid>
 
@@ -89,7 +86,7 @@
 
 
 							<Grid Grid.Column="2" RowDefinitions="Auto,*">
-								<Grid IsVisible="{Binding AppState.SelectedTab.CurrentLocation^.IsLoading^}">
+								<Grid IsVisible="{Binding AppState.SelectedTab^.CurrentLocation^.IsLoading^}">
 									<Image Width="40" Height="40" Source="{SvgImage /Assets/loading.svg}" Classes="LoadingAnimation"/>
 								</Grid>
 								<ListBox
@@ -98,7 +95,7 @@
 									x:CompileBindings="False"
 									AutoScrollToSelectedItem="True"
 									IsTabStop="True"
-									Items="{Binding AppState.SelectedTab.CurrentItems^}"
+									Items="{Binding AppState.SelectedTab^.CurrentItems^}"
 									ScrollViewer.HorizontalScrollBarVisibility="Hidden"
 									ScrollViewer.VerticalScrollBarVisibility="Visible"
 									Classes="ContentListView">
@@ -117,7 +114,7 @@
 									HorizontalAlignment="Center"
 									FontWeight="Bold"
 									Foreground="{DynamicResource ErrorBrush}"
-									IsVisible="{Binding AppState.SelectedTab.CurrentLocation^.Items^.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
+									IsVisible="{Binding AppState.SelectedTab^.CurrentLocation^.Items^.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
 									Empty
 								</TextBlock>
 							</Grid>