github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tokens to v6.1 (#153722)

Browse Source 
This PR is to update the token version to v6.1. 
* This version fixes https://github.com/flutter/flutter/issues/153271
* Change the chip default border color from `ColorScheme.outline` to `ColorScheme.outlineVariant`. The Chips' border color is softened to improve visual hierarchy between chips and buttons
This commit is contained in:
Qun Cheng 2024-09-03 17:20:16 -07:00 committed by GitHub
parent 67a75d240e
commit 182c266961
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
74 changed files with 90 additions and 86 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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_0",
"md.comp.checkbox.container.size": 18.0,
"md.comp.checkbox.error.focus.state-layer.color": "error",

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.comp.assist-chip.container.height": 32.0,
"md.comp.assist-chip.container.shape": "md.sys.shape.corner.small",
@ -22,7 +22,7 @@
"md.comp.assist-chip.flat.disabled.outline.color": "onSurface",
"md.comp.assist-chip.flat.disabled.outline.opacity": 0.12,
"md.comp.assist-chip.flat.focus.outline.color": "onSurface",
"md.comp.assist-chip.flat.outline.color": "outline",
"md.comp.assist-chip.flat.outline.color": "outlineVariant",
"md.comp.assist-chip.flat.outline.width": 1.0,
"md.comp.assist-chip.focus.indicator.color": "secondary",
"md.comp.assist-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.comp.filter-chip.container.height": 32.0,
"md.comp.filter-chip.container.shape": "md.sys.shape.corner.small",
@ -29,7 +29,7 @@
"md.comp.filter-chip.flat.unselected.focus.container.elevation": "md.sys.elevation.level0",
"md.comp.filter-chip.flat.unselected.focus.outline.color": "onSurfaceVariant",
"md.comp.filter-chip.flat.unselected.hover.container.elevation": "md.sys.elevation.level0",
"md.comp.filter-chip.flat.unselected.outline.color": "outline",
"md.comp.filter-chip.flat.unselected.outline.color": "outlineVariant",
"md.comp.filter-chip.flat.unselected.outline.width": 1.0,
"md.comp.filter-chip.flat.unselected.pressed.container.elevation": "md.sys.elevation.level0",
"md.comp.filter-chip.focus.indicator.color": "secondary",

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.comp.input-chip.container.elevation": "md.sys.elevation.level0",
"md.comp.input-chip.container.height": 32.0,
@ -41,7 +41,7 @@
"md.comp.input-chip.unselected.hover.state-layer.color": "onSurfaceVariant",
"md.comp.input-chip.unselected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity",
"md.comp.input-chip.unselected.label-text.color": "onSurfaceVariant",
"md.comp.input-chip.unselected.outline.color": "outline",
"md.comp.input-chip.unselected.outline.color": "outlineVariant",
"md.comp.input-chip.unselected.outline.width": 1.0,
"md.comp.input-chip.unselected.pressed.label-text.color": "onSurfaceVariant",
"md.comp.input-chip.unselected.pressed.state-layer.color": "onSurfaceVariant",

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.comp.suggestion-chip.container.height": 32.0,
"md.comp.suggestion-chip.container.shape": "md.sys.shape.corner.small",
@ -22,7 +22,7 @@
"md.comp.suggestion-chip.flat.disabled.outline.color": "onSurface",
"md.comp.suggestion-chip.flat.disabled.outline.opacity": 0.12,
"md.comp.suggestion-chip.flat.focus.outline.color": "onSurfaceVariant",
"md.comp.suggestion-chip.flat.outline.color": "outline",
"md.comp.suggestion-chip.flat.outline.color": "outlineVariant",
"md.comp.suggestion-chip.flat.outline.width": 1.0,
"md.comp.suggestion-chip.focus.indicator.color": "secondary",
"md.comp.suggestion-chip.focus.indicator.outline.offset": "md.sys.state.focus-indicator.outer-offset",

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

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

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.sys.color.background": "md.ref.palette.neutral98",
"md.sys.color.error": "md.ref.palette.error40",

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

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

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_0",
"md.comp.outlined-icon-button.container.height": 40.0,
"md.comp.outlined-icon-button.container.shape": "md.sys.shape.corner.full",

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.comp.list.divider.leading-space": 16.0,
"md.comp.list.divider.trailing-space": 16.0,

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.comp.menu.container.color": "surfaceContainer",
"md.comp.menu.container.elevation": "md.sys.elevation.level2",

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_0",
"md.comp.sheet.bottom.docked.container.color": "surfaceContainerLow",
"md.comp.sheet.bottom.docked.container.shape": "md.sys.shape.corner.extra-large.top",

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_0",
"md.comp.slider.active.handle.height": 44.0,
"md.comp.slider.active.handle.leading-space": 6.0,
@ -7,19 +7,21 @@
"md.comp.slider.active.handle.shape": "md.sys.shape.corner.full",
"md.comp.slider.active.handle.trailing-space": 6.0,
"md.comp.slider.active.handle.width": 4.0,
"md.comp.slider.active.stop-indicator.container.color": "onPrimary",
"md.comp.slider.active.stop-indicator.container.opacity": 1.0,
"md.comp.slider.active.track.color": "primary",
"md.comp.slider.active.track.height": 16.0,
"md.comp.slider.active.track.shape": "md.sys.shape.corner.full",
"md.comp.slider.active.track.shape.leading": "md.sys.shape.corner.full",
"md.comp.slider.disabled.active.stop-indicator.container.color": "onInverseSurface",
"md.comp.slider.disabled.active.track.color": "onSurface",
"md.comp.slider.disabled.active.track.opacity": 0.38,
"md.comp.slider.disabled.handle.color": "onSurface",
"md.comp.slider.disabled.handle.opacity": 0.38,
"md.comp.slider.disabled.handle.width": 4.0,
"md.comp.slider.disabled.inactive.stop-indicator.container.color": "onSurface",
"md.comp.slider.disabled.inactive.track.color": "onSurface",
"md.comp.slider.disabled.inactive.track.opacity": 0.12,
"md.comp.slider.disabled.stop-indicator.color": "onSurface",
"md.comp.slider.disabled.stop-indicator.color-selected": "onInverseSurface",
"md.comp.slider.focus.active.track.color": "primary",
"md.comp.slider.focus.handle.width": 2.0,
"md.comp.slider.focus.inactive.track.color": "secondaryContainer",
@ -28,6 +30,8 @@
"md.comp.slider.handle.shape": "md.sys.shape.corner.full",
"md.comp.slider.handle.width": 4.0,
"md.comp.slider.hover.handle.width": 4.0,
"md.comp.slider.inactive.stop-indicator.container.color": "onSecondaryContainer",
"md.comp.slider.inactive.stop-indicator.container.opacity": 1.0,
"md.comp.slider.inactive.track.color": "secondaryContainer",
"md.comp.slider.inactive.track.height": 16.0,
"md.comp.slider.inactive.track.shape": "md.sys.shape.corner.full",
@ -36,8 +40,8 @@
"md.comp.slider.pressed.handle.width": 2.0,
"md.comp.slider.pressed.inactive.track.color": "secondaryContainer",
"md.comp.slider.slider-active-handle-color": "primary",
"md.comp.slider.stop-indicator.color": "secondaryContainer",
"md.comp.slider.stop-indicator.color-selected": "secondaryContainer",
"md.comp.slider.stop-indicator.color": "onSecondaryContainer",
"md.comp.slider.stop-indicator.color-selected": "onPrimary",
"md.comp.slider.stop-indicator.shape": "md.sys.shape.corner.full",
"md.comp.slider.stop-indicator.size": 4.0,
"md.comp.slider.stop-indicator.trailing-space": 6.0,

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

@ -1,5 +1,5 @@
{
"version": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_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": "5_0_0",
"version": "6_1_0",
"md.ref.typeface.brand": "Roboto",
"md.ref.typeface.plain": "Roboto",

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

@ -1,4 +1,4 @@
Versions used, 5_0_0
Versions used, 6_1_0
md.comp.assist-chip.container.shape,
md.comp.assist-chip.disabled.label-text.color,
md.comp.assist-chip.elevated.container.color,

1 Versions used 5_0_0 6_1_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

2
examples/api/test/material/material_state/material_state_border_side.0_test.dart
View File

@ -50,7 +50,7 @@ void main() {
await tester.tap(find.byType(FilterChip));
await tester.pumpAndSettle();
expect(findBorderColor(const Color(0xff79747e)), findsOne);
expect(findBorderColor(const Color(0xffcac4d0)), findsOne);
},
);
}

