Unverified Commit 87f16844 authored by Casey Hillers's avatar Casey Hillers Committed by GitHub

Revert "Add `outlineVariant` and `scrim` colors to `ColorScheme` (#109071)" (#109199)

This reverts commit d880c33e.
parent e7c867c9
...@@ -9,7 +9,7 @@ import 'package:material_color_utilities/material_color_utilities.dart'; ...@@ -9,7 +9,7 @@ import 'package:material_color_utilities/material_color_utilities.dart';
import 'colors.dart'; import 'colors.dart';
import 'theme_data.dart'; import 'theme_data.dart';
/// A set of 30 colors based on the /// A set of 25 colors based on the
/// [Material spec](https://m3.material.io/styles/color/the-color-system/color-roles) /// [Material spec](https://m3.material.io/styles/color/the-color-system/color-roles)
/// that can be used to configure the color properties of most components. /// that can be used to configure the color properties of most components.
/// ///
...@@ -100,9 +100,7 @@ class ColorScheme with Diagnosticable { ...@@ -100,9 +100,7 @@ class ColorScheme with Diagnosticable {
Color? surfaceVariant, Color? surfaceVariant,
Color? onSurfaceVariant, Color? onSurfaceVariant,
Color? outline, Color? outline,
Color? outlineVariant,
Color? shadow, Color? shadow,
Color? scrim,
Color? inverseSurface, Color? inverseSurface,
Color? onInverseSurface, Color? onInverseSurface,
Color? inversePrimary, Color? inversePrimary,
...@@ -141,9 +139,7 @@ class ColorScheme with Diagnosticable { ...@@ -141,9 +139,7 @@ class ColorScheme with Diagnosticable {
_surfaceVariant = surfaceVariant, _surfaceVariant = surfaceVariant,
_onSurfaceVariant = onSurfaceVariant, _onSurfaceVariant = onSurfaceVariant,
_outline = outline, _outline = outline,
_outlineVariant = outlineVariant,
_shadow = shadow, _shadow = shadow,
_scrim = scrim,
_inverseSurface = inverseSurface, _inverseSurface = inverseSurface,
_onInverseSurface = onInverseSurface, _onInverseSurface = onInverseSurface,
_inversePrimary = inversePrimary, _inversePrimary = inversePrimary,
...@@ -193,7 +189,6 @@ class ColorScheme with Diagnosticable { ...@@ -193,7 +189,6 @@ class ColorScheme with Diagnosticable {
Color? errorContainer, Color? errorContainer,
Color? onErrorContainer, Color? onErrorContainer,
Color? outline, Color? outline,
Color? outlineVariant,
Color? background, Color? background,
Color? onBackground, Color? onBackground,
Color? surface, Color? surface,
...@@ -204,7 +199,6 @@ class ColorScheme with Diagnosticable { ...@@ -204,7 +199,6 @@ class ColorScheme with Diagnosticable {
Color? onInverseSurface, Color? onInverseSurface,
Color? inversePrimary, Color? inversePrimary,
Color? shadow, Color? shadow,
Color? scrim,
Color? surfaceTint, Color? surfaceTint,
}) { }) {
final Scheme scheme; final Scheme scheme;
...@@ -234,7 +228,6 @@ class ColorScheme with Diagnosticable { ...@@ -234,7 +228,6 @@ class ColorScheme with Diagnosticable {
errorContainer: errorContainer ?? Color(scheme.errorContainer), errorContainer: errorContainer ?? Color(scheme.errorContainer),
onErrorContainer: onErrorContainer ?? Color(scheme.onErrorContainer), onErrorContainer: onErrorContainer ?? Color(scheme.onErrorContainer),
outline: outline ?? Color(scheme.outline), outline: outline ?? Color(scheme.outline),
outlineVariant: outlineVariant ?? Color(scheme.outlineVariant),
background: background ?? Color(scheme.background), background: background ?? Color(scheme.background),
onBackground: onBackground ?? Color(scheme.onBackground), onBackground: onBackground ?? Color(scheme.onBackground),
surface: surface ?? Color(scheme.surface), surface: surface ?? Color(scheme.surface),
...@@ -245,7 +238,6 @@ class ColorScheme with Diagnosticable { ...@@ -245,7 +238,6 @@ class ColorScheme with Diagnosticable {
onInverseSurface: onInverseSurface ?? Color(scheme.inverseOnSurface), onInverseSurface: onInverseSurface ?? Color(scheme.inverseOnSurface),
inversePrimary: inversePrimary ?? Color(scheme.inversePrimary), inversePrimary: inversePrimary ?? Color(scheme.inversePrimary),
shadow: shadow ?? Color(scheme.shadow), shadow: shadow ?? Color(scheme.shadow),
scrim: scrim ?? Color(scheme.scrim),
surfaceTint: surfaceTint ?? Color(scheme.primary), surfaceTint: surfaceTint ?? Color(scheme.primary),
brightness: brightness, brightness: brightness,
); );
...@@ -278,9 +270,7 @@ class ColorScheme with Diagnosticable { ...@@ -278,9 +270,7 @@ class ColorScheme with Diagnosticable {
Color? surfaceVariant, Color? surfaceVariant,
Color? onSurfaceVariant, Color? onSurfaceVariant,
Color? outline, Color? outline,
Color? outlineVariant,
Color? shadow, Color? shadow,
Color? scrim,
Color? inverseSurface, Color? inverseSurface,
Color? onInverseSurface, Color? onInverseSurface,
Color? inversePrimary, Color? inversePrimary,
...@@ -319,9 +309,7 @@ class ColorScheme with Diagnosticable { ...@@ -319,9 +309,7 @@ class ColorScheme with Diagnosticable {
_surfaceVariant = surfaceVariant, _surfaceVariant = surfaceVariant,
_onSurfaceVariant = onSurfaceVariant, _onSurfaceVariant = onSurfaceVariant,
_outline = outline, _outline = outline,
_outlineVariant = outlineVariant,
_shadow = shadow, _shadow = shadow,
_scrim = scrim,
_inverseSurface = inverseSurface, _inverseSurface = inverseSurface,
_onInverseSurface = onInverseSurface, _onInverseSurface = onInverseSurface,
_inversePrimary = inversePrimary, _inversePrimary = inversePrimary,
...@@ -356,9 +344,7 @@ class ColorScheme with Diagnosticable { ...@@ -356,9 +344,7 @@ class ColorScheme with Diagnosticable {
Color? surfaceVariant, Color? surfaceVariant,
Color? onSurfaceVariant, Color? onSurfaceVariant,
Color? outline, Color? outline,
Color? outlineVariant,
Color? shadow, Color? shadow,
Color? scrim,
Color? inverseSurface, Color? inverseSurface,
Color? onInverseSurface, Color? onInverseSurface,
Color? inversePrimary, Color? inversePrimary,
...@@ -397,9 +383,7 @@ class ColorScheme with Diagnosticable { ...@@ -397,9 +383,7 @@ class ColorScheme with Diagnosticable {
_surfaceVariant = surfaceVariant, _surfaceVariant = surfaceVariant,
_onSurfaceVariant = onSurfaceVariant, _onSurfaceVariant = onSurfaceVariant,
_outline = outline, _outline = outline,
_outlineVariant = outlineVariant,
_shadow = shadow, _shadow = shadow,
_scrim = scrim,
_inverseSurface = inverseSurface, _inverseSurface = inverseSurface,
_onInverseSurface = onInverseSurface, _onInverseSurface = onInverseSurface,
_inversePrimary = inversePrimary, _inversePrimary = inversePrimary,
...@@ -434,9 +418,7 @@ class ColorScheme with Diagnosticable { ...@@ -434,9 +418,7 @@ class ColorScheme with Diagnosticable {
Color? surfaceVariant, Color? surfaceVariant,
Color? onSurfaceVariant, Color? onSurfaceVariant,
Color? outline, Color? outline,
Color? outlineVariant,
Color? shadow, Color? shadow,
Color? scrim,
Color? inverseSurface, Color? inverseSurface,
Color? onInverseSurface, Color? onInverseSurface,
Color? inversePrimary, Color? inversePrimary,
...@@ -475,9 +457,7 @@ class ColorScheme with Diagnosticable { ...@@ -475,9 +457,7 @@ class ColorScheme with Diagnosticable {
_surfaceVariant = surfaceVariant, _surfaceVariant = surfaceVariant,
_onSurfaceVariant = onSurfaceVariant, _onSurfaceVariant = onSurfaceVariant,
_outline = outline, _outline = outline,
_outlineVariant = outlineVariant,
_shadow = shadow, _shadow = shadow,
_scrim = scrim,
_inverseSurface = inverseSurface, _inverseSurface = inverseSurface,
_onInverseSurface = onInverseSurface, _onInverseSurface = onInverseSurface,
_inversePrimary = inversePrimary, _inversePrimary = inversePrimary,
...@@ -512,9 +492,7 @@ class ColorScheme with Diagnosticable { ...@@ -512,9 +492,7 @@ class ColorScheme with Diagnosticable {
Color? surfaceVariant, Color? surfaceVariant,
Color? onSurfaceVariant, Color? onSurfaceVariant,
Color? outline, Color? outline,
Color? outlineVariant,
Color? shadow, Color? shadow,
Color? scrim,
Color? inverseSurface, Color? inverseSurface,
Color? onInverseSurface, Color? onInverseSurface,
Color? inversePrimary, Color? inversePrimary,
...@@ -553,9 +531,7 @@ class ColorScheme with Diagnosticable { ...@@ -553,9 +531,7 @@ class ColorScheme with Diagnosticable {
_surfaceVariant = surfaceVariant, _surfaceVariant = surfaceVariant,
_onSurfaceVariant = onSurfaceVariant, _onSurfaceVariant = onSurfaceVariant,
_outline = outline, _outline = outline,
_outlineVariant = outlineVariant,
_shadow = shadow, _shadow = shadow,
_scrim = scrim,
_inverseSurface = inverseSurface, _inverseSurface = inverseSurface,
_onInverseSurface = onInverseSurface, _onInverseSurface = onInverseSurface,
_inversePrimary = inversePrimary, _inversePrimary = inversePrimary,
...@@ -742,19 +718,10 @@ class ColorScheme with Diagnosticable { ...@@ -742,19 +718,10 @@ class ColorScheme with Diagnosticable {
/// A utility color that creates boundaries and emphasis to improve usability. /// A utility color that creates boundaries and emphasis to improve usability.
Color get outline => _outline ?? onBackground; Color get outline => _outline ?? onBackground;
final Color? _outlineVariant;
/// A utility color that creates boundaries for decorative elements when a
/// 3:1 contrast isn’t required, such as for dividers or decorative elements.
Color get outlineVariant => _outlineVariant ?? onBackground;
final Color? _shadow; final Color? _shadow;
/// A color use to paint the drop shadows of elevated components. /// A color use to paint the drop shadows of elevated components.
Color get shadow => _shadow ?? const Color(0xff000000); Color get shadow => _shadow ?? const Color(0xff000000);
final Color? _scrim;
/// A color use to paint the scrim around of modal components.
Color get scrim => _scrim ?? const Color(0xff000000);
final Color? _inverseSurface; final Color? _inverseSurface;
/// A surface color used for displaying the reverse of what’s seen in the /// A surface color used for displaying the reverse of what’s seen in the
/// surrounding UI, for example in a SnackBar to bring attention to /// surrounding UI, for example in a SnackBar to bring attention to
...@@ -823,9 +790,7 @@ class ColorScheme with Diagnosticable { ...@@ -823,9 +790,7 @@ class ColorScheme with Diagnosticable {
Color? surfaceVariant, Color? surfaceVariant,
Color? onSurfaceVariant, Color? onSurfaceVariant,
Color? outline, Color? outline,
Color? outlineVariant,
Color? shadow, Color? shadow,
Color? scrim,
Color? inverseSurface, Color? inverseSurface,
Color? onInverseSurface, Color? onInverseSurface,
Color? inversePrimary, Color? inversePrimary,
...@@ -866,9 +831,7 @@ class ColorScheme with Diagnosticable { ...@@ -866,9 +831,7 @@ class ColorScheme with Diagnosticable {
surfaceVariant : surfaceVariant ?? this.surfaceVariant, surfaceVariant : surfaceVariant ?? this.surfaceVariant,
onSurfaceVariant : onSurfaceVariant ?? this.onSurfaceVariant, onSurfaceVariant : onSurfaceVariant ?? this.onSurfaceVariant,
outline : outline ?? this.outline, outline : outline ?? this.outline,
outlineVariant : outlineVariant ?? this.outlineVariant,
shadow : shadow ?? this.shadow, shadow : shadow ?? this.shadow,
scrim : scrim ?? this.scrim,
inverseSurface : inverseSurface ?? this.inverseSurface, inverseSurface : inverseSurface ?? this.inverseSurface,
onInverseSurface : onInverseSurface ?? this.onInverseSurface, onInverseSurface : onInverseSurface ?? this.onInverseSurface,
inversePrimary : inversePrimary ?? this.inversePrimary, inversePrimary : inversePrimary ?? this.inversePrimary,
...@@ -907,9 +870,7 @@ class ColorScheme with Diagnosticable { ...@@ -907,9 +870,7 @@ class ColorScheme with Diagnosticable {
surfaceVariant: Color.lerp(a.surfaceVariant, b.surfaceVariant, t), surfaceVariant: Color.lerp(a.surfaceVariant, b.surfaceVariant, t),
onSurfaceVariant: Color.lerp(a.onSurfaceVariant, b.onSurfaceVariant, t), onSurfaceVariant: Color.lerp(a.onSurfaceVariant, b.onSurfaceVariant, t),
outline: Color.lerp(a.outline, b.outline, t), outline: Color.lerp(a.outline, b.outline, t),
outlineVariant: Color.lerp(a.outlineVariant, b.outlineVariant, t),
shadow: Color.lerp(a.shadow, b.shadow, t), shadow: Color.lerp(a.shadow, b.shadow, t),
scrim: Color.lerp(a.scrim, b.scrim, t),
inverseSurface: Color.lerp(a.inverseSurface, b.inverseSurface, t), inverseSurface: Color.lerp(a.inverseSurface, b.inverseSurface, t),
onInverseSurface: Color.lerp(a.onInverseSurface, b.onInverseSurface, t), onInverseSurface: Color.lerp(a.onInverseSurface, b.onInverseSurface, t),
inversePrimary: Color.lerp(a.inversePrimary, b.inversePrimary, t), inversePrimary: Color.lerp(a.inversePrimary, b.inversePrimary, t),
...@@ -952,9 +913,7 @@ class ColorScheme with Diagnosticable { ...@@ -952,9 +913,7 @@ class ColorScheme with Diagnosticable {
&& other.surfaceVariant == surfaceVariant && other.surfaceVariant == surfaceVariant
&& other.onSurfaceVariant == onSurfaceVariant && other.onSurfaceVariant == onSurfaceVariant
&& other.outline == outline && other.outline == outline
&& other.outlineVariant == outlineVariant
&& other.shadow == shadow && other.shadow == shadow
&& other.scrim == scrim
&& other.inverseSurface == inverseSurface && other.inverseSurface == inverseSurface
&& other.onInverseSurface == onInverseSurface && other.onInverseSurface == onInverseSurface
&& other.inversePrimary == inversePrimary && other.inversePrimary == inversePrimary
...@@ -990,9 +949,7 @@ class ColorScheme with Diagnosticable { ...@@ -990,9 +949,7 @@ class ColorScheme with Diagnosticable {
surfaceVariant, surfaceVariant,
onSurfaceVariant, onSurfaceVariant,
outline, outline,
outlineVariant,
shadow, shadow,
scrim,
inverseSurface, inverseSurface,
onInverseSurface, onInverseSurface,
inversePrimary, inversePrimary,
...@@ -1030,9 +987,7 @@ class ColorScheme with Diagnosticable { ...@@ -1030,9 +987,7 @@ class ColorScheme with Diagnosticable {
properties.add(ColorProperty('surfaceVariant', surfaceVariant, defaultValue: defaultScheme.surfaceVariant)); properties.add(ColorProperty('surfaceVariant', surfaceVariant, defaultValue: defaultScheme.surfaceVariant));
properties.add(ColorProperty('onSurfaceVariant', onSurfaceVariant, defaultValue: defaultScheme.onSurfaceVariant)); properties.add(ColorProperty('onSurfaceVariant', onSurfaceVariant, defaultValue: defaultScheme.onSurfaceVariant));
properties.add(ColorProperty('outline', outline, defaultValue: defaultScheme.outline)); properties.add(ColorProperty('outline', outline, defaultValue: defaultScheme.outline));
properties.add(ColorProperty('outlineVariant', outlineVariant, defaultValue: defaultScheme.outlineVariant));
properties.add(ColorProperty('shadow', shadow, defaultValue: defaultScheme.shadow)); properties.add(ColorProperty('shadow', shadow, defaultValue: defaultScheme.shadow));
properties.add(ColorProperty('scrim', scrim, defaultValue: defaultScheme.scrim));
properties.add(ColorProperty('inverseSurface', inverseSurface, defaultValue: defaultScheme.inverseSurface)); properties.add(ColorProperty('inverseSurface', inverseSurface, defaultValue: defaultScheme.inverseSurface));
properties.add(ColorProperty('onInverseSurface', onInverseSurface, defaultValue: defaultScheme.onInverseSurface)); properties.add(ColorProperty('onInverseSurface', onInverseSurface, defaultValue: defaultScheme.onInverseSurface));
properties.add(ColorProperty('inversePrimary', inversePrimary, defaultValue: defaultScheme.inversePrimary)); properties.add(ColorProperty('inversePrimary', inversePrimary, defaultValue: defaultScheme.inversePrimary));
......
...@@ -36,9 +36,7 @@ void main() { ...@@ -36,9 +36,7 @@ void main() {
expect(scheme.surfaceVariant, scheme.surface); expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface); expect(scheme.onSurfaceVariant, scheme.onSurface);
expect(scheme.outline, scheme.onBackground); expect(scheme.outline, scheme.onBackground);
expect(scheme.outlineVariant, scheme.onBackground);
expect(scheme.shadow, const Color(0xff000000)); expect(scheme.shadow, const Color(0xff000000));
expect(scheme.scrim, const Color(0xff000000));
expect(scheme.inverseSurface, scheme.onSurface); expect(scheme.inverseSurface, scheme.onSurface);
expect(scheme.onInverseSurface, scheme.surface); expect(scheme.onInverseSurface, scheme.surface);
expect(scheme.inversePrimary, scheme.onPrimary); expect(scheme.inversePrimary, scheme.onPrimary);
...@@ -78,9 +76,7 @@ void main() { ...@@ -78,9 +76,7 @@ void main() {
expect(scheme.surfaceVariant, scheme.surface); expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface); expect(scheme.onSurfaceVariant, scheme.onSurface);
expect(scheme.outline, scheme.onBackground); expect(scheme.outline, scheme.onBackground);
expect(scheme.outlineVariant, scheme.onBackground);
expect(scheme.shadow, const Color(0xff000000)); expect(scheme.shadow, const Color(0xff000000));
expect(scheme.scrim, const Color(0xff000000));
expect(scheme.inverseSurface, scheme.onSurface); expect(scheme.inverseSurface, scheme.onSurface);
expect(scheme.onInverseSurface, scheme.surface); expect(scheme.onInverseSurface, scheme.surface);
expect(scheme.inversePrimary, scheme.onPrimary); expect(scheme.inversePrimary, scheme.onPrimary);
...@@ -120,9 +116,7 @@ void main() { ...@@ -120,9 +116,7 @@ void main() {
expect(scheme.surfaceVariant, scheme.surface); expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface); expect(scheme.onSurfaceVariant, scheme.onSurface);
expect(scheme.outline, scheme.onBackground); expect(scheme.outline, scheme.onBackground);
expect(scheme.outlineVariant, scheme.onBackground);
expect(scheme.shadow, const Color(0xff000000)); expect(scheme.shadow, const Color(0xff000000));
expect(scheme.scrim, const Color(0xff000000));
expect(scheme.inverseSurface, scheme.onSurface); expect(scheme.inverseSurface, scheme.onSurface);
expect(scheme.onInverseSurface, scheme.surface); expect(scheme.onInverseSurface, scheme.surface);
expect(scheme.inversePrimary, scheme.onPrimary); expect(scheme.inversePrimary, scheme.onPrimary);
...@@ -162,9 +156,7 @@ void main() { ...@@ -162,9 +156,7 @@ void main() {
expect(scheme.surfaceVariant, scheme.surface); expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface); expect(scheme.onSurfaceVariant, scheme.onSurface);
expect(scheme.outline, scheme.onBackground); expect(scheme.outline, scheme.onBackground);
expect(scheme.outlineVariant, scheme.onBackground);
expect(scheme.shadow, const Color(0xff000000)); expect(scheme.shadow, const Color(0xff000000));
expect(scheme.scrim, const Color(0xff000000));
expect(scheme.inverseSurface, scheme.onSurface); expect(scheme.inverseSurface, scheme.onSurface);
expect(scheme.onInverseSurface, scheme.surface); expect(scheme.onInverseSurface, scheme.surface);
expect(scheme.inversePrimary, scheme.onPrimary); expect(scheme.inversePrimary, scheme.onPrimary);
...@@ -193,7 +185,6 @@ void main() { ...@@ -193,7 +185,6 @@ void main() {
expect(scheme.errorContainer, const Color(0xffffdad6)); expect(scheme.errorContainer, const Color(0xffffdad6));
expect(scheme.onErrorContainer, const Color(0xff410002)); expect(scheme.onErrorContainer, const Color(0xff410002));
expect(scheme.outline, const Color(0xff73777f)); expect(scheme.outline, const Color(0xff73777f));
expect(scheme.outlineVariant, const Color(0xffc3c7cf));
expect(scheme.background, const Color(0xfffdfcff)); expect(scheme.background, const Color(0xfffdfcff));
expect(scheme.onBackground, const Color(0xff1a1c1e)); expect(scheme.onBackground, const Color(0xff1a1c1e));
expect(scheme.surface, const Color(0xfffdfcff)); expect(scheme.surface, const Color(0xfffdfcff));
...@@ -204,7 +195,6 @@ void main() { ...@@ -204,7 +195,6 @@ void main() {
expect(scheme.onInverseSurface, const Color(0xfff1f0f4)); expect(scheme.onInverseSurface, const Color(0xfff1f0f4));
expect(scheme.inversePrimary, const Color(0xff9ecaff)); expect(scheme.inversePrimary, const Color(0xff9ecaff));
expect(scheme.shadow, const Color(0xff000000)); expect(scheme.shadow, const Color(0xff000000));
expect(scheme.scrim, const Color(0xff000000));
expect(scheme.surfaceTint, const Color(0xff0061a4)); expect(scheme.surfaceTint, const Color(0xff0061a4));
expect(scheme.brightness, Brightness.light); expect(scheme.brightness, Brightness.light);
}); });
...@@ -235,9 +225,7 @@ void main() { ...@@ -235,9 +225,7 @@ void main() {
surfaceVariant: const Color(0x00000015), surfaceVariant: const Color(0x00000015),
onSurfaceVariant: const Color(0x00000016), onSurfaceVariant: const Color(0x00000016),
outline: const Color(0x00000017), outline: const Color(0x00000017),
outlineVariant: const Color(0x00000117),
shadow: const Color(0x00000018), shadow: const Color(0x00000018),
scrim: const Color(0x00000118),
inverseSurface: const Color(0x00000019), inverseSurface: const Color(0x00000019),
onInverseSurface: const Color(0x0000001A), onInverseSurface: const Color(0x0000001A),
inversePrimary: const Color(0x0000001B), inversePrimary: const Color(0x0000001B),
...@@ -271,9 +259,7 @@ void main() { ...@@ -271,9 +259,7 @@ void main() {
expect(scheme.surfaceVariant, const Color(0x00000015)); expect(scheme.surfaceVariant, const Color(0x00000015));
expect(scheme.onSurfaceVariant, const Color(0x00000016)); expect(scheme.onSurfaceVariant, const Color(0x00000016));
expect(scheme.outline, const Color(0x00000017)); expect(scheme.outline, const Color(0x00000017));
expect(scheme.outlineVariant, const Color(0x00000117));
expect(scheme.shadow, const Color(0x00000018)); expect(scheme.shadow, const Color(0x00000018));
expect(scheme.scrim, const Color(0x00000118));
expect(scheme.inverseSurface, const Color(0x00000019)); expect(scheme.inverseSurface, const Color(0x00000019));
expect(scheme.onInverseSurface, const Color(0x0000001A)); expect(scheme.onInverseSurface, const Color(0x0000001A));
expect(scheme.inversePrimary, const Color(0x0000001B)); expect(scheme.inversePrimary, const Color(0x0000001B));
...@@ -302,7 +288,6 @@ void main() { ...@@ -302,7 +288,6 @@ void main() {
expect(scheme.errorContainer, const Color(0xff93000a)); expect(scheme.errorContainer, const Color(0xff93000a));
expect(scheme.onErrorContainer, const Color(0xffffb4ab)); expect(scheme.onErrorContainer, const Color(0xffffb4ab));
expect(scheme.outline, const Color(0xff8d9199)); expect(scheme.outline, const Color(0xff8d9199));
expect(scheme.outlineVariant, const Color(0xff43474e));
expect(scheme.background, const Color(0xff1a1c1e)); expect(scheme.background, const Color(0xff1a1c1e));
expect(scheme.onBackground, const Color(0xffe2e2e6)); expect(scheme.onBackground, const Color(0xffe2e2e6));
expect(scheme.surface, const Color(0xff1a1c1e)); expect(scheme.surface, const Color(0xff1a1c1e));
...@@ -313,7 +298,6 @@ void main() { ...@@ -313,7 +298,6 @@ void main() {
expect(scheme.onInverseSurface, const Color(0xff2f3033)); expect(scheme.onInverseSurface, const Color(0xff2f3033));
expect(scheme.inversePrimary, const Color(0xff0061a4)); expect(scheme.inversePrimary, const Color(0xff0061a4));
expect(scheme.shadow, const Color(0xff000000)); expect(scheme.shadow, const Color(0xff000000));
expect(scheme.scrim, const Color(0xff000000));
expect(scheme.surfaceTint, const Color(0xff9ecaff)); expect(scheme.surfaceTint, const Color(0xff9ecaff));
expect(scheme.brightness, Brightness.dark); expect(scheme.brightness, Brightness.dark);
}); });
...@@ -343,7 +327,6 @@ void main() { ...@@ -343,7 +327,6 @@ void main() {
expect(scheme.errorContainer, baseScheme.errorContainer); expect(scheme.errorContainer, baseScheme.errorContainer);
expect(scheme.onErrorContainer, baseScheme.onErrorContainer); expect(scheme.onErrorContainer, baseScheme.onErrorContainer);
expect(scheme.outline, baseScheme.outline); expect(scheme.outline, baseScheme.outline);
expect(scheme.outlineVariant, baseScheme.outlineVariant);
expect(scheme.background, baseScheme.background); expect(scheme.background, baseScheme.background);
expect(scheme.onBackground, baseScheme.onBackground); expect(scheme.onBackground, baseScheme.onBackground);
expect(scheme.surface, baseScheme.surface); expect(scheme.surface, baseScheme.surface);
...@@ -354,7 +337,6 @@ void main() { ...@@ -354,7 +337,6 @@ void main() {
expect(scheme.onInverseSurface, baseScheme.onInverseSurface); expect(scheme.onInverseSurface, baseScheme.onInverseSurface);
expect(scheme.inversePrimary, baseScheme.inversePrimary); expect(scheme.inversePrimary, baseScheme.inversePrimary);
expect(scheme.shadow, baseScheme.shadow); expect(scheme.shadow, baseScheme.shadow);
expect(scheme.scrim, baseScheme.shadow);
expect(scheme.surfaceTint, baseScheme.surfaceTint); expect(scheme.surfaceTint, baseScheme.surfaceTint);
expect(scheme.brightness, baseScheme.brightness); expect(scheme.brightness, baseScheme.brightness);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment