Skip to content

Commit

Permalink
feat: default light theme
Browse files Browse the repository at this point in the history 
fixs:

- create_key_editor color;
- raw_value color;
- servers color;
- redis_cli color;
  • Loading branch information
@honhimW
honhimW committed Dec 13, 2024
1 parent 09f3247 commit 8272084
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/components/create_key_editor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
use std::cmp;
use strum::{Display, EnumCount, EnumIter, IntoEnumIterator};
use tui_textarea::TextArea;
use ratisui::theme::get_color;
use crate::theme::get_color;

pub struct Form {
title: String,
Expand Down
2 changes: 1 addition & 1 deletion src/components/raw_value.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::borrow::Cow;
use ratatui::prelude::Text;
use ratatui::style::Style;
use ratatui::text::{Line, Span};
use ratisui::theme::get_color;
use crate::theme::get_color;
use crate::utils::ContentType;
use crate::components::highlight_value::{HighlightKind, HighlightProcessor, HighlightText};

Expand Down
2 changes: 1 addition & 1 deletion src/components/redis_cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use serde_json::Value;
use std::cmp;
use strum::Display;
use tui_textarea::{CursorMove, TextArea};
use ratisui::theme::get_color;
use crate::theme::get_color;

pub struct RedisCli<'a> {
max_menu_width: u16,
Expand Down
8 changes: 4 additions & 4 deletions src/components/servers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ use ratatui::{crossterm::event::{KeyCode, KeyEventKind}, layout::{Margin, Rect},
use std::cmp;
use std::string::ToString;
use unicode_width::UnicodeWidthStr;
use ratisui::theme::get_color;
use crate::components::TableColors;
use crate::theme::get_color;

const ITEM_HEIGHT: usize = 4;

Expand Down Expand Up @@ -133,7 +133,7 @@ impl ServerList {
state: TableState::default().with_selected(default_selected),
longest_item_lens: constraint_len_calculator(&vec),
column_styles: [
Style::default().fg(get_color(|t| &t.server.highlight)),
Style::default(),
Style::default().fg(get_color(|t| &t.server.name)),
Style::default().fg(get_color(|t| &t.server.location)),
Style::default().fg(get_color(|t| &t.server.db)),
Expand Down Expand Up @@ -207,7 +207,7 @@ impl ServerList {
.fg(self.colors.header_fg)
.bg(self.colors.header_bg);
let selected_style = Style::default()
.bg(self.colors.alt_row)
.bg(get_color(|t| &t.server.highlight))
;

let header = ["", "Name", "Location", "DB", "Username", "TLS", "Protocol"]
Expand Down Expand Up @@ -247,7 +247,7 @@ impl ServerList {
)
.header(header)
.row_highlight_style(selected_style)
.highlight_symbol(Text::raw(bar))
.highlight_symbol(Text::raw(bar).style(Style::default()))
.bg(self.colors.bg)
.column_spacing(1)
.highlight_spacing(HighlightSpacing::Always);
Expand Down
89 changes: 81 additions & 8 deletions src/theme.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,79 @@ impl Theme {
let mut theme = Self::default();
theme.name = "ratisui-light".to_string();
theme.kind = Kind::Light;

theme.context.fps = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C500);
theme.context.key_bg = Color::Tailwind(TailwindColor::YELLOW, TailwindPalette::C700);

theme.server.highlight = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C400);
theme.server.name = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C700);
theme.server.location = Color::Tailwind(TailwindColor::CYAN, TailwindPalette::C700);
theme.server.db = Color::Tailwind(TailwindColor::BLUE, TailwindPalette::C700);
theme.server.username = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C700);
theme.server.tls = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C600);
theme.server.protocol = Color::Tailwind(TailwindColor::EMERALD, TailwindPalette::C600);

theme.table.bg = Color::Default;
theme.table.header_bg = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C300);
theme.table.header = Color::Default;
theme.table.row = Color::Default;
theme.table.odd_row_bg = Color::Default;
theme.table.even_row_bg = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C100);

theme.raw.string = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C700);
theme.raw.boolean = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C600);
theme.raw.keyword = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C600);
theme.raw.constant = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C600);
theme.raw.null = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C600);
theme.raw.property = Color::Tailwind(TailwindColor::FUCHSIA, TailwindPalette::C700);
theme.raw.comment = Color::Tailwind(TailwindColor::CYAN, TailwindPalette::C500);
theme.raw.number = Color::Tailwind(TailwindColor::BLUE, TailwindPalette::C600);

theme.border.highlight = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C700);
theme.border.default = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C400);

theme.editor.editing = Color::Tailwind(TailwindColor::SKY, TailwindPalette::C700);
theme.editor.warning = Color::Tailwind(TailwindColor::RED, TailwindPalette::C600);

theme.tab.title = Color::Tailwind(TailwindColor::SLATE, TailwindPalette::C200);

theme.tab.explorer.accent = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C800);
theme.tab.explorer.highlight = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C400);
theme.tab.explorer.tree.highlight = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C400);
theme.tab.explorer.key_type.hash = Color::Tailwind(TailwindColor::BLUE, TailwindPalette::C400);
theme.tab.explorer.key_type.list = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C400);
theme.tab.explorer.key_type.set = Color::Tailwind(TailwindColor::ORANGE, TailwindPalette::C400);
theme.tab.explorer.key_type.zset = Color::Tailwind(TailwindColor::PINK, TailwindPalette::C400);
theme.tab.explorer.key_type.string = Color::Tailwind(TailwindColor::PURPLE, TailwindPalette::C400);
theme.tab.explorer.key_type.json = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C400);
theme.tab.explorer.key_type.stream = Color::Tailwind(TailwindColor::YELLOW, TailwindPalette::C400);
theme.tab.explorer.key_type.unknown = Color::Tailwind(TailwindColor::SLATE, TailwindPalette::C500);

