Improved keyboad shortcuts.

Wino.Mail.WinUI/Views/Calendar/CalendarAppShell.xaml.cs

@@ -1,6 +1,12 @@
-using CommunityToolkit.Mvvm.Messaging;
+using System;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models;
 using Wino.Mail.Views.Abstract;
 using Wino.Messaging.Client.Calendar;
 
@@ -17,14 +23,13 @@ public sealed partial class CalendarAppShell : CalendarAppShellAbstract,
     public CalendarAppShell()
     {
         InitializeComponent();
+        PreviewKeyDown += OnPreviewKeyDown;
 
-        // Window.Current.SetTitleBar(DragArea);
         ManageCalendarDisplayType(ViewModel.StatePersistenceService.CalendarDisplayType);
     }
 
     private void ManageCalendarDisplayType(Core.Domain.Enums.CalendarDisplayType displayType)
     {
-        // Go to different states based on the display type.
         if (displayType == Core.Domain.Enums.CalendarDisplayType.Month)
         {
             VisualStateManager.GoToState(this, STATE_VerticalCalendar, false);
@@ -44,12 +49,6 @@ public sealed partial class CalendarAppShell : CalendarAppShellAbstract,
         ManageCalendarDisplayType(message.NewDisplayType);
     }
 
-    //private void ShellFrameContentNavigated(object sender, Microsoft.UI.Xaml.Navigation.NavigationEventArgs e)
-    //    => RealAppBar.ShellFrameContent = (e.Content as BasePage).ShellContent;
-
-    //private void AppBarBackButtonClicked(Core.UWP.Controls.WinoAppTitleBar sender, RoutedEventArgs args)
-    //    => ViewModel.NavigationService.GoBack();
-
     protected override void RegisterRecipients()
     {
         base.RegisterRecipients();
@@ -63,4 +62,98 @@ public sealed partial class CalendarAppShell : CalendarAppShellAbstract,
 
         WeakReferenceMessenger.Default.Unregister<CalendarDisplayTypeChangedMessage>(this);
     }
+
+    private async void OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.KeyStatus.RepeatCount > 1 || ShouldIgnoreShortcut())
+            return;
+
+        var key = NormalizeKey(e.Key);
+        if (string.IsNullOrEmpty(key))
+            return;
+
+        var shortcutService = WinoApplication.Current.Services.GetRequiredService<IKeyboardShortcutService>();
+        var shortcut = await shortcutService.GetShortcutForKeyAsync(WinoApplicationMode.Calendar, key, GetCurrentModifierKeys());
+
+        if (shortcut == null)
+            return;
+
+        var details = new KeyboardShortcutTriggerDetails
+        {
+            ShortcutId = shortcut.Id,
+            Mode = shortcut.Mode,
+            Action = shortcut.Action,
+            Key = shortcut.Key,
+            ModifierKeys = shortcut.ModifierKeys,
+            Sender = sender,
+            Origin = FocusManager.GetFocusedElement(XamlRoot)
+        };
+
+        await ViewModel.KeyboardShortcutHook(details);
+
+        if (InnerShellFrame.Content is BasePage activePage && activePage.AssociatedViewModel != null)
+        {
+            await activePage.AssociatedViewModel.KeyboardShortcutHook(details);
+        }
+
+        if (details.Handled)
+        {
+            e.Handled = true;
+        }
+    }
+
+    private bool ShouldIgnoreShortcut()
+    {
+        var focusedElement = FocusManager.GetFocusedElement(XamlRoot);
+
+        if (focusedElement is TextBox or AutoSuggestBox or PasswordBox or RichEditBox or ComboBox)
+            return true;
+
+        if (focusedElement is FrameworkElement frameworkElement)
+        {
+            var typeName = frameworkElement.GetType().Name;
+            if (typeName.Contains("WebView", StringComparison.OrdinalIgnoreCase))
+                return true;
+        }
+
+        return false;
+    }
+
+    private static ModifierKeys GetCurrentModifierKeys()
+    {
+        var modifiers = ModifierKeys.None;
+
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Control).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Control;
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Menu).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Alt;
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Shift).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Shift;
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.LeftWindows).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down) ||
+            Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.RightWindows).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+        {
+            modifiers |= ModifierKeys.Windows;
+        }
+
+        return modifiers;
+    }
+
+    private static string NormalizeKey(Windows.System.VirtualKey key)
+    {
+        return key switch
+        {
+            Windows.System.VirtualKey.Control or
+            Windows.System.VirtualKey.LeftControl or
+            Windows.System.VirtualKey.RightControl or
+            Windows.System.VirtualKey.Menu or
+            Windows.System.VirtualKey.LeftMenu or
+            Windows.System.VirtualKey.RightMenu or
+            Windows.System.VirtualKey.Shift or
+            Windows.System.VirtualKey.LeftShift or
+            Windows.System.VirtualKey.RightShift or
+            Windows.System.VirtualKey.LeftWindows or
+            Windows.System.VirtualKey.RightWindows => string.Empty,
+            _ => key.ToString()
+        };
+    }
 }

Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml

