Refactored all popups to use centrally defined, consistent sizes.

This commit is contained in:
2024-02-13 17:56:00 -07:00
parent 4b734811f4
commit 9bff58c20b
19 changed files with 313 additions and 261 deletions
+2 -2
View File
@@ -9,6 +9,7 @@ use crate::ui::widgets::button::Button;
use crate::ui::widgets::checkbox::Checkbox;
use crate::ui::widgets::input_box::InputBox;
use crate::ui::widgets::loading_block::LoadingBlock;
use crate::ui::widgets::popup::Size;
use crate::ui::{draw_popup_over, DrawUi};
use ratatui::layout::{Constraint, Flex, Layout, Rect};
use ratatui::Frame;
@@ -35,8 +36,7 @@ impl DrawUi for EditIndexerUi {
area,
draw_indexers,
draw_edit_indexer_prompt,
70,
45,
Size::LargePrompt,
);
}
}
@@ -14,6 +14,7 @@ use crate::ui::widgets::button::Button;
use crate::ui::widgets::checkbox::Checkbox;
use crate::ui::widgets::input_box::InputBox;
use crate::ui::widgets::loading_block::LoadingBlock;
use crate::ui::widgets::popup::Size;
use crate::ui::{draw_popup_over, DrawUi};
#[cfg(test)]
@@ -38,8 +39,7 @@ impl DrawUi for IndexerSettingsUi {
area,
draw_indexers,
draw_edit_indexer_settings_prompt,
70,
45,
Size::LargePrompt,
);
}
}
+10 -4
View File
@@ -13,7 +13,8 @@ use crate::ui::radarr_ui::indexers::test_all_indexers_ui::TestAllIndexersUi;
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::layout_block_top_border;
use crate::ui::widgets::managarr_table::ManagarrTable;
use crate::ui::{draw_prompt_box, draw_prompt_popup_over, DrawUi};
use crate::ui::widgets::popup::Size;
use crate::ui::{draw_popup_over, draw_prompt_box, DrawUi};
mod edit_indexer_ui;
mod indexer_settings_ui;
@@ -41,9 +42,14 @@ impl DrawUi for IndexersUi {
let route = *app.get_current_route();
let mut indexers_matchers = |active_radarr_block| match active_radarr_block {
ActiveRadarrBlock::Indexers => draw_indexers(f, app, area),
ActiveRadarrBlock::DeleteIndexerPrompt => {
draw_prompt_popup_over(f, app, area, draw_indexers, draw_delete_indexer_prompt)
}
ActiveRadarrBlock::DeleteIndexerPrompt => draw_popup_over(
f,
app,
area,
draw_indexers,
draw_delete_indexer_prompt,
Size::Prompt,
),
_ => (),
};
@@ -7,7 +7,8 @@ use crate::ui::radarr_ui::indexers::draw_indexers;
use crate::ui::styles::ManagarrStyle;
use crate::ui::utils::{borderless_block, get_width_from_percentage, title_block};
use crate::ui::widgets::managarr_table::ManagarrTable;
use crate::ui::{draw_large_popup_over, DrawUi};
use crate::ui::widgets::popup::Size;
use crate::ui::{draw_popup_over, DrawUi};
use ratatui::layout::{Alignment, Constraint, Rect};
use ratatui::widgets::{Cell, Row};
use ratatui::Frame;
@@ -28,12 +29,13 @@ impl DrawUi for TestAllIndexersUi {
}
fn draw(f: &mut Frame<'_>, app: &mut App<'_>, area: Rect) {
draw_large_popup_over(
draw_popup_over(
f,
app,
area,
draw_indexers,
draw_test_all_indexers_test_results,
Size::Large,
);
}
}