Implemented the final widget for confirmation prompts!

src/ui/radarr_ui/library/delete_movie_ui.rs

@@ -5,8 +5,10 @@ use crate::app::App;
 use crate::models::servarr_data::radarr::radarr_data::{ActiveRadarrBlock, DELETE_MOVIE_BLOCKS};
 use crate::models::Route;
 use crate::ui::radarr_ui::library::draw_library;
-use crate::ui::widgets::popup::Size;
-use crate::ui::{draw_popup_over, draw_prompt_box_with_checkboxes, DrawUi};
+use crate::ui::widgets::checkbox::Checkbox;
+use crate::ui::widgets::confirmation_prompt::ConfirmationPrompt;
+use crate::ui::widgets::popup::{Popup, Size};
+use crate::ui::DrawUi;
 
 #[cfg(test)]
 #[path = "delete_movie_ui_tests.rs"]
@@ -28,42 +30,28 @@ impl DrawUi for DeleteMovieUi {
       *app.get_current_route(),
       Route::Radarr(ActiveRadarrBlock::DeleteMoviePrompt, _)
     ) {
-      let draw_delete_movie_prompt = |f: &mut Frame<'_>, app: &mut App<'_>, prompt_area: Rect| {
-        let selected_block = app.data.radarr_data.selected_block.get_active_block();
-        draw_prompt_box_with_checkboxes(
-          f,
-          prompt_area,
-          "Delete Movie",
-          format!(
-            "Do you really want to delete: \n{}?",
-            app.data.radarr_data.movies.current_selection().title.text
-          )
-          .as_str(),
-          vec![
-            (
-              "Delete Movie Files",
-              app.data.radarr_data.delete_movie_files,
-              selected_block == &ActiveRadarrBlock::DeleteMovieToggleDeleteFile,
-            ),
-            (
-              "Add List Exclusion",
-              app.data.radarr_data.add_list_exclusion,
-              selected_block == &ActiveRadarrBlock::DeleteMovieToggleAddListExclusion,
-            ),
-          ],
-          selected_block == &ActiveRadarrBlock::DeleteMovieConfirmPrompt,
-          app.data.radarr_data.prompt_confirm,
-        )
-      };
-
-      draw_popup_over(
-        f,
-        app,
-        area,
-        draw_library,
-        draw_delete_movie_prompt,
-        Size::Prompt,
+      let selected_block = app.data.radarr_data.selected_block.get_active_block();
+      let prompt = format!(
+        "Do you really want to delete: \n{}?",
+        app.data.radarr_data.movies.current_selection().title.text
       );
+      let checkboxes = vec![
+        Checkbox::new("Delete Movie File")
+          .checked(app.data.radarr_data.delete_movie_files)
+          .highlighted(selected_block == &ActiveRadarrBlock::DeleteMovieToggleDeleteFile),
+        Checkbox::new("Add List Exclusion")
+          .checked(app.data.radarr_data.add_list_exclusion)
+          .highlighted(selected_block == &ActiveRadarrBlock::DeleteMovieToggleAddListExclusion),
+      ];
+      let confirmation_prompt = ConfirmationPrompt::new()
+        .title("Delete Movie")
+        .prompt(&prompt)
+        .checkboxes(checkboxes)
+        .yes_no_highlighted(selected_block == &ActiveRadarrBlock::DeleteMovieConfirmPrompt)
+        .yes_no_value(app.data.radarr_data.prompt_confirm);
+
+      draw_library(f, app, area);
+      f.render_widget(Popup::new(confirmation_prompt).size(Size::Prompt), f.size());
     }
   }
 }