Terminal interface to find, download, and stream movies, TV shows, and live TV using local media players.
fix(tui): resolve modal layering, theme revert, help layout, and status edge cases
Samir Hossains260e9ade0397
diff --git a/src/tui/app/keyboard.rs b/src/tui/app/keyboard.rsindex 747b9e8..bdfd328 100644--- a/src/tui/app/keyboard.rs+++ b/src/tui/app/keyboard.rs@@ -82,6 +82,9 @@ impl App {match key.code {KeyCode::Esc => {self.state.show_theme_popup = false;+ if let Some(orig) = self.state.original_theme_kind.take() {+ self.action_sender.send(Action::SelectTheme(orig)).ok();+ }}KeyCode::Up => {let max = crate::tui::theme::AVAILABLE_THEMES.len().saturating_sub(1);@@ -121,6 +124,7 @@ impl App {}KeyCode::Enter => {self.state.show_theme_popup = false;+ self.state.original_theme_kind = None;self.persist_config();}_ => {}diff --git a/src/tui/app/system.rs b/src/tui/app/system.rsindex 8257ed3..663164f 100644--- a/src/tui/app/system.rs+++ b/src/tui/app/system.rs@@ -267,6 +267,7 @@ impl App {if open {self.reset_transient_overlays();self.state.tv_config_popup = false;+ self.state.original_theme_kind = Some(self.state.active_theme_kind.clone());self.state.show_theme_popup = true;if let Some(idx) = crate::tui::theme::AVAILABLE_THEMES.iter()diff --git a/src/tui/screens/details.rs b/src/tui/screens/details.rsindex 96f5027..61f1377 100644--- a/src/tui/screens/details.rs+++ b/src/tui/screens/details.rs@@ -1039,6 +1039,20 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)if !state.selected_resources.is_some() {frame.render_widget(streams_block, streams_area);}++ let (mut primary_footer, secondary_footer) = details_footer(state, theme, area.width);+ let footer_p = if area.width >= 70 {+ primary_footer.extend(secondary_footer);+ Paragraph::new(Line::from(primary_footer))+ } else {+ Paragraph::new(vec![+ Line::from(primary_footer),+ Line::from(secondary_footer),+ ])+ }+ .alignment(Alignment::Center);+ frame.render_widget(footer_p, chunks[3]);+if state.subtitle_popup || state.is_download_subtitle_popup {let items = state.subtitle_list@@ -1091,19 +1105,6 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme));}- let (mut primary_footer, secondary_footer) = details_footer(state, theme, area.width);- let footer_p = if area.width >= 70 {- primary_footer.extend(secondary_footer);- Paragraph::new(Line::from(primary_footer))- } else {- Paragraph::new(vec![- Line::from(primary_footer),- Line::from(secondary_footer),- ])- }- .alignment(Alignment::Center);- frame.render_widget(footer_p, chunks[3]);-if state.show_season_download_confirm {let season_idx = state.selected_season;let eps_count = if season_idx > 0 && season_idx <= state.available_episode_numbers.len() {diff --git a/src/tui/screens/help.rs b/src/tui/screens/help.rsindex 603d661..0372c98 100644--- a/src/tui/screens/help.rs+++ b/src/tui/screens/help.rs@@ -63,13 +63,21 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &AppState, theme: &Theme) {Span::styled(" [Enter] ", theme.header),Span::styled("Play Channel", theme.text),]),+ Line::from(vec![+ Span::styled(" [o] ", theme.header),+ Span::styled("Open Player Picker", theme.text),+ ]),Line::from(vec![Span::styled(" [r] ", theme.header),Span::styled("Reload Playlists", theme.text),]),Line::from(vec![- Span::styled(" Type /config", theme.header),- Span::styled("Manage Playlists (in search)", theme.text),+ Span::styled(" /config ", theme.header),+ Span::styled("Configure Playlists", theme.text),+ ]),+ Line::from(vec![+ Span::styled(" /list ", theme.header),+ Span::styled("Show Channels", theme.text),]),]);} else {@@ -183,7 +191,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &AppState, theme: &Theme) {let popup_chunk = crate::tui::overlay::centered(area, desired_width, desired_height, 46, 120);- crate::tui::overlay::clear_modal_area(frame, area, popup_chunk, theme);+ crate::tui::clear_area(frame, area, theme);let block = Block::default().title(" Keybindings Help ")diff --git a/src/tui/screens/home.rs b/src/tui/screens/home.rsindex 8ce32de..2e856ed 100644--- a/src/tui/screens/home.rs+++ b/src/tui/screens/home.rs@@ -144,6 +144,8 @@ fn render_search_state(};let msg = if let Some(preset) = state.active_browse_preset {format!("No items found for {}", preset.label())+ } else if state.search_query.trim().eq_ignore_ascii_case("/history") {+ "No watch history found".to_string()} else if !state.search_query.trim().is_empty() {format!("No matches for “{query}”")} else {diff --git a/src/tui/screens/startup.rs b/src/tui/screens/startup.rsindex 8176b66..4c01ea0 100644--- a/src/tui/screens/startup.rs+++ b/src/tui/screens/startup.rs@@ -48,6 +48,12 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)width: panel.width,height: 1,};+ let auto_update_label = if state.auto_update {+ " • AUTOMATIC UPDATES ON"+ } else {+ " • AUTOMATIC UPDATES OFF"+ };+frame.render_widget(Paragraph::new(Line::from(vec![Span::styled("CURRENT ", theme.muted),@@ -55,7 +61,7 @@ pub fn draw(frame: &mut Frame, area: Rect, state: &mut AppState, theme: &Theme)format!("v{}", env!("CARGO_PKG_VERSION")),theme.text_dim.add_modifier(Modifier::BOLD),),- Span::styled(" • AUTOMATIC UPDATES ON", theme.muted),+ Span::styled(auto_update_label, theme.muted),])).alignment(Alignment::Center),footer,diff --git a/src/tui/state.rs b/src/tui/state.rsindex eee231a..9e625eb 100644--- a/src/tui/state.rs+++ b/src/tui/state.rs@@ -201,6 +201,7 @@ pub struct AppState {pub show_theme_popup: bool,pub active_theme_kind: String,+ pub original_theme_kind: Option<String>,pub theme_list_state: ListState,pub show_browse_popup: bool,pub browse_list_state: ListState,@@ -324,6 +325,7 @@ impl Default for AppState {tick_count: 0,poster_image: None,active_theme_kind: String::new(),+ original_theme_kind: None,show_theme_popup: false,theme_list_state: ListState::default(),show_browse_popup: false,