diff options
| -rw-r--r-- | src/main.rs | 9 | ||||
| -rw-r--r-- | src/tui/popup.rs | 2 | ||||
| -rw-r--r-- | src/tui/ui.rs | 61 |
3 files changed, 4 insertions, 68 deletions
diff --git a/src/main.rs b/src/main.rs index 9140c7a..b1160e2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,15 +26,6 @@ pub mod cliargs; pub mod errorsetup; pub mod tui; -// Color indices -static MAIN_ENTRY_COLOR_INDEX: u8 = 36; -static MAIN_KEYWORD_COLOR_INDEX: u8 = 101; -static MAIN_INFO_COLOR_INDEX: u8 = 99; -static CONFIRM_COLOR_INDEX: u8 = 47; -static WARN_COLOR_INDEX: u8 = 124; -static TEXT_HIGHLIGHT_COLOR_INDEX: u8 = 254; -static TEXT_FG_COLOR_INDEX: u8 = 250; - #[tokio::main] async fn main() -> Result<()> { // Parse CLI arguments diff --git a/src/tui/popup.rs b/src/tui/popup.rs index 3098297..890e5c8 100644 --- a/src/tui/popup.rs +++ b/src/tui/popup.rs @@ -21,7 +21,7 @@ use ratatui::{ widgets::ListState, }; -use crate::{cliargs::CLIArgs, MAIN_ENTRY_COLOR_INDEX, MAIN_KEYWORD_COLOR_INDEX}; +use crate::cliargs::CLIArgs; #[derive(Debug)] pub enum PopupKind { diff --git a/src/tui/ui.rs b/src/tui/ui.rs index af36397..c9ee3ba 100644 --- a/src/tui/ui.rs +++ b/src/tui/ui.rs @@ -42,64 +42,12 @@ use walkdir::WalkDir; static HEADER_FOOTER_BG: Color = Color::Indexed(235); static POPUP_BG: Color = Color::Indexed(234); -// Box styles -// Keyword Box -// static KEYWORD_BOX_SELECTED_BORDER_STYLE: Style = Style::new().fg(TEXT_BRIGHT_FG_COLOR); -// static KEYWORD_BOX_SELECTED_TITLE_STYLE: Style = -// Style::new().fg(KEYWORD_COLOR).add_modifier(Modifier::BOLD); -// static KEYWORD_BOX_UNSELECTED_BORDER_STYLE: Style = Style::new().fg(TEXT_FG_COLOR); -// static KEYWORD_BOX_UNSELECTED_TITLE_STYLE: Style = -// Style::new().fg(KEYWORD_COLOR).add_modifier(Modifier::BOLD); -// Entry box -// static ENTRY_BOX_SELECTED_BORDER_STYLE: Style = Style::new().fg(TEXT_BRIGHT_FG_COLOR); -// static ENTRY_BOX_SELECTED_TITLE_STYLE: Style = -// Style::new().fg(ENTRY_COLOR).add_modifier(Modifier::BOLD); -// static ENTRY_BOX_UNSELECTED_BORDER_STYLE: Style = Style::new().fg(TEXT_FG_COLOR); -// static ENTRY_BOX_UNSELECTED_TITLE_STYLE: Style = -// Style::new().fg(ENTRY_COLOR).add_modifier(Modifier::BOLD); -// Default box -// static BOX_SELECTED_BORDER_STYLE: Style = Style::new().fg(TEXT_BRIGHT_FG_COLOR); -// static BOX_SELECTED_TITLE_STYLE: Style = Style::new() -// .fg(TEXT_BRIGHT_FG_COLOR) -// .add_modifier(Modifier::BOLD); -// static BOX_UNSELECTED_BORDER_STYLE: Style = Style::new().fg(TEXT_FG_COLOR); -// static BOX_UNSELECTED_TITLE_STYLE: Style = -// Style::new().fg(TEXT_FG_COLOR).add_modifier(Modifier::BOLD); -// Popup box -// static POPUP_HELP_BOX: Style = Style::new() -// .fg(Color::Indexed(args.colors.main_text_color)) -// .bg(POPUP_BG); - -// Entry table styles -// static ENTRY_SELECTED_ROW_STYLE: Style = Style::new() -// .fg(ENTRY_COLOR) -// .add_modifier(Modifier::BOLD) -// .add_modifier(Modifier::REVERSED); -// static KEYWORD_SELECTED_ROW_STYLE: Style = Style::new() -// .fg(KEYWORD_COLOR) -// .add_modifier(Modifier::BOLD) -// .add_modifier(Modifier::REVERSED); -// static SELECTION_SELECTED_ROW_STYLE: Style = Style::new() -// // .fg(ENTRY_COLOR) -// .add_modifier(Modifier::BOLD) -// .add_modifier(Modifier::REVERSED); -// static SELECTED_TABLE_COL_STYLE: Style = Style::new().add_modifier(Modifier::BOLD); -// static SELECTEC_TABLE_CELL_STYLE: Style = Style::new().add_modifier(Modifier::REVERSED); - // Symbols static SORTED_ENTRIES: &str = "▼"; static SORTED_ENTRIES_REVERSED: &str = "▲"; static SCROLLBAR_UPPER_CORNER: Option<&str> = Some("┓"); static SCROLLBAR_LOWER_CORNER: Option<&str> = Some("┛"); -// Info area styles -// static INFO_STYLE_AUTHOR: Style = Style::new().fg(INFO_COLOR); -// static INFO_STYLE_TITLE: Style = Style::new().fg(ENTRY_COLOR).add_modifier(Modifier::ITALIC); -// static INFO_STYLE_YEAR: Style = Style::new().fg(KEYWORD_COLOR); -// static INFO_STYLE_DOI: Style = Style::new().fg(TEXT_FG_COLOR); -// static INFO_STYLE_FILE: Style = Style::new().fg(TEXT_FG_COLOR); -// static INFO_STYLE_ABSTRACT: Style = Style::new().fg(TEXT_FG_COLOR); - pub const fn color_list(list_item: i32, sel_item: i32, highlight: u8, max_diff: i32) -> Color { if list_item == sel_item { Color::Indexed(highlight) @@ -960,12 +908,9 @@ pub fn render_taglist(app: &mut App, args: &CLIArgs, frame: &mut Frame, rect: Re .collect(); // Create a List from all list items and highlight the currently selected one - let list = List::new(items).block(block).highlight_style( - Style::new() - .fg(Color::Indexed(args.colors.keyword_color)) - .add_modifier(Modifier::BOLD) - .add_modifier(Modifier::REVERSED), - ); + let list = List::new(items) + .block(block) + .highlight_style(keyword_selected_row_style); // Save list length for calculating scrollbar need // Add 2 to compmensate lines of the block border |