refactor: move custom theme into its separate crate

3 files changed, 70 insertions, 260 deletions

diff --git a/src/theme/button.rs b/material_theme/src/button.rs
index ddd2c71..051d6c9 100644
--- a/src/theme/button.rs
+++ b/material_theme/src/button.rs
@@ -1,14 +1,15 @@
 #![allow(dead_code)]
-use iced::widget::button::{Catalog, Status, Style, StyleFn};
-use iced::{Background, Border, Color, Shadow, Vector};
+use iced_widget::button::{Catalog, Status, Style, StyleFn};
+use iced_widget::core::{Background, Border, Color, Shadow, Vector};
 
-use super::OtherTheme;
+use crate::Theme;
+use crate::utils::{elevation, mix};
 
-impl Catalog for OtherTheme {
+impl Catalog for Theme {
     type Class<'a> = StyleFn<'a, Self>;
 
     fn default<'a>() -> Self::Class<'a> {
-        Box::new(default)
+        Box::new(filled)
     }
 
     fn style(&self, class: &Self::Class<'_>, status: Status) -> Style {
@@ -16,65 +17,61 @@ impl Catalog for OtherTheme {
     }
 }
 
-fn default(theme: &OtherTheme, status: Status) -> Style {
-    filled(theme, status)
-}
-
 fn button(
     foreground: Color,
     background: Color,
-    background_hover: Color,
+    tone_overlay: Color,
     disabled: Color,
     shadow_color: Color,
     shadow_elevation: u8,
     status: Status,
 ) -> Style {
     let border = Border {
-        radius: 400.0.into(),
+        radius: 400.into(),
         ..Default::default()
     };
 
-    let elevation_to_offset = |elevation: u8| {
-        (match elevation {
-            0 => 0.0,
-            1 => 1.0,
-            2 => 3.0,
-            3 => 6.0,
-            4 => 8.0,
-            _ => 12.0,
-        } as f32)
+    let active = Style {
+        background: Some(Background::Color(background)),
+        text_color: foreground,
+        border,
+        shadow: Shadow {
+            color: shadow_color,
+            offset: Vector {
+                x: 0.0,
+                y: elevation(shadow_elevation),
+            },
+            blur_radius: elevation(shadow_elevation)
+                * (1.0 + 0.4_f32.powf(elevation(shadow_elevation))),
+        },
     };
 
     match status {
-        Status::Active | Status::Pressed => Style {
-            background: Some(Background::Color(background)),
-            text_color: foreground,
-            border,
-            shadow: Shadow {
-                color: shadow_color,
-                offset: Vector {
-                    x: 0.0,
-                    y: elevation_to_offset(shadow_elevation),
-                },
-                blur_radius: elevation_to_offset(shadow_elevation)
-                    * (1.0
-                        + 0.4_f32.powf(elevation_to_offset(shadow_elevation))),
-            },
+        Status::Active => active,
+        Status::Pressed => Style {
+            background: Some(Background::Color(mix(
+                background,
+                tone_overlay,
+                0.08,
+            ))),
+            ..active
         },
         Status::Hovered => Style {
-            background: Some(Background::Color(background_hover)),
+            background: Some(Background::Color(mix(
+                background,
+                tone_overlay,
+                0.1,
+            ))),
             text_color: foreground,
             border,
             shadow: Shadow {
                 color: shadow_color,
                 offset: Vector {
                     x: 0.0,
-                    y: elevation_to_offset(shadow_elevation + 1),
+                    y: elevation(shadow_elevation + 1),
                 },
-                blur_radius: (elevation_to_offset(shadow_elevation + 1))
-                    * (1.0
-                        + 0.4_f32
-                            .powf(elevation_to_offset(shadow_elevation + 1))),
+                blur_radius: (elevation(shadow_elevation + 1))
+                    * (1.0 + 0.4_f32.powf(elevation(shadow_elevation + 1))),
             },
         },
         Status::Disabled => Style {
@@ -92,7 +89,7 @@ fn button(
     }
 }
 
-pub fn elevated(theme: &OtherTheme, status: Status) -> Style {
+pub fn elevated(theme: &Theme, status: Status) -> Style {
     let surface_colors = theme.colorscheme.surface;
 
     let foreground = theme.colorscheme.primary.color;
@@ -104,7 +101,7 @@ pub fn elevated(theme: &OtherTheme, status: Status) -> Style {
     button(
         foreground,
         background,
-        background,
+        foreground,
         disabled,
         shadow_color,
         1,
@@ -112,7 +109,7 @@ pub fn elevated(theme: &OtherTheme, status: Status) -> Style {
     )
 }
 
-pub fn filled(theme: &OtherTheme, status: Status) -> Style {
+pub fn filled(theme: &Theme, status: Status) -> Style {
     let primary_colors = theme.colorscheme.primary;
 
     let foreground = primary_colors.on_primary;
@@ -124,7 +121,7 @@ pub fn filled(theme: &OtherTheme, status: Status) -> Style {
     button(
         foreground,
         background,
-        background,
+        foreground,
         disabled,
         shadow_color,
         0,
@@ -132,19 +129,18 @@ pub fn filled(theme: &OtherTheme, status: Status) -> Style {
     )
 }
 
-pub fn filled_tonal(theme: &OtherTheme, status: Status) -> Style {
+pub fn filled_tonal(theme: &Theme, status: Status) -> Style {
     let secondary_colors = theme.colorscheme.secondary;
 
     let foreground = secondary_colors.on_secondary_container;
     let background = secondary_colors.secondary_container;
     let disabled = theme.colorscheme.surface.on_surface;
-
     let shadow_color = theme.colorscheme.shadow;
 
     button(
         foreground,
         background,
-        background,
+        foreground,
         disabled,
         shadow_color,
         0,
@@ -152,7 +148,7 @@ pub fn filled_tonal(theme: &OtherTheme, status: Status) -> Style {
     )
 }
 
-pub fn outlined(theme: &OtherTheme, status: Status) -> Style {
+pub fn outlined(theme: &Theme, status: Status) -> Style {
     let foreground = theme.colorscheme.primary.color;
     let background = Color::TRANSPARENT;
     let disabled = theme.colorscheme.surface.on_surface;
@@ -178,7 +174,7 @@ pub fn outlined(theme: &OtherTheme, status: Status) -> Style {
     let style = button(
         foreground,
         background,
-        background,
+        foreground,
         disabled,
         Color::TRANSPARENT,
         0,
@@ -187,3 +183,27 @@ pub fn outlined(theme: &OtherTheme, status: Status) -> Style {
 
     Style { border, ..style }
 }
+
+pub fn text(theme: &Theme, status: Status) -> Style {
+    let foreground = theme.colorscheme.primary.color;
+    let background = Color::TRANSPARENT;
+    let disabled = theme.colorscheme.surface.on_surface;
+
+    let style = button(
+        foreground,
+        background,
+        foreground,
+        disabled,
+        Color::TRANSPARENT,
+        0,
+        status,
+    );
+
+    match status {
+        Status::Hovered | Status::Pressed => style,
+        _ => Style {
+            background: None,
+            ..style
+        },
+    }
+}
diff --git a/src/theme.rs b/src/theme.rs
index 6fe844c..232f309 100644
--- a/src/theme.rs
+++ b/src/theme.rs
@@ -1,18 +1,11 @@
-pub mod button;
-pub mod text;
-
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 
 use iced::Color;
-use iced::theme::Base;
 use iced::theme::palette::Extended;
 use serde::Deserialize;
 
 use crate::config::Config;
 
-const DARK_THEME_CONTENT: &str = include_str!("../assets/themes/dark.toml");
-const LIGHT_THEME_CONTENT: &str = include_str!("../assets/themes/light.toml");
-
 pub fn theme_index(theme_name: &str, slice: &[iced::Theme]) -> Option<usize> {
     slice
         .iter()
@@ -83,159 +76,6 @@ impl Default for Appearance {
     }
 }
 
-#[derive(Debug, PartialEq, Deserialize)]
-pub struct OtherTheme {
-    name: String,
-    #[serde(flatten)]
-    colorscheme: ColorScheme,
-}
-
-impl Clone for OtherTheme {
-    fn clone(&self) -> Self {
-        Self {
-            name: self.name.clone(),
-            colorscheme: self.colorscheme,
-        }
-    }
-
-    fn clone_from(&mut self, source: &Self) {
-        self.name = source.name.clone();
-        self.colorscheme = source.colorscheme;
-    }
-}
-
-impl Default for OtherTheme {
-    fn default() -> Self {
-        match dark_light::detect().unwrap_or(dark_light::Mode::Unspecified) {
-            dark_light::Mode::Dark | dark_light::Mode::Unspecified => {
-                DARK.clone()
-            }
-            dark_light::Mode::Light => LIGHT.clone(),
-        }
-    }
-}
-
-impl Base for OtherTheme {
-    fn base(&self) -> iced::theme::Style {
-        iced::theme::Style {
-            background_color: self.colorscheme.surface.color,
-            text_color: self.colorscheme.surface.on_surface,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct ColorScheme {
-    pub primary: Primary,
-    pub secondary: Secondary,
-    pub tertiary: Tertiary,
-    pub error: Error,
-    pub surface: Surface,
-    pub inverse: Inverse,
-    pub outline: Outline,
-    #[serde(with = "color_serde")]
-    pub shadow: Color,
-}
-
-pub static DARK: LazyLock<OtherTheme> = LazyLock::new(|| {
-    toml::from_str(DARK_THEME_CONTENT).expect("parse dark theme")
-});
-
-pub static LIGHT: LazyLock<OtherTheme> = LazyLock::new(|| {
-    toml::from_str(LIGHT_THEME_CONTENT).expect("parse light theme")
-});
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct Primary {
-    #[serde(with = "color_serde")]
-    pub color: Color,
-    #[serde(with = "color_serde")]
-    pub on_primary: Color,
-    #[serde(with = "color_serde")]
-    pub primary_container: Color,
-    #[serde(with = "color_serde")]
-    pub on_primary_container: Color,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct Secondary {
-    #[serde(with = "color_serde")]
-    pub color: Color,
-    #[serde(with = "color_serde")]
-    pub on_secondary: Color,
-    #[serde(with = "color_serde")]
-    pub secondary_container: Color,
-    #[serde(with = "color_serde")]
-    pub on_secondary_container: Color,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct Tertiary {
-    #[serde(with = "color_serde")]
-    pub color: Color,
-    #[serde(with = "color_serde")]
-    pub on_tertiary: Color,
-    #[serde(with = "color_serde")]
-    pub tertiary_container: Color,
-    #[serde(with = "color_serde")]
-    pub on_tertiary_container: Color,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct Error {
-    #[serde(with = "color_serde")]
-    pub color: Color,
-    #[serde(with = "color_serde")]
-    pub on_error: Color,
-    #[serde(with = "color_serde")]
-    pub error_container: Color,
-    #[serde(with = "color_serde")]
-    pub on_error_container: Color,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct Surface {
-    #[serde(with = "color_serde")]
-    pub color: Color,
-    #[serde(with = "color_serde")]
-    pub on_surface: Color,
-    #[serde(with = "color_serde")]
-    pub on_surface_variant: Color,
-    pub surface_container: SurfaceContainer,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct SurfaceContainer {
-    #[serde(with = "color_serde")]
-    pub lowest: Color,
-    #[serde(with = "color_serde")]
-    pub low: Color,
-    #[serde(with = "color_serde")]
-    pub base: Color,
-    #[serde(with = "color_serde")]
-    pub high: Color,
-    #[serde(with = "color_serde")]
-    pub highest: Color,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct Inverse {
-    #[serde(with = "color_serde")]
-    pub inverse_surface: Color,
-    #[serde(with = "color_serde")]
-    pub inverse_on_surface: Color,
-    #[serde(with = "color_serde")]
-    pub inverse_primary: Color,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Deserialize)]
-pub struct Outline {
-    #[serde(with = "color_serde")]
-    pub color: Color,
-    #[serde(with = "color_serde")]
-    pub variant: Color,
-}
-
 #[derive(Debug, Deserialize)]
 pub struct Theme {
     name: String,
diff --git a/src/theme/text.rs b/src/theme/text.rs
deleted file mode 100644
index 9cbd056..0000000
--- a/src/theme/text.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-#![allow(dead_code)]
-use iced::widget::text::{Catalog, Style, StyleFn};
-
-use super::OtherTheme;
-
-impl Catalog for OtherTheme {
-    type Class<'a> = StyleFn<'a, Self>;
-
-    fn default<'a>() -> Self::Class<'a> {
-        Box::new(none)
-    }
-
-    fn style(&self, class: &Self::Class<'_>) -> Style {
-        class(self)
-    }
-}
-
-pub fn none(_: &OtherTheme) -> Style {
-    Style { color: None }
-}
-
-pub fn primary(theme: &OtherTheme) -> Style {
-    Style {
-        color: Some(theme.colorscheme.primary.on_primary),
-    }
-}
-
-pub fn secondary(theme: &OtherTheme) -> Style {
-    Style {
-        color: Some(theme.colorscheme.secondary.on_secondary),
-    }
-}
-
-pub fn tertiary(theme: &OtherTheme) -> Style {
-    Style {
-        color: Some(theme.colorscheme.tertiary.on_tertiary),
-    }
-}
-
-pub fn error(theme: &OtherTheme) -> Style {
-    Style {
-        color: Some(theme.colorscheme.error.on_error),
-    }
-}
-
-pub fn surface(theme: &OtherTheme) -> Style {
-    Style {
-        color: Some(theme.colorscheme.surface.on_surface),
-    }
-}