From adfe658d5da46af7067e937211625ddae00ea86d Mon Sep 17 00:00:00 2001 From: Divyanshu Bhargava Date: Tue, 6 May 2025 13:50:41 +0530 Subject: [PATCH] feat: Add Material 3 fixed color and new surface variants to color scheme --- .../stac_color_scheme/stac_color_scheme.dart | 42 +- .../stac_color_scheme.freezed.dart | 500 +++++++++++++++--- .../stac_color_scheme.g.dart | 44 +- 3 files changed, 499 insertions(+), 87 deletions(-) diff --git a/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.dart b/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.dart index 1a037917..1c5957ae 100644 --- a/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.dart +++ b/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.dart @@ -13,23 +13,39 @@ abstract class StacColorScheme with _$StacColorScheme { required String onPrimary, String? primaryContainer, String? onPrimaryContainer, + String? primaryFixed, + String? primaryFixedDim, + String? onPrimaryFixed, + String? onPrimaryFixedVariant, required String secondary, required String onSecondary, String? secondaryContainer, String? onSecondaryContainer, + String? secondaryFixed, + String? secondaryFixedDim, + String? onSecondaryFixed, + String? onSecondaryFixedVariant, String? tertiary, String? onTertiary, String? tertiaryContainer, String? onTertiaryContainer, + String? tertiaryFixed, + String? tertiaryFixedDim, + String? onTertiaryFixed, + String? onTertiaryFixedVariant, required String error, required String onError, String? errorContainer, String? onErrorContainer, - String? background, - String? onBackground, required String surface, required String onSurface, - String? surfaceVariant, + String? surfaceDim, + String? surfaceBright, + String? surfaceContainerLowest, + String? surfaceContainerLow, + String? surfaceContainer, + String? surfaceContainerHigh, + String? surfaceContainerHighest, String? onSurfaceVariant, String? outline, String? outlineVariant, @@ -53,21 +69,39 @@ extension StacColorSchemeParser on StacColorScheme { onPrimary: onPrimary.toColor(context)!, primaryContainer: primaryContainer.toColor(context), onPrimaryContainer: onPrimaryContainer.toColor(context), + primaryFixed: primaryFixed.toColor(context), + primaryFixedDim: primaryFixedDim.toColor(context), + onPrimaryFixed: onPrimaryFixed.toColor(context), + onPrimaryFixedVariant: onPrimaryFixedVariant.toColor(context), secondary: secondary.toColor(context)!, onSecondary: onSecondary.toColor(context)!, secondaryContainer: secondaryContainer.toColor(context), onSecondaryContainer: onSecondaryContainer.toColor(context), + secondaryFixed: secondaryFixed.toColor(context), + secondaryFixedDim: secondaryFixedDim.toColor(context), + onSecondaryFixed: onSecondaryFixed.toColor(context), + onSecondaryFixedVariant: onSecondaryFixedVariant.toColor(context), tertiary: tertiary.toColor(context), onTertiary: onTertiary.toColor(context), tertiaryContainer: tertiaryContainer.toColor(context), onTertiaryContainer: onTertiaryContainer.toColor(context), + tertiaryFixed: tertiaryFixed.toColor(context), + tertiaryFixedDim: tertiaryFixedDim.toColor(context), + onTertiaryFixed: onTertiaryFixed.toColor(context), + onTertiaryFixedVariant: onTertiaryFixedVariant.toColor(context), error: error.toColor(context)!, onError: onError.toColor(context)!, errorContainer: errorContainer.toColor(context), onErrorContainer: onErrorContainer.toColor(context), surface: surface.toColor(context)!, onSurface: onSurface.toColor(context)!, - surfaceContainerHighest: surfaceVariant.toColor(context), + surfaceDim: surfaceDim.toColor(context), + surfaceBright: surfaceBright.toColor(context), + surfaceContainerLowest: surfaceContainerLowest.toColor(context), + surfaceContainerLow: surfaceContainerLow.toColor(context), + surfaceContainer: surfaceContainer.toColor(context), + surfaceContainerHigh: surfaceContainerHigh.toColor(context), + surfaceContainerHighest: surfaceContainerHighest.toColor(context), onSurfaceVariant: onSurfaceVariant.toColor(context), outline: outline.toColor(context), outlineVariant: outlineVariant.toColor(context), diff --git a/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.freezed.dart b/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.freezed.dart index a46cbc9b..3e61db9e 100644 --- a/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.freezed.dart +++ b/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.freezed.dart @@ -20,23 +20,39 @@ mixin _$StacColorScheme { String get onPrimary; String? get primaryContainer; String? get onPrimaryContainer; + String? get primaryFixed; + String? get primaryFixedDim; + String? get onPrimaryFixed; + String? get onPrimaryFixedVariant; String get secondary; String get onSecondary; String? get secondaryContainer; String? get onSecondaryContainer; + String? get secondaryFixed; + String? get secondaryFixedDim; + String? get onSecondaryFixed; + String? get onSecondaryFixedVariant; String? get tertiary; String? get onTertiary; String? get tertiaryContainer; String? get onTertiaryContainer; + String? get tertiaryFixed; + String? get tertiaryFixedDim; + String? get onTertiaryFixed; + String? get onTertiaryFixedVariant; String get error; String get onError; String? get errorContainer; String? get onErrorContainer; - String? get background; - String? get onBackground; String get surface; String get onSurface; - String? get surfaceVariant; + String? get surfaceDim; + String? get surfaceBright; + String? get surfaceContainerLowest; + String? get surfaceContainerLow; + String? get surfaceContainer; + String? get surfaceContainerHigh; + String? get surfaceContainerHighest; String? get onSurfaceVariant; String? get outline; String? get outlineVariant; @@ -72,6 +88,14 @@ mixin _$StacColorScheme { other.primaryContainer == primaryContainer) && (identical(other.onPrimaryContainer, onPrimaryContainer) || other.onPrimaryContainer == onPrimaryContainer) && + (identical(other.primaryFixed, primaryFixed) || + other.primaryFixed == primaryFixed) && + (identical(other.primaryFixedDim, primaryFixedDim) || + other.primaryFixedDim == primaryFixedDim) && + (identical(other.onPrimaryFixed, onPrimaryFixed) || + other.onPrimaryFixed == onPrimaryFixed) && + (identical(other.onPrimaryFixedVariant, onPrimaryFixedVariant) || + other.onPrimaryFixedVariant == onPrimaryFixedVariant) && (identical(other.secondary, secondary) || other.secondary == secondary) && (identical(other.onSecondary, onSecondary) || @@ -80,6 +104,14 @@ mixin _$StacColorScheme { other.secondaryContainer == secondaryContainer) && (identical(other.onSecondaryContainer, onSecondaryContainer) || other.onSecondaryContainer == onSecondaryContainer) && + (identical(other.secondaryFixed, secondaryFixed) || + other.secondaryFixed == secondaryFixed) && + (identical(other.secondaryFixedDim, secondaryFixedDim) || + other.secondaryFixedDim == secondaryFixedDim) && + (identical(other.onSecondaryFixed, onSecondaryFixed) || + other.onSecondaryFixed == onSecondaryFixed) && + (identical(other.onSecondaryFixedVariant, onSecondaryFixedVariant) || + other.onSecondaryFixedVariant == onSecondaryFixedVariant) && (identical(other.tertiary, tertiary) || other.tertiary == tertiary) && (identical(other.onTertiary, onTertiary) || @@ -88,21 +120,37 @@ mixin _$StacColorScheme { other.tertiaryContainer == tertiaryContainer) && (identical(other.onTertiaryContainer, onTertiaryContainer) || other.onTertiaryContainer == onTertiaryContainer) && + (identical(other.tertiaryFixed, tertiaryFixed) || + other.tertiaryFixed == tertiaryFixed) && + (identical(other.tertiaryFixedDim, tertiaryFixedDim) || + other.tertiaryFixedDim == tertiaryFixedDim) && + (identical(other.onTertiaryFixed, onTertiaryFixed) || + other.onTertiaryFixed == onTertiaryFixed) && + (identical(other.onTertiaryFixedVariant, onTertiaryFixedVariant) || + other.onTertiaryFixedVariant == onTertiaryFixedVariant) && (identical(other.error, error) || other.error == error) && (identical(other.onError, onError) || other.onError == onError) && (identical(other.errorContainer, errorContainer) || other.errorContainer == errorContainer) && (identical(other.onErrorContainer, onErrorContainer) || other.onErrorContainer == onErrorContainer) && - (identical(other.background, background) || - other.background == background) && - (identical(other.onBackground, onBackground) || - other.onBackground == onBackground) && (identical(other.surface, surface) || other.surface == surface) && (identical(other.onSurface, onSurface) || other.onSurface == onSurface) && - (identical(other.surfaceVariant, surfaceVariant) || - other.surfaceVariant == surfaceVariant) && + (identical(other.surfaceDim, surfaceDim) || + other.surfaceDim == surfaceDim) && + (identical(other.surfaceBright, surfaceBright) || + other.surfaceBright == surfaceBright) && + (identical(other.surfaceContainerLowest, surfaceContainerLowest) || + other.surfaceContainerLowest == surfaceContainerLowest) && + (identical(other.surfaceContainerLow, surfaceContainerLow) || + other.surfaceContainerLow == surfaceContainerLow) && + (identical(other.surfaceContainer, surfaceContainer) || + other.surfaceContainer == surfaceContainer) && + (identical(other.surfaceContainerHigh, surfaceContainerHigh) || + other.surfaceContainerHigh == surfaceContainerHigh) && + (identical(other.surfaceContainerHighest, surfaceContainerHighest) || + other.surfaceContainerHighest == surfaceContainerHighest) && (identical(other.onSurfaceVariant, onSurfaceVariant) || other.onSurfaceVariant == onSurfaceVariant) && (identical(other.outline, outline) || other.outline == outline) && @@ -112,12 +160,9 @@ mixin _$StacColorScheme { (identical(other.scrim, scrim) || other.scrim == scrim) && (identical(other.inverseSurface, inverseSurface) || other.inverseSurface == inverseSurface) && - (identical(other.onInverseSurface, onInverseSurface) || - other.onInverseSurface == onInverseSurface) && - (identical(other.inversePrimary, inversePrimary) || - other.inversePrimary == inversePrimary) && - (identical(other.surfaceTint, surfaceTint) || - other.surfaceTint == surfaceTint)); + (identical(other.onInverseSurface, onInverseSurface) || other.onInverseSurface == onInverseSurface) && + (identical(other.inversePrimary, inversePrimary) || other.inversePrimary == inversePrimary) && + (identical(other.surfaceTint, surfaceTint) || other.surfaceTint == surfaceTint)); } @JsonKey(includeFromJson: false, includeToJson: false) @@ -129,23 +174,39 @@ mixin _$StacColorScheme { onPrimary, primaryContainer, onPrimaryContainer, + primaryFixed, + primaryFixedDim, + onPrimaryFixed, + onPrimaryFixedVariant, secondary, onSecondary, secondaryContainer, onSecondaryContainer, + secondaryFixed, + secondaryFixedDim, + onSecondaryFixed, + onSecondaryFixedVariant, tertiary, onTertiary, tertiaryContainer, onTertiaryContainer, + tertiaryFixed, + tertiaryFixedDim, + onTertiaryFixed, + onTertiaryFixedVariant, error, onError, errorContainer, onErrorContainer, - background, - onBackground, surface, onSurface, - surfaceVariant, + surfaceDim, + surfaceBright, + surfaceContainerLowest, + surfaceContainerLow, + surfaceContainer, + surfaceContainerHigh, + surfaceContainerHighest, onSurfaceVariant, outline, outlineVariant, @@ -159,7 +220,7 @@ mixin _$StacColorScheme { @override String toString() { - return 'StacColorScheme(brightness: $brightness, primary: $primary, onPrimary: $onPrimary, primaryContainer: $primaryContainer, onPrimaryContainer: $onPrimaryContainer, secondary: $secondary, onSecondary: $onSecondary, secondaryContainer: $secondaryContainer, onSecondaryContainer: $onSecondaryContainer, tertiary: $tertiary, onTertiary: $onTertiary, tertiaryContainer: $tertiaryContainer, onTertiaryContainer: $onTertiaryContainer, error: $error, onError: $onError, errorContainer: $errorContainer, onErrorContainer: $onErrorContainer, background: $background, onBackground: $onBackground, surface: $surface, onSurface: $onSurface, surfaceVariant: $surfaceVariant, onSurfaceVariant: $onSurfaceVariant, outline: $outline, outlineVariant: $outlineVariant, shadow: $shadow, scrim: $scrim, inverseSurface: $inverseSurface, onInverseSurface: $onInverseSurface, inversePrimary: $inversePrimary, surfaceTint: $surfaceTint)'; + return 'StacColorScheme(brightness: $brightness, primary: $primary, onPrimary: $onPrimary, primaryContainer: $primaryContainer, onPrimaryContainer: $onPrimaryContainer, primaryFixed: $primaryFixed, primaryFixedDim: $primaryFixedDim, onPrimaryFixed: $onPrimaryFixed, onPrimaryFixedVariant: $onPrimaryFixedVariant, secondary: $secondary, onSecondary: $onSecondary, secondaryContainer: $secondaryContainer, onSecondaryContainer: $onSecondaryContainer, secondaryFixed: $secondaryFixed, secondaryFixedDim: $secondaryFixedDim, onSecondaryFixed: $onSecondaryFixed, onSecondaryFixedVariant: $onSecondaryFixedVariant, tertiary: $tertiary, onTertiary: $onTertiary, tertiaryContainer: $tertiaryContainer, onTertiaryContainer: $onTertiaryContainer, tertiaryFixed: $tertiaryFixed, tertiaryFixedDim: $tertiaryFixedDim, onTertiaryFixed: $onTertiaryFixed, onTertiaryFixedVariant: $onTertiaryFixedVariant, error: $error, onError: $onError, errorContainer: $errorContainer, onErrorContainer: $onErrorContainer, surface: $surface, onSurface: $onSurface, surfaceDim: $surfaceDim, surfaceBright: $surfaceBright, surfaceContainerLowest: $surfaceContainerLowest, surfaceContainerLow: $surfaceContainerLow, surfaceContainer: $surfaceContainer, surfaceContainerHigh: $surfaceContainerHigh, surfaceContainerHighest: $surfaceContainerHighest, onSurfaceVariant: $onSurfaceVariant, outline: $outline, outlineVariant: $outlineVariant, shadow: $shadow, scrim: $scrim, inverseSurface: $inverseSurface, onInverseSurface: $onInverseSurface, inversePrimary: $inversePrimary, surfaceTint: $surfaceTint)'; } } @@ -175,23 +236,39 @@ abstract mixin class $StacColorSchemeCopyWith<$Res> { String onPrimary, String? primaryContainer, String? onPrimaryContainer, + String? primaryFixed, + String? primaryFixedDim, + String? onPrimaryFixed, + String? onPrimaryFixedVariant, String secondary, String onSecondary, String? secondaryContainer, String? onSecondaryContainer, + String? secondaryFixed, + String? secondaryFixedDim, + String? onSecondaryFixed, + String? onSecondaryFixedVariant, String? tertiary, String? onTertiary, String? tertiaryContainer, String? onTertiaryContainer, + String? tertiaryFixed, + String? tertiaryFixedDim, + String? onTertiaryFixed, + String? onTertiaryFixedVariant, String error, String onError, String? errorContainer, String? onErrorContainer, - String? background, - String? onBackground, String surface, String onSurface, - String? surfaceVariant, + String? surfaceDim, + String? surfaceBright, + String? surfaceContainerLowest, + String? surfaceContainerLow, + String? surfaceContainer, + String? surfaceContainerHigh, + String? surfaceContainerHighest, String? onSurfaceVariant, String? outline, String? outlineVariant, @@ -221,23 +298,39 @@ class _$StacColorSchemeCopyWithImpl<$Res> Object? onPrimary = null, Object? primaryContainer = freezed, Object? onPrimaryContainer = freezed, + Object? primaryFixed = freezed, + Object? primaryFixedDim = freezed, + Object? onPrimaryFixed = freezed, + Object? onPrimaryFixedVariant = freezed, Object? secondary = null, Object? onSecondary = null, Object? secondaryContainer = freezed, Object? onSecondaryContainer = freezed, + Object? secondaryFixed = freezed, + Object? secondaryFixedDim = freezed, + Object? onSecondaryFixed = freezed, + Object? onSecondaryFixedVariant = freezed, Object? tertiary = freezed, Object? onTertiary = freezed, Object? tertiaryContainer = freezed, Object? onTertiaryContainer = freezed, + Object? tertiaryFixed = freezed, + Object? tertiaryFixedDim = freezed, + Object? onTertiaryFixed = freezed, + Object? onTertiaryFixedVariant = freezed, Object? error = null, Object? onError = null, Object? errorContainer = freezed, Object? onErrorContainer = freezed, - Object? background = freezed, - Object? onBackground = freezed, Object? surface = null, Object? onSurface = null, - Object? surfaceVariant = freezed, + Object? surfaceDim = freezed, + Object? surfaceBright = freezed, + Object? surfaceContainerLowest = freezed, + Object? surfaceContainerLow = freezed, + Object? surfaceContainer = freezed, + Object? surfaceContainerHigh = freezed, + Object? surfaceContainerHighest = freezed, Object? onSurfaceVariant = freezed, Object? outline = freezed, Object? outlineVariant = freezed, @@ -269,6 +362,22 @@ class _$StacColorSchemeCopyWithImpl<$Res> ? _self.onPrimaryContainer : onPrimaryContainer // ignore: cast_nullable_to_non_nullable as String?, + primaryFixed: freezed == primaryFixed + ? _self.primaryFixed + : primaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + primaryFixedDim: freezed == primaryFixedDim + ? _self.primaryFixedDim + : primaryFixedDim // ignore: cast_nullable_to_non_nullable + as String?, + onPrimaryFixed: freezed == onPrimaryFixed + ? _self.onPrimaryFixed + : onPrimaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + onPrimaryFixedVariant: freezed == onPrimaryFixedVariant + ? _self.onPrimaryFixedVariant + : onPrimaryFixedVariant // ignore: cast_nullable_to_non_nullable + as String?, secondary: null == secondary ? _self.secondary : secondary // ignore: cast_nullable_to_non_nullable @@ -285,6 +394,22 @@ class _$StacColorSchemeCopyWithImpl<$Res> ? _self.onSecondaryContainer : onSecondaryContainer // ignore: cast_nullable_to_non_nullable as String?, + secondaryFixed: freezed == secondaryFixed + ? _self.secondaryFixed + : secondaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + secondaryFixedDim: freezed == secondaryFixedDim + ? _self.secondaryFixedDim + : secondaryFixedDim // ignore: cast_nullable_to_non_nullable + as String?, + onSecondaryFixed: freezed == onSecondaryFixed + ? _self.onSecondaryFixed + : onSecondaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + onSecondaryFixedVariant: freezed == onSecondaryFixedVariant + ? _self.onSecondaryFixedVariant + : onSecondaryFixedVariant // ignore: cast_nullable_to_non_nullable + as String?, tertiary: freezed == tertiary ? _self.tertiary : tertiary // ignore: cast_nullable_to_non_nullable @@ -301,6 +426,22 @@ class _$StacColorSchemeCopyWithImpl<$Res> ? _self.onTertiaryContainer : onTertiaryContainer // ignore: cast_nullable_to_non_nullable as String?, + tertiaryFixed: freezed == tertiaryFixed + ? _self.tertiaryFixed + : tertiaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + tertiaryFixedDim: freezed == tertiaryFixedDim + ? _self.tertiaryFixedDim + : tertiaryFixedDim // ignore: cast_nullable_to_non_nullable + as String?, + onTertiaryFixed: freezed == onTertiaryFixed + ? _self.onTertiaryFixed + : onTertiaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + onTertiaryFixedVariant: freezed == onTertiaryFixedVariant + ? _self.onTertiaryFixedVariant + : onTertiaryFixedVariant // ignore: cast_nullable_to_non_nullable + as String?, error: null == error ? _self.error : error // ignore: cast_nullable_to_non_nullable @@ -317,14 +458,6 @@ class _$StacColorSchemeCopyWithImpl<$Res> ? _self.onErrorContainer : onErrorContainer // ignore: cast_nullable_to_non_nullable as String?, - background: freezed == background - ? _self.background - : background // ignore: cast_nullable_to_non_nullable - as String?, - onBackground: freezed == onBackground - ? _self.onBackground - : onBackground // ignore: cast_nullable_to_non_nullable - as String?, surface: null == surface ? _self.surface : surface // ignore: cast_nullable_to_non_nullable @@ -333,9 +466,33 @@ class _$StacColorSchemeCopyWithImpl<$Res> ? _self.onSurface : onSurface // ignore: cast_nullable_to_non_nullable as String, - surfaceVariant: freezed == surfaceVariant - ? _self.surfaceVariant - : surfaceVariant // ignore: cast_nullable_to_non_nullable + surfaceDim: freezed == surfaceDim + ? _self.surfaceDim + : surfaceDim // ignore: cast_nullable_to_non_nullable + as String?, + surfaceBright: freezed == surfaceBright + ? _self.surfaceBright + : surfaceBright // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerLowest: freezed == surfaceContainerLowest + ? _self.surfaceContainerLowest + : surfaceContainerLowest // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerLow: freezed == surfaceContainerLow + ? _self.surfaceContainerLow + : surfaceContainerLow // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainer: freezed == surfaceContainer + ? _self.surfaceContainer + : surfaceContainer // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerHigh: freezed == surfaceContainerHigh + ? _self.surfaceContainerHigh + : surfaceContainerHigh // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerHighest: freezed == surfaceContainerHighest + ? _self.surfaceContainerHighest + : surfaceContainerHighest // ignore: cast_nullable_to_non_nullable as String?, onSurfaceVariant: freezed == onSurfaceVariant ? _self.onSurfaceVariant @@ -386,23 +543,39 @@ class _StacColorScheme implements StacColorScheme { required this.onPrimary, this.primaryContainer, this.onPrimaryContainer, + this.primaryFixed, + this.primaryFixedDim, + this.onPrimaryFixed, + this.onPrimaryFixedVariant, required this.secondary, required this.onSecondary, this.secondaryContainer, this.onSecondaryContainer, + this.secondaryFixed, + this.secondaryFixedDim, + this.onSecondaryFixed, + this.onSecondaryFixedVariant, this.tertiary, this.onTertiary, this.tertiaryContainer, this.onTertiaryContainer, + this.tertiaryFixed, + this.tertiaryFixedDim, + this.onTertiaryFixed, + this.onTertiaryFixedVariant, required this.error, required this.onError, this.errorContainer, this.onErrorContainer, - this.background, - this.onBackground, required this.surface, required this.onSurface, - this.surfaceVariant, + this.surfaceDim, + this.surfaceBright, + this.surfaceContainerLowest, + this.surfaceContainerLow, + this.surfaceContainer, + this.surfaceContainerHigh, + this.surfaceContainerHighest, this.onSurfaceVariant, this.outline, this.outlineVariant, @@ -426,6 +599,14 @@ class _StacColorScheme implements StacColorScheme { @override final String? onPrimaryContainer; @override + final String? primaryFixed; + @override + final String? primaryFixedDim; + @override + final String? onPrimaryFixed; + @override + final String? onPrimaryFixedVariant; + @override final String secondary; @override final String onSecondary; @@ -434,6 +615,14 @@ class _StacColorScheme implements StacColorScheme { @override final String? onSecondaryContainer; @override + final String? secondaryFixed; + @override + final String? secondaryFixedDim; + @override + final String? onSecondaryFixed; + @override + final String? onSecondaryFixedVariant; + @override final String? tertiary; @override final String? onTertiary; @@ -442,6 +631,14 @@ class _StacColorScheme implements StacColorScheme { @override final String? onTertiaryContainer; @override + final String? tertiaryFixed; + @override + final String? tertiaryFixedDim; + @override + final String? onTertiaryFixed; + @override + final String? onTertiaryFixedVariant; + @override final String error; @override final String onError; @@ -450,15 +647,23 @@ class _StacColorScheme implements StacColorScheme { @override final String? onErrorContainer; @override - final String? background; - @override - final String? onBackground; - @override final String surface; @override final String onSurface; @override - final String? surfaceVariant; + final String? surfaceDim; + @override + final String? surfaceBright; + @override + final String? surfaceContainerLowest; + @override + final String? surfaceContainerLow; + @override + final String? surfaceContainer; + @override + final String? surfaceContainerHigh; + @override + final String? surfaceContainerHighest; @override final String? onSurfaceVariant; @override @@ -507,6 +712,14 @@ class _StacColorScheme implements StacColorScheme { other.primaryContainer == primaryContainer) && (identical(other.onPrimaryContainer, onPrimaryContainer) || other.onPrimaryContainer == onPrimaryContainer) && + (identical(other.primaryFixed, primaryFixed) || + other.primaryFixed == primaryFixed) && + (identical(other.primaryFixedDim, primaryFixedDim) || + other.primaryFixedDim == primaryFixedDim) && + (identical(other.onPrimaryFixed, onPrimaryFixed) || + other.onPrimaryFixed == onPrimaryFixed) && + (identical(other.onPrimaryFixedVariant, onPrimaryFixedVariant) || + other.onPrimaryFixedVariant == onPrimaryFixedVariant) && (identical(other.secondary, secondary) || other.secondary == secondary) && (identical(other.onSecondary, onSecondary) || @@ -515,6 +728,14 @@ class _StacColorScheme implements StacColorScheme { other.secondaryContainer == secondaryContainer) && (identical(other.onSecondaryContainer, onSecondaryContainer) || other.onSecondaryContainer == onSecondaryContainer) && + (identical(other.secondaryFixed, secondaryFixed) || + other.secondaryFixed == secondaryFixed) && + (identical(other.secondaryFixedDim, secondaryFixedDim) || + other.secondaryFixedDim == secondaryFixedDim) && + (identical(other.onSecondaryFixed, onSecondaryFixed) || + other.onSecondaryFixed == onSecondaryFixed) && + (identical(other.onSecondaryFixedVariant, onSecondaryFixedVariant) || + other.onSecondaryFixedVariant == onSecondaryFixedVariant) && (identical(other.tertiary, tertiary) || other.tertiary == tertiary) && (identical(other.onTertiary, onTertiary) || @@ -523,21 +744,37 @@ class _StacColorScheme implements StacColorScheme { other.tertiaryContainer == tertiaryContainer) && (identical(other.onTertiaryContainer, onTertiaryContainer) || other.onTertiaryContainer == onTertiaryContainer) && + (identical(other.tertiaryFixed, tertiaryFixed) || + other.tertiaryFixed == tertiaryFixed) && + (identical(other.tertiaryFixedDim, tertiaryFixedDim) || + other.tertiaryFixedDim == tertiaryFixedDim) && + (identical(other.onTertiaryFixed, onTertiaryFixed) || + other.onTertiaryFixed == onTertiaryFixed) && + (identical(other.onTertiaryFixedVariant, onTertiaryFixedVariant) || + other.onTertiaryFixedVariant == onTertiaryFixedVariant) && (identical(other.error, error) || other.error == error) && (identical(other.onError, onError) || other.onError == onError) && (identical(other.errorContainer, errorContainer) || other.errorContainer == errorContainer) && (identical(other.onErrorContainer, onErrorContainer) || other.onErrorContainer == onErrorContainer) && - (identical(other.background, background) || - other.background == background) && - (identical(other.onBackground, onBackground) || - other.onBackground == onBackground) && (identical(other.surface, surface) || other.surface == surface) && (identical(other.onSurface, onSurface) || other.onSurface == onSurface) && - (identical(other.surfaceVariant, surfaceVariant) || - other.surfaceVariant == surfaceVariant) && + (identical(other.surfaceDim, surfaceDim) || + other.surfaceDim == surfaceDim) && + (identical(other.surfaceBright, surfaceBright) || + other.surfaceBright == surfaceBright) && + (identical(other.surfaceContainerLowest, surfaceContainerLowest) || + other.surfaceContainerLowest == surfaceContainerLowest) && + (identical(other.surfaceContainerLow, surfaceContainerLow) || + other.surfaceContainerLow == surfaceContainerLow) && + (identical(other.surfaceContainer, surfaceContainer) || + other.surfaceContainer == surfaceContainer) && + (identical(other.surfaceContainerHigh, surfaceContainerHigh) || + other.surfaceContainerHigh == surfaceContainerHigh) && + (identical(other.surfaceContainerHighest, surfaceContainerHighest) || + other.surfaceContainerHighest == surfaceContainerHighest) && (identical(other.onSurfaceVariant, onSurfaceVariant) || other.onSurfaceVariant == onSurfaceVariant) && (identical(other.outline, outline) || other.outline == outline) && @@ -547,12 +784,9 @@ class _StacColorScheme implements StacColorScheme { (identical(other.scrim, scrim) || other.scrim == scrim) && (identical(other.inverseSurface, inverseSurface) || other.inverseSurface == inverseSurface) && - (identical(other.onInverseSurface, onInverseSurface) || - other.onInverseSurface == onInverseSurface) && - (identical(other.inversePrimary, inversePrimary) || - other.inversePrimary == inversePrimary) && - (identical(other.surfaceTint, surfaceTint) || - other.surfaceTint == surfaceTint)); + (identical(other.onInverseSurface, onInverseSurface) || other.onInverseSurface == onInverseSurface) && + (identical(other.inversePrimary, inversePrimary) || other.inversePrimary == inversePrimary) && + (identical(other.surfaceTint, surfaceTint) || other.surfaceTint == surfaceTint)); } @JsonKey(includeFromJson: false, includeToJson: false) @@ -564,23 +798,39 @@ class _StacColorScheme implements StacColorScheme { onPrimary, primaryContainer, onPrimaryContainer, + primaryFixed, + primaryFixedDim, + onPrimaryFixed, + onPrimaryFixedVariant, secondary, onSecondary, secondaryContainer, onSecondaryContainer, + secondaryFixed, + secondaryFixedDim, + onSecondaryFixed, + onSecondaryFixedVariant, tertiary, onTertiary, tertiaryContainer, onTertiaryContainer, + tertiaryFixed, + tertiaryFixedDim, + onTertiaryFixed, + onTertiaryFixedVariant, error, onError, errorContainer, onErrorContainer, - background, - onBackground, surface, onSurface, - surfaceVariant, + surfaceDim, + surfaceBright, + surfaceContainerLowest, + surfaceContainerLow, + surfaceContainer, + surfaceContainerHigh, + surfaceContainerHighest, onSurfaceVariant, outline, outlineVariant, @@ -594,7 +844,7 @@ class _StacColorScheme implements StacColorScheme { @override String toString() { - return 'StacColorScheme(brightness: $brightness, primary: $primary, onPrimary: $onPrimary, primaryContainer: $primaryContainer, onPrimaryContainer: $onPrimaryContainer, secondary: $secondary, onSecondary: $onSecondary, secondaryContainer: $secondaryContainer, onSecondaryContainer: $onSecondaryContainer, tertiary: $tertiary, onTertiary: $onTertiary, tertiaryContainer: $tertiaryContainer, onTertiaryContainer: $onTertiaryContainer, error: $error, onError: $onError, errorContainer: $errorContainer, onErrorContainer: $onErrorContainer, background: $background, onBackground: $onBackground, surface: $surface, onSurface: $onSurface, surfaceVariant: $surfaceVariant, onSurfaceVariant: $onSurfaceVariant, outline: $outline, outlineVariant: $outlineVariant, shadow: $shadow, scrim: $scrim, inverseSurface: $inverseSurface, onInverseSurface: $onInverseSurface, inversePrimary: $inversePrimary, surfaceTint: $surfaceTint)'; + return 'StacColorScheme(brightness: $brightness, primary: $primary, onPrimary: $onPrimary, primaryContainer: $primaryContainer, onPrimaryContainer: $onPrimaryContainer, primaryFixed: $primaryFixed, primaryFixedDim: $primaryFixedDim, onPrimaryFixed: $onPrimaryFixed, onPrimaryFixedVariant: $onPrimaryFixedVariant, secondary: $secondary, onSecondary: $onSecondary, secondaryContainer: $secondaryContainer, onSecondaryContainer: $onSecondaryContainer, secondaryFixed: $secondaryFixed, secondaryFixedDim: $secondaryFixedDim, onSecondaryFixed: $onSecondaryFixed, onSecondaryFixedVariant: $onSecondaryFixedVariant, tertiary: $tertiary, onTertiary: $onTertiary, tertiaryContainer: $tertiaryContainer, onTertiaryContainer: $onTertiaryContainer, tertiaryFixed: $tertiaryFixed, tertiaryFixedDim: $tertiaryFixedDim, onTertiaryFixed: $onTertiaryFixed, onTertiaryFixedVariant: $onTertiaryFixedVariant, error: $error, onError: $onError, errorContainer: $errorContainer, onErrorContainer: $onErrorContainer, surface: $surface, onSurface: $onSurface, surfaceDim: $surfaceDim, surfaceBright: $surfaceBright, surfaceContainerLowest: $surfaceContainerLowest, surfaceContainerLow: $surfaceContainerLow, surfaceContainer: $surfaceContainer, surfaceContainerHigh: $surfaceContainerHigh, surfaceContainerHighest: $surfaceContainerHighest, onSurfaceVariant: $onSurfaceVariant, outline: $outline, outlineVariant: $outlineVariant, shadow: $shadow, scrim: $scrim, inverseSurface: $inverseSurface, onInverseSurface: $onInverseSurface, inversePrimary: $inversePrimary, surfaceTint: $surfaceTint)'; } } @@ -612,23 +862,39 @@ abstract mixin class _$StacColorSchemeCopyWith<$Res> String onPrimary, String? primaryContainer, String? onPrimaryContainer, + String? primaryFixed, + String? primaryFixedDim, + String? onPrimaryFixed, + String? onPrimaryFixedVariant, String secondary, String onSecondary, String? secondaryContainer, String? onSecondaryContainer, + String? secondaryFixed, + String? secondaryFixedDim, + String? onSecondaryFixed, + String? onSecondaryFixedVariant, String? tertiary, String? onTertiary, String? tertiaryContainer, String? onTertiaryContainer, + String? tertiaryFixed, + String? tertiaryFixedDim, + String? onTertiaryFixed, + String? onTertiaryFixedVariant, String error, String onError, String? errorContainer, String? onErrorContainer, - String? background, - String? onBackground, String surface, String onSurface, - String? surfaceVariant, + String? surfaceDim, + String? surfaceBright, + String? surfaceContainerLowest, + String? surfaceContainerLow, + String? surfaceContainer, + String? surfaceContainerHigh, + String? surfaceContainerHighest, String? onSurfaceVariant, String? outline, String? outlineVariant, @@ -658,23 +924,39 @@ class __$StacColorSchemeCopyWithImpl<$Res> Object? onPrimary = null, Object? primaryContainer = freezed, Object? onPrimaryContainer = freezed, + Object? primaryFixed = freezed, + Object? primaryFixedDim = freezed, + Object? onPrimaryFixed = freezed, + Object? onPrimaryFixedVariant = freezed, Object? secondary = null, Object? onSecondary = null, Object? secondaryContainer = freezed, Object? onSecondaryContainer = freezed, + Object? secondaryFixed = freezed, + Object? secondaryFixedDim = freezed, + Object? onSecondaryFixed = freezed, + Object? onSecondaryFixedVariant = freezed, Object? tertiary = freezed, Object? onTertiary = freezed, Object? tertiaryContainer = freezed, Object? onTertiaryContainer = freezed, + Object? tertiaryFixed = freezed, + Object? tertiaryFixedDim = freezed, + Object? onTertiaryFixed = freezed, + Object? onTertiaryFixedVariant = freezed, Object? error = null, Object? onError = null, Object? errorContainer = freezed, Object? onErrorContainer = freezed, - Object? background = freezed, - Object? onBackground = freezed, Object? surface = null, Object? onSurface = null, - Object? surfaceVariant = freezed, + Object? surfaceDim = freezed, + Object? surfaceBright = freezed, + Object? surfaceContainerLowest = freezed, + Object? surfaceContainerLow = freezed, + Object? surfaceContainer = freezed, + Object? surfaceContainerHigh = freezed, + Object? surfaceContainerHighest = freezed, Object? onSurfaceVariant = freezed, Object? outline = freezed, Object? outlineVariant = freezed, @@ -706,6 +988,22 @@ class __$StacColorSchemeCopyWithImpl<$Res> ? _self.onPrimaryContainer : onPrimaryContainer // ignore: cast_nullable_to_non_nullable as String?, + primaryFixed: freezed == primaryFixed + ? _self.primaryFixed + : primaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + primaryFixedDim: freezed == primaryFixedDim + ? _self.primaryFixedDim + : primaryFixedDim // ignore: cast_nullable_to_non_nullable + as String?, + onPrimaryFixed: freezed == onPrimaryFixed + ? _self.onPrimaryFixed + : onPrimaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + onPrimaryFixedVariant: freezed == onPrimaryFixedVariant + ? _self.onPrimaryFixedVariant + : onPrimaryFixedVariant // ignore: cast_nullable_to_non_nullable + as String?, secondary: null == secondary ? _self.secondary : secondary // ignore: cast_nullable_to_non_nullable @@ -722,6 +1020,22 @@ class __$StacColorSchemeCopyWithImpl<$Res> ? _self.onSecondaryContainer : onSecondaryContainer // ignore: cast_nullable_to_non_nullable as String?, + secondaryFixed: freezed == secondaryFixed + ? _self.secondaryFixed + : secondaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + secondaryFixedDim: freezed == secondaryFixedDim + ? _self.secondaryFixedDim + : secondaryFixedDim // ignore: cast_nullable_to_non_nullable + as String?, + onSecondaryFixed: freezed == onSecondaryFixed + ? _self.onSecondaryFixed + : onSecondaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + onSecondaryFixedVariant: freezed == onSecondaryFixedVariant + ? _self.onSecondaryFixedVariant + : onSecondaryFixedVariant // ignore: cast_nullable_to_non_nullable + as String?, tertiary: freezed == tertiary ? _self.tertiary : tertiary // ignore: cast_nullable_to_non_nullable @@ -738,6 +1052,22 @@ class __$StacColorSchemeCopyWithImpl<$Res> ? _self.onTertiaryContainer : onTertiaryContainer // ignore: cast_nullable_to_non_nullable as String?, + tertiaryFixed: freezed == tertiaryFixed + ? _self.tertiaryFixed + : tertiaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + tertiaryFixedDim: freezed == tertiaryFixedDim + ? _self.tertiaryFixedDim + : tertiaryFixedDim // ignore: cast_nullable_to_non_nullable + as String?, + onTertiaryFixed: freezed == onTertiaryFixed + ? _self.onTertiaryFixed + : onTertiaryFixed // ignore: cast_nullable_to_non_nullable + as String?, + onTertiaryFixedVariant: freezed == onTertiaryFixedVariant + ? _self.onTertiaryFixedVariant + : onTertiaryFixedVariant // ignore: cast_nullable_to_non_nullable + as String?, error: null == error ? _self.error : error // ignore: cast_nullable_to_non_nullable @@ -754,14 +1084,6 @@ class __$StacColorSchemeCopyWithImpl<$Res> ? _self.onErrorContainer : onErrorContainer // ignore: cast_nullable_to_non_nullable as String?, - background: freezed == background - ? _self.background - : background // ignore: cast_nullable_to_non_nullable - as String?, - onBackground: freezed == onBackground - ? _self.onBackground - : onBackground // ignore: cast_nullable_to_non_nullable - as String?, surface: null == surface ? _self.surface : surface // ignore: cast_nullable_to_non_nullable @@ -770,9 +1092,33 @@ class __$StacColorSchemeCopyWithImpl<$Res> ? _self.onSurface : onSurface // ignore: cast_nullable_to_non_nullable as String, - surfaceVariant: freezed == surfaceVariant - ? _self.surfaceVariant - : surfaceVariant // ignore: cast_nullable_to_non_nullable + surfaceDim: freezed == surfaceDim + ? _self.surfaceDim + : surfaceDim // ignore: cast_nullable_to_non_nullable + as String?, + surfaceBright: freezed == surfaceBright + ? _self.surfaceBright + : surfaceBright // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerLowest: freezed == surfaceContainerLowest + ? _self.surfaceContainerLowest + : surfaceContainerLowest // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerLow: freezed == surfaceContainerLow + ? _self.surfaceContainerLow + : surfaceContainerLow // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainer: freezed == surfaceContainer + ? _self.surfaceContainer + : surfaceContainer // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerHigh: freezed == surfaceContainerHigh + ? _self.surfaceContainerHigh + : surfaceContainerHigh // ignore: cast_nullable_to_non_nullable + as String?, + surfaceContainerHighest: freezed == surfaceContainerHighest + ? _self.surfaceContainerHighest + : surfaceContainerHighest // ignore: cast_nullable_to_non_nullable as String?, onSurfaceVariant: freezed == onSurfaceVariant ? _self.onSurfaceVariant diff --git a/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.g.dart b/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.g.dart index 54cd562a..71f2616d 100644 --- a/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.g.dart +++ b/packages/stac/lib/src/parsers/theme/stac_color_scheme/stac_color_scheme.g.dart @@ -13,23 +13,39 @@ _StacColorScheme _$StacColorSchemeFromJson(Map json) => onPrimary: json['onPrimary'] as String, primaryContainer: json['primaryContainer'] as String?, onPrimaryContainer: json['onPrimaryContainer'] as String?, + primaryFixed: json['primaryFixed'] as String?, + primaryFixedDim: json['primaryFixedDim'] as String?, + onPrimaryFixed: json['onPrimaryFixed'] as String?, + onPrimaryFixedVariant: json['onPrimaryFixedVariant'] as String?, secondary: json['secondary'] as String, onSecondary: json['onSecondary'] as String, secondaryContainer: json['secondaryContainer'] as String?, onSecondaryContainer: json['onSecondaryContainer'] as String?, + secondaryFixed: json['secondaryFixed'] as String?, + secondaryFixedDim: json['secondaryFixedDim'] as String?, + onSecondaryFixed: json['onSecondaryFixed'] as String?, + onSecondaryFixedVariant: json['onSecondaryFixedVariant'] as String?, tertiary: json['tertiary'] as String?, onTertiary: json['onTertiary'] as String?, tertiaryContainer: json['tertiaryContainer'] as String?, onTertiaryContainer: json['onTertiaryContainer'] as String?, + tertiaryFixed: json['tertiaryFixed'] as String?, + tertiaryFixedDim: json['tertiaryFixedDim'] as String?, + onTertiaryFixed: json['onTertiaryFixed'] as String?, + onTertiaryFixedVariant: json['onTertiaryFixedVariant'] as String?, error: json['error'] as String, onError: json['onError'] as String, errorContainer: json['errorContainer'] as String?, onErrorContainer: json['onErrorContainer'] as String?, - background: json['background'] as String?, - onBackground: json['onBackground'] as String?, surface: json['surface'] as String, onSurface: json['onSurface'] as String, - surfaceVariant: json['surfaceVariant'] as String?, + surfaceDim: json['surfaceDim'] as String?, + surfaceBright: json['surfaceBright'] as String?, + surfaceContainerLowest: json['surfaceContainerLowest'] as String?, + surfaceContainerLow: json['surfaceContainerLow'] as String?, + surfaceContainer: json['surfaceContainer'] as String?, + surfaceContainerHigh: json['surfaceContainerHigh'] as String?, + surfaceContainerHighest: json['surfaceContainerHighest'] as String?, onSurfaceVariant: json['onSurfaceVariant'] as String?, outline: json['outline'] as String?, outlineVariant: json['outlineVariant'] as String?, @@ -48,23 +64,39 @@ Map _$StacColorSchemeToJson(_StacColorScheme instance) => 'onPrimary': instance.onPrimary, 'primaryContainer': instance.primaryContainer, 'onPrimaryContainer': instance.onPrimaryContainer, + 'primaryFixed': instance.primaryFixed, + 'primaryFixedDim': instance.primaryFixedDim, + 'onPrimaryFixed': instance.onPrimaryFixed, + 'onPrimaryFixedVariant': instance.onPrimaryFixedVariant, 'secondary': instance.secondary, 'onSecondary': instance.onSecondary, 'secondaryContainer': instance.secondaryContainer, 'onSecondaryContainer': instance.onSecondaryContainer, + 'secondaryFixed': instance.secondaryFixed, + 'secondaryFixedDim': instance.secondaryFixedDim, + 'onSecondaryFixed': instance.onSecondaryFixed, + 'onSecondaryFixedVariant': instance.onSecondaryFixedVariant, 'tertiary': instance.tertiary, 'onTertiary': instance.onTertiary, 'tertiaryContainer': instance.tertiaryContainer, 'onTertiaryContainer': instance.onTertiaryContainer, + 'tertiaryFixed': instance.tertiaryFixed, + 'tertiaryFixedDim': instance.tertiaryFixedDim, + 'onTertiaryFixed': instance.onTertiaryFixed, + 'onTertiaryFixedVariant': instance.onTertiaryFixedVariant, 'error': instance.error, 'onError': instance.onError, 'errorContainer': instance.errorContainer, 'onErrorContainer': instance.onErrorContainer, - 'background': instance.background, - 'onBackground': instance.onBackground, 'surface': instance.surface, 'onSurface': instance.onSurface, - 'surfaceVariant': instance.surfaceVariant, + 'surfaceDim': instance.surfaceDim, + 'surfaceBright': instance.surfaceBright, + 'surfaceContainerLowest': instance.surfaceContainerLowest, + 'surfaceContainerLow': instance.surfaceContainerLow, + 'surfaceContainer': instance.surfaceContainer, + 'surfaceContainerHigh': instance.surfaceContainerHigh, + 'surfaceContainerHighest': instance.surfaceContainerHighest, 'onSurfaceVariant': instance.onSurfaceVariant, 'outline': instance.outline, 'outlineVariant': instance.outlineVariant,