Update to use ratatui as tui is abandoned

max-niederman · Jun 1, 2023 · db166be · db166be
1 parent 77f942a
commit db166be
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 54 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,10 +16,8 @@ crossterm = "^0.26"
 rust-embed = "^6.4"
 toml = "^0.7"
 
-[dependencies.tui]
-version = "^0.19"
-default-features = false
-features = ["crossterm"]
+[dependencies.ratatui]
+version = "^0.21"
 
 [dependencies.rand]
 version = "^0.8"

diff --git a/src/config.rs b/src/config.rs
@@ -2,7 +2,7 @@ use serde::{
     de::{self, IntoDeserializer},
     Deserialize,
 };
-use tui::style::{Color, Modifier, Style};
+use ratatui::style::{Color, Modifier, Style};
 
 #[derive(Debug, Deserialize)]
 #[serde(default)]

diff --git a/src/main.rs b/src/main.rs
@@ -21,7 +21,7 @@ use std::{
     str,
 };
 use structopt::StructOpt;
-use tui::{backend::CrosstermBackend, terminal::Terminal};
+use ratatui::{backend::CrosstermBackend, terminal::Terminal};
 
 #[derive(RustEmbed)]
 #[folder = "resources/runtime"]
@@ -156,7 +156,7 @@ enum State {
 }
 
 impl State {
-    fn render_into<B: tui::backend::Backend>(
+    fn render_into<B: ratatui::backend::Backend>(
         &self,
         terminal: &mut Terminal<B>,
         config: &Config,

diff --git a/src/ui.rs b/src/ui.rs
@@ -6,11 +6,11 @@ use crossterm::event::KeyCode;
 use crossterm::event::KeyEvent;
 use results::Fraction;
 use std::iter;
-use tui::{
+use ratatui::{
     buffer::Buffer,
     layout::{Constraint, Direction, Layout, Rect},
     symbols::Marker,
-    text::{Span, Spans, Text},
+    text::{Span, Line, Text},
     widgets::{Axis, Block, BorderType, Borders, Chart, Dataset, GraphType, Paragraph, Widget},
 };
 
@@ -39,10 +39,10 @@ trait DrawInner<T> {
     fn draw_inner(&self, content: T, buf: &mut Buffer);
 }
 
-impl DrawInner<&Spans<'_>> for SizedBlock<'_> {
-    fn draw_inner(&self, content: &Spans, buf: &mut Buffer) {
+impl DrawInner<&Line<'_>> for SizedBlock<'_> {
+    fn draw_inner(&self, content: &Line, buf: &mut Buffer) {
         let inner = self.block.inner(self.area);
-        buf.set_spans(inner.x, inner.y, content, inner.width);
+        buf.set_line(inner.x, inner.y, content, inner.width);
     }
 }
 
@@ -88,19 +88,19 @@ impl ThemedWidget for &Test {
         // Sections
         let input = SizedBlock {
             block: Block::default()
-                .title(Spans::from(vec![Span::styled("Input", theme.title)]))
+                .title(Line::from(vec![Span::styled("Input", theme.title)]))
                 .borders(Borders::ALL)
                 .border_type(BorderType::Rounded)
                 .border_style(theme.input_border),
             area: chunks[0],
         };
         input.draw_inner(
-            &Spans::from(self.words[self.current_word].progress.clone()),
+            &Line::from(self.words[self.current_word].progress.clone()),
             buf,
         );
         input.render(buf);
 
-        let target_lines: Vec<Spans> = {
+        let target_lines: Vec<Line> = {
             let words = iter::empty::<Vec<Span>>()
                 // already typed words
                 .chain(self.words[..self.current_word].iter().map(|w| {
@@ -158,23 +158,23 @@ impl ThemedWidget for &Test {
                         .map(|w| vec![Span::styled(w.text.clone() + " ", theme.prompt_untyped)]),
                 );
 
-            let mut lines: Vec<Spans> = Vec::new();
+            let mut lines: Vec<Line> = Vec::new();
             let mut current_line: Vec<Span> = Vec::new();
             let mut current_width = 0;
             for word in words {
                 let word_width: usize = word.iter().map(|s| s.width()).sum();
 
                 if current_width + word_width > chunks[1].width as usize - 2 {
                     current_line.push(Span::raw("\n"));
-                    lines.push(Spans::from(current_line.clone()));
+                    lines.push(Line::from(current_line.clone()));
                     current_line.clear();
                     current_width = 0;
                 }
 
                 current_line.extend(word);
                 current_width += word_width;
             }
-            lines.push(Spans::from(current_line));
+            lines.push(Line::from(current_line));
 
             lines
         };
@@ -217,19 +217,19 @@ impl ThemedWidget for &results::Results {
         // Sections
         let mut overview_text = Text::styled("", theme.results_overview);
         overview_text.extend([
-            Spans::from(format!(
+            Line::from(format!(
                 "Adjusted WPM: {:.1}",
                 self.timing.overall_cps * WPM_PER_CPS * f64::from(self.accuracy.overall)
             )),
-            Spans::from(format!(
+            Line::from(format!(
                 "Accuracy: {:.1}%",
                 f64::from(self.accuracy.overall) * 100f64
             )),
-            Spans::from(format!(
+            Line::from(format!(
                 "Raw WPM: {:.1}",
                 self.timing.overall_cps * WPM_PER_CPS
             )),
-            Spans::from(format!("Correct Keypresses: {}", self.accuracy.overall)),
+            Line::from(format!("Correct Keypresses: {}", self.accuracy.overall)),
         ]);
         let overview = Paragraph::new(overview_text).block(
             Block::default()
@@ -264,7 +264,7 @@ impl ThemedWidget for &results::Results {
                         None
                     }
                 })
-                .map(Spans::from),
+                .map(Line::from),
         );
         let worst = Paragraph::new(worst_text).block(
             Block::default()