appearance - show keyboard hints

src/Camelot.Services.Abstractions/IAppearanceSettingsService.cs

@@ -0,0 +1,10 @@
+using Camelot.Services.Abstractions.Models;
+
+namespace Camelot.Services.Abstractions;
+
+public interface IAppearanceSettingsService
+{
+    AppearanceSettingsModel GetAppearanceSettings();
+
+    void SaveAppearanceSettings(AppearanceSettingsModel appearanceSettingsModel);
+}

src/Camelot.Services.Abstractions/Models/AppearanceSettingsModel.cs

@@ -0,0 +1,11 @@
+namespace Camelot.Services.Abstractions.Models;
+
+public class AppearanceSettingsModel
+{
+    public bool ShowKeyboardShortcuts { get; }
+
+    public AppearanceSettingsModel(bool showKeyboardShortcuts)
+    {
+        ShowKeyboardShortcuts = showKeyboardShortcuts;
+    }
+}

src/Camelot.Services.Environment/Models/DriveInfo.cs

@@ -1,5 +1,4 @@
 using DriveType =  System.IO.DriveType;
-using IoDriveInfo = System.IO.DriveInfo;
 
 namespace Camelot.Services.Environment.Models;
 

src/Camelot.Services/AppearanceSettingsService.cs

@@ -0,0 +1,51 @@
+using System;
+using Camelot.DataAccess.UnitOfWork;
+using Camelot.Services.Abstractions;
+using Camelot.Services.Abstractions.Models;
+
+namespace Camelot.Services;
+
+public class AppearanceSettingsService : IAppearanceSettingsService
+{
+    private const string SettingsId = "AppearanceSettings";
+
+    private readonly AppearanceSettingsModel _default;
+    private readonly IUnitOfWorkFactory _unitOfWorkFactory;
+
+    private AppearanceSettingsModel _cachedSettingsValue;
+
+    public AppearanceSettingsService(IUnitOfWorkFactory unitOfWorkFactory)
+    {
+        _unitOfWorkFactory = unitOfWorkFactory;
+        _default = new AppearanceSettingsModel(false);
+        GetAppearanceSettings();
+    }
+
+    public AppearanceSettingsModel GetAppearanceSettings()
+    {
+        if (_cachedSettingsValue == null)
+        {
+            using var uow = _unitOfWorkFactory.Create();
+            var repository = uow.GetRepository<AppearanceSettingsModel>();
+            var dbModel = repository.GetById(SettingsId);
+            _cachedSettingsValue = dbModel ?? _default;
+        }
+
+        return _cachedSettingsValue;
+    }
+
+
+    public void SaveAppearanceSettings(AppearanceSettingsModel appearanceSettingsModel)
+    {
+        if (appearanceSettingsModel == null)
+        {
+            throw new ArgumentNullException(nameof(appearanceSettingsModel));
+        }
+
+        using var uow = _unitOfWorkFactory.Create();
+        var repository = uow.GetRepository<AppearanceSettingsModel>();
+
+        repository.Upsert(SettingsId, appearanceSettingsModel);
+        _cachedSettingsValue = appearanceSettingsModel;
+    }
+}

src/Camelot.ViewModels.Windows/ShellIcons/WindowsShellIconsService.cs

@@ -3,7 +3,6 @@
 using Camelot.ViewModels.Services.Interfaces.Enums;
 using Camelot.ViewModels.Services.Interfaces.Models;
 using Camelot.ViewModels.Windows.WinApi;
-using SystemBitmap = System.Drawing.Bitmap;
 using AvaloniaBitmap = Avalonia.Media.Imaging.Bitmap;
 
 namespace Camelot.ViewModels.Windows.ShellIcons;
