Cleaned up the block selection logic to use the new BlockSelectionState struct

src/ui/radarr_ui/edit_collection_ui.rs

@@ -18,7 +18,7 @@ use crate::ui::{
 
 pub(super) fn draw_edit_collection_prompt<B: Backend>(
   f: &mut Frame<'_, B>,
-  app: &mut App,
+  app: &mut App<'_>,
   prompt_area: Rect,
 ) {
   if let Route::Radarr(active_radarr_block, _) = *app.get_current_route() {
@@ -54,7 +54,7 @@ pub(super) fn draw_edit_collection_prompt<B: Backend>(
 
 fn draw_edit_collection_confirmation_prompt<B: Backend>(
   f: &mut Frame<'_, B>,
-  app: &mut App,
+  app: &mut App<'_>,
   prompt_area: Rect,
 ) {
   let (collection_title, collection_overview) =
@@ -97,8 +97,8 @@ fn draw_edit_collection_confirmation_prompt<B: Backend>(
     };
   let title = format!("Edit - {}", collection_title);
   let yes_no_value = app.data.radarr_data.prompt_confirm;
-  let selected_block = app.data.radarr_data.selected_block;
-  let highlight_yes_no = selected_block == ActiveRadarrBlock::EditCollectionConfirmPrompt;
+  let selected_block = app.data.radarr_data.selected_block.get_active_block();
+  let highlight_yes_no = selected_block == &ActiveRadarrBlock::EditCollectionConfirmPrompt;
 
   let selected_minimum_availability = app
     .data
@@ -141,7 +141,7 @@ fn draw_edit_collection_confirmation_prompt<B: Backend>(
     chunks[1],
     "Monitored",
     app.data.radarr_data.edit_monitored.unwrap_or_default(),
-    selected_block == ActiveRadarrBlock::EditCollectionToggleMonitored,
+    selected_block == &ActiveRadarrBlock::EditCollectionToggleMonitored,
   );
 
   draw_drop_down_menu_button(
@@ -149,14 +149,14 @@ fn draw_edit_collection_confirmation_prompt<B: Backend>(
     chunks[2],
     "Minimum Availability",
     selected_minimum_availability.to_display_str(),
-    selected_block == ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
+    selected_block == &ActiveRadarrBlock::EditCollectionSelectMinimumAvailability,
   );
   draw_drop_down_menu_button(
     f,
     chunks[3],
     "Quality Profile",
     selected_quality_profile,
-    selected_block == ActiveRadarrBlock::EditCollectionSelectQualityProfile,
+    selected_block == &ActiveRadarrBlock::EditCollectionSelectQualityProfile,
   );
 
   if let Route::Radarr(active_radarr_block, _) = *app.get_current_route() {
@@ -166,7 +166,7 @@ fn draw_edit_collection_confirmation_prompt<B: Backend>(
       "Root Folder",
       &app.data.radarr_data.edit_path.text,
       *app.data.radarr_data.edit_path.offset.borrow(),
-      selected_block == ActiveRadarrBlock::EditCollectionRootFolderPathInput,
+      selected_block == &ActiveRadarrBlock::EditCollectionRootFolderPathInput,
       active_radarr_block == ActiveRadarrBlock::EditCollectionRootFolderPathInput,
     );
   }
@@ -176,7 +176,7 @@ fn draw_edit_collection_confirmation_prompt<B: Backend>(
     chunks[5],
     "Search on Add",
     app.data.radarr_data.edit_search_on_add.unwrap_or_default(),
-    selected_block == ActiveRadarrBlock::EditCollectionToggleSearchOnAdd,
+    selected_block == &ActiveRadarrBlock::EditCollectionToggleSearchOnAdd,
   );
 
   draw_button(