chore(deps): Update ratatui and tracing to fix cargo install issue (#25)

* chore(deps): Update ratatui and tracing to fix #12

* fix fmt

---------

Co-authored-by: Dmitriy Kovalenko <[email protected]>

Author: pavlus

Cargo.lock

@@ -25,10 +25,10 @@ hexyl = "0.13.0"
 lazy_static = "1.4.0"
 regex = "1.8.4"
 tokio = { version = "1.28", features = ["full", "tracing"] }
-tracing = "0.1.37"
-tracing-appender = "0.2.2"
+tracing = "0.1.40"
+tracing-appender = "0.2.3"
 tracing-subscriber = "0.3.18"
-tui = { package = "ratatui", version = "0.21.0" }
+tui = { package = "ratatui", version = "0.28.1" }
 uuid = "1.3.4"
 
 [build-dependencies]

Cargo.toml

@@ -198,7 +198,7 @@ impl AppRoute for ConnectionView {
         &mut self,
         area: tui::layout::Rect,
         route_active: bool,
-        f: &mut tui::Frame<super::TerminalBackend>,
+        f: &mut tui::Frame,
     ) -> crate::error::Result<()> {
         let active_route = self.ctx.active_route.read()?;
         let (_, characteristic, history, historical_view_index) =

src/tui/connection_view.rs

@@ -1,6 +1,6 @@
 use crate::{
     error,
-    tui::{ui::BlendrBlock, AppRoute, HandleKeydownResult, TerminalBackend},
+    tui::{ui::BlendrBlock, AppRoute, HandleKeydownResult},
     Ctx,
 };
 use crossterm::event::KeyCode;
@@ -67,20 +67,15 @@ impl AppRoute for ErrorView {
         }
     }
 
-    fn render(
-        &mut self,
-        _area: Rect,
-        _is_active: bool,
-        f: &mut Frame<TerminalBackend>,
-    ) -> error::Result<()> {
+    fn render(&mut self, _area: Rect, _is_active: bool, f: &mut Frame) -> error::Result<()> {
         let global_error_lock = self.ctx.global_error.lock().unwrap();
         let error = if let Some(error) = global_error_lock.deref() {
             error
         } else {
             return Ok(());
         };
 
-        let area = centered_rect(60, 20, f.size());
+        let area = centered_rect(60, 20, f.area());
         f.render_widget(Clear, area); //this clears out the background
 
         let paragraph = Paragraph::new(vec![Line::from(""), Line::from(format!("{error}"))]).block(

src/tui/error_popup.rs

@@ -120,8 +120,7 @@ trait AppRoute {
     where
         Self: Sized;
     fn handle_input(&mut self, key: &KeyEvent) -> HandleKeydownResult;
-    fn render(&mut self, area: Rect, is_active: bool, f: &mut Frame<TerminalBackend>)
-        -> Result<()>;
+    fn render(&mut self, area: Rect, is_active: bool, f: &mut Frame) -> Result<()>;
 }
 
 pub fn run_tui_app(ctx: Arc<Ctx>) -> Result<()> {
@@ -217,9 +216,9 @@ fn tui_loop(
     }
 }
 
-fn ui(f: &mut Frame<TerminalBackend>, app: &mut App) {
+fn ui(f: &mut Frame, app: &mut App) {
     // Create two chunks with equal horizontal screen space
-    let active_blocks = app.get_active_blocks(f.size().width);
+    let active_blocks = app.get_active_blocks(f.area().width);
     let chunks = Layout::default()
         .direction(Direction::Horizontal)
         .constraints(
@@ -228,7 +227,7 @@ fn ui(f: &mut Frame<TerminalBackend>, app: &mut App) {
                 .map(|_| Constraint::Ratio(1, active_blocks.len() as u32))
                 .collect::<Vec<_>>(),
         )
-        .split(f.size());
+        .split(f.area());
 
     for (i, block) in active_blocks.into_iter().enumerate() {
         let is_active = matches!(block, BlockVariant::Primary(_));

src/tui/mod.rs

@@ -168,12 +168,7 @@ impl AppRoute for PeripheralList {
         HandleKeydownResult::Continue
     }
 
-    fn render(
-        &mut self,
-        area: Rect,
-        route_active: bool,
-        f: &mut Frame<super::TerminalBackend>,
-    ) -> Result<()> {
+    fn render(&mut self, area: Rect, route_active: bool, f: &mut Frame) -> Result<()> {
         let scan = self.ctx.latest_scan.read();
         let BleScan {
             peripherals,

src/tui/peripheral_list.rs

@@ -205,7 +205,7 @@ impl AppRoute for PeripheralView {
         &mut self,
         area: tui::layout::Rect,
         route_active: bool,
-        f: &mut tui::Frame<super::TerminalBackend>,
+        f: &mut tui::Frame,
     ) -> crate::error::Result<()> {
         let active_route = self.ctx.get_active_route();
 

src/tui/peripheral_view.rs

@@ -4,7 +4,7 @@ use tui::{
     widgets::{Block, Borders, Paragraph, Wrap},
 };
 
-use crate::tui::{AppRoute, HandleKeydownResult, TerminalBackend};
+use crate::tui::{AppRoute, HandleKeydownResult};
 
 pub struct WelcomeBlock {}
 
@@ -100,7 +100,7 @@ impl AppRoute for WelcomeBlock {
         &mut self,
         area: tui::layout::Rect,
         _is_active: bool,
-        f: &mut tui::Frame<TerminalBackend>,
+        f: &mut tui::Frame,
     ) -> crate::error::Result<()> {
         if area.height > 25 {
             let paragraph = Paragraph::new(Text::from(if area.height < 30 {