feat!: combine `Primary`, `Secondary`, `Tertiary` and `Error`

Now only a singular `ColorQuartet` struct exists.

Also rename some `Surface` and `Inverse` fields for consistency.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/checkbox.rs b/src/checkbox.rs
index 7a3729c..cb5b96c 100644
--- a/src/checkbox.rs
+++ b/src/checkbox.rs
@@ -52,28 +52,28 @@ pub fn default(theme: &Theme, status: Status) -> Style {
         Status::Active { is_checked } => styled(
             primary.color,
             None,
-            primary.on_primary,
-            surface.on_surface_variant,
-            Some(surface.on_surface),
+            primary.text,
+            surface.text_variant,
+            Some(surface.text),
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            mix(primary.color, surface.on_surface, HOVERED_LAYER_OPACITY),
+            mix(primary.color, surface.text, HOVERED_LAYER_OPACITY),
             Some(Color {
                 a: HOVERED_LAYER_OPACITY,
-                ..surface.on_surface
+                ..surface.text
             }),
-            primary.on_primary,
-            surface.on_surface_variant,
-            Some(surface.on_surface),
+            primary.text,
+            surface.text_variant,
+            Some(surface.text),
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
-            disabled_text(surface.on_surface),
+            disabled_text(surface.text),
             None,
             surface.color,
-            disabled_text(surface.on_surface),
-            Some(surface.on_surface),
+            disabled_text(surface.text),
+            Some(surface.text),
             is_checked,
         ),
     }
@@ -87,28 +87,28 @@ pub fn error(theme: &Theme, status: Status) -> Style {
         Status::Active { is_checked } => styled(
             error.color,
             None,
-            error.on_error,
+            error.text,
             error.color,
             Some(error.color),
             is_checked,
         ),
         Status::Hovered { is_checked } => styled(
-            mix(error.color, surface.on_surface, HOVERED_LAYER_OPACITY),
+            mix(error.color, surface.text, HOVERED_LAYER_OPACITY),
             Some(Color {
                 a: HOVERED_LAYER_OPACITY,
                 ..error.color
             }),
-            error.on_error,
+            error.text,
             error.color,
             Some(error.color),
             is_checked,
         ),
         Status::Disabled { is_checked } => styled(
-            disabled_text(surface.on_surface),
+            disabled_text(surface.text),
             None,
             surface.color,
-            disabled_text(surface.on_surface),
-            Some(surface.on_surface),
+            disabled_text(surface.text),
+            Some(surface.text),
             is_checked,
         ),
     }