github/television
1
1
Fork 0
mirror of https://github.com/alexpasmantier/television.git synced 2025-06-07 12:05:34 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

chore: use named constant for colors (#99)

Browse Source 
this PR replaces straight colors by named constants, which should
facilitate any subsequent move to refactor the theming capabilities of
`tv`
This commit is contained in:
Bertrand Chardon 2024-12-05 22:45:36 +01:00 committed by GitHub
parent 2ea6f9a5c1
commit 4567f26a37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/television/ui/help.rs
View File

@ -1,18 +1,18 @@
use super::layout::HelpBarLayout;
use crate::television::Television; use crate::television::Television;
use crate::ui::logo::build_logo_paragraph; use crate::ui::logo::build_logo_paragraph;
use crate::ui::mode::mode_color; use crate::ui::mode::mode_color;
use crate::ui::BORDER_COLOR;
use ratatui::layout::Rect; use ratatui::layout::Rect;
use ratatui::prelude::{Color, Style}; use ratatui::prelude::{Color, Style};
use ratatui::widgets::{Block, BorderType, Borders, Padding}; use ratatui::widgets::{Block, BorderType, Borders, Padding};
use ratatui::Frame; use ratatui::Frame;
use super::layout::HelpBarLayout;
pub fn draw_logo_block(f: &mut Frame, area: Rect, color: Color) { pub fn draw_logo_block(f: &mut Frame, area: Rect, color: Color) {
let logo_block = Block::default() let logo_block = Block::default()
.borders(Borders::ALL) .borders(Borders::ALL)
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)
.border_style(Style::default().fg(Color::Blue)) .border_style(Style::default().fg(BORDER_COLOR))
.style(Style::default().fg(color)) .style(Style::default().fg(color))
.padding(Padding::horizontal(1)); .padding(Padding::horizontal(1));
@ -39,7 +39,7 @@ impl Television {
let metadata_block = Block::default() let metadata_block = Block::default()
.borders(Borders::ALL) .borders(Borders::ALL)
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)
.border_style(Style::default().fg(Color::Blue)) .border_style(Style::default().fg(BORDER_COLOR))
.padding(Padding::horizontal(1)) .padding(Padding::horizontal(1))
.style(Style::default()); .style(Style::default());
@ -56,7 +56,7 @@ impl Television {
let keymaps_block = Block::default() let keymaps_block = Block::default()
.borders(Borders::ALL) .borders(Borders::ALL)
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)
.border_style(Style::default().fg(Color::Blue)) .border_style(Style::default().fg(BORDER_COLOR))
.style(Style::default()) .style(Style::default())
.padding(Padding::horizontal(1)); .padding(Padding::horizontal(1));

8
crates/television/ui/results.rs
View File

@ -23,6 +23,8 @@ const DEFAULT_RESULT_PREVIEW_FG: Color = Color::Rgb(150, 150, 150);
const DEFAULT_RESULT_LINE_NUMBER_FG: Color = Color::Yellow; const DEFAULT_RESULT_LINE_NUMBER_FG: Color = Color::Yellow;
const DEFAULT_RESULT_SELECTED_BG: Color = Color::Rgb(50, 50, 50); const DEFAULT_RESULT_SELECTED_BG: Color = Color::Rgb(50, 50, 50);
const DEFAULT_RESULTS_LIST_MATCH_FOREGROUND_COLOR: Color = Color::Red;
pub struct ResultsListColors { pub struct ResultsListColors {
pub result_name_fg: Color, pub result_name_fg: Color,
pub result_preview_fg: Color, pub result_preview_fg: Color,
@ -118,7 +120,8 @@ where
// the current match // the current match
spans.push(Span::styled( spans.push(Span::styled(
slice_at_char_boundaries(&entry_name, start, end).to_string(), slice_at_char_boundaries(&entry_name, start, end).to_string(),
Style::default().fg(Color::Red), Style::default()
.fg(DEFAULT_RESULTS_LIST_MATCH_FOREGROUND_COLOR),
)); ));
last_match_end = end; last_match_end = end;
} }
@ -160,7 +163,8 @@ where
)); ));
spans.push(Span::styled( spans.push(Span::styled(
slice_at_char_boundaries(&preview, start, end).to_string(), slice_at_char_boundaries(&preview, start, end).to_string(),
Style::default().fg(Color::Red), Style::default()
.fg(DEFAULT_RESULTS_LIST_MATCH_FOREGROUND_COLOR),
)); ));
last_match_end = end; last_match_end = end;
} }