theme.tab.cli.accent = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C800);
theme.tab.cli.highlight = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C600);
theme.tab.cli.console.cmd = Color::Tailwind(TailwindColor::EMERALD, TailwindPalette::C700);
theme.tab.cli.console.out = Color::Default;
theme.tab.cli.console.err = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C700);
theme.tab.cli.menu.bg = Color::Tailwind(TailwindColor::NEUTRAL, TailwindPalette::C300);
theme.tab.cli.menu.highlight = Color::Tailwind(TailwindColor::ZINC, TailwindPalette::C300);
theme.tab.cli.menu.info_bg = Color::Tailwind(TailwindColor::STONE, TailwindPalette::C300);
theme.tab.cli.menu.input = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C700);
theme.tab.cli.doc.bg = Color::Tailwind(TailwindColor::NEUTRAL, TailwindPalette::C300);
theme.tab.cli.doc.command = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C800);
theme.tab.cli.doc.attribute = Color::Tailwind(TailwindColor::PINK, TailwindPalette::C800);

theme.tab.logger.accent = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C800);
theme.tab.logger.highlight = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C600);
theme.tab.logger.level.error = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C700);
theme.tab.logger.level.warn = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C700);
theme.tab.logger.level.info = Color::Tailwind(TailwindColor::CYAN, TailwindPalette::C700);
theme.tab.logger.level.debug = Color::Tailwind(TailwindColor::EMERALD, TailwindPalette::C700);
theme.tab.logger.level.trace = Color::Tailwind(TailwindColor::VIOLET, TailwindPalette::C700);

theme.toast.info = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C500);
theme.toast.warn = Color::Tailwind(TailwindColor::YELLOW, TailwindPalette::C500);
theme.toast.error = Color::Tailwind(TailwindColor::RED, TailwindPalette::C500);

theme
}

Expand All @@ -54,7 +127,7 @@ impl Theme {
theme.context.fps = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C500);
theme.context.key_bg = Color::Tailwind(TailwindColor::YELLOW, TailwindPalette::C700);

theme.server.highlight = Color::Default;
theme.server.highlight = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C950);
theme.server.name = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C400);
theme.server.location = Color::Tailwind(TailwindColor::CYAN, TailwindPalette::C500);
theme.server.db = Color::Tailwind(TailwindColor::BLUE, TailwindPalette::C600);
Expand All @@ -78,10 +151,6 @@ impl Theme {
theme.raw.comment = Color::Tailwind(TailwindColor::CYAN, TailwindPalette::C500);
theme.raw.number = Color::Tailwind(TailwindColor::BLUE, TailwindPalette::C600);

theme.toast.info = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C700);
theme.toast.warn = Color::Tailwind(TailwindColor::YELLOW, TailwindPalette::C700);
theme.toast.error = Color::Tailwind(TailwindColor::RED, TailwindPalette::C700);

theme.border.highlight = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C300);
theme.border.default = Color::Tailwind(TailwindColor::GRAY, TailwindPalette::C600);

Expand All @@ -104,16 +173,16 @@ impl Theme {

theme.tab.cli.accent = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C900);
theme.tab.cli.highlight = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C700);
theme.tab.cli.console.cmd = Color::Tailwind(TailwindColor::EMERALD, TailwindPalette::C700);
theme.tab.cli.console.out = Color::Default;
theme.tab.cli.console.err = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C700);
theme.tab.cli.menu.bg = Color::Tailwind(TailwindColor::NEUTRAL, TailwindPalette::C800);
theme.tab.cli.menu.highlight = Color::Tailwind(TailwindColor::ZINC, TailwindPalette::C900);
theme.tab.cli.menu.info_bg = Color::Tailwind(TailwindColor::STONE, TailwindPalette::C900);
theme.tab.cli.menu.input = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C500);
theme.tab.cli.doc.bg = Color::Tailwind(TailwindColor::NEUTRAL, TailwindPalette::C800);
theme.tab.cli.doc.command = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C400);
theme.tab.cli.doc.attribute = Color::Tailwind(TailwindColor::PINK, TailwindPalette::C800);
theme.tab.cli.console.cmd = Color::Tailwind(TailwindColor::EMERALD, TailwindPalette::C700);
theme.tab.cli.console.out = Color::Default;
theme.tab.cli.console.err = Color::Tailwind(TailwindColor::ROSE, TailwindPalette::C700);

theme.tab.logger.accent = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C900);
theme.tab.logger.highlight = Color::Tailwind(TailwindColor::AMBER, TailwindPalette::C700);
Expand All @@ -123,6 +192,10 @@ impl Theme {
theme.tab.logger.level.debug = Color::Tailwind(TailwindColor::EMERALD, TailwindPalette::C700);
theme.tab.logger.level.trace = Color::Tailwind(TailwindColor::VIOLET, TailwindPalette::C700);

theme.toast.info = Color::Tailwind(TailwindColor::GREEN, TailwindPalette::C700);
theme.toast.warn = Color::Tailwind(TailwindColor::YELLOW, TailwindPalette::C700);
theme.toast.error = Color::Tailwind(TailwindColor::RED, TailwindPalette::C700);

theme
}
}
Expand Down

0 comments on commit 8272084

Please sign in to comment.