2
packages/flutter/lib/src/material/action_chip.dart
View File

@ -316,7 +316,7 @@ class _ActionChipDefaultsM3 extends ChipThemeData {
@override
BorderSide? get side => _chipVariant == _ChipVariant.flat
? isEnabled
? BorderSide(color: _colors.outline)
? BorderSide(color: _colors.outlineVariant)
: BorderSide(color: _colors.onSurface.withOpacity(0.12))
: const BorderSide(color: Colors.transparent);

2
packages/flutter/lib/src/material/chip.dart
View File

@ -2441,7 +2441,7 @@ class _ChipDefaultsM3 extends ChipThemeData {
@override
BorderSide? get side => isEnabled
? BorderSide(color: _colors.outline)
? BorderSide(color: _colors.outlineVariant)
: BorderSide(color: _colors.onSurface.withOpacity(0.12));
@override

2
packages/flutter/lib/src/material/choice_chip.dart
View File

@ -347,7 +347,7 @@ class _ChoiceChipDefaultsM3 extends ChipThemeData {
@override
BorderSide? get side => _chipVariant == _ChipVariant.flat && !isSelected
? isEnabled
? BorderSide(color: _colors.outline)
? BorderSide(color: _colors.outlineVariant)
: BorderSide(color: _colors.onSurface.withOpacity(0.12))
: const BorderSide(color: Colors.transparent);

2
packages/flutter/lib/src/material/filter_chip.dart
View File

@ -380,7 +380,7 @@ class _FilterChipDefaultsM3 extends ChipThemeData {
@override
BorderSide? get side => _chipVariant == _ChipVariant.flat && !isSelected
? isEnabled
? BorderSide(color: _colors.outline)
? BorderSide(color: _colors.outlineVariant)
: BorderSide(color: _colors.onSurface.withOpacity(0.12))
: const BorderSide(color: Colors.transparent);

2
packages/flutter/lib/src/material/input_chip.dart
View File

@ -329,7 +329,7 @@ class _InputChipDefaultsM3 extends ChipThemeData {
@override
BorderSide? get side => !isSelected
? isEnabled
? BorderSide(color: _colors.outline)
? BorderSide(color: _colors.outlineVariant)
: BorderSide(color: _colors.onSurface.withOpacity(0.12))
: const BorderSide(color: Colors.transparent);

2
packages/flutter/test/material/action_chip_test.dart
View File

@ -166,7 +166,7 @@ void main() {
chipMaterial.shape,
RoundedRectangleBorder(
borderRadius: const BorderRadius.all(Radius.circular(8.0)),
side: BorderSide(color: theme.colorScheme.outline),
side: BorderSide(color: theme.colorScheme.outlineVariant),
),
);

8
packages/flutter/test/material/chip_test.dart
View File

@ -260,7 +260,7 @@ void main() {
expect(getMaterial(tester).color, null);
expect(getMaterial(tester).elevation, 0);
expect(getMaterial(tester).shape, RoundedRectangleBorder(
side: BorderSide(color: lightTheme.colorScheme.outline),
side: BorderSide(color: lightTheme.colorScheme.outlineVariant),
borderRadius: BorderRadius.circular(8.0),
));
expect(getIconData(tester).color, lightTheme.colorScheme.primary);
@ -288,7 +288,7 @@ void main() {
expect(getMaterial(tester).color, null);
expect(getMaterial(tester).elevation, 0);
expect(getMaterial(tester).shape, RoundedRectangleBorder(
side: BorderSide(color: darkTheme.colorScheme.outline),
side: BorderSide(color: darkTheme.colorScheme.outlineVariant),
borderRadius: BorderRadius.circular(8.0),
));
expect(getIconData(tester).color, darkTheme.colorScheme.primary);
@ -4722,7 +4722,7 @@ void main() {
));
final ShapeDecoration decoration = ink.decoration! as ShapeDecoration;
expect(decoration.color, backgroundColor);
expect(decoration.shape, shape.copyWith(side: BorderSide(color: theme.colorScheme.outline)));
expect(decoration.shape, shape.copyWith(side: BorderSide(color: theme.colorScheme.outlineVariant)));
});
testWidgets('Chip highlight color is drawn on top of the backgroundColor', (WidgetTester tester) async {
@ -4910,7 +4910,7 @@ void main() {
// Chip should have the default side.
expect(
getMaterial(tester).shape,
StadiumBorder(side: BorderSide(color: theme.colorScheme.outline)),
StadiumBorder(side: BorderSide(color: theme.colorScheme.outlineVariant)),
);
});

4
packages/flutter/test/material/chip_theme_test.dart
View File

@ -198,7 +198,7 @@ void main() {
expect(tester.getSize(find.byType(RawChip)), const Size(402, 252)); // label + padding + labelPadding
expect(
getMaterial(tester).shape,
chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outline)),
chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outlineVariant)),
);
expect(getLabelStyle(tester).style.fontSize, 32);
expect(getIconData(tester).color, chipTheme.iconTheme!.color);
@ -285,7 +285,7 @@ void main() {
expect(getMaterial(tester).elevation, chipTheme.elevation);
expect(
getMaterial(tester).shape,
chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outline)),
chipTheme.shape?.copyWith(side: BorderSide(color: theme.colorScheme.outlineVariant)),
);
expect(getLabelStyle(tester).style.fontSize, 32);
expect(getIconData(tester).color, chipTheme.iconTheme!.color);

2
packages/flutter/test/material/choice_chip_test.dart
View File

@ -215,7 +215,7 @@ void main() {
chipMaterial.shape,
RoundedRectangleBorder(
borderRadius: const BorderRadius.all(Radius.circular(8.0)),
side: BorderSide(color: theme.colorScheme.outline),
side: BorderSide(color: theme.colorScheme.outlineVariant),
),
);

2
packages/flutter/test/material/filter_chip_test.dart
View File

@ -280,7 +280,7 @@ void main() {
chipMaterial.shape,
RoundedRectangleBorder(
borderRadius: const BorderRadius.all(Radius.circular(8.0)),
side: BorderSide(color: theme.colorScheme.outline),
side: BorderSide(color: theme.colorScheme.outlineVariant),
),
);