Added Material 3 colors to ColorScheme. by darrenaustin · Pull Request #93427 · flutter/flutter

darrenaustin · 2021-11-10T21:01:00Z

As part of the migration to Material 3, this PR adds new colors to ColorScheme and deprecates two colors that are no longer being supported:

The added colors include a new ‘tertiary’ group and ‘container’ variants for several of the colors:

primaryContainer
secondaryContainer
tertiary
tertiaryContainer
surfaceVariant
errorContainer
onPrimaryContainer
onSecondaryContainer
onTertiary
onTertiaryContainer
onSurfaceVariant
onErrorContainer
outline
shadow
inverseSurface
onInverseSurface
inversePrimary

The two colors being deprecated:

primaryVariant
secondaryVariant

Includes flutter fix data to automatically remove references to the two deprecated colors and rename references to them with primaryContainer and secondaryContainer.

See the design doc for more discussion about this change.

Fixes: #89852

Pre-launch Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I signed the [CLA].
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is [test-exempt].
All existing and new tests are passing.

rami-a

LGTM

packages/flutter/lib/src/material/color_scheme.dart

jambestwick

see

packages/flutter/test/material/color_scheme_test.dart

packages/flutter/lib/src/material/color_scheme.dart

HansMuller

LGTM

packages/flutter/lib/src/material/color_scheme.dart

darrenaustin · 2021-11-19T20:37:17Z

@Piinks if you get a chance, can you review my flutter fix for this to make sure I wasn't holding it wrong?

There are two deprecated colors for ColorScheme: primaryVariant and secondaryVariant. They need to be removed from the 5 constructors and the copyWith method. I then map references of these properties to primaryContainer and secondaryContainer. Does this look right:

f9e61c4

Thx.

skia-gold · 2021-11-19T20:44:20Z

Gold has detected about 1 new digest(s) on patchset 9.
View them at https://flutter-gold.skia.org/cl/github/93427

Piinks · 2021-11-19T22:15:41Z

Sure thing! Happy to check it out, thanks for writing a fix! :)

…eme.

InfiniteCoder06 · 2021-12-12T06:37:57Z

@darrenaustin @rami-a There is a wrong in color scheme

flutter/packages/flutter/lib/src/material/color_scheme.dart

Line 222 in 895beb0

background: background ?? Color(palette.neutral.get(90)),

It must be 99 and not 90 according to Material Color design system for light theme.

rami-a · 2021-12-13T14:04:28Z

Thanks for the catch @Hacker437 . It looks like light theme's onSurface is incorrect too, it should be 10 not 0. @darrenaustin can we double check these all against the source of truth?

guidezpl · 2021-12-13T14:15:37Z

I've made Scheme public, so instead of keeping things in sync, we can just do background: scheme.background

rami-a · 2021-12-13T14:19:32Z

Yeah I agree with that @guidezpl so I made #95172 to track the work

This helps unblock the roller. See flutter/flutter#93427 Change-Id: I4a75255c499ea7cdde40845a88c5441b344db67f Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/613961 Fuchsia-Auto-Submit: Darren Chan <[email protected]> Reviewed-by: Chase Latta <[email protected]> Commit-Queue: Darren Chan <[email protected]>

Move off of the deprecated fields. See flutter/flutter#93427. Change-Id: Ib45ef5ef6c343e591b080187a469ec26de054563 Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/613962 Reviewed-by: Chase Latta <[email protected]> Reviewed-by: Sanjay Chouksey <[email protected]> Commit-Queue: Darren Chan <[email protected]>

По primaryVariant и secondaryVariant руководствовался: flutter/flutter#93427 https://docs.google.com/document/d/1mY1ahBQEMAfsawGJMX5S34pXb7c8dHGatyotClReeas/edit# По isLight руководствовался: https://reddeveloper.ru/questions/jetpack-compose-polucheniye-svetlogo-i-temnogo-rezhima-ot-materialtheme-s-ispol-zovaniyem-materiala-3-LXGXw

This helps unblock the roller. See flutter/flutter#93427 Change-Id: I4a75255c499ea7cdde40845a88c5441b344db67f Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/613961 Fuchsia-Auto-Submit: Darren Chan <[email protected]> Reviewed-by: Chase Latta <[email protected]> Commit-Queue: Darren Chan <[email protected]>

Move off of the deprecated fields. See flutter/flutter#93427. Change-Id: Ib45ef5ef6c343e591b080187a469ec26de054563 Reviewed-on: https://fuchsia-review.googlesource.com/c/experiences/+/613962 Reviewed-by: Chase Latta <[email protected]> Reviewed-by: Sanjay Chouksey <[email protected]> Commit-Queue: Darren Chan <[email protected]>

