From 04b9dc4e2de4d36c2de7d537bb71694278bb79f0 Mon Sep 17 00:00:00 2001
From: Var Bhat <mailvarbhat@gmail.com>
Date: Fri, 22 Dec 2023 02:10:53 +0530
Subject: Add Dracula, Nord, Solarized and Grubvox variants to `Theme`

---
 style/src/theme.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'style/src/theme.rs')

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<Custom>),
 }
@@ -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),
         }
     }
-- 
cgit 


From 17cb548e20a0594684b00c2eeda0e81cc8d06095 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
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/src/theme.rs')

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>),
+    Custom(Arc<Custom>),
 }
 
 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 ed02c1b24d22122e292b54950381589f29c5b21e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
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/src/theme.rs')

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<Custom>),
-- 
cgit