working different shades of colors

Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-iced = "0.10.0"
+iced = { version = "0.10.0", features = ["palette"]}
 iced_aw = { version = "0.6", default-features = false, features = ["menu", "tab_bar", "tabs"] }
 log = "0.4.18"
-palette = "*"
+palette = "0.7.0"
 pretty_env_logger = "0.5"
 rfd = "0.11.4"

src/gui/file_dialog.rs

@@ -1,5 +1,5 @@
-use crate::core;
 use super::FileTab;
+use crate::core;
 
 use rfd::FileDialog;
 use std::io::Result;

src/gui/theme/colors.rs

@@ -1,12 +1,12 @@
-use crate::gui::theme::shade::Shade;
+use crate::gui::theme::shades::Shades;
 
 /// Holds infomation about the post-processed colors at the highest level
 /// The result of Palette mixed with Shade
 #[derive(Clone)]
 pub struct Colors {
-    pub accent: Shade,
-    pub background: Shade,
-    pub primary: Shade,
-    pub secondary: Shade,
-    pub text: Shade,
+    pub accent: Shades,
+    pub background: Shades,
+    pub primary: Shades,
+    pub secondary: Shades,
+    pub text: Shades,
 }

src/gui/theme/mod.rs

@@ -1,9 +1,9 @@
 mod colors;
 mod pigment;
-mod shade;
+mod shades;
 use colors::Colors;
 use pigment::Pigment;
-use shade::Shade;
+use shades::Shades;
 
 use iced::widget::{button, text, text_input};
 use iced::{application, Background};
@@ -23,21 +23,11 @@ impl Default for Theme {
 
         Theme {
             colors: Colors {
-                accent: Shade {
-                    default: pigment.accent,
-                },
-                background: Shade {
-                    default: pigment.background,
-                },
-                primary: Shade {
-                    default: pigment.primary,
-                },
-                secondary: Shade {
-                    default: pigment.secondary,
-                },
-                text: Shade {
-                    default: pigment.text,
-                },
+                accent: Shades::new(pigment.accent),
+                background: Shades::new(pigment.background),
+                primary: Shades::new(pigment.primary),
+                secondary: Shades::new(pigment.secondary),
+                text: Shades::new(pigment.text),
             },
         }
     }
@@ -226,7 +216,7 @@ impl text_input::StyleSheet for Theme {
 
     fn placeholder_color(&self, style: &Self::Style) -> iced::Color {
         match style {
-            TextInput::Primary => self.colors.text.default, //TODO lightest
+            TextInput::Primary => self.colors.text.dark, //TODO lightest
         }
     }
 

src/gui/theme/pigment.rs

@@ -1,5 +1,6 @@
 use iced::Color;
 
+
 /// raw hex colors from the theme files
 #[derive(Clone, Copy)]
 pub struct Pigment {
@@ -42,3 +43,4 @@ fn hex_to_color(hex: &str) -> Option<Color> {
 
     None
 }
+

src/gui/theme/shades.rs

@@ -0,0 +1,55 @@
+use iced::Color;
+use palette::rgb::Rgb;
+use palette::{DarkenAssign, FromColor, LightenAssign, Okhsl, Srgb};
+
+/// provides post-processing to Pigment's raw colors
+#[derive(Clone)]
+pub struct Shades {
+    pub default: Color,
+    pub light: Color,
+    pub dark: Color,
+}
+
+impl Shades {
+    pub fn new(color: Color) -> Self{
+        Self {
+          default: color,
+          light: lighten(color, 0.5),
+          dark: darken(color, 0.5),
+        }
+      }
+}
+
+// special thanks to Halloy https://github.com/squidowl/halloy
+fn to_hsl(color: Color) -> Okhsl {
+    let mut hsl = Okhsl::from_color(Rgb::from(color));
+    if hsl.saturation.is_nan() {
+        hsl.saturation = Okhsl::max_saturation();
+    }
+
+    hsl
+}
+
+fn from_hsl(hsl: Okhsl) -> Color {
+    Srgb::from_color(hsl).into()
+}
+
+// fn alpha(color: Color, alpha: f32) -> Color {
+//     Color { a: alpha, ..color }
+// }
+
+fn lighten(color: Color, amount: f32) -> Color {
+    let mut hsl = to_hsl(color);
+
+    hsl.lighten_fixed_assign(amount);
+
+    from_hsl(hsl)
+}
+
+fn darken(color: Color, amount: f32) -> Color {
+    let mut hsl = to_hsl(color);
+
+    hsl.darken_fixed_assign(amount);
+
+    from_hsl(hsl)
+}