Cargo.toml

@@ -17,18 +17,18 @@ bench = false
 anyhow = "1.0"
 bytes = "1"
 copypasta = "0.10.1"
-crossterm = { version = "0.28.1", features = ["event-stream"] }
+crossterm = { version = "0.25", features = ["event-stream"] }
 env_logger = { version = "0.11.5", default-features = false }
 home = "0.5.4"
 indoc = "1"
 log = { version = "0.4", features = ["std"] }
 open = "3"
 rand = "0.8.5"
-ratatui = "0.28.0"
 thiserror = "1.0"
 tokio = { version = "1", features = ["io-std", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "fs"] }
 tokio-stream = "0.1"
 toml = "0.5"
+tui = "0.19"
 xdg = "2"
 
 [dev-dependencies]

src/client/ui.rs

@@ -14,15 +14,6 @@ use crossterm::{
     },
 };
 use log::{error, info, warn, Level, Metadata, Record};
-use ratatui::{
-    backend::CrosstermBackend,
-    layout::{Constraint, Direction, Layout, Margin, Rect},
-    style::{Color, Modifier, Style},
-    widgets::{
-        Block, Borders, List, ListItem, ListState, Row, Table, TableState,
-    },
-    Frame, Terminal,
-};
 use std::collections::vec_deque::VecDeque;
 use std::collections::{HashMap, HashSet};
 use std::io::stdout;
@@ -30,6 +21,15 @@ use std::sync::{Arc, Mutex};
 use tokio::sync::mpsc;
 use tokio::sync::oneshot;
 use tokio_stream::StreamExt;
+use tui::{
+    backend::{Backend, CrosstermBackend},
+    layout::{Constraint, Direction, Layout, Margin, Rect},
+    style::{Color, Modifier, Style},
+    widgets::{
+        Block, Borders, List, ListItem, ListState, Row, Table, TableState,
+    },
+    Frame, Terminal,
+};
 
 pub enum UIEvent {
     Connected(u16),
@@ -301,7 +301,7 @@ impl UI {
         Ok(code)
     }
 
-    fn render_connected(&mut self, frame: &mut Frame) {
+    fn render_connected<T: Backend>(&mut self, frame: &mut Frame<T>) {
         let constraints = if self.show_logs {
             vec![Constraint::Percentage(50), Constraint::Percentage(50)]
         } else {
@@ -311,7 +311,7 @@ impl UI {
         let chunks = Layout::default()
             .direction(Direction::Vertical)
             .constraints(constraints)
-            .split(frame.area());
+            .split(frame.size());
 
         self.render_ports(frame, chunks[0]);
         if self.show_logs {
@@ -322,11 +322,11 @@ impl UI {
         }
     }
 
-    fn render_ports(&mut self, frame: &mut Frame, size: Rect) {
+    fn render_ports<B: Backend>(&mut self, frame: &mut Frame<B>, size: Rect) {
-        let enabled_port_style = Style::reset();
+        let enabled_port_style = Style::default();
-        let disabled_port_style = Style::reset().fg(Color::DarkGray);
+        let disabled_port_style = Style::default().fg(Color::DarkGray);
         let broken_port_style =
-            Style::reset().fg(Color::Red).add_modifier(Modifier::DIM);
+            Style::default().fg(Color::Red).add_modifier(Modifier::DIM);
 
         let mut rows = Vec::new();
         let ports = self.get_ui_ports();
@@ -358,16 +358,17 @@ impl UI {
             Constraint::Length(size.width),
         ];
 
-        let port_list = Table::new(rows, &widths)
+        let port_list = Table::new(rows)
             .header(Row::new(vec!["fwd", "Port", "Description"]))
             .block(Block::default().title("Ports").borders(Borders::ALL))
             .column_spacing(1)
+            .widths(&widths)
             .highlight_symbol(">> ");
 
         frame.render_stateful_widget(port_list, size, &mut self.selection);
     }
 
-    fn render_help(&mut self, frame: &mut Frame) {
+    fn render_help<B: Backend>(&mut self, frame: &mut Frame<B>) {
         let keybindings = vec![
             Row::new(vec!["↑ / k", "Move cursor up"]),
             Row::new(vec!["↓ / j", "Move cursor down"]),
@@ -386,10 +387,10 @@ impl UI {
         let help_popup_area = centered_rect(
             65,
             keybindings.len() as u16 + border_lines,
-            frame.area(),
+            frame.size(),
         );
         let inner_area =
-            help_popup_area.inner(Margin { vertical: 1, horizontal: 1 });
+            help_popup_area.inner(&Margin { vertical: 1, horizontal: 1 });
         let key_width = 7;
         let binding_width = inner_area.width.saturating_sub(key_width);
 
@@ -397,16 +398,16 @@ impl UI {
             Constraint::Length(key_width),
             Constraint::Length(binding_width),
         ];
-        let keybindings = Table::new(keybindings, keybindings_widths)
+        let keybindings = Table::new(keybindings)
+            .widths(keybindings_widths)
             .column_spacing(1)
-            .block(Block::default().title("Keys").borders(Borders::ALL))
+            .block(Block::default().title("Keys").borders(Borders::ALL));
-            .style(Style::reset());
 
         // keybindings
         frame.render_widget(keybindings, inner_area);
     }
 
-    fn render_logs(&mut self, frame: &mut Frame, size: Rect) {
+    fn render_logs<B: Backend>(&mut self, frame: &mut Frame<B>, size: Rect) {
         let items: Vec<_> =
             self.lines.iter().map(|l| ListItem::new(&l[..])).collect();