added theme configuration
All checks were successful
Version Check / check-version (pull_request) Successful in 3s

This commit is contained in:
2026-03-16 17:47:01 +01:00
parent a274938368
commit 7aa12f1a31
2 changed files with 73 additions and 37 deletions

View File

@@ -1,15 +1,59 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fs; use std::fs;
use ratatui::style::Color;
#[derive(Debug, Deserialize, Serialize, Clone)] #[derive(Debug, Deserialize, Serialize, Clone)]
pub struct ThemeConfig { pub struct ThemeConfig {
pub name: String, #[serde(default)]
pub transparent: bool,
pub crust: String,
pub surface0: String,
pub surface1: String,
pub text: String,
pub blue: String,
pub green: String,
pub lavender: String,
pub mauve: String,
pub peach: String,
}
impl ThemeConfig {
fn parse_hex(hex: &str) -> Color {
let hex = hex.trim_start_matches('#');
if hex.len() == 6 {
let r = u8::from_str_radix(&hex[0..2], 16).unwrap_or(0);
let g = u8::from_str_radix(&hex[2..4], 16).unwrap_or(0);
let b = u8::from_str_radix(&hex[4..6], 16).unwrap_or(0);
Color::Rgb(r, g, b)
} else {
Color::Reset
}
}
pub fn crust(&self) -> Color { Self::parse_hex(&self.crust) }
pub fn surface0(&self) -> Color { Self::parse_hex(&self.surface0) }
pub fn surface1(&self) -> Color { Self::parse_hex(&self.surface1) }
pub fn text(&self) -> Color { Self::parse_hex(&self.text) }
pub fn blue(&self) -> Color { Self::parse_hex(&self.blue) }
pub fn green(&self) -> Color { Self::parse_hex(&self.green) }
pub fn lavender(&self) -> Color { Self::parse_hex(&self.lavender) }
pub fn mauve(&self) -> Color { Self::parse_hex(&self.mauve) }
pub fn peach(&self) -> Color { Self::parse_hex(&self.peach) }
} }
impl Default for ThemeConfig { impl Default for ThemeConfig {
fn default() -> Self { fn default() -> Self {
Self { Self {
name: "catppuccin_mocha".to_string(), transparent: false,
crust: "#11111b".to_string(),
surface0: "#313244".to_string(),
surface1: "#45475a".to_string(),
text: "#cdd6f4".to_string(),
blue: "#89b4fa".to_string(),
green: "#a6e3a1".to_string(),
lavender: "#b4befe".to_string(),
mauve: "#cba6f7".to_string(),
peach: "#fab387".to_string(),
} }
} }
} }

View File

