refactor: reorganize modules into screen/ and widget/ directories

Author: uednd

src/app.rs

@@ -9,11 +9,10 @@ use ratatui::{
 };
 
 use crate::{
-    exit_handler::ExitHandler,
-    footer::Footer,
-    menu_screen::MenuScreen,
-    screen::{Screen, ScreenCommand},
+    exit::ExitHandler,
+    screen::{Screen, ScreenCommand, home::MenuScreen},
     theme::Theme,
+    widget::footer::Footer,
 };
 
 const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -54,10 +53,7 @@ impl App {
             terminal.draw(|frame| {
                 let area = frame.area();
 
-                frame.render_widget(
-                    Block::new().style(Style::default().bg(self.theme.bg)),
-                    area,
-                );
+                frame.render_widget(Block::new().style(Style::default().bg(self.theme.bg)), area);
 
                 let [body, footer_area] =
                     Layout::vertical([Constraint::Fill(1), Constraint::Length(2)]).areas(area);

src/exit_handler.rs src/exit.rssrc/exit_handler.rs renamed to src/exit.rs

@@ -3,14 +3,10 @@
 //! 按两次 Ctrl+C 退出。
 
 mod app;
-mod exit_handler;
-mod footer;
-mod input;
-mod logo;
-mod menu_screen;
+mod exit;
 mod screen;
-mod tabs;
 mod theme;
+mod widget;
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;

src/main.rs

@@ -0,0 +1,53 @@
+use crossterm::event::{KeyCode, KeyEvent};
+use ratatui::{
+    Frame,
+    layout::{Constraint, Layout, Rect},
+};
+
+use crate::{
+    theme::Theme,
+    widget::{
+        logo::{LOGO_HEIGHT, Logo},
+        tabs::Tabs,
+    },
+};
+
+use super::{Screen, ScreenCommand};
+
+pub struct MenuScreen {
+    logo: Logo,
+    tabs: Tabs,
+}
+
+impl MenuScreen {
+    pub fn new(theme: Theme) -> Self {
+        Self {
+            logo: Logo::new(theme),
+            tabs: Tabs::new(theme),
+        }
+    }
+}
+
+impl Screen for MenuScreen {
+    fn render(&self, frame: &mut Frame, area: Rect) {
+        let [_, logo_area, _, body_area, _] = Layout::vertical([
+            Constraint::Fill(1),
+            Constraint::Length(LOGO_HEIGHT),
+            Constraint::Length(3),
+            Constraint::Fill(3),
+            Constraint::Fill(1),
+        ])
+        .areas(area);
+
+        self.logo.render(frame, logo_area);
+        self.tabs.render(frame, body_area);
+    }
+
+    fn handle_key(&mut self, key: KeyEvent) -> Option<ScreenCommand> {
+        match key.code {
+            KeyCode::Enter => Some(ScreenCommand::Stay),
+            _ if self.tabs.handle_key(key) => Some(ScreenCommand::Stay),
+            _ => Some(ScreenCommand::Stay),
+        }
+    }
+}

src/menu_screen.rs

@@ -0,0 +1,16 @@
+pub mod home;
+
+use crossterm::event::KeyEvent;
+use ratatui::{Frame, layout::Rect};
+
+#[allow(dead_code)]
+pub enum ScreenCommand {
+    Stay,
+    Navigate(Box<dyn Screen>),
+}
+
+pub trait Screen {
+    fn render(&self, frame: &mut Frame, area: Rect);
+
+    fn handle_key(&mut self, key: KeyEvent) -> Option<ScreenCommand>;
+}

src/screen.rs

@@ -47,33 +47,33 @@ impl Footer {
             Span::styled(" 切换标签", dim_style),
         ]);
 
+        // Cwd
         frame.render_widget(
             Paragraph::new(Line::from(self.current_dir.as_str()).style(dim_style)),
             path_area,
         );
+
+        // Tip
         frame.render_widget(Paragraph::new(hint).alignment(Alignment::Center), hint_area);
 
-        if let Some(text) = exit_hint {
-            let exit_width = text.width() as u16 + 2;
-            let [exit_hint_area, version_text_area] =
-                Layout::horizontal([Constraint::Length(exit_width), Constraint::Fill(1)])
-                    .areas(version_area);
+        // Exit hint
+        let exit_width = exit_hint.map_or(0, |t| t.width() as u16 + 2);
+        let [exit_hint_area, version_text_area] =
+            Layout::horizontal([Constraint::Length(exit_width), Constraint::Fill(1)])
+                .areas(version_area);
 
+        if let Some(text) = exit_hint {
             frame.render_widget(
                 Paragraph::new(Line::from(text)).yellow().bold(),
                 exit_hint_area,
             );
-            frame.render_widget(
-                Paragraph::new(Line::from(self.version.as_str()).style(dim_style))
-                    .alignment(Alignment::Right),
-                version_text_area,
-            );
-        } else {
-            frame.render_widget(
-                Paragraph::new(Line::from(self.version.as_str()).style(dim_style))
-                    .alignment(Alignment::Right),
-                version_area,
-            );
         }
+
+        // Version
+        frame.render_widget(
+            Paragraph::new(Line::from(self.version.as_str()).style(dim_style))
+                .alignment(Alignment::Right),
+            version_text_area,
+        );
     }
 }