github-worst-company · 2023-04-12T12:31:35Z

Will the new surface colors be added? There are 7 new color roles which act as a replacement for the color tint.
Here are the docs https://m3.material.io/styles/color/the-color-system/color-roles#0abbf8b7-61e1-49ee-9f97-4967beb1e4fe

guidezpl · 2023-04-14T10:27:20Z

Yes, the issue for that is #115912

…Scheme` (#127124) This PR is to remove deprecated `primaryVariant` and `secondaryVariant` from framework. These two apis are made obsolete in #93427 Part of #127042

…Scheme` (flutter#127124) This PR is to remove deprecated `primaryVariant` and `secondaryVariant` from framework. These two apis are made obsolete in flutter#93427 Part of flutter#127042

google-cla bot added the cla: yes label Nov 10, 2021

darrenaustin requested review from HansMuller, guidezpl and rami-a November 10, 2021 21:02

rami-a approved these changes Nov 10, 2021

View reviewed changes

packages/flutter/lib/src/material/color_scheme.dart Outdated Show resolved Hide resolved

packages/flutter/lib/src/material/color_scheme.dart Outdated Show resolved Hide resolved

guidezpl requested changes Nov 11, 2021

View reviewed changes

jambestwick reviewed Nov 11, 2021

View reviewed changes

guidezpl approved these changes Nov 12, 2021

View reviewed changes

guidezpl reviewed Nov 15, 2021

View reviewed changes

packages/flutter/test/material/color_scheme_test.dart Outdated Show resolved Hide resolved

guidezpl reviewed Nov 17, 2021

View reviewed changes

packages/flutter/lib/src/material/color_scheme.dart Outdated Show resolved Hide resolved

darrenaustin mentioned this pull request Nov 18, 2021

Add support for generating a full ColorScheme from a single color #93463

Merged

8 tasks

HansMuller approved these changes Nov 18, 2021

View reviewed changes

packages/flutter/lib/src/material/color_scheme.dart Outdated Show resolved Hide resolved

flutter-dashboard bot added the c: tech-debt Technical debt, code quality, testing, etc. label Nov 19, 2021

CaseyHillers mentioned this pull request Nov 19, 2021

ci.yaml validation failed due to github token generation failing #93923

Closed

darrenaustin added 9 commits November 23, 2021 11:58

Deprecated primaryVariant and secondaryVariant colors in the ColorSch…

944fe33

…eme.

Added the new Material 3 colors to ColorScheme.

7bf82bd

Updated the color scheme tests to check the new color params.

3075a47

Fixed a doc bug and changes from review comments.

fa10281

Renamed inverseOnSurface -> onInverseSurface.

f612396

Reordered the parameters to better match the order in the Material spec.

46308a7

Updated documentation based on review comments.

ef28fcf

Fixed a whitespace issue.

a098ed5

Added a flutter fix for the deprecated colors.

41fef00

darrenaustin merged commit 128c723 into flutter:master Nov 23, 2021

darrenaustin deleted the colorscheme_m3 branch November 23, 2021 21:56

guidezpl mentioned this pull request Feb 2, 2023

Add API to create m3 color scheme from dynamic colors material-foundation/flutter-packages#343

Closed

rami-a mentioned this pull request Dec 13, 2021

Update M3 color scheme from seed generation #95172

Closed

guidezpl mentioned this pull request Jan 7, 2022

Project does not compile for Android flutter/gallery#581

Closed

QuncCccccc mentioned this pull request May 18, 2023

Remove deprecated primaryVariant and secondaryVariant from ColorScheme #127124

Merged

8 tasks

Conversation

darrenaustin commented Nov 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

rami-a left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jambestwick left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

HansMuller left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

darrenaustin commented Nov 19, 2021

Uh oh!

skia-gold commented Nov 19, 2021

Uh oh!

Piinks commented Nov 19, 2021

Uh oh!

InfiniteCoder06 commented Dec 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rami-a commented Dec 13, 2021

Uh oh!

guidezpl commented Dec 13, 2021

Uh oh!

rami-a commented Dec 13, 2021

Uh oh!

github-worst-company commented Apr 12, 2023

Uh oh!

guidezpl commented Apr 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

darrenaustin commented Nov 10, 2021 •

edited

Loading

InfiniteCoder06 commented Dec 12, 2021 •

edited

Loading