From dac7e82e0bff128097653fe05829b2d576fcdb2f Mon Sep 17 00:00:00 2001 From: pml68 Date: Mon, 28 Apr 2025 10:56:49 +0200 Subject: refactor(material_theme)!: make `Theme` an enum with `Custom` variant --- crates/material_theme/src/text.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'crates/material_theme/src/text.rs') diff --git a/crates/material_theme/src/text.rs b/crates/material_theme/src/text.rs index 10b2e65..8da3cdf 100644 --- a/crates/material_theme/src/text.rs +++ b/crates/material_theme/src/text.rs @@ -21,66 +21,66 @@ pub fn none(_: &Theme) -> Style { pub fn primary(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.primary.on_primary), + color: Some(theme.colors().primary.on_primary), } } pub fn primary_container(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.primary.on_primary_container), + color: Some(theme.colors().primary.on_primary_container), } } pub fn secondary(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.secondary.on_secondary), + color: Some(theme.colors().secondary.on_secondary), } } pub fn secondary_container(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.secondary.on_secondary_container), + color: Some(theme.colors().secondary.on_secondary_container), } } pub fn tertiary(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.tertiary.on_tertiary), + color: Some(theme.colors().tertiary.on_tertiary), } } pub fn tertiary_container(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.tertiary.on_tertiary_container), + color: Some(theme.colors().tertiary.on_tertiary_container), } } pub fn error(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.error.on_error), + color: Some(theme.colors().error.on_error), } } pub fn error_container(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.error.on_error_container), + color: Some(theme.colors().error.on_error_container), } } pub fn surface(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.surface.on_surface), + color: Some(theme.colors().surface.on_surface), } } pub fn surface_variant(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.surface.on_surface_variant), + color: Some(theme.colors().surface.on_surface_variant), } } pub fn inverse_surface(theme: &Theme) -> Style { Style { - color: Some(theme.colorscheme.inverse.inverse_on_surface), + color: Some(theme.colors().inverse.inverse_on_surface), } } -- cgit v1.2.3