Merge pull request #1220 from lawson85/Add-keyboard-shortcuts

feat: add keyboard shortcuts

Author: lawson85

src/gui/mod.rs

@@ -19,6 +19,8 @@ use widgets::navigation_menu::nav_menu;
 
 use iced::widget::column;
 use iced::{Alignment, Element, Length, Settings, Task, window::Settings as Window};
+use iced::{Subscription, event, keyboard};
+
 #[cfg(feature = "self-update")]
 use std::path::PathBuf;
 
@@ -96,6 +98,30 @@ impl UadGui {
         )
     }
 
+    fn subscription(&self) -> Subscription<Message> {
+        event::listen_with(|event, _status, _env| match event {
+            iced::Event::Keyboard(keyboard::Event::KeyPressed { key, modifiers, .. }) => {
+                if modifiers.control() && modifiers.shift() {
+                    match key {
+                        keyboard::Key::Character(c) if c == "r" => {
+                            Some(Message::RebootButtonPressed)
+                        }
+                        keyboard::Key::Character(c) if c == "5" => {
+                            Some(Message::RefreshButtonPressed)
+                        }
+                        keyboard::Key::Character(c) if c == "a" => Some(Message::AppsPress),
+                        keyboard::Key::Character(c) if c == "i" => Some(Message::AboutPressed),
+                        keyboard::Key::Character(c) if c == "s" => Some(Message::SettingsPressed),
+                        _ => None,
+                    }
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        })
+    }
+
     #[allow(
         clippy::too_many_lines,
         reason = "Root GUI update orchestrates many flows"
@@ -389,6 +415,7 @@ impl UadGui {
         iced::application(UadGui::new, UadGui::update, UadGui::view)
             .title(UadGui::title)
             .theme(UadGui::theme)
+            .subscription(UadGui::subscription)
             .settings(Settings {
                 id: Some(String::from(NAME)),
                 default_text_size: iced::Pixels(16.0),

src/gui/widgets/navigation_menu.rs

@@ -7,7 +7,6 @@ pub use crate::gui::views::list::{List as AppsView, LoadingState as ListLoadingS
 use crate::gui::{Message, style, widgets::text};
 use iced::widget::{Space, button, container, pick_list, row, tooltip};
 use iced::{Alignment, Element, Font, Length, Renderer, alignment, font};
-
 /// resources/assets/icons.ttf, loaded in [`crate::gui::UadGui`]
 pub const ICONS: Font = Font {
     family: font::Family::Name("icomoon"),
@@ -28,12 +27,24 @@ pub fn nav_menu<'a>(
     )
     .on_press(Message::RefreshButtonPressed);
 
-    let apps_refresh_tooltip = tooltip(apps_refresh_btn, "Refresh apps", tooltip::Position::Bottom)
-        .style(style::Container::Tooltip)
-        .gap(4);
+    let apps_refresh_tooltip = tooltip(
+        apps_refresh_btn,
+        "Refresh apps (Ctrl+Shift+5)",
+        tooltip::Position::Bottom,
+    )
+    .style(style::Container::Tooltip)
+    .gap(4);
 
     let reboot_btn = button_primary("Reboot").on_press(Message::RebootButtonPressed);
 
+    let reboot_btn = tooltip(
+        reboot_btn,
+        "Reboot device (Ctrl+Shift+R)",
+        tooltip::Position::Bottom,
+    )
+    .style(style::Container::Tooltip)
+    .gap(4);
+
     let uad_version_text = if let Some(r) = &self_update_state.latest_release {
         match self_update_state.status {
             SelfUpdateStatus::Failed => text(format!("Failed to update to {}", r.tag_name)),
@@ -60,8 +71,16 @@ pub fn nav_menu<'a>(
 
     let apps_btn = button_primary("Apps").on_press(Message::AppsPress);
 
+    let apps_btn = tooltip(apps_btn, "(Ctrl+Shift+A)", tooltip::Position::Bottom)
+        .style(style::Container::Tooltip)
+        .gap(4);
+
     let about_btn = button_primary("About").on_press(Message::AboutPressed);
 
+    let about_btn = tooltip(about_btn, "(Ctrl+Shift+I)", tooltip::Position::Bottom)
+        .style(style::Container::Tooltip)
+        .gap(4);
+
     let settings_btn = button_primary(
         text("\u{E994}")
             .font(ICONS)
@@ -70,6 +89,10 @@ pub fn nav_menu<'a>(
     )
     .on_press(Message::SettingsPressed);
 
+    let settings_btn = tooltip(settings_btn, "(Ctrl+Shift+S)", tooltip::Position::Bottom)
+        .style(style::Container::Tooltip)
+        .gap(4);
+
     let device_list_text = match apps_view.loading_state {
         ListLoadingState::FindingPhones => text("Finding connected devices..."),
         _ => text("No devices/emulators found"),