Converted project to use the tui-rs-revival ratatui in favor of the likely soon-to-be-archived tui-rs repo.

Cargo.toml

@@ -31,7 +31,7 @@ serde = { version = "1.0", features = ["derive"] }
 strum = {version = "0.24", features = ["derive"] }
 strum_macros = "0.24"
 tokio = { version = "1.24.1", features = ["full"] }
-tui = "0.19.0"
+tui = { version = "0.20.1", package = "ratatui" }
 urlencoding = "2.1.2"
 
 [dev-dependencies]

src/handlers/radarr_handlers/collection_details_handler.rs

@@ -95,7 +95,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for CollectionDetailsHandler<'a>
           )
             .into(),
         );
-        self.app.data.radarr_data.selected_block = ActiveRadarrBlock::EditMovieToggleMonitored;
+        self.app.data.radarr_data.selected_block = ActiveRadarrBlock::AddMovieSelectRootFolder;
         self.app.data.radarr_data.populate_preferences_lists();
       }
     }
@@ -124,7 +124,7 @@ impl<'a> KeyEventHandler<'a, ActiveRadarrBlock> for CollectionDetailsHandler<'a>
           .into(),
       );
       self.app.data.radarr_data.populate_edit_collection_fields();
-      self.app.data.radarr_data.selected_block = ActiveRadarrBlock::EditCollectionToggleMonitored;
+      self.app.data.radarr_data.selected_block = ActiveRadarrBlock::AddMovieSelectRootFolder;
     }
   }
 }
@@ -219,7 +219,7 @@ mod tests {
       assert!(!app.data.radarr_data.monitor_list.items.is_empty());
       assert_eq!(
         app.data.radarr_data.selected_block,
-        ActiveRadarrBlock::EditMovieToggleMonitored
+        ActiveRadarrBlock::AddMovieSelectRootFolder
       );
       assert!(!app
         .data

src/network/radarr_network.rs

@@ -1461,12 +1461,12 @@ mod test {
       vec![
         DiskSpace {
           free_space: Number::from(1111),
-          total_space: Number::from(2222)
+          total_space: Number::from(2222),
         },
         DiskSpace {
           free_space: Number::from(3333),
-          total_space: Number::from(4444)
+          total_space: Number::from(4444),
-        }
+        },
       ]
     );
   }

src/ui/mod.rs

@@ -1,4 +1,5 @@
 use std::iter;
+use std::rc::Rc;
 
 use tui::backend::Backend;
 use tui::layout::{Alignment, Constraint, Rect};
@@ -44,7 +45,7 @@ pub fn ui<B: Backend>(f: &mut Frame<'_, B>, app: &mut App) {
 
     draw_error(f, app, chunks[1]);
 
-    vec![chunks[0], chunks[2], chunks[3]]
+    Rc::new([chunks[0], chunks[2], chunks[3]])
   } else {
     vertical_chunks_with_margin(
       vec![
@@ -365,7 +366,7 @@ pub fn draw_prompt_box_with_content<B: Backend>(
 
     f.render_widget(content_paragraph, vertical_chunks[1]);
 
-    vec![vertical_chunks[0], vertical_chunks[2], vertical_chunks[3]]
+    Rc::new([vertical_chunks[0], vertical_chunks[2], vertical_chunks[3]])
   } else {
     vertical_chunks_with_margin(
       vec![

src/ui/utils.rs

@@ -1,3 +1,4 @@
+use std::rc::Rc;
 use tui::backend::Backend;
 use tui::layout::{Alignment, Constraint, Direction, Layout, Rect};
 use tui::style::{Color, Modifier, Style};
@@ -15,7 +16,7 @@ pub const COLOR_ORANGE: Color = Color::Rgb(255, 170, 66);
 pub const COLOR_WHITE: Color = Color::White;
 pub const COLOR_MAGENTA: Color = Color::Magenta;
 
-pub fn horizontal_chunks(constraints: Vec<Constraint>, area: Rect) -> Vec<Rect> {
+pub fn horizontal_chunks(constraints: Vec<Constraint>, area: Rect) -> Rc<[Rect]> {
   layout_with_constraints(constraints)
     .direction(Direction::Horizontal)
     .split(area)
@@ -25,14 +26,14 @@ pub fn horizontal_chunks_with_margin(
   constraints: Vec<Constraint>,
   area: Rect,
   margin: u16,
-) -> Vec<Rect> {
+) -> Rc<[Rect]> {
   layout_with_constraints(constraints)
     .direction(Direction::Horizontal)
     .margin(margin)
     .split(area)
 }
 
-pub fn vertical_chunks(constraints: Vec<Constraint>, area: Rect) -> Vec<Rect> {
+pub fn vertical_chunks(constraints: Vec<Constraint>, area: Rect) -> Rc<[Rect]> {
   layout_with_constraints(constraints)
     .direction(Direction::Vertical)
     .split(area)
@@ -42,7 +43,7 @@ pub fn vertical_chunks_with_margin(
   constraints: Vec<Constraint>,
   area: Rect,
   margin: u16,
-) -> Vec<Rect> {
+) -> Rc<[Rect]> {
   layout_with_constraints(constraints)
     .direction(Direction::Vertical)
     .margin(margin)