2 files changed, 52 insertions, 13 deletions

diff --git a/src/components/global_keys.rs b/src/components/global_keys.rs
index e99e2e0..67b1b6a 100644
--- a/src/components/global_keys.rs
+++ b/src/components/global_keys.rs
@@ -4,41 +4,69 @@ use ratatui::widgets::*;
 
 use crate::app_action::AppAction;
 use crate::component::Component;
+use crate::keys::key_commands::*;
 
-#[derive(Default, Clone, Copy)]
+#[derive(Default)]
 pub struct GlobalKeys {
-    should_show: bool,
+    pub key_commands: Vec<KeyCommand>,
+
+    pub should_show: bool,
+    pub scroll: u16,
 }
 
 impl Component for GlobalKeys {
+    fn init(&mut self) -> eyre::Result<()> {
+        self.key_commands.push(KeyCommand {
+            key_code: "?".to_string(),
+            description: "Show help menu".to_string(),
+            action: None,
+        });
+
+        Ok(())
+    }
+
     fn handle_key_event(
         &mut self,
         key: KeyEvent,
     ) -> eyre::Result<Option<AppAction>> {
         if key.kind == KeyEventKind::Press {
-            return match key.code {
-                KeyCode::Char('q') => Ok(Some(AppAction::Quit)),
-                KeyCode::Char('?') => {
-                    self.should_show = !self.should_show;
-                    Ok(None)
+            for key_command in self.key_commands.iter_mut() {
+                if key_command.key_code == serialize_key_event(key) {
+                    if serialize_key_event(key) == "?" {
+                        self.should_show = !self.should_show;
+                    }
+
+                    return Ok(key_command.action);
                 }
-                _ => Ok(None),
-            };
+            }
         }
 
         Ok(None)
     }
 
     fn render(&mut self, frame: &mut Frame, rect: Rect) -> eyre::Result<()> {
-        let horizontal_center = Layout::default()
-            .direction(Direction::Horizontal);
-
         let block = Block::default()
             .title("Keyboard shortcuts")
             .borders(Borders::ALL);
 
+        let mut lines: Vec<Line> = vec![];
+        for key_command in self.key_commands.iter_mut() {
+            let command = Span::from(key_command.key_code.clone());
+            let description =
+                Span::from(key_command.description.clone()).italic();
+            let spacer = Span::from("  ");
+
+            let line = Line::from(vec![command, spacer, description]);
+            lines.push(line);
+        }
+
+        let commands = Paragraph::new(lines)
+            .block(block)
+            .wrap(Wrap { trim: true })
+            .scroll((self.scroll, 0));
+
         if self.should_show {
-            frame.render_widget(block, rect);
+            frame.render_widget(commands, rect);
         }
 
         Ok(())
diff --git a/src/components/hello_world.rs b/src/components/hello_world.rs
index afb9d47..2e3a2ee 100644
--- a/src/components/hello_world.rs
+++ b/src/components/hello_world.rs
@@ -1,7 +1,9 @@
 use ratatui::prelude::*;
 use ratatui::widgets::Paragraph;
 
+use crate::app_action::AppAction;
 use crate::component::Component;
+use crate::keys::key_commands::*;
 
 #[derive(Default, Clone)]
 pub struct HelloWorld {
@@ -14,7 +16,16 @@ impl Component for HelloWorld {
         Ok(())
     }
 
+    fn handle_key_event(
+        &mut self,
+        key: crossterm::event::KeyEvent,
+    ) -> eyre::Result<Option<AppAction>> {
+        self.text = serialize_key_event(key);
+        Ok(None)
+    }
+
     fn render(&mut self, frame: &mut Frame, rect: Rect) -> eyre::Result<()> {
+
         frame.render_widget(Paragraph::new(self.text.clone()), rect);
 
         Ok(())