ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move common things to AppCore from GuiApp

Browse Source
This commit is contained in:
Ádám Kovács
2023-08-07 12:06:34 +02:00
parent 3d0eda54fb
commit 936c3896b9
48 changed files with 427 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/AppCommon/FileTime.App.CommandPalette/FileTime.App.CommandPalette.csproj
View File

@@ -7,7 +7,6 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\GuiApp\Avalonia\FileTime.GuiApp.App.Abstractions\FileTime.GuiApp.App.Abstractions.csproj" />
<ProjectReference Include="..\FileTime.App.CommandPalette.Abstractions\FileTime.App.CommandPalette.Abstractions.csproj" />
<ProjectReference Include="..\FileTime.App.Core.Abstraction\FileTime.App.Core.Abstraction.csproj" />
<ProjectReference Include="..\FileTime.App.FuzzyPanel\FileTime.App.FuzzyPanel.csproj" />

13
src/AppCommon/FileTime.App.CommandPalette/ViewModels/CommandPaletteViewModel.cs
View File

@@ -1,11 +1,10 @@
using System.Text;
using Avalonia.Input;
using FileTime.App.CommandPalette.Services;
using FileTime.App.Core.Configuration;
using FileTime.App.Core.Models;
using FileTime.App.Core.Services;
using FileTime.App.Core.ViewModels;
using FileTime.App.FuzzyPanel;
using FileTime.GuiApp.App.Configuration;
using FileTime.GuiApp.App.Services;
using Microsoft.Extensions.Logging;
namespace FileTime.App.CommandPalette.ViewModels;
@@ -89,7 +88,7 @@ public class CommandPaletteViewModel : FuzzyPanelViewModel<ICommandPaletteEntryV
.Select(k => k.Keys)
.ToList();
public override async Task<bool> HandleKeyDown(KeyEventArgs keyEventArgs)
public override async Task<bool> HandleKeyDown(GeneralKeyEventArgs keyEventArgs)
{
if (keyEventArgs.Handled) return false;
@@ -99,7 +98,7 @@ public class CommandPaletteViewModel : FuzzyPanelViewModel<ICommandPaletteEntryV
return true;
}
if (keyEventArgs.Key == Key.Escape)
if (keyEventArgs.Key == Keys.Escape)
{
keyEventArgs.Handled = true;
Close();
@@ -109,11 +108,11 @@ public class CommandPaletteViewModel : FuzzyPanelViewModel<ICommandPaletteEntryV
return false;
}
public async Task<bool> HandleKeyUp(KeyEventArgs keyEventArgs)
public async Task<bool> HandleKeyUp(GeneralKeyEventArgs keyEventArgs)
{
if (keyEventArgs.Handled) return false;
if (keyEventArgs.Key == Key.Enter)
if (keyEventArgs.Key == Keys.Enter)
{
if (SelectedItem is null) return false;