appearance - show keyboard hints

src/Camelot.Services.Abstractions/IAppearanceSettingsService.cs

@@ -0,0 +1,11 @@
+using Camelot.Services.Abstractions.Models;
+using Camelot.Services.Abstractions.Models.Enums;
+
+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/AppearanceSettingsService.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Camelot.DataAccess.UnitOfWork;
+using Camelot.Services.Abstractions;
+using Camelot.Services.Abstractions.Models;
+using Camelot.Services.Abstractions.Models.Enums;
+
+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);
+            if (dbModel != null)
+                _cachedSettingsValue = dbModel;
+            else
+                _cachedSettingsValue = _default;
+        }
+        else
+        {
+            // we set value of _cachedValue in 'save',
+            // so no need to read from the repository every time.
+        }
+        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/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();
+        _initialShowKeyboardShortcuts = model.ShowKeyboardShortcuts;
+        ShowKeyboardShortcuts = _initialShowKeyboardShortcuts;
+    }
+
+    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>()

src/Camelot/Properties/Resources.resx

@@ -552,4 +552,10 @@
   <data name="SupportedOnWindowsOnly" xml:space="preserve">
     <value>* Supported on Windows only</value>
   </data>
+  <data name="Appearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="ShowKeyboardShortcuts" xml:space="preserve">
+    <value>Show keyboard shortcuts</value>
+  </data>
 </root>

src/Camelot/Styles/MainWindow.xaml

@@ -35,6 +35,14 @@
         <Setter Property="Opacity" Value="0.5" />
         <Setter Property="Margin" Value="5,5,0,0" />
     </Style>
+
+    <Style Selector="TextBlock.topOperationHotkeyTextBlock">
+        <Setter Property="FontFamily" Value="SansSerif" />
+        <Setter Property="Foreground" Value="{DynamicResource OperationButtonHotkeyBrush}" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="Opacity" Value="0.5" />
+        <Setter Property="Margin" Value="5,0,0,0" />
+    </Style>
 
     <Style Selector="Border.tabBorder">
         <Setter Property="CornerRadius" Value="4,4,0,0" />

src/Camelot/Views/Dialogs/Settings/AppearanceSettingsView.xaml

@@ -0,0 +1,38 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:p="clr-namespace:Camelot.Properties"
+             xmlns:settings="clr-namespace:Camelot.ViewModels.Implementations.Settings;assembly=Camelot.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Camelot.Views.Dialogs.Settings.AppearanceSettingsView"
+             x:DataType="settings:AppearanceSettingsViewModel"
+             x:CompileBindings="True">
+
+    <Design.DataContext>
+        <settings:AppearanceSettingsViewModel />
+    </Design.DataContext>
+    <Grid RowDefinitions="Auto,Auto,Auto"
+                        ColumnDefinitions="Auto"
+                        Margin="10">
+        <TextBlock 
+            Grid.Row="0"
+            Grid.Column="0"
+            Classes="settingsTabTextBlock" Margin="5,8,10,0"
+            Text="{x:Static p:Resources.ChangesRequireRestart}" />
+
+        <StackPanel Name="Quick Search"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="5,8,10,0"
+                    Orientation="Horizontal"
+                    Spacing="5">
+            <CheckBox 
+               IsChecked="{Binding ShowKeyboardShortcuts}">
+            </CheckBox>
+            <TextBlock
+                Classes="settingsTabTextBlock"
+                Text="{x:Static p:Resources.ShowKeyboardShortcuts}" />
+        </StackPanel>
+    </Grid>
+</UserControl>

src/Camelot/Views/Dialogs/Settings/AppearanceSettingsView.xaml.cs

@@ -0,0 +1,13 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Camelot.Views.Dialogs.Settings;
+public class AppearanceSettingsView : UserControl
+{
+    public AppearanceSettingsView()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+}