Completed the refactor and upgrade to Ratatui v0.26. Next up: Refactoring all of the "draw_" functions into custom widgets for more ergonomic and extensible DevX

src/ui/radarr_ui/collections/edit_collection_ui.rs

@@ -1,4 +1,4 @@
-use ratatui::layout::{Constraint, Rect};
+use ratatui::layout::{Constraint, Layout, Rect};
 use ratatui::widgets::ListItem;
 use ratatui::Frame;
 
@@ -10,9 +10,7 @@ use crate::models::servarr_data::radarr::radarr_data::{
 use crate::models::Route;
 use crate::ui::radarr_ui::collections::collection_details_ui::CollectionDetailsUi;
 use crate::ui::radarr_ui::collections::draw_collections;
-use crate::ui::utils::{
-  horizontal_chunks, layout_paragraph_borderless, title_block_centered, vertical_chunks_with_margin,
-};
+use crate::ui::utils::{layout_paragraph_borderless, title_block_centered};
 use crate::ui::{
   draw_button, draw_checkbox_with_label, draw_drop_down_menu_button, draw_drop_down_popup,
   draw_large_popup_over_background_fn_with_ui, draw_medium_popup_over, draw_popup,
@@ -34,7 +32,7 @@ impl DrawUi for EditCollectionUi {
     false
   }
 
-  fn draw(f: &mut Frame<'_>, app: &mut App<'_>, content_rect: Rect) {
+  fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
     if let Route::Radarr(active_radarr_block, context_option) = *app.get_current_route() {
       let draw_edit_collection_prompt =
         |f: &mut Frame<'_>, app: &mut App<'_>, prompt_area: Rect| match active_radarr_block {
@@ -67,18 +65,14 @@ impl DrawUi for EditCollectionUi {
 
       if let Some(context) = context_option {
         match context {
-          ActiveRadarrBlock::Collections => draw_medium_popup_over(
-            f,
-            app,
-            content_rect,
-            draw_collections,
-            draw_edit_collection_prompt,
-          ),
+          ActiveRadarrBlock::Collections => {
+            draw_medium_popup_over(f, app, area, draw_collections, draw_edit_collection_prompt)
+          }
           _ if COLLECTION_DETAILS_BLOCKS.contains(&context) => {
             draw_large_popup_over_background_fn_with_ui::<CollectionDetailsUi>(
               f,
               app,
-              content_rect,
+              area,
               draw_collections,
             );
             draw_popup(f, app, draw_edit_collection_prompt, 60, 60);
@@ -90,11 +84,7 @@ impl DrawUi for EditCollectionUi {
   }
 }
 
-fn draw_edit_collection_confirmation_prompt(
-  f: &mut Frame<'_>,
-  app: &mut App<'_>,
-  prompt_area: Rect,
-) {
+fn draw_edit_collection_confirmation_prompt(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
   let (collection_title, collection_overview) =
     if let Some(filtered_collections) = app.data.radarr_data.filtered_collections.as_ref() {
       (
@@ -140,34 +130,32 @@ fn draw_edit_collection_confirmation_prompt(
   let selected_minimum_availability = minimum_availability_list.current_selection();
   let selected_quality_profile = quality_profile_list.current_selection();
 
-  f.render_widget(title_block_centered(&title), prompt_area);
+  f.render_widget(title_block_centered(&title), area);
 
-  let chunks = vertical_chunks_with_margin(
-    vec![
+  let [paragraph_area, monitored_area, min_availability_area, quality_profile_area, root_folder_area, search_on_add_area, _, buttons_area] =
+    Layout::vertical([
       Constraint::Length(6),
       Constraint::Length(3),
       Constraint::Length(3),
       Constraint::Length(3),
       Constraint::Length(3),
       Constraint::Length(3),
-      Constraint::Min(0),
+      Constraint::Fill(0),
       Constraint::Length(3),
-    ],
-    prompt_area,
-    1,
-  );
+    ])
+    .margin(1)
+    .areas(area);
 
   let prompt_paragraph = layout_paragraph_borderless(&collection_overview);
-  f.render_widget(prompt_paragraph, chunks[0]);
+  f.render_widget(prompt_paragraph, paragraph_area);
 
-  let horizontal_chunks = horizontal_chunks(
-    vec![Constraint::Percentage(50), Constraint::Percentage(50)],
-    chunks[7],
-  );
+  let [save_area, cancel_area] =
+    Layout::horizontal([Constraint::Percentage(50), Constraint::Percentage(50)])
+      .areas(buttons_area);
 
   draw_checkbox_with_label(
     f,
-    chunks[1],
+    monitored_area,
     "Monitored",
     monitored.unwrap_or_default(),
     selected_block == &ActiveRadarrBlock::EditCollectionToggleMonitored,
@@ -175,14 +163,14 @@ fn draw_edit_collection_confirmation_prompt(
 
   draw_drop_down_menu_button(
     f,
-    chunks[2],
+    min_availability_area,
     "Minimum Availability",
     selected_minimum_availability.to_display_str(),
     selected_block == &ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
   );
   draw_drop_down_menu_button(
     f,
-    chunks[3],
+    quality_profile_area,
     "Quality Profile",
     selected_quality_profile,
     selected_block == &ActiveRadarrBlock::EditCollectionSelectQualityProfile,
@@ -192,7 +180,7 @@ fn draw_edit_collection_confirmation_prompt(
     draw_text_box_with_label(
       f,
       LabeledTextBoxProps {
-        area: chunks[4],
+        area: root_folder_area,
         label: "Root Folder",
         text: &path.text,
         offset: *path.offset.borrow(),
@@ -206,34 +194,24 @@ fn draw_edit_collection_confirmation_prompt(
 
   draw_checkbox_with_label(
     f,
-    chunks[5],
+    search_on_add_area,
     "Search on Add",
     search_on_add.unwrap_or_default(),
     selected_block == &ActiveRadarrBlock::EditCollectionToggleSearchOnAdd,
   );
 
-  draw_button(
-    f,
-    horizontal_chunks[0],
-    "Save",
-    yes_no_value && highlight_yes_no,
-  );
-  draw_button(
-    f,
-    horizontal_chunks[1],
-    "Cancel",
-    !yes_no_value && highlight_yes_no,
-  );
+  draw_button(f, save_area, "Save", yes_no_value && highlight_yes_no);
+  draw_button(f, cancel_area, "Cancel", !yes_no_value && highlight_yes_no);
 }
 
 fn draw_edit_collection_select_minimum_availability_popup(
   f: &mut Frame<'_>,
   app: &mut App<'_>,
-  popup_area: Rect,
+  area: Rect,
 ) {
   draw_selectable_list(
     f,
-    popup_area,
+    area,
     &mut app
       .data
       .radarr_data
@@ -248,11 +226,11 @@ fn draw_edit_collection_select_minimum_availability_popup(
 fn draw_edit_collection_select_quality_profile_popup(
   f: &mut Frame<'_>,
   app: &mut App<'_>,
-  popup_area: Rect,
+  area: Rect,
 ) {
   draw_selectable_list(
     f,
-    popup_area,
+    area,
     &mut app
       .data
       .radarr_data