Skip to content

F
Front-End
Unverified Commit 4d61823c authored by Qun Cheng's avatar Qun Cheng Committed by GitHub
Browse files
Options

Introduce tone-based surfaces and accent color add-ons - Part 1 (#142654) 

This PR is to add 19 new `ColorScheme` roles following the Material Design 3 specs. This PR doesn't apply the new colors to `ThemeData`  or any widgets.

This PR is created to split the big change in #138521, once this is merged, another PR that contains the rest of the changes(apply new color roles to widgets and deprecate 3 more colors) will follow.

**Tone-based surface colors** (7 colors): 
* surfaceBright
* surfaceDim
* surfaceContainer
* surfaceContainerLowest
* surfaceContainerLow
* surfaceContainerHigh
* surfaceContainerHighest

**Accent color add-ons** (12 colors):
* primary/secondary/tertiary-Fixed
* primary/secondary/tertiary-FixedDim
* onPrimary/onSecondary/onTertiary-Fixed
* onPrimary/onSecondary/onTertiary-FixedVariant

Please checkout this [design doc](https://docs.google.com/document/d/1ODqivpM_6c490T4j5XIiWCDKo5YqHy78YEFqDm4S8h4/edit?usp=sharing) for more information:)
parent 31116770
Expand all Show whitespace changes
Inline Side-by-side
Showing with 532 additions and 38 deletions
packages/flutter/test/material/color_scheme_test.dart
View file @ 4d61823c
......@@ -26,14 +26,26 @@ void main() {
expect(scheme.onPrimary, const Color(0xffffffff));
expect(scheme.primaryContainer, scheme.primary);
expect(scheme.onPrimaryContainer, scheme.onPrimary);
expect(scheme.primaryFixed, scheme.primary);
expect(scheme.primaryFixedDim, scheme.primary);
expect(scheme.onPrimaryFixed, scheme.onPrimary);
expect(scheme.onPrimaryFixedVariant, scheme.onPrimary);
expect(scheme.secondary, const Color(0xff03dac6));
expect(scheme.onSecondary, const Color(0xff000000));
expect(scheme.secondaryContainer, scheme.secondary);
expect(scheme.onSecondaryContainer, scheme.onSecondary);
expect(scheme.secondaryFixed, scheme.secondary);
expect(scheme.secondaryFixedDim, scheme.secondary);
expect(scheme.onSecondaryFixed, scheme.onSecondary);
expect(scheme.onSecondaryFixedVariant, scheme.onSecondary);
expect(scheme.tertiary, scheme.secondary);
expect(scheme.onTertiary, scheme.onSecondary);
expect(scheme.tertiaryContainer, scheme.tertiary);
expect(scheme.onTertiaryContainer, scheme.onTertiary);
expect(scheme.tertiaryFixed, scheme.tertiary);
expect(scheme.tertiaryFixedDim, scheme.tertiary);
expect(scheme.onTertiaryFixed, scheme.onTertiary);
expect(scheme.onTertiaryFixedVariant, scheme.onTertiary);
expect(scheme.error, const Color(0xffb00020));
expect(scheme.onError, const Color(0xffffffff));
expect(scheme.errorContainer, scheme.error);
......@@ -41,6 +53,13 @@ void main() {
expect(scheme.background, const Color(0xffffffff));
expect(scheme.onBackground, const Color(0xff000000));
expect(scheme.surface, const Color(0xffffffff));
expect(scheme.surfaceBright, scheme.surface);
expect(scheme.surfaceDim, scheme.surface);
expect(scheme.surfaceContainerLowest, scheme.surface);
expect(scheme.surfaceContainerLow, scheme.surface);
expect(scheme.surfaceContainer, scheme.surface);
expect(scheme.surfaceContainerHigh, scheme.surface);
expect(scheme.surfaceContainerHighest, scheme.surface);
expect(scheme.onSurface, const Color(0xff000000));
expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface);
......@@ -65,14 +84,26 @@ void main() {
expect(scheme.onPrimary, const Color(0xff000000));
expect(scheme.primaryContainer, scheme.primary);
expect(scheme.onPrimaryContainer, scheme.onPrimary);
expect(scheme.primaryFixed, scheme.primary);
expect(scheme.primaryFixedDim, scheme.primary);
expect(scheme.onPrimaryFixed, scheme.onPrimary);
expect(scheme.onPrimaryFixedVariant, scheme.onPrimary);
expect(scheme.secondary, const Color(0xff03dac6));
expect(scheme.onSecondary, const Color(0xff000000));
expect(scheme.secondaryContainer, scheme.secondary);
expect(scheme.onSecondaryContainer, scheme.onSecondary);
expect(scheme.secondaryFixed, scheme.secondary);
expect(scheme.secondaryFixedDim, scheme.secondary);
expect(scheme.onSecondaryFixed, scheme.onSecondary);
expect(scheme.onSecondaryFixedVariant, scheme.onSecondary);
expect(scheme.tertiary, scheme.secondary);
expect(scheme.onTertiary, scheme.onSecondary);
expect(scheme.tertiaryContainer, scheme.tertiary);
expect(scheme.onTertiaryContainer, scheme.onTertiary);
expect(scheme.tertiaryFixed, scheme.tertiary);
expect(scheme.tertiaryFixedDim, scheme.tertiary);
expect(scheme.onTertiaryFixed, scheme.onTertiary);
expect(scheme.onTertiaryFixedVariant, scheme.onTertiary);
expect(scheme.error, const Color(0xffcf6679));
expect(scheme.onError, const Color(0xff000000));
expect(scheme.errorContainer, scheme.error);
......@@ -80,6 +111,13 @@ void main() {
expect(scheme.background, const Color(0xff121212));
expect(scheme.onBackground, const Color(0xffffffff));
expect(scheme.surface, const Color(0xff121212));
expect(scheme.surfaceBright, scheme.surface);
expect(scheme.surfaceDim, scheme.surface);
expect(scheme.surfaceContainerLowest, scheme.surface);
expect(scheme.surfaceContainerLow, scheme.surface);
expect(scheme.surfaceContainer, scheme.surface);
expect(scheme.surfaceContainerHigh, scheme.surface);
expect(scheme.surfaceContainerHighest, scheme.surface);
expect(scheme.onSurface, const Color(0xffffffff));
expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface);
......@@ -104,14 +142,26 @@ void main() {
expect(scheme.onPrimary, const Color(0xffffffff));
expect(scheme.primaryContainer, scheme.primary);
expect(scheme.onPrimaryContainer, scheme.onPrimary);
expect(scheme.primaryFixed, scheme.primary);
expect(scheme.primaryFixedDim, scheme.primary);
expect(scheme.onPrimaryFixed, scheme.onPrimary);
expect(scheme.onPrimaryFixedVariant, scheme.onPrimary);
expect(scheme.secondary, const Color(0xff66fff9));
expect(scheme.onSecondary, const Color(0xff000000));
expect(scheme.secondaryContainer, scheme.secondary);
expect(scheme.onSecondaryContainer, scheme.onSecondary);
expect(scheme.secondaryFixed, scheme.secondary);
expect(scheme.secondaryFixedDim, scheme.secondary);
expect(scheme.onSecondaryFixed, scheme.onSecondary);
expect(scheme.onSecondaryFixedVariant, scheme.onSecondary);
expect(scheme.tertiary, scheme.secondary);
expect(scheme.onTertiary, scheme.onSecondary);
expect(scheme.tertiaryContainer, scheme.tertiary);
expect(scheme.onTertiaryContainer, scheme.onTertiary);
expect(scheme.tertiaryFixed, scheme.tertiary);
expect(scheme.tertiaryFixedDim, scheme.tertiary);
expect(scheme.onTertiaryFixed, scheme.onTertiary);
expect(scheme.onTertiaryFixedVariant, scheme.onTertiary);
expect(scheme.error, const Color(0xff790000));
expect(scheme.onError, const Color(0xffffffff));
expect(scheme.errorContainer, scheme.error);
......@@ -119,6 +169,13 @@ void main() {
expect(scheme.background, const Color(0xffffffff));
expect(scheme.onBackground, const Color(0xff000000));
expect(scheme.surface, const Color(0xffffffff));
expect(scheme.surfaceBright, scheme.surface);
expect(scheme.surfaceDim, scheme.surface);
expect(scheme.surfaceContainerLowest, scheme.surface);
expect(scheme.surfaceContainerLow, scheme.surface);
expect(scheme.surfaceContainer, scheme.surface);
expect(scheme.surfaceContainerHigh, scheme.surface);
expect(scheme.surfaceContainerHighest, scheme.surface);
expect(scheme.onSurface, const Color(0xff000000));
expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface);
......@@ -143,14 +200,26 @@ void main() {
expect(scheme.onPrimary, const Color(0xff000000));
expect(scheme.primaryContainer, scheme.primary);
expect(scheme.onPrimaryContainer, scheme.onPrimary);
expect(scheme.primaryFixed, scheme.primary);
expect(scheme.primaryFixedDim, scheme.primary);
expect(scheme.onPrimaryFixed, scheme.onPrimary);
expect(scheme.onPrimaryFixedVariant, scheme.onPrimary);
expect(scheme.secondary, const Color(0xff66fff9));
expect(scheme.onSecondary, const Color(0xff000000));
expect(scheme.secondaryContainer, scheme.secondary);
expect(scheme.onSecondaryContainer, scheme.onSecondary);
expect(scheme.secondaryFixed, scheme.secondary);
expect(scheme.secondaryFixedDim, scheme.secondary);
expect(scheme.onSecondaryFixed, scheme.onSecondary);
expect(scheme.onSecondaryFixedVariant, scheme.onSecondary);
expect(scheme.tertiary, scheme.secondary);
expect(scheme.onTertiary, scheme.onSecondary);
expect(scheme.tertiaryContainer, scheme.tertiary);
expect(scheme.onTertiaryContainer, scheme.onTertiary);
expect(scheme.tertiaryFixed, scheme.tertiary);
expect(scheme.tertiaryFixedDim, scheme.tertiary);
expect(scheme.onTertiaryFixed, scheme.onTertiary);
expect(scheme.onTertiaryFixedVariant, scheme.onTertiary);
expect(scheme.error, const Color(0xff9b374d));
expect(scheme.onError, const Color(0xff000000));
expect(scheme.errorContainer, scheme.error);
......@@ -158,6 +227,13 @@ void main() {
expect(scheme.background, const Color(0xff121212));
expect(scheme.onBackground, const Color(0xffffffff));
expect(scheme.surface, const Color(0xff121212));
expect(scheme.surfaceBright, scheme.surface);
expect(scheme.surfaceDim, scheme.surface);
expect(scheme.surfaceContainerLowest, scheme.surface);
expect(scheme.surfaceContainerLow, scheme.surface);
expect(scheme.surfaceContainer, scheme.surface);
expect(scheme.surfaceContainerHigh, scheme.surface);
expect(scheme.surfaceContainerHighest, scheme.surface);
expect(scheme.onSurface, const Color(0xffffffff));
expect(scheme.surfaceVariant, scheme.surface);
expect(scheme.onSurfaceVariant, scheme.onSurface);
......
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

HIAST - GitLab