@@ -2,28 +2,20 @@ use crate::app::{App, Mode};
use crate::config::Config; use crate::config::Config;
use ratatui::{ use ratatui::{
layout::{Constraint, Direction, Layout}, layout::{Constraint, Direction, Layout},
style::{Color, Modifier, Style}, style::{Modifier, Style},
text::{Line, Span}, text::{Line, Span},
widgets::{Block, BorderType, Borders, List, ListItem, ListState, Paragraph}, widgets::{Block, BorderType, Borders, List, ListItem, ListState, Paragraph},
Frame, Frame,
}; };
// Catppuccin Mocha Palette pub fn draw(f: &mut Frame, app: &mut App, config: &Config) {
const CRUST: Color = Color::Rgb(17, 17, 27); let theme = &config.theme;
const SURFACE0: Color = Color::Rgb(49, 50, 68);
const SURFACE1: Color = Color::Rgb(69, 71, 90);
const TEXT: Color = Color::Rgb(205, 214, 244);
const BLUE: Color = Color::Rgb(137, 180, 250);
const GREEN: Color = Color::Rgb(166, 227, 161);
const LAVENDER: Color = Color::Rgb(180, 190, 254);
const MAUVE: Color = Color::Rgb(203, 166, 247);
const PEACH: Color = Color::Rgb(250, 179, 135);
pub fn draw(f: &mut Frame, app: &mut App, _config: &Config) {
let size = f.area(); let size = f.area();
// Background // Background
f.render_widget(Block::default().style(Style::default().bg(CRUST)), size); if !theme.transparent {
f.render_widget(Block::default().style(Style::default().bg(theme.crust())), size);
}
// Main layout with horizontal padding // Main layout with horizontal padding
let outer_layout = Layout::default() let outer_layout = Layout::default()
@@ -52,7 +44,7 @@ pub fn draw(f: &mut Frame, app: &mut App, _config: &Config) {
.map(|v| v.key.len()) .map(|v| v.key.len())
.max() .max()
.unwrap_or(20) .unwrap_or(20)
.min(40); // Cap at 40 to prevent long keys from hiding values .min(40);
// List // List
let items: Vec<ListItem> = app let items: Vec<ListItem> = app
@@ -69,27 +61,27 @@ pub fn draw(f: &mut Frame, app: &mut App, _config: &Config) {
}; };
let key_style = if is_selected { let key_style = if is_selected {
Style::default().fg(CRUST).add_modifier(Modifier::BOLD) Style::default().fg(theme.crust()).add_modifier(Modifier::BOLD)
} else { } else {
Style::default().fg(LAVENDER) Style::default().fg(theme.lavender())
}; };
let value_style = if is_selected { let value_style = if is_selected {
Style::default().fg(CRUST) Style::default().fg(theme.crust())
} else { } else {
Style::default().fg(TEXT) Style::default().fg(theme.text())
}; };
let line = Line::from(vec![ let line = Line::from(vec![
Span::styled(format!(" {:<width$} ", var.key, width = max_key_len), key_style), Span::styled(format!(" {:<width$} ", var.key, width = max_key_len), key_style),
Span::styled("", Style::default().fg(SURFACE1)), Span::styled("", Style::default().fg(theme.surface1())),
Span::styled(format!(" {} ", val), value_style), Span::styled(format!(" {} ", val), value_style),
]); ]);
let item_style = if is_selected { let item_style = if is_selected {
Style::default().bg(BLUE) Style::default().bg(theme.blue())
} else { } else {
Style::default().fg(TEXT) Style::default().fg(theme.text())
}; };
ListItem::new(line).style(item_style) ListItem::new(line).style(item_style)
@@ -102,8 +94,8 @@ pub fn draw(f: &mut Frame, app: &mut App, _config: &Config) {
.borders(Borders::ALL) .borders(Borders::ALL)
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)
.title(" Config Variables ") .title(" Config Variables ")
.title_style(Style::default().fg(MAUVE).add_modifier(Modifier::BOLD)) .title_style(Style::default().fg(theme.mauve()).add_modifier(Modifier::BOLD))
.border_style(Style::default().fg(SURFACE1)), .border_style(Style::default().fg(theme.surface1())),
); );
let mut state = ListState::default(); let mut state = ListState::default();
@@ -123,21 +115,21 @@ pub fn draw(f: &mut Frame, app: &mut App, _config: &Config) {
}; };
let input_border_color = match app.mode { let input_border_color = match app.mode {
Mode::Insert => GREEN, Mode::Insert => theme.green(),
Mode::Normal => SURFACE1, Mode::Normal => theme.surface1(),
}; };
let input_text = app.input.value(); let input_text = app.input.value();
let cursor_pos = app.input.visual_cursor(); let cursor_pos = app.input.visual_cursor();
let input = Paragraph::new(input_text) let input = Paragraph::new(input_text)
.style(Style::default().fg(TEXT)) .style(Style::default().fg(theme.text()))
.block( .block(
Block::default() Block::default()
.borders(Borders::ALL) .borders(Borders::ALL)
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)
.title(input_title) .title(input_title)
.title_style(Style::default().fg(PEACH).add_modifier(Modifier::BOLD)) .title_style(Style::default().fg(theme.peach()).add_modifier(Modifier::BOLD))
.border_style(Style::default().fg(input_border_color)), .border_style(Style::default().fg(input_border_color)),
); );
f.render_widget(input, chunks[2]); f.render_widget(input, chunks[2]);
@@ -149,20 +141,20 @@ pub fn draw(f: &mut Frame, app: &mut App, _config: &Config) {
)); ));
} }
// Status bar (modern pill style at the bottom) // Status bar
let (mode_str, mode_style) = match app.mode { let (mode_str, mode_style) = match app.mode {
Mode::Normal => ( Mode::Normal => (
" NORMAL ", " NORMAL ",
Style::default() Style::default()
.bg(BLUE) .bg(theme.blue())
.fg(CRUST) .fg(theme.crust())
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
), ),
Mode::Insert => ( Mode::Insert => (
" INSERT ", " INSERT ",
Style::default() Style::default()
.bg(GREEN) .bg(theme.green())
.fg(CRUST) .fg(theme.crust())
.add_modifier(Modifier::BOLD), .add_modifier(Modifier::BOLD),
), ),
}; };
@@ -176,9 +168,9 @@ pub fn draw(f: &mut Frame, app: &mut App, _config: &Config) {
let status_line = Line::from(vec![ let status_line = Line::from(vec![
Span::styled(mode_str, mode_style), Span::styled(mode_str, mode_style),
Span::styled(format!(" {} ", status_msg), Style::default().bg(SURFACE0).fg(TEXT)), Span::styled(format!(" {} ", status_msg), Style::default().bg(theme.surface0()).fg(theme.text())),
]); ]);
let status = Paragraph::new(status_line).style(Style::default().bg(SURFACE0)); let status = Paragraph::new(status_line).style(Style::default().bg(theme.surface0()));
f.render_widget(status, chunks[4]); f.render_widget(status, chunks[4]);
} }