meli
/
meli
9
Fork 13
Code Issues 13 Pull Requests 11 Actions Packages Projects 1 Releases 19 Wiki Activity

themes: add LIGHT, DARK constant theme keys
Run cargo lints / Lint on ${{ matrix.build }} (linux-amd64, ubuntu-latest, stable, x86_64-unknown-linux-gnu) (pull_request) Has started running Details
Cargo manifest lints / Lint Cargo manifests on ${{ matrix.build }} (linux-amd64, ubuntu-latest, stable, x86_64-unknown-linux-gnu) (pull_request) Has been cancelled Details
Run Tests / Test on ${{ matrix.build }} (linux-amd64, ubuntu-latest, stable, x86_64-unknown-linux-gnu) (pull_request) Has been cancelled Details 

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
Manos Pitsidianakis 2024-05-07 12:00:41 +03:00
parent 9ca34a6864
commit e336f03b40
Signed by: Manos Pitsidianakis
GPG Key ID: 7729C7707F7E09D0
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meli/src/conf/themes.rs
View File

@ -47,11 +47,14 @@ use crate::{
Context,
};
pub const LIGHT: &str = "light";
pub const DARK: &str = "dark";
#[inline(always)]
pub fn value(context: &Context, key: &'static str) -> ThemeAttribute {
let theme = match context.settings.terminal.theme.as_str() {
"light" => &context.settings.terminal.themes.light,
"dark" => &context.settings.terminal.themes.dark,
self::LIGHT => &context.settings.terminal.themes.light,
self::DARK => &context.settings.terminal.themes.dark,
t => context
.settings
.terminal
@ -66,8 +69,8 @@ pub fn value(context: &Context, key: &'static str) -> ThemeAttribute {
#[inline(always)]
pub fn fg_color(context: &Context, key: &'static str) -> Color {
let theme = match context.settings.terminal.theme.as_str() {
"light" => &context.settings.terminal.themes.light,
"dark" => &context.settings.terminal.themes.dark,
self::LIGHT => &context.settings.terminal.themes.light,
self::DARK => &context.settings.terminal.themes.dark,
t => context
.settings
.terminal
@ -82,8 +85,8 @@ pub fn fg_color(context: &Context, key: &'static str) -> Color {
#[inline(always)]
pub fn bg_color(context: &Context, key: &'static str) -> Color {
let theme = match context.settings.terminal.theme.as_str() {
"light" => &context.settings.terminal.themes.light,
"dark" => &context.settings.terminal.themes.dark,
self::LIGHT => &context.settings.terminal.themes.light,
self::DARK => &context.settings.terminal.themes.dark,
t => context
.settings
.terminal
@ -98,8 +101,8 @@ pub fn bg_color(context: &Context, key: &'static str) -> Color {
#[inline(always)]
pub fn attrs(context: &Context, key: &'static str) -> Attr {
let theme = match context.settings.terminal.theme.as_str() {
"light" => &context.settings.terminal.themes.light,
"dark" => &context.settings.terminal.themes.dark,
self::LIGHT => &context.settings.terminal.themes.light,
self::DARK => &context.settings.terminal.themes.dark,
t => context
.settings
.terminal
@ -648,8 +651,8 @@ mod regexp {
key: &'static str,
) -> SmallVec<[TextFormatter<'ctx>; 64]> {
let theme = match context.settings.terminal.theme.as_str() {
"light" => &context.settings.terminal.themes.light,
"dark" => &context.settings.terminal.themes.dark,
self::LIGHT => &context.settings.terminal.themes.light,
self::DARK => &context.settings.terminal.themes.dark,
t => context
.settings
.terminal
@ -1213,8 +1216,8 @@ impl Themes {
}
pub fn validate(&self) -> Result<()> {
let hash_set: HashSet<&'static str> = DEFAULT_KEYS.iter().copied().collect();
Self::validate_keys("light", &self.light, &hash_set)?;
Self::validate_keys("dark", &self.dark, &hash_set)?;
Self::validate_keys(self::LIGHT, &self.light, &hash_set)?;
Self::validate_keys(self::DARK, &self.dark, &hash_set)?;
for (name, t) in self.other_themes.iter() {
Self::validate_keys(name, t, &hash_set)?;
}
@ -1234,8 +1237,8 @@ impl Themes {
pub fn key_to_string(&self, key: &str, unlink: bool) -> String {
let theme = match key {
"light" => &self.light,
"dark" => &self.dark,
self::LIGHT => &self.light,
self::DARK => &self.dark,
t => self.other_themes.get(t).unwrap_or(&self.dark),
};
let mut ret = String::new();
@ -1270,10 +1273,10 @@ impl Themes {
impl std::fmt::Display for Themes {
fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
let mut ret = String::new();
ret.push_str(&self.key_to_string("dark", true));
ret.push_str(&self.key_to_string(self::DARK, true));
ret.push_str("\n\n");
ret.push_str(&self.key_to_string("light", true));
ret.push_str(&self.key_to_string(self::LIGHT, true));
for name in self.other_themes.keys() {
ret.push_str("\n\n");
ret.push_str(&self.key_to_string(name, true));
@ -1803,8 +1806,8 @@ impl Serialize for Themes {
other_themes.insert(name.to_string(), new_map);
}
other_themes.insert("light".to_string(), light);
other_themes.insert("dark".to_string(), dark);
other_themes.insert(self::LIGHT.to_string(), light);
other_themes.insert(self::DARK.to_string(), dark);
other_themes.serialize(serializer)
}
}