@@ -470,8 +470,8 @@
                 <Border
                     x:Name="AttachmentsPane"
                     Margin="0,8,0,0"
-                    AllowDrop="True"
                     Padding="16"
+                    AllowDrop="True"
                     Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                     CornerRadius="{StaticResource ControlCornerRadius}"
                     DragLeave="AttachmentsPane_DragLeave"
@@ -487,7 +487,10 @@
                             Style="{StaticResource TransparentActionButtonStyle}">
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <coreControls:WinoFontIcon FontSize="14" Icon="AttachmentNew" />
-                                <TextBlock FontSize="18" FontWeight="SemiBold" Text="+" />
+                                <TextBlock
+                                    FontSize="18"
+                                    FontWeight="SemiBold"
+                                    Text="+" />
                             </StackPanel>
                         </Button>
 
@@ -560,7 +563,20 @@
                     <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.CalendarEventCompose_Notes}" />
                 </StackPanel>
                 <!--  Notes Editor  -->
-                <mailControls:EditorTabbedCommandBarControl CommandTarget="{x:Bind NotesEditor}" />
+                <mailControls:EditorTabbedCommandBarControl CommandTarget="{x:Bind NotesEditor}">
+                    <mailControls:EditorTabbedCommandBarControl.PaneCustomContent>
+                        <toolkit:TabbedCommandBarItem
+                            CommandAlignment="Right"
+                            IsDynamicOverflowEnabled="True"
+                            OverflowButtonAlignment="Left">
+                            <AppBarButton Click="ToggleNotesEditorThemeClicked" ToolTipService.ToolTip="{x:Bind GetEditorThemeToolTip(NotesEditor.IsEditorDarkMode), Mode=OneWay}">
+                                <AppBarButton.Icon>
+                                    <coreControls:WinoFontIcon Icon="{x:Bind GetEditorThemeIcon(NotesEditor.IsEditorDarkMode), Mode=OneWay}" />
+                                </AppBarButton.Icon>
+                            </AppBarButton>
+                        </toolkit:TabbedCommandBarItem>
+                    </mailControls:EditorTabbedCommandBarControl.PaneCustomContent>
+                </mailControls:EditorTabbedCommandBarControl>
                 <mailControls:WebViewEditorControl
                     x:Name="NotesEditor"
                     MinHeight="500"

Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml.cs

@@ -15,6 +15,7 @@ using Windows.Storage;
 using Wino.Core.Domain;
 using Wino.Messaging.Client.Shell;
 using Wino.Calendar.ViewModels.Data;
+using Wino.Mail.WinUI.Controls;
 using Wino.Mail.WinUI.Views.Abstract;
 
 namespace Wino.Calendar.Views;
@@ -29,6 +30,15 @@ public sealed partial class CalendarEventComposePage : CalendarEventComposePageA
         InitializeComponent();
     }
 
+    public WinoIconGlyph GetEditorThemeIcon(bool isDarkMode) => isDarkMode ? WinoIconGlyph.LightEditor : WinoIconGlyph.DarkEditor;
+
+    public string GetEditorThemeToolTip(bool isDarkMode) => isDarkMode ? Translator.Composer_LightTheme : Translator.Composer_DarkTheme;
+
+    private void ToggleNotesEditorThemeClicked(object sender, RoutedEventArgs e)
+    {
+        NotesEditor.ToggleEditorTheme();
+    }
+
     protected override async void OnNavigatedTo(NavigationEventArgs e)
     {
         base.OnNavigatedTo(e);