firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tokens to 5.0.0 (#153385)

Browse Source 
This PR is to
* Update the Material Design tokens to 5.0.0
* 4 color roles in **Light mode** have different default values
   `onPrimaryContainer`: Primary10  -> Primary30 
   `onSecondaryContainer`: Secondary10 -> Secondary30
   `onTertiaryContainer`: Tertiary10 -> Tertiary30
   `onErrorContainer`: Error10 -> Error30
    
        ![Screenshot 2024-08-13 at 12 53 03 PM](https://github.com/user-attachments/assets/bfa863d9-03d3-4557-8676-d56febdb2be5)

* new tokens added in list.json
* `md.comp.menu.list-item.*` tokens are deprecated and should be replaced by tokens in list.json and we've done the migration last year:)!(#122388)
This commit is contained in:
Qun Cheng 2024-08-14 15:53:36 -07:00 committed by GitHub
parent b4b8f07124
commit 108a355453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
65 changed files with 108 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/tools/gen_defaults/data/badge.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.badge.color": "error",
"md.comp.badge.large.color": "error",

2
dev/tools/gen_defaults/data/banner.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.banner.container.color": "surfaceContainerLow",
"md.comp.banner.container.elevation": "md.sys.elevation.level1",

2
dev/tools/gen_defaults/data/bottom_app_bar.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.bottom-app-bar.container.color": "surfaceContainer",
"md.comp.bottom-app-bar.container.elevation": "md.sys.elevation.level2",

2
dev/tools/gen_defaults/data/button_elevated.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.elevated-button.container.color": "surfaceContainerLow",
"md.comp.elevated-button.container.elevation": "md.sys.elevation.level1",

2
dev/tools/gen_defaults/data/button_filled.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.filled-button.container.color": "primary",
"md.comp.filled-button.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/button_filled_tonal.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.filled-tonal-button.container.color": "secondaryContainer",
"md.comp.filled-tonal-button.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/button_outlined.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.outlined-button.container.height": 40.0,
"md.comp.outlined-button.container.shape": "md.sys.shape.corner.full",

2
dev/tools/gen_defaults/data/button_text.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.text-button.container.height": 40.0,
"md.comp.text-button.container.shape": "md.sys.shape.corner.full",

2
dev/tools/gen_defaults/data/card_elevated.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.elevated-card.container.color": "surfaceContainerLow",
"md.comp.elevated-card.container.elevation": "md.sys.elevation.level1",

2
dev/tools/gen_defaults/data/card_filled.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.filled-card.container.color": "surfaceContainerHighest",
"md.comp.filled-card.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/card_outlined.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.outlined-card.container.color": "surface",
"md.comp.outlined-card.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/carousel_item.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.carousel-item.container.color": "surface",
"md.comp.carousel-item.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/checkbox.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.checkbox.container.size": 18.0,
"md.comp.checkbox.error.focus.state-layer.color": "error",

2
dev/tools/gen_defaults/data/chip_assist.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.assist-chip.container.height": 32.0,
"md.comp.assist-chip.container.shape": "md.sys.shape.corner.small",

2
dev/tools/gen_defaults/data/chip_filter.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.filter-chip.container.height": 32.0,
"md.comp.filter-chip.container.shape": "md.sys.shape.corner.small",

2
dev/tools/gen_defaults/data/chip_input.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.input-chip.container.elevation": "md.sys.elevation.level0",
"md.comp.input-chip.container.height": 32.0,

2
dev/tools/gen_defaults/data/chip_suggestion.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.suggestion-chip.container.height": 32.0,
"md.comp.suggestion-chip.container.shape": "md.sys.shape.corner.small",

2
dev/tools/gen_defaults/data/color_dark.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.sys.color.background": "md.ref.palette.neutral6",
"md.sys.color.error": "md.ref.palette.error80",

10
dev/tools/gen_defaults/data/color_light.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.sys.color.background": "md.ref.palette.neutral98",
"md.sys.color.error": "md.ref.palette.error40",
@ -9,19 +9,19 @@
"md.sys.color.inverse-surface": "md.ref.palette.neutral20",
"md.sys.color.on-background": "md.ref.palette.neutral10",
"md.sys.color.on-error": "md.ref.palette.error100",
"md.sys.color.on-error-container": "md.ref.palette.error10",
"md.sys.color.on-error-container": "md.ref.palette.error30",
"md.sys.color.on-primary": "md.ref.palette.primary100",
"md.sys.color.on-primary-container": "md.ref.palette.primary10",
"md.sys.color.on-primary-container": "md.ref.palette.primary30",
"md.sys.color.on-primary-fixed": "md.ref.palette.primary10",
"md.sys.color.on-primary-fixed-variant": "md.ref.palette.primary30",
"md.sys.color.on-secondary": "md.ref.palette.secondary100",
"md.sys.color.on-secondary-container": "md.ref.palette.secondary10",
"md.sys.color.on-secondary-container": "md.ref.palette.secondary30",
"md.sys.color.on-secondary-fixed": "md.ref.palette.secondary10",
"md.sys.color.on-secondary-fixed-variant": "md.ref.palette.secondary30",
"md.sys.color.on-surface": "md.ref.palette.neutral10",
"md.sys.color.on-surface-variant": "md.ref.palette.neutral-variant30",
"md.sys.color.on-tertiary": "md.ref.palette.tertiary100",
"md.sys.color.on-tertiary-container": "md.ref.palette.tertiary10",
"md.sys.color.on-tertiary-container": "md.ref.palette.tertiary30",
"md.sys.color.on-tertiary-fixed": "md.ref.palette.tertiary10",
"md.sys.color.on-tertiary-fixed-variant": "md.ref.palette.tertiary30",
"md.sys.color.outline": "md.ref.palette.neutral-variant50",

4
dev/tools/gen_defaults/data/date_picker_docked.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.date-picker.docked.container.color": "surfaceContainerHigh",
"md.comp.date-picker.docked.container.elevation": "md.sys.elevation.level3",
@ -30,7 +30,7 @@
"md.comp.date-picker.docked.date.unselected.focus.state-layer.color": "onSurfaceVariant",
"md.comp.date-picker.docked.date.unselected.hover.state-layer.color": "onSurfaceVariant",
"md.comp.date-picker.docked.date.unselected.label-text.color": "onSurface",
"md.comp.date-picker.docked.date.unselected.outside-month.label-text.color": "onSurfaceVariant",
"md.comp.date-picker.docked.date.unselected.outside-month.label-text.color": "outlineVariant",
"md.comp.date-picker.docked.date.unselected.pressed.state-layer.color": "onSurfaceVariant",
"md.comp.date-picker.docked.header.height": 64.0,
"md.comp.date-picker.docked.menu-button.container.height": 40.0,

2
dev/tools/gen_defaults/data/date_picker_input_modal.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.date-input.modal.container.color": "surfaceContainerHigh",
"md.comp.date-input.modal.container.elevation": "md.sys.elevation.level3",

2
dev/tools/gen_defaults/data/date_picker_modal.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.date-picker.modal.container.color": "surfaceContainerHigh",
"md.comp.date-picker.modal.container.elevation": "md.sys.elevation.level3",

2
dev/tools/gen_defaults/data/dialog.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.dialog.action.focus.label-text.color": "primary",
"md.comp.dialog.action.focus.state-layer.color": "primary",

2
dev/tools/gen_defaults/data/dialog_fullscreen.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.full-screen-dialog.container.color": "surface",
"md.comp.full-screen-dialog.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/divider.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.divider.color": "outlineVariant",
"md.comp.divider.thickness": 1.0

2
dev/tools/gen_defaults/data/elevation.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.sys.elevation.level0": 0.0,
"md.sys.elevation.level1": 1.0,

2
dev/tools/gen_defaults/data/fab_extended_primary.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.extended-fab.primary.container.color": "primaryContainer",
"md.comp.extended-fab.primary.container.elevation": "md.sys.elevation.level3",

2
dev/tools/gen_defaults/data/fab_large_primary.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.fab.primary.large.container.color": "primaryContainer",
"md.comp.fab.primary.large.container.elevation": "md.sys.elevation.level3",

2
dev/tools/gen_defaults/data/fab_primary.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.fab.primary.container.color": "primaryContainer",
"md.comp.fab.primary.container.elevation": "md.sys.elevation.level3",

2
dev/tools/gen_defaults/data/fab_small_primary.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.fab.primary.small.container.color": "primaryContainer",
"md.comp.fab.primary.small.container.elevation": "md.sys.elevation.level3",

2
dev/tools/gen_defaults/data/icon_button.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.icon-button.disabled.icon.color": "onSurface",
"md.comp.icon-button.disabled.icon.opacity": 0.38,

2
dev/tools/gen_defaults/data/icon_button_filled.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.filled-icon-button.container.color": "primary",
"md.comp.filled-icon-button.container.height": 40.0,

2
dev/tools/gen_defaults/data/icon_button_filled_tonal.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.filled-tonal-icon-button.container.color": "secondaryContainer",
"md.comp.filled-tonal-icon-button.container.height": 40.0,

2
dev/tools/gen_defaults/data/icon_button_outlined.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.outlined-icon-button.container.height": 40.0,
"md.comp.outlined-icon-button.container.shape": "md.sys.shape.corner.full",

30
dev/tools/gen_defaults/data/list.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.list.divider.leading-space": 16.0,
"md.comp.list.divider.trailing-space": 16.0,
@ -21,7 +21,7 @@
"md.comp.list.list-item.dragged.label-text.color": "onSurface",
"md.comp.list.list-item.dragged.leading-icon.icon.color": "onSurfaceVariant",
"md.comp.list.list-item.dragged.state-layer.color": "onSurface",
"md.comp.list.list-item.dragged.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
"md.comp.list.list-item.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
"md.comp.list.list-item.dragged.trailing-icon.icon.color": "onSurfaceVariant",
"md.comp.list.list-item.focus.label-text.color": "onSurface",
"md.comp.list.list-item.focus.leading-icon.icon.color": "onSurfaceVariant",
@ -57,7 +57,33 @@
"md.comp.list.list-item.pressed.state-layer.color": "onSurface",
"md.comp.list.list-item.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
"md.comp.list.list-item.pressed.trailing-icon.icon.color": "onSurfaceVariant",
"md.comp.list.list-item.selected.container.color": "secondaryContainer",
"md.comp.list.list-item.selected.dragged.label-text.color": "onSecondaryContainer",
"md.comp.list.list-item.selected.dragged.leading-icon.color": "onSurface",
"md.comp.list.list-item.selected.dragged.state-layer.color": "onSurface",
"md.comp.list.list-item.selected.dragged.state-layer.opacity": "md.sys.state.dragged.state-layer-opacity",
"md.comp.list.list-item.selected.dragged.trailing-icon.color": "onSurface",
"md.comp.list.list-item.selected.focus.label-text.color": "onSecondaryContainer",
"md.comp.list.list-item.selected.focus.leading-icon.color": "onSurface",
"md.comp.list.list-item.selected.focus.state-layer.color": "onSurface",
"md.comp.list.list-item.selected.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",
"md.comp.list.list-item.selected.focus.trailing-icon.color": "onSurface",
"md.comp.list.list-item.selected.hover.label-text.color": "onSecondaryContainer",
"md.comp.list.list-item.selected.hover.leading-icon.color": "onSurface",
"md.comp.list.list-item.selected.hover.state-layer.color": "onSurface",
"md.comp.list.list-item.selected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
"md.comp.list.list-item.selected.hover.trailing-icon.color": "onSurface",
"md.comp.list.list-item.selected.label-text.color": "onSecondaryContainer",
"md.comp.list.list-item.selected.leading-icon.color": "onSurface",
"md.comp.list.list-item.selected.overline.color": "onSurface",
"md.comp.list.list-item.selected.pressed.label-text.color": "onSecondaryContainer",
"md.comp.list.list-item.selected.pressed.leading-icon.color": "onSurface",
"md.comp.list.list-item.selected.pressed.state-layer.color": "onSurface",
"md.comp.list.list-item.selected.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity",
"md.comp.list.list-item.selected.pressed.trailing-icon.color": "onSurface",
"md.comp.list.list-item.selected.supporting-text.color": "onSurface",
"md.comp.list.list-item.selected.trailing-icon.color": "primary",
"md.comp.list.list-item.selected.trailing-supporting-text.color": "onSurface",
"md.comp.list.list-item.small.leading-video.height": 56.0,
"md.comp.list.list-item.supporting-text.color": "onSurfaceVariant",
"md.comp.list.list-item.supporting-text.text-style": "bodyMedium",

8
dev/tools/gen_defaults/data/menu.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.menu.container.color": "surfaceContainer",
"md.comp.menu.container.elevation": "md.sys.elevation.level2",
@ -7,9 +7,5 @@
"md.comp.menu.container.shape": "md.sys.shape.corner.extra-small",
"md.comp.menu.focus.indicator.color": "secondary",
"md.comp.menu.focus.indicator.outline.offset": "md.sys.state.focus-indicator.inner-offset",
"md.comp.menu.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness",
"md.comp.menu.list-item.selected.container.color": "secondaryContainer",
"md.comp.menu.list-item.selected.label-text.color": "onSecondaryContainer",
"md.comp.menu.list-item.selected.with-leading-icon.trailing-icon.color": "onSecondaryContainer",
"md.comp.menu.menu-list-item-with-leading-icon-icon-color": "onSecondaryContainer"
"md.comp.menu.focus.indicator.thickness": "md.sys.state.focus-indicator.thickness"
}

2
dev/tools/gen_defaults/data/motion.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.sys.motion.duration.extra-long1Ms": 700.0,
"md.sys.motion.duration.extra-long2Ms": 800.0,

2
dev/tools/gen_defaults/data/navigation_bar.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.navigation-bar.active.focus.icon.color": "onSecondaryContainer",
"md.comp.navigation-bar.active.focus.label-text.color": "onSurface",

2
dev/tools/gen_defaults/data/navigation_drawer.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.navigation-drawer.active.focus.icon.color": "onSecondaryContainer",
"md.comp.navigation-drawer.active.focus.label-text.color": "onSecondaryContainer",

2
dev/tools/gen_defaults/data/navigation_rail.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.navigation-rail.active.focus.icon.color": "onSecondaryContainer",
"md.comp.navigation-rail.active.focus.label-text.color": "onSurface",

2
dev/tools/gen_defaults/data/navigation_tab_primary.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.primary-navigation-tab.active.focus.state-layer.color": "primary",
"md.comp.primary-navigation-tab.active.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity",

2
dev/tools/gen_defaults/data/navigation_tab_secondary.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.secondary-navigation-tab.active-indicator.color": "primary",
"md.comp.secondary-navigation-tab.active-indicator.height": 2.0,

2
dev/tools/gen_defaults/data/palette.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.ref.palette.black": "0xFF000000",
"md.ref.palette.blue0": "0xFF000000",

2
dev/tools/gen_defaults/data/progress_indicator.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.progress-indicator.active-indicator.color": "primary",
"md.comp.progress-indicator.active-indicator.shape": "md.sys.shape.corner.full",

2
dev/tools/gen_defaults/data/radio_button.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.radio-button.disabled.selected.icon.color": "onSurface",
"md.comp.radio-button.disabled.selected.icon.opacity": 0.38,

2
dev/tools/gen_defaults/data/search_bar.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.search-bar.avatar.shape": "md.sys.shape.corner.full",
"md.comp.search-bar.avatar.size": 30.0,

2
dev/tools/gen_defaults/data/search_view.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.search-view.container.color": "surfaceContainerHigh",
"md.comp.search-view.container.elevation": "md.sys.elevation.level3",

2
dev/tools/gen_defaults/data/segmented_button_outlined.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.outlined-segmented-button.container.height": 40.0,
"md.comp.outlined-segmented-button.disabled.icon.color": "onSurface",

2
dev/tools/gen_defaults/data/shape.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.sys.shape.corner.extra-large": {
"family": "SHAPE_FAMILY_ROUNDED_CORNERS",

2
dev/tools/gen_defaults/data/sheet_bottom.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.sheet.bottom.docked.container.color": "surfaceContainerLow",
"md.comp.sheet.bottom.docked.container.shape": "md.sys.shape.corner.extra-large.top",

2
dev/tools/gen_defaults/data/slider.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.slider.active.handle.height": 44.0,
"md.comp.slider.active.handle.leading-space": 6.0,

2
dev/tools/gen_defaults/data/snackbar.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.snackbar.action.focus.label-text.color": "inversePrimary",
"md.comp.snackbar.action.focus.state-layer.color": "inversePrimary",

2
dev/tools/gen_defaults/data/state.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.sys.state.dragged.state-layer-opacity": 0.16,
"md.sys.state.focus.state-layer-opacity": 0.1,

2
dev/tools/gen_defaults/data/switch.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.switch.disabled.selected.handle.color": "surface",
"md.comp.switch.disabled.selected.handle.opacity": 1.0,

2
dev/tools/gen_defaults/data/text_field_filled.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.filled-text-field.active-indicator.color": "onSurfaceVariant",
"md.comp.filled-text-field.active-indicator.height": 1.0,

2
dev/tools/gen_defaults/data/text_field_outlined.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.outlined-text-field.caret.color": "primary",
"md.comp.outlined-text-field.container.shape": "md.sys.shape.corner.extra-small",

2
dev/tools/gen_defaults/data/text_style.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.sys.typescale.body-large.font": "md.ref.typeface.plain",
"md.sys.typescale.body-large.line-height": 24.0,

2
dev/tools/gen_defaults/data/time_picker.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.time-picker.clock-dial.color": "surfaceContainerHighest",
"md.comp.time-picker.clock-dial.container.size": 256.0,

2
dev/tools/gen_defaults/data/top_app_bar_large.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.top-app-bar.large.container.color": "surface",
"md.comp.top-app-bar.large.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/top_app_bar_medium.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.top-app-bar.medium.container.color": "surface",
"md.comp.top-app-bar.medium.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/top_app_bar_small.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.comp.top-app-bar.small.container.color": "surface",
"md.comp.top-app-bar.small.container.elevation": "md.sys.elevation.level0",

2
dev/tools/gen_defaults/data/typeface.json
View File

@ -1,5 +1,5 @@
{
"version": "v4_1_0",
"version": "5_0_0",
"md.ref.typeface.brand": "Roboto",
"md.ref.typeface.plain": "Roboto",

3
dev/tools/gen_defaults/generated/used_tokens.csv
View File

@ -1,4 +1,4 @@
Versions used, v4_1_0
Versions used, 5_0_0
md.comp.assist-chip.container.shape,
md.comp.assist-chip.disabled.label-text.color,
md.comp.assist-chip.elevated.container.color,
@ -808,7 +808,6 @@ md.comp.top-app-bar.small.leading-icon.size,
md.comp.top-app-bar.small.on-scroll.container.elevation,
md.comp.top-app-bar.small.trailing-icon.color,
md.comp.top-app-bar.small.trailing-icon.size,
md.ref.palette.error10,
md.ref.palette.error100,
md.ref.palette.error20,
md.ref.palette.error30,

1 Versions used v4_1_0 5_0_0
2 md.comp.assist-chip.container.shape
3 md.comp.assist-chip.disabled.label-text.color
4 md.comp.assist-chip.elevated.container.color
808 md.comp.top-app-bar.small.on-scroll.container.elevation
809 md.comp.top-app-bar.small.trailing-icon.color
810 md.comp.top-app-bar.small.trailing-icon.size
md.ref.palette.error10
811 md.ref.palette.error100
812 md.ref.palette.error20
813 md.ref.palette.error30

8
packages/flutter/lib/src/material/theme_data.dart
View File

@ -2532,7 +2532,7 @@ const ColorScheme _colorSchemeLightM3 = ColorScheme(
primary: Color(0xFF6750A4),
onPrimary: Color(0xFFFFFFFF),
primaryContainer: Color(0xFFEADDFF),
onPrimaryContainer: Color(0xFF21005D),
onPrimaryContainer: Color(0xFF4F378B),
primaryFixed: Color(0xFFEADDFF),
primaryFixedDim: Color(0xFFD0BCFF),
onPrimaryFixed: Color(0xFF21005D),
@ -2540,7 +2540,7 @@ const ColorScheme _colorSchemeLightM3 = ColorScheme(
secondary: Color(0xFF625B71),
onSecondary: Color(0xFFFFFFFF),
secondaryContainer: Color(0xFFE8DEF8),
onSecondaryContainer: Color(0xFF1D192B),
onSecondaryContainer: Color(0xFF4A4458),
secondaryFixed: Color(0xFFE8DEF8),
secondaryFixedDim: Color(0xFFCCC2DC),
onSecondaryFixed: Color(0xFF1D192B),
@ -2548,7 +2548,7 @@ const ColorScheme _colorSchemeLightM3 = ColorScheme(
tertiary: Color(0xFF7D5260),
onTertiary: Color(0xFFFFFFFF),
tertiaryContainer: Color(0xFFFFD8E4),
onTertiaryContainer: Color(0xFF31111D),
onTertiaryContainer: Color(0xFF633B48),
tertiaryFixed: Color(0xFFFFD8E4),
tertiaryFixedDim: Color(0xFFEFB8C8),
onTertiaryFixed: Color(0xFF31111D),
@ -2556,7 +2556,7 @@ const ColorScheme _colorSchemeLightM3 = ColorScheme(
error: Color(0xFFB3261E),
onError: Color(0xFFFFFFFF),
errorContainer: Color(0xFFF9DEDC),
onErrorContainer: Color(0xFF410E0B),
onErrorContainer: Color(0xFF8C1D18),
background: Color(0xFFFEF7FF),
onBackground: Color(0xFF1D1B20),
surface: Color(0xFFFEF7FF),

16
packages/flutter/test/material/theme_data_test.dart
View File

@ -272,7 +272,7 @@ void main() {
expect(theme.colorScheme.primary, const Color(0xff6750a4));
expect(theme.colorScheme.onPrimary, const Color(0xffffffff));
expect(theme.colorScheme.primaryContainer, const Color(0xffeaddff));
expect(theme.colorScheme.onPrimaryContainer, const Color(0xff21005d));
expect(theme.colorScheme.onPrimaryContainer, const Color(0xff4f378b));
expect(theme.colorScheme.primaryFixed, const Color(0xffeaddff));
expect(theme.colorScheme.primaryFixedDim, const Color(0xffd0bcff));
expect(theme.colorScheme.onPrimaryFixed, const Color(0xff21005d));
@ -280,7 +280,7 @@ void main() {
expect(theme.colorScheme.secondary, const Color(0xff625b71));
expect(theme.colorScheme.onSecondary, const Color(0xffffffff));
expect(theme.colorScheme.secondaryContainer, const Color(0xffe8def8));
expect(theme.colorScheme.onSecondaryContainer, const Color(0xff1d192b));
expect(theme.colorScheme.onSecondaryContainer, const Color(0xff4a4458));
expect(theme.colorScheme.secondaryFixed, const Color(0xffe8def8));
expect(theme.colorScheme.secondaryFixedDim, const Color(0xffccc2dc));
expect(theme.colorScheme.onSecondaryFixed, const Color(0xff1d192b));
@ -288,7 +288,7 @@ void main() {
expect(theme.colorScheme.tertiary, const Color(0xff7d5260));
expect(theme.colorScheme.onTertiary, const Color(0xffffffff));
expect(theme.colorScheme.tertiaryContainer, const Color(0xffffd8e4));
expect(theme.colorScheme.onTertiaryContainer, const Color(0xff31111d));
expect(theme.colorScheme.onTertiaryContainer, const Color(0xff633b48));
expect(theme.colorScheme.tertiaryFixed, const Color(0xffffd8e4));
expect(theme.colorScheme.tertiaryFixedDim, const Color(0xffefb8c8));
expect(theme.colorScheme.onTertiaryFixed, const Color(0xff31111d));
@ -296,7 +296,7 @@ void main() {
expect(theme.colorScheme.error, const Color(0xffb3261e));
expect(theme.colorScheme.onError, const Color(0xffffffff));
expect(theme.colorScheme.errorContainer, const Color(0xfff9dedc));
expect(theme.colorScheme.onErrorContainer, const Color(0xff410e0b));
expect(theme.colorScheme.onErrorContainer, const Color(0xff8c1d18));
expect(theme.colorScheme.outline, const Color(0xff79747e));
expect(theme.colorScheme.background, const Color(0xfffef7ff));
expect(theme.colorScheme.onBackground, const Color(0xff1d1b20));
@ -335,7 +335,7 @@ void main() {
expect(theme.colorScheme.primary, const Color(0xff6750a4));
expect(theme.colorScheme.onPrimary, const Color(0xffffffff));
expect(theme.colorScheme.primaryContainer, const Color(0xffeaddff));
expect(theme.colorScheme.onPrimaryContainer, const Color(0xff21005d));
expect(theme.colorScheme.onPrimaryContainer, const Color(0xff4f378b));
expect(theme.colorScheme.primaryFixed, const Color(0xffeaddff));
expect(theme.colorScheme.primaryFixedDim, const Color(0xffd0bcff));
expect(theme.colorScheme.onPrimaryFixed, const Color(0xff21005d));
@ -343,7 +343,7 @@ void main() {
expect(theme.colorScheme.secondary, const Color(0xff625b71));
expect(theme.colorScheme.onSecondary, const Color(0xffffffff));
expect(theme.colorScheme.secondaryContainer, const Color(0xffe8def8));
expect(theme.colorScheme.onSecondaryContainer, const Color(0xff1d192b));
expect(theme.colorScheme.onSecondaryContainer, const Color(0xff4a4458));
expect(theme.colorScheme.secondaryFixed, const Color(0xffe8def8));
expect(theme.colorScheme.secondaryFixedDim, const Color(0xffccc2dc));
expect(theme.colorScheme.onSecondaryFixed, const Color(0xff1d192b));
@ -351,7 +351,7 @@ void main() {
expect(theme.colorScheme.tertiary, const Color(0xff7d5260));
expect(theme.colorScheme.onTertiary, const Color(0xffffffff));
expect(theme.colorScheme.tertiaryContainer, const Color(0xffffd8e4));
expect(theme.colorScheme.onTertiaryContainer, const Color(0xff31111d));
expect(theme.colorScheme.onTertiaryContainer, const Color(0xff633b48));
expect(theme.colorScheme.tertiaryFixed, const Color(0xffffd8e4));
expect(theme.colorScheme.tertiaryFixedDim, const Color(0xffefb8c8));
expect(theme.colorScheme.onTertiaryFixed, const Color(0xff31111d));
@ -359,7 +359,7 @@ void main() {
expect(theme.colorScheme.error, const Color(0xffb3261e));
expect(theme.colorScheme.onError, const Color(0xffffffff));
expect(theme.colorScheme.errorContainer, const Color(0xfff9dedc));
expect(theme.colorScheme.onErrorContainer, const Color(0xff410e0b));
expect(theme.colorScheme.onErrorContainer, const Color(0xff8c1d18));
expect(theme.colorScheme.outline, const Color(0xff79747e));
expect(theme.colorScheme.background, const Color(0xfffef7ff));
expect(theme.colorScheme.onBackground, const Color(0xff1d1b20));