From 04b9dc4e2de4d36c2de7d537bb71694278bb79f0 Mon Sep 17 00:00:00 2001 From: Var Bhat Date: Fri, 22 Dec 2023 02:10:53 +0530 Subject: Add Dracula, Nord, Solarized and Grubvox variants to `Theme` --- style/src/theme.rs | 30 ++++++++++++++++ style/src/theme/palette.rs | 86 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 1 deletion(-) (limited to 'style') diff --git a/style/src/theme.rs b/style/src/theme.rs index 166410ae..b1902b06 100644 --- a/style/src/theme.rs +++ b/style/src/theme.rs @@ -34,6 +34,18 @@ pub enum Theme { Light, /// The built-in dark variant. Dark, + /// The built-in dracula variant. + Dracula, + /// The built-in nord variant. + Nord, + /// The built-in solarized light variant. + SolarizedLight, + /// The built-in solarized dark variant. + SolarizedDark, + /// The built-in gruvbox light variant. + GruvboxLight, + /// The built-in gruvbox dark variant. + GruvboxDark, /// A [`Theme`] that uses a [`Custom`] palette. Custom(Box), } @@ -62,6 +74,12 @@ impl Theme { match self { Self::Light => Palette::LIGHT, Self::Dark => Palette::DARK, + Self::Dracula => Palette::DRACULA, + Self::Nord => Palette::NORD, + Self::SolarizedLight => Palette::SOLARIZED_LIGHT, + Self::SolarizedDark => Palette::SOLARIZED_DARK, + Self::GruvboxLight => Palette::GRUVBOX_LIGHT, + Self::GruvboxDark => Palette::GRUVBOX_DARK, Self::Custom(custom) => custom.palette, } } @@ -71,6 +89,12 @@ impl Theme { match self { Self::Light => &palette::EXTENDED_LIGHT, Self::Dark => &palette::EXTENDED_DARK, + Self::Dracula => &palette::EXTENDED_DRACULA, + Self::Nord => &palette::EXTENDED_NORD, + Self::SolarizedLight => &palette::EXTENDED_SOLARIZED_LIGHT, + Self::SolarizedDark => &palette::EXTENDED_SOLARIZED_DARK, + Self::GruvboxLight => &palette::EXTENDED_GRUVBOX_LIGHT, + Self::GruvboxDark => &palette::EXTENDED_GRUVBOX_DARK, Self::Custom(custom) => &custom.extended, } } @@ -81,6 +105,12 @@ impl fmt::Display for Theme { match self { Self::Light => write!(f, "Light"), Self::Dark => write!(f, "Dark"), + Self::Dracula => write!(f, "Dracula"), + Self::Nord => write!(f, "Nord"), + Self::SolarizedLight => write!(f, "Solarized Light"), + Self::SolarizedDark => write!(f, "Solarized Dark"), + Self::GruvboxLight => write!(f, "Gruvbox Light"), + Self::GruvboxDark => write!(f, "Gruvbox Dark"), Self::Custom(custom) => custom.fmt(f), } } diff --git a/style/src/theme/palette.rs b/style/src/theme/palette.rs index 76977a29..65a39ce7 100644 --- a/style/src/theme/palette.rs +++ b/style/src/theme/palette.rs @@ -1,5 +1,5 @@ //! Define the colors of a theme. -use iced_core::Color; +use iced_core::{color, Color}; use once_cell::sync::Lazy; use palette::color_difference::Wcag21RelativeContrast; @@ -67,6 +67,66 @@ impl Palette { 0x3F as f32 / 255.0, ), }; + + /// The built-in dracula variant of a [`Palette`]. + /// theme source: https://draculatheme.com + pub const DRACULA: Self = Self { + background: color!(0x282A36), // BACKGROUND + text: color!(0xf8f8f2), // FOREGROUND + primary: color!(0xbd93f9), // PURPLE + success: color!(0x50fa7b), // GREEN + danger: color!(0xff5555), // RED + }; + + /// The built-in nord variant of a [`Palette`]. + /// theme source: https://www.nordtheme.com/docs/colors-and-palettes + pub const NORD: Self = Self { + background: color!(0x2e3440), // nord0 + text: color!(0xeceff4), // nord6 + primary: color!(0x8fbcbb), // nord7 + success: color!(0xa3be8c), // nord14 + danger: color!(0xbf616a), // nord11 + }; + + /// The built-in solarized light variant of a [`Palette`]. + /// light variant of https://ethanschoonover.com/solarized + pub const SOLARIZED_LIGHT: Self = Self { + background: color!(0xfdf6e3), // base3 + text: color!(0x657b83), // base00 + primary: color!(0x2aa198), // cyan + success: color!(0x859900), // green + danger: color!(0xdc322f), // red + }; + + /// The built-in solarized dark variant of a [`Palette`]. + /// dark variant of https://ethanschoonover.com/solarized + pub const SOLARIZED_DARK: Self = Self { + background: color!(0x002b36), // base03 + text: color!(0x839496), // base0 + primary: color!(0x2aa198), // cyan + success: color!(0x859900), // green + danger: color!(0xdc322f), // red + }; + + /// The built-in gruvbox light variant of a [`Palette`]. + /// light variant of https://github.com/morhetz/gruvbox + pub const GRUVBOX_LIGHT: Self = Self { + background: color!(0xfbf1c7), // light BG_0 + text: color!(0x282828), // light FG0_29 + primary: color!(0x458588), // light BLUE_4 + success: color!(0x98971a), // light GREEN_2 + danger: color!(0xcc241d), // light RED_1 + }; + + /// The built-in gruvbox dark variant of a [`Palette`]. + /// dark variant of https://github.com/morhetz/gruvbox + pub const GRUVBOX_DARK: Self = Self { + background: color!(0x282828), // dark BG_0 + text: color!(0xfbf1c7), // dark FG0_29 + primary: color!(0x458588), // dark BLUE_4 + success: color!(0x98971a), // dark GREEN_2 + danger: color!(0xcc241d), // dark RED_1 + }; } /// An extended set of colors generated from a [`Palette`]. @@ -94,6 +154,30 @@ pub static EXTENDED_LIGHT: Lazy = pub static EXTENDED_DARK: Lazy = Lazy::new(|| Extended::generate(Palette::DARK)); +/// The built-in dracula variant of an [`Extended`] palette. +pub static EXTENDED_DRACULA: Lazy = + Lazy::new(|| Extended::generate(Palette::DRACULA)); + +/// The built-in nord variant of an [`Extended`] palette. +pub static EXTENDED_NORD: Lazy = + Lazy::new(|| Extended::generate(Palette::NORD)); + +/// The built-in solarized light variant of an [`Extended`] palette. +pub static EXTENDED_SOLARIZED_LIGHT: Lazy = + Lazy::new(|| Extended::generate(Palette::SOLARIZED_LIGHT)); + +/// The built-in solarized dark variant of an [`Extended`] palette. +pub static EXTENDED_SOLARIZED_DARK: Lazy = + Lazy::new(|| Extended::generate(Palette::SOLARIZED_DARK)); + +/// The built-in gruvbox light variant of an [`Extended`] palette. +pub static EXTENDED_GRUVBOX_LIGHT: Lazy = + Lazy::new(|| Extended::generate(Palette::GRUVBOX_LIGHT)); + +/// The built-in gruvbox dark variant of an [`Extended`] palette. +pub static EXTENDED_GRUVBOX_DARK: Lazy = + Lazy::new(|| Extended::generate(Palette::GRUVBOX_DARK)); + impl Extended { /// Generates an [`Extended`] palette from a simple [`Palette`]. pub fn generate(palette: Palette) -> Self { -- cgit From 5770efe06dc552409daf586590d4f477206c732b Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 3 Feb 2024 18:41:06 +0100 Subject: Capitalize theme names in `style::theme::palette` --- style/src/theme/palette.rs | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'style') diff --git a/style/src/theme/palette.rs b/style/src/theme/palette.rs index 65a39ce7..50846d43 100644 --- a/style/src/theme/palette.rs +++ b/style/src/theme/palette.rs @@ -68,8 +68,9 @@ impl Palette { ), }; - /// The built-in dracula variant of a [`Palette`]. - /// theme source: https://draculatheme.com + /// The built-in Dracula variant of a [`Palette`]. + /// + /// Source: https://draculatheme.com pub const DRACULA: Self = Self { background: color!(0x282A36), // BACKGROUND text: color!(0xf8f8f2), // FOREGROUND @@ -78,8 +79,9 @@ impl Palette { danger: color!(0xff5555), // RED }; - /// The built-in nord variant of a [`Palette`]. - /// theme source: https://www.nordtheme.com/docs/colors-and-palettes + /// The built-in Nord variant of a [`Palette`]. + /// + /// Source: https://www.nordtheme.com/docs/colors-and-palettes pub const NORD: Self = Self { background: color!(0x2e3440), // nord0 text: color!(0xeceff4), // nord6 @@ -88,8 +90,9 @@ impl Palette { danger: color!(0xbf616a), // nord11 }; - /// The built-in solarized light variant of a [`Palette`]. - /// light variant of https://ethanschoonover.com/solarized + /// The built-in Solarized Light variant of a [`Palette`]. + /// + /// Source: https://ethanschoonover.com/solarized pub const SOLARIZED_LIGHT: Self = Self { background: color!(0xfdf6e3), // base3 text: color!(0x657b83), // base00 @@ -98,8 +101,9 @@ impl Palette { danger: color!(0xdc322f), // red }; - /// The built-in solarized dark variant of a [`Palette`]. - /// dark variant of https://ethanschoonover.com/solarized + /// The built-in Solarized Dark variant of a [`Palette`]. + /// + /// Source: https://ethanschoonover.com/solarized pub const SOLARIZED_DARK: Self = Self { background: color!(0x002b36), // base03 text: color!(0x839496), // base0 @@ -108,8 +112,9 @@ impl Palette { danger: color!(0xdc322f), // red }; - /// The built-in gruvbox light variant of a [`Palette`]. - /// light variant of https://github.com/morhetz/gruvbox + /// The built-in Gruvbox Light variant of a [`Palette`]. + /// + /// Source: https://github.com/morhetz/gruvbox pub const GRUVBOX_LIGHT: Self = Self { background: color!(0xfbf1c7), // light BG_0 text: color!(0x282828), // light FG0_29 @@ -118,8 +123,9 @@ impl Palette { danger: color!(0xcc241d), // light RED_1 }; - /// The built-in gruvbox dark variant of a [`Palette`]. - /// dark variant of https://github.com/morhetz/gruvbox + /// The built-in Gruvbox Dark variant of a [`Palette`]. + /// + /// Source: https://github.com/morhetz/gruvbox pub const GRUVBOX_DARK: Self = Self { background: color!(0x282828), // dark BG_0 text: color!(0xfbf1c7), // dark FG0_29 @@ -154,27 +160,27 @@ pub static EXTENDED_LIGHT: Lazy = pub static EXTENDED_DARK: Lazy = Lazy::new(|| Extended::generate(Palette::DARK)); -/// The built-in dracula variant of an [`Extended`] palette. +/// The built-in Dracula variant of an [`Extended`] palette. pub static EXTENDED_DRACULA: Lazy = Lazy::new(|| Extended::generate(Palette::DRACULA)); -/// The built-in nord variant of an [`Extended`] palette. +/// The built-in Nord variant of an [`Extended`] palette. pub static EXTENDED_NORD: Lazy = Lazy::new(|| Extended::generate(Palette::NORD)); -/// The built-in solarized light variant of an [`Extended`] palette. +/// The built-in Solarized Light variant of an [`Extended`] palette. pub static EXTENDED_SOLARIZED_LIGHT: Lazy = Lazy::new(|| Extended::generate(Palette::SOLARIZED_LIGHT)); -/// The built-in solarized dark variant of an [`Extended`] palette. +/// The built-in Solarized Dark variant of an [`Extended`] palette. pub static EXTENDED_SOLARIZED_DARK: Lazy = Lazy::new(|| Extended::generate(Palette::SOLARIZED_DARK)); -/// The built-in gruvbox light variant of an [`Extended`] palette. +/// The built-in Gruvbox Light variant of an [`Extended`] palette. pub static EXTENDED_GRUVBOX_LIGHT: Lazy = Lazy::new(|| Extended::generate(Palette::GRUVBOX_LIGHT)); -/// The built-in gruvbox dark variant of an [`Extended`] palette. +/// The built-in Gruvbox Dark variant of an [`Extended`] palette. pub static EXTENDED_GRUVBOX_DARK: Lazy = Lazy::new(|| Extended::generate(Palette::GRUVBOX_DARK)); -- cgit From 17cb548e20a0594684b00c2eeda0e81cc8d06095 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 3 Feb 2024 18:51:30 +0100 Subject: Use `Theme::ALL` for theme selector in `styling` example --- style/src/theme.rs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'style') diff --git a/style/src/theme.rs b/style/src/theme.rs index b1902b06..890f6dce 100644 --- a/style/src/theme.rs +++ b/style/src/theme.rs @@ -25,6 +25,7 @@ use crate::core::{Background, Border, Color, Shadow, Vector}; use std::fmt; use std::rc::Rc; +use std::sync::Arc; /// A built-in theme. #[derive(Debug, Clone, PartialEq, Default)] @@ -47,12 +48,21 @@ pub enum Theme { /// The built-in gruvbox dark variant. GruvboxDark, /// A [`Theme`] that uses a [`Custom`] palette. - Custom(Box), + Custom(Arc), } impl Theme { /// A list with all the defined themes. - pub const ALL: &'static [Self] = &[Self::Light, Self::Dark]; + pub const ALL: &'static [Self] = &[ + Self::Light, + Self::Dark, + Self::Dracula, + Self::Nord, + Self::SolarizedLight, + Self::SolarizedDark, + Self::GruvboxLight, + Self::GruvboxDark, + ]; /// Creates a new custom [`Theme`] from the given [`Palette`]. pub fn custom(name: String, palette: Palette) -> Self { @@ -66,7 +76,7 @@ impl Theme { palette: Palette, generate: impl FnOnce(Palette) -> palette::Extended, ) -> Self { - Self::Custom(Box::new(Custom::with_fn(name, palette, generate))) + Self::Custom(Arc::new(Custom::with_fn(name, palette, generate))) } /// Returns the [`Palette`] of the [`Theme`]. -- cgit From ed159cb9630b951ccfc705938bb6d9fab1662a5b Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 3 Feb 2024 18:52:48 +0100 Subject: Fix import style in `style::theme::palette` --- style/src/theme/palette.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'style') diff --git a/style/src/theme/palette.rs b/style/src/theme/palette.rs index 50846d43..d5a1a5d9 100644 --- a/style/src/theme/palette.rs +++ b/style/src/theme/palette.rs @@ -1,5 +1,5 @@ //! Define the colors of a theme. -use iced_core::{color, Color}; +use crate::core::{color, Color}; use once_cell::sync::Lazy; use palette::color_difference::Wcag21RelativeContrast; -- cgit From ed02c1b24d22122e292b54950381589f29c5b21e Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 3 Feb 2024 18:56:33 +0100 Subject: Capitalize theme names in docs of `Theme` --- style/src/theme.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'style') diff --git a/style/src/theme.rs b/style/src/theme.rs index 890f6dce..96f91260 100644 --- a/style/src/theme.rs +++ b/style/src/theme.rs @@ -35,17 +35,17 @@ pub enum Theme { Light, /// The built-in dark variant. Dark, - /// The built-in dracula variant. + /// The built-in Dracula variant. Dracula, - /// The built-in nord variant. + /// The built-in Nord variant. Nord, - /// The built-in solarized light variant. + /// The built-in Solarized Light variant. SolarizedLight, - /// The built-in solarized dark variant. + /// The built-in Solarized Dark variant. SolarizedDark, - /// The built-in gruvbox light variant. + /// The built-in Gruvbox Light variant. GruvboxLight, - /// The built-in gruvbox dark variant. + /// The built-in Gruvbox Dark variant. GruvboxDark, /// A [`Theme`] that uses a [`Custom`] palette. Custom(Arc), -- cgit