Merge pull request #62 from matheuswhite/47-ratatui

Change from "tui" to "ratatui"
matheuswhite · Mar 11, 2024 · f039bd2 · f039bd2
2 parents 7528684 + 3b36a5c
commit f039bd2
Show file tree

Hide file tree

Showing 8 changed files with 234 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ path = "src/main.rs"
 
 [dependencies]
 serialport = "4.3.0"
-tui = "0.19.0"
+ratatui = "0.26.1"
 crossterm = "0.25.0"
 chrono = "0.4.23"
 serde = "1.0"

diff --git a/src/command_bar.rs b/src/command_bar.rs
@@ -4,10 +4,14 @@ use crate::messages::{SerialRxData, UserTxData};
 use crate::plugin_manager::PluginManager;
 use crate::serial::SerialIF;
 use crate::text::TextView;
-use crate::ConcreteBackend;
 use chrono::Local;
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers, MouseEventKind};
 use rand::seq::SliceRandom;
+use ratatui::layout::{Constraint, Direction, Layout, Rect};
+use ratatui::style::{Color, Style};
+use ratatui::text::{Line, Span};
+use ratatui::widgets::{Block, BorderType, Borders, Clear, Paragraph};
+use ratatui::Frame;
 use std::cmp::{max, min};
 use std::collections::btree_map::BTreeMap;
 use std::collections::HashMap;
@@ -17,11 +21,6 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use std::thread::sleep;
 use std::time::Duration;
-use tui::layout::{Constraint, Direction, Layout, Rect};
-use tui::style::{Color, Style};
-use tui::text::{Span, Spans};
-use tui::widgets::{Block, BorderType, Borders, Clear, Paragraph};
-use tui::Frame;
 
 pub struct CommandBar {
     interface: Arc<Mutex<SerialIF>>,
@@ -103,7 +102,7 @@ impl CommandBar {
         }
     }
 
-    pub fn draw(&self, f: &mut Frame<ConcreteBackend>) {
+    pub fn draw(&self, f: &mut Frame) {
         let chunks = Layout::default()
             .direction(Direction::Vertical)
             .constraints(
@@ -567,7 +566,7 @@ impl CommandList {
         self.pattern = pattern;
     }
 
-    pub fn draw(&self, f: &mut Frame<ConcreteBackend>, command_bar_y: u16, color: Color) {
+    pub fn draw(&self, f: &mut Frame, command_bar_y: u16, color: Color) {
         if self.commands.is_empty() {
             return;
         }
@@ -598,7 +597,7 @@ impl CommandList {
                 let is_last =
                     (x == commands.last().unwrap()) && (commands.len() < self.commands.len());
 
-                Spans::from(vec![
+                Line::from(vec![
                     Span::styled(
                         format!(" {}", if !is_last { &self.pattern } else { "" }),
                         Style::default().fg(color),

diff --git a/src/error_pop_up.rs b/src/error_pop_up.rs
@@ -1,10 +1,9 @@
-use crate::ConcreteBackend;
+use ratatui::layout::{Alignment, Rect};
+use ratatui::style::{Color, Style};
+use ratatui::text::Span;
+use ratatui::widgets::{Block, Borders, Clear, Paragraph};
+use ratatui::Frame;
 use std::time::{Duration, Instant};
-use tui::layout::{Alignment, Rect};
-use tui::style::{Color, Style};
-use tui::text::Span;
-use tui::widgets::{Block, Borders, Clear, Paragraph};
-use tui::Frame;
 
 pub struct ErrorPopUp {
     message: String,
@@ -21,7 +20,7 @@ impl ErrorPopUp {
         }
     }
 
-    pub fn draw(&self, f: &mut Frame<ConcreteBackend>, command_bar_y: u16) {
+    pub fn draw(&self, f: &mut Frame, command_bar_y: u16) {
         let area_size = (self.message.chars().count() as u16 + 4, 3);
         let area = Rect::new(
             (f.size().width - area_size.0) / 2,

diff --git a/src/main.rs b/src/main.rs
@@ -11,11 +11,11 @@ use crossterm::execute;
 use crossterm::terminal::{
     disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen,
 };
+use ratatui::backend::{Backend, CrosstermBackend};
+use ratatui::Terminal;
 use std::io;
 use std::io::Stdout;
 use std::path::PathBuf;
-use tui::backend::{Backend, CrosstermBackend};
-use tui::Terminal;
 
 mod command_bar;
 mod error_pop_up;

diff --git a/src/messages.rs b/src/messages.rs
@@ -1,7 +1,7 @@
 use crate::rich_string::RichText;
 use crate::text::ViewData;
 use chrono::{DateTime, Local};
-use tui::style::Color;
+use ratatui::style::Color;
 
 pub enum UserTxData {
     Exit,

diff --git a/src/rich_string.rs b/src/rich_string.rs
@@ -1,8 +1,8 @@
 use crate::text::ViewData;
 use chrono::{DateTime, Local};
+use ratatui::style::{Color, Style};
+use ratatui::text::Span;
 use std::collections::HashMap;
-use tui::style::{Color, Style};
-use tui::text::Span;
 
 pub struct RichText {
     content: Vec<u8>,

diff --git a/src/text.rs b/src/text.rs
@@ -1,12 +1,11 @@
 use crate::messages::SerialRxData;
 use crate::rich_string::RichText;
-use crate::ConcreteBackend;
 use chrono::{DateTime, Local};
-use tui::layout::Rect;
-use tui::style::{Color, Modifier, Style};
-use tui::text::{Span, Spans};
-use tui::widgets::{Block, BorderType, Borders, Paragraph};
-use tui::Frame;
+use ratatui::layout::Rect;
+use ratatui::style::{Color, Modifier, Style};
+use ratatui::text::{Line, Span};
+use ratatui::widgets::{Block, BorderType, Borders, Paragraph};
+use ratatui::Frame;
 
 pub struct TextView {
     history: Vec<ViewData>,
@@ -38,7 +37,7 @@ impl TextView {
         }
     }
 
-    pub fn draw(&self, f: &mut Frame<ConcreteBackend>, rect: Rect) {
+    pub fn draw(&self, f: &mut Frame, rect: Rect) {
         let scroll = if self.auto_scroll {
             (self.max_main_axis(), self.scroll.1)
         } else {
@@ -87,7 +86,7 @@ impl TextView {
                     }))
                     .collect::<Vec<_>>();
 
-                Spans::from(content)
+                Line::from(content)
             })
             .collect::<Vec<_>>();
         let paragraph = Paragraph::new(text).block(block);