refactor(example): restructure import / use

This commit is contained in:
EdJoPaTo
2024-02-24 11:18:09 +01:00
parent b31a599a37
commit 49bfa7e5f0
+22 -27
View File
@@ -1,16 +1,8 @@
use crossterm::{ use crossterm::event::{Event, KeyCode, MouseEventKind};
event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode}, use ratatui::backend::{Backend, CrosstermBackend};
execute, use ratatui::style::{Color, Modifier, Style};
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, use ratatui::widgets::{Block, Scrollbar, ScrollbarOrientation};
}; use ratatui::Terminal;
use ratatui::{
backend::{Backend, CrosstermBackend},
style::{Color, Modifier, Style},
widgets::{Block, Scrollbar, ScrollbarOrientation},
Terminal,
};
use std::error::Error;
use std::io;
use tui_tree_widget::{Tree, TreeItem, TreeState}; use tui_tree_widget::{Tree, TreeItem, TreeState};
@@ -85,24 +77,27 @@ impl<'a> App<'a> {
} }
} }
fn main() -> Result<(), Box<dyn Error>> { fn main() -> std::io::Result<()> {
// Terminal initialization // Terminal initialization
enable_raw_mode()?; crossterm::terminal::enable_raw_mode()?;
let mut stdout = io::stdout(); let mut stdout = std::io::stdout();
execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?; crossterm::execute!(
let backend = CrosstermBackend::new(stdout); stdout,
let mut terminal = Terminal::new(backend)?; crossterm::terminal::EnterAlternateScreen,
crossterm::event::EnableMouseCapture
)?;
let mut terminal = Terminal::new(CrosstermBackend::new(stdout))?;
// App // App
let app = App::new(); let app = App::new();
let res = run_app(&mut terminal, app); let res = run_app(&mut terminal, app);
// restore terminal // restore terminal
disable_raw_mode()?; crossterm::terminal::disable_raw_mode()?;
execute!( crossterm::execute!(
terminal.backend_mut(), terminal.backend_mut(),
LeaveAlternateScreen, crossterm::terminal::LeaveAlternateScreen,
DisableMouseCapture crossterm::event::DisableMouseCapture
)?; )?;
terminal.show_cursor()?; terminal.show_cursor()?;
@@ -113,7 +108,7 @@ fn main() -> Result<(), Box<dyn Error>> {
Ok(()) Ok(())
} }
fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Result<()> { fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> std::io::Result<()> {
loop { loop {
terminal.draw(|frame| { terminal.draw(|frame| {
let area = frame.size(); let area = frame.size();
@@ -141,7 +136,7 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Result<(
frame.render_stateful_widget(widget, area, &mut app.state); frame.render_stateful_widget(widget, area, &mut app.state);
})?; })?;
match event::read()? { match crossterm::event::read()? {
Event::Key(key) => match key.code { Event::Key(key) => match key.code {
KeyCode::Char('q') => return Ok(()), KeyCode::Char('q') => return Ok(()),
KeyCode::Char('\n' | ' ') => app.state.toggle_selected(), KeyCode::Char('\n' | ' ') => app.state.toggle_selected(),
@@ -160,8 +155,8 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Result<(
_ => {} _ => {}
}, },
Event::Mouse(mouse) => match mouse.kind { Event::Mouse(mouse) => match mouse.kind {
event::MouseEventKind::ScrollDown => app.state.scroll_down(1), MouseEventKind::ScrollDown => app.state.scroll_down(1),
event::MouseEventKind::ScrollUp => app.state.scroll_up(1), MouseEventKind::ScrollUp => app.state.scroll_up(1),
_ => {} _ => {}
}, },
_ => {} _ => {}