@@ -84,7 +83,7 @@
             var icon = IconExtractor.ExtractIcon(path);
             // TODO: check if lossy and/or try other options, see url below. (iksi4prs).
             // https://learn.microsoft.com/en-us/dotnet/api/system.drawing.imageconverter.canconvertfrom?view=dotnet-plat-ext-7.0
             var systemBitmap = icon.ToBitmap();
             var avaloniaBitmap = SystemImageToAvaloniaBitmapConverter.Convert(systemBitmap);
             result = new ImageModel(avaloniaBitmap);
         }

src/Camelot.ViewModels.Windows/WinApi/ShellIcon.cs

@@ -1,5 +1,4 @@
 using Camelot.Services.Windows.WinApi;
-using System.Diagnostics;
 
 namespace Camelot.ViewModels.Windows.WinApi;
 

src/Camelot.ViewModels/Implementations/Dialogs/SettingsDialogViewModel.cs

@@ -17,6 +17,7 @@ public class SettingsDialogViewModel : DialogViewModelBase
     public ISettingsViewModel GeneralSettingsViewModel { get; set; }
     public ISettingsViewModel IconsSettingsViewModel { get; set; }
 
+    public ISettingsViewModel AppearanceSettingsViewModel { get; set; }
     public int SelectedIndex
     {
         get => _selectedIndex;
@@ -31,16 +32,21 @@ public int SelectedIndex
 
     public SettingsDialogViewModel(
         ISettingsViewModel generalSettingsViewModel,
+        ISettingsViewModel appearanceSettingsViewModel,
         ISettingsViewModel terminalSettingsViewModel,
         ISettingsViewModel iconsSettingsViewModel)
     {
         TerminalSettingsViewModel = terminalSettingsViewModel;
         GeneralSettingsViewModel = generalSettingsViewModel;
         IconsSettingsViewModel = iconsSettingsViewModel;
-
+        AppearanceSettingsViewModel = appearanceSettingsViewModel;
+        // Items in next array should be in same order as 'tabs' in xaml,
+        // Otherwise, Activate will called for wrong model.
+        // TODO: need to make it more dynamic, and not rely on order in view.
         _settingsViewModels = new[]
         {
             generalSettingsViewModel,
+            appearanceSettingsViewModel,
             terminalSettingsViewModel,
             iconsSettingsViewModel
         };

src/Camelot.ViewModels/Implementations/MainWindow/Operations/TopOperationsViewModel.cs

@@ -22,6 +22,7 @@ public class TopOperationsViewModel : ViewModelBase, ITopOperationsViewModel
     private readonly IArchiveService _archiveService;
     private readonly INodesSelectionService _nodesSelectionService;
     private readonly ISystemDialogService _systemDialogService;
+    private readonly IAppearanceSettingsService _appearanceSettingsService;
 
     public ICommand PackCommand { get; }
 
@@ -31,6 +32,14 @@ public class TopOperationsViewModel : ViewModelBase, ITopOperationsViewModel
 
     public ICommand OpenTerminalCommand { get; }
 
+    public bool KeyboardShortcutIsVisible 
+    { 
+        get
+        {
+            return _appearanceSettingsService.GetAppearanceSettings().ShowKeyboardShortcuts;
+        }
+    }
+
     public TopOperationsViewModel(
         ITerminalService terminalService,
         IDirectoryService directoryService,
@@ -39,7 +48,8 @@ public TopOperationsViewModel(
         IPathService pathService,
         IArchiveService archiveService,
         INodesSelectionService nodesSelectionService,
-        ISystemDialogService systemDialogService)
+        ISystemDialogService systemDialogService,
+        IAppearanceSettingsService appearanceSettingsService)
     {
         _terminalService = terminalService;
         _directoryService = directoryService;
@@ -49,6 +59,7 @@ public TopOperationsViewModel(
         _archiveService = archiveService;
         _nodesSelectionService = nodesSelectionService;
         _systemDialogService = systemDialogService;
+        _appearanceSettingsService = appearanceSettingsService;
 
         PackCommand = ReactiveCommand.CreateFromTask(PackAsync);
         ExtractCommand = ReactiveCommand.Create(ExtractAsync);

src/Camelot.ViewModels/Implementations/Settings/AppearanceSettingsViewModel.cs

@@ -0,0 +1,46 @@
+using Camelot.Services.Abstractions;
+using Camelot.Services.Abstractions.Models;
+using Camelot.ViewModels.Interfaces.Settings;
+using ReactiveUI.Fody.Helpers;
+
+namespace Camelot.ViewModels.Implementations.Settings;
+
+public class AppearanceSettingsViewModel : ViewModelBase, ISettingsViewModel
+{
+    private readonly IAppearanceSettingsService _appearanceSettingService;
+    private bool _initialShowKeyboardShortcuts;
+
+    private bool _isActivated;
+
+    [Reactive]
+    public bool ShowKeyboardShortcuts { get; set; }
+
+
+    public bool IsChanged => _initialShowKeyboardShortcuts != ShowKeyboardShortcuts;
+
+    public AppearanceSettingsViewModel(
+        IAppearanceSettingsService appearanceSettingService)
+    {
+        _appearanceSettingService = appearanceSettingService;
+    }
+
+    public void Activate()
+    {
+        if (_isActivated)
+        {
+            return;
+        }
+
+        _isActivated = true;
+
+        var model = _appearanceSettingService.GetAppearanceSettings();
+        ShowKeyboardShortcuts = _initialShowKeyboardShortcuts = model.ShowKeyboardShortcuts;
+    }
+
+    public void SaveChanges()
+    {
+        var model = new AppearanceSettingsModel(ShowKeyboardShortcuts);
+
+        _appearanceSettingService.SaveAppearanceSettings(model);
+    }
+}

src/Camelot/DependencyInjection/ServicesBootstrapper.cs

@@ -177,6 +177,10 @@ private static void RegisterCommonServices(IMutableDependencyResolver services,
             resolver.GetRequiredService<IUnitOfWorkFactory>(),
             resolver.GetRequiredService<IPlatformService>()
         ));
+
+        services.RegisterLazySingleton<IAppearanceSettingsService>(() => new AppearanceSettingsService(
+           resolver.GetRequiredService<IUnitOfWorkFactory>()
+       ));
     }
 
     private static void RegisterPlatformSpecificServices(IMutableDependencyResolver services, IReadonlyDependencyResolver resolver)

src/Camelot/DependencyInjection/ViewModelsBootstrapper.cs

@@ -213,12 +213,17 @@ private static void RegisterCommonViewModels(IMutableDependencyResolver services
         ));
         services.Register(() => new SettingsDialogViewModel(
             resolver.GetRequiredService<GeneralSettingsViewModel>(),
+            resolver.GetRequiredService<AppearanceSettingsViewModel>(),
             resolver.GetRequiredService<TerminalSettingsViewModel>(),
             resolver.GetRequiredService<IconsSettingsViewModel>()
         ));
         services.Register(() => new IconsSettingsViewModel(
             resolver.GetRequiredService<IIconsSettingsService>()
         ));
+        services.Register(() => new AppearanceSettingsViewModel(
+            resolver.GetRequiredService<IAppearanceSettingsService>()
+        ));
+
         services.RegisterLazySingleton(() => new FilePropertiesBehavior(
             resolver.GetRequiredService<IDialogService>()
         ));
@@ -312,7 +317,8 @@ private static void RegisterCommonViewModels(IMutableDependencyResolver services
             resolver.GetRequiredService<IPathService>(),
             resolver.GetRequiredService<IArchiveService>(),
             resolver.GetRequiredService<INodesSelectionService>(),
-            resolver.GetRequiredService<ISystemDialogService>()
+            resolver.GetRequiredService<ISystemDialogService>(),
+            resolver.GetRequiredService<IAppearanceSettingsService>()
         ));
         services.RegisterLazySingleton<IOperationStateViewModelFactory>(() => new OperationStateViewModelFactory(
             resolver.GetRequiredService<IPathService>()