From 108a355453c2ccb569fee1c1d02aa629fb5b3ecc Mon Sep 17 00:00:00 2001 From: Qun Cheng <36861262+QuncCccccc@users.noreply.github.com> Date: Wed, 14 Aug 2024 15:53:36 -0700 Subject: [PATCH] Update tokens to 5.0.0 (#153385) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- dev/tools/gen_defaults/data/badge.json | 2 +- dev/tools/gen_defaults/data/banner.json | 2 +- .../gen_defaults/data/bottom_app_bar.json | 2 +- .../gen_defaults/data/button_elevated.json | 2 +- .../gen_defaults/data/button_filled.json | 2 +- .../data/button_filled_tonal.json | 2 +- .../gen_defaults/data/button_outlined.json | 2 +- dev/tools/gen_defaults/data/button_text.json | 2 +- .../gen_defaults/data/card_elevated.json | 2 +- dev/tools/gen_defaults/data/card_filled.json | 2 +- .../gen_defaults/data/card_outlined.json | 2 +- .../gen_defaults/data/carousel_item.json | 2 +- dev/tools/gen_defaults/data/checkbox.json | 2 +- dev/tools/gen_defaults/data/chip_assist.json | 2 +- dev/tools/gen_defaults/data/chip_filter.json | 2 +- dev/tools/gen_defaults/data/chip_input.json | 2 +- .../gen_defaults/data/chip_suggestion.json | 2 +- dev/tools/gen_defaults/data/color_dark.json | 2 +- dev/tools/gen_defaults/data/color_light.json | 10 +++---- .../gen_defaults/data/date_picker_docked.json | 4 +-- .../data/date_picker_input_modal.json | 2 +- .../gen_defaults/data/date_picker_modal.json | 2 +- dev/tools/gen_defaults/data/dialog.json | 2 +- .../gen_defaults/data/dialog_fullscreen.json | 2 +- dev/tools/gen_defaults/data/divider.json | 2 +- dev/tools/gen_defaults/data/elevation.json | 2 +- .../data/fab_extended_primary.json | 2 +- .../gen_defaults/data/fab_large_primary.json | 2 +- dev/tools/gen_defaults/data/fab_primary.json | 2 +- .../gen_defaults/data/fab_small_primary.json | 2 +- dev/tools/gen_defaults/data/icon_button.json | 2 +- .../gen_defaults/data/icon_button_filled.json | 2 +- .../data/icon_button_filled_tonal.json | 2 +- .../data/icon_button_outlined.json | 2 +- dev/tools/gen_defaults/data/list.json | 30 +++++++++++++++++-- dev/tools/gen_defaults/data/menu.json | 8 ++--- dev/tools/gen_defaults/data/motion.json | 2 +- .../gen_defaults/data/navigation_bar.json | 2 +- .../gen_defaults/data/navigation_drawer.json | 2 +- .../gen_defaults/data/navigation_rail.json | 2 +- .../data/navigation_tab_primary.json | 2 +- .../data/navigation_tab_secondary.json | 2 +- dev/tools/gen_defaults/data/palette.json | 2 +- .../gen_defaults/data/progress_indicator.json | 2 +- dev/tools/gen_defaults/data/radio_button.json | 2 +- dev/tools/gen_defaults/data/search_bar.json | 2 +- dev/tools/gen_defaults/data/search_view.json | 2 +- .../data/segmented_button_outlined.json | 2 +- dev/tools/gen_defaults/data/shape.json | 2 +- dev/tools/gen_defaults/data/sheet_bottom.json | 2 +- dev/tools/gen_defaults/data/slider.json | 2 +- dev/tools/gen_defaults/data/snackbar.json | 2 +- dev/tools/gen_defaults/data/state.json | 2 +- dev/tools/gen_defaults/data/switch.json | 2 +- .../gen_defaults/data/text_field_filled.json | 2 +- .../data/text_field_outlined.json | 2 +- dev/tools/gen_defaults/data/text_style.json | 2 +- dev/tools/gen_defaults/data/time_picker.json | 2 +- .../gen_defaults/data/top_app_bar_large.json | 2 +- .../gen_defaults/data/top_app_bar_medium.json | 2 +- .../gen_defaults/data/top_app_bar_small.json | 2 +- dev/tools/gen_defaults/data/typeface.json | 2 +- .../gen_defaults/generated/used_tokens.csv | 3 +- .../flutter/lib/src/material/theme_data.dart | 8 ++--- .../test/material/theme_data_test.dart | 16 +++++----- 65 files changed, 108 insertions(+), 87 deletions(-) diff --git a/dev/tools/gen_defaults/data/badge.json b/dev/tools/gen_defaults/data/badge.json index b1adcbd6be..75f4d11e66 100644 --- a/dev/tools/gen_defaults/data/badge.json +++ b/dev/tools/gen_defaults/data/badge.json @@ -1,5 +1,5 @@ { - "version": "v4_1_0", + "version": "5_0_0", "md.comp.badge.color": "error", "md.comp.badge.large.color": "error", diff --git a/dev/tools/gen_defaults/data/banner.json b/dev/tools/gen_defaults/data/banner.json index 844fae132e..89b9f0c369 100644 --- a/dev/tools/gen_defaults/data/banner.json +++ b/dev/tools/gen_defaults/data/banner.json @@ -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", diff --git a/dev/tools/gen_defaults/data/bottom_app_bar.json b/dev/tools/gen_defaults/data/bottom_app_bar.json index 3af189db8a..a81c288951 100644 --- a/dev/tools/gen_defaults/data/bottom_app_bar.json +++ b/dev/tools/gen_defaults/data/bottom_app_bar.json @@ -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", diff --git a/dev/tools/gen_defaults/data/button_elevated.json b/dev/tools/gen_defaults/data/button_elevated.json index 77ca5e6a9a..e1160c22a4 100644 --- a/dev/tools/gen_defaults/data/button_elevated.json +++ b/dev/tools/gen_defaults/data/button_elevated.json @@ -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", diff --git a/dev/tools/gen_defaults/data/button_filled.json b/dev/tools/gen_defaults/data/button_filled.json index 9ae7c71a20..8682eab411 100644 --- a/dev/tools/gen_defaults/data/button_filled.json +++ b/dev/tools/gen_defaults/data/button_filled.json @@ -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", diff --git a/dev/tools/gen_defaults/data/button_filled_tonal.json b/dev/tools/gen_defaults/data/button_filled_tonal.json index 4cf706487f..d9e59ac395 100644 --- a/dev/tools/gen_defaults/data/button_filled_tonal.json +++ b/dev/tools/gen_defaults/data/button_filled_tonal.json @@ -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", diff --git a/dev/tools/gen_defaults/data/button_outlined.json b/dev/tools/gen_defaults/data/button_outlined.json index 40098f533c..5452ad5388 100644 --- a/dev/tools/gen_defaults/data/button_outlined.json +++ b/dev/tools/gen_defaults/data/button_outlined.json @@ -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", diff --git a/dev/tools/gen_defaults/data/button_text.json b/dev/tools/gen_defaults/data/button_text.json index 11ae40b69d..2671b56f11 100644 --- a/dev/tools/gen_defaults/data/button_text.json +++ b/dev/tools/gen_defaults/data/button_text.json @@ -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", diff --git a/dev/tools/gen_defaults/data/card_elevated.json b/dev/tools/gen_defaults/data/card_elevated.json index a694e4b778..3719135533 100644 --- a/dev/tools/gen_defaults/data/card_elevated.json +++ b/dev/tools/gen_defaults/data/card_elevated.json @@ -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", diff --git a/dev/tools/gen_defaults/data/card_filled.json b/dev/tools/gen_defaults/data/card_filled.json index 5001db589c..6ae53de7b9 100644 --- a/dev/tools/gen_defaults/data/card_filled.json +++ b/dev/tools/gen_defaults/data/card_filled.json @@ -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", diff --git a/dev/tools/gen_defaults/data/card_outlined.json b/dev/tools/gen_defaults/data/card_outlined.json index 64aa816939..ca20936deb 100644 --- a/dev/tools/gen_defaults/data/card_outlined.json +++ b/dev/tools/gen_defaults/data/card_outlined.json @@ -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", diff --git a/dev/tools/gen_defaults/data/carousel_item.json b/dev/tools/gen_defaults/data/carousel_item.json index 07879d7216..2eeedfe34d 100644 --- a/dev/tools/gen_defaults/data/carousel_item.json +++ b/dev/tools/gen_defaults/data/carousel_item.json @@ -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", diff --git a/dev/tools/gen_defaults/data/checkbox.json b/dev/tools/gen_defaults/data/checkbox.json index 3b6604fe78..84071e5f49 100644 --- a/dev/tools/gen_defaults/data/checkbox.json +++ b/dev/tools/gen_defaults/data/checkbox.json @@ -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", diff --git a/dev/tools/gen_defaults/data/chip_assist.json b/dev/tools/gen_defaults/data/chip_assist.json index d13c9f11d1..698046ce88 100644 --- a/dev/tools/gen_defaults/data/chip_assist.json +++ b/dev/tools/gen_defaults/data/chip_assist.json @@ -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", diff --git a/dev/tools/gen_defaults/data/chip_filter.json b/dev/tools/gen_defaults/data/chip_filter.json index ea18d11b77..394358b931 100644 --- a/dev/tools/gen_defaults/data/chip_filter.json +++ b/dev/tools/gen_defaults/data/chip_filter.json @@ -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", diff --git a/dev/tools/gen_defaults/data/chip_input.json b/dev/tools/gen_defaults/data/chip_input.json index 918873cdf7..c69edda6c6 100644 --- a/dev/tools/gen_defaults/data/chip_input.json +++ b/dev/tools/gen_defaults/data/chip_input.json @@ -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, diff --git a/dev/tools/gen_defaults/data/chip_suggestion.json b/dev/tools/gen_defaults/data/chip_suggestion.json index 7826ee67a7..630455b22f 100644 --- a/dev/tools/gen_defaults/data/chip_suggestion.json +++ b/dev/tools/gen_defaults/data/chip_suggestion.json @@ -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", diff --git a/dev/tools/gen_defaults/data/color_dark.json b/dev/tools/gen_defaults/data/color_dark.json index 613f7b37e4..039c15ef52 100644 --- a/dev/tools/gen_defaults/data/color_dark.json +++ b/dev/tools/gen_defaults/data/color_dark.json @@ -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", diff --git a/dev/tools/gen_defaults/data/color_light.json b/dev/tools/gen_defaults/data/color_light.json index 6ce96ef112..1897c6484a 100644 --- a/dev/tools/gen_defaults/data/color_light.json +++ b/dev/tools/gen_defaults/data/color_light.json @@ -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", diff --git a/dev/tools/gen_defaults/data/date_picker_docked.json b/dev/tools/gen_defaults/data/date_picker_docked.json index 6364b44f98..f9a42c808b 100644 --- a/dev/tools/gen_defaults/data/date_picker_docked.json +++ b/dev/tools/gen_defaults/data/date_picker_docked.json @@ -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, diff --git a/dev/tools/gen_defaults/data/date_picker_input_modal.json b/dev/tools/gen_defaults/data/date_picker_input_modal.json index 62e03838da..d45502680a 100644 --- a/dev/tools/gen_defaults/data/date_picker_input_modal.json +++ b/dev/tools/gen_defaults/data/date_picker_input_modal.json @@ -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", diff --git a/dev/tools/gen_defaults/data/date_picker_modal.json b/dev/tools/gen_defaults/data/date_picker_modal.json index d813c70b35..0f413a8271 100644 --- a/dev/tools/gen_defaults/data/date_picker_modal.json +++ b/dev/tools/gen_defaults/data/date_picker_modal.json @@ -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", diff --git a/dev/tools/gen_defaults/data/dialog.json b/dev/tools/gen_defaults/data/dialog.json index 556c0fbeba..6fd221a515 100644 --- a/dev/tools/gen_defaults/data/dialog.json +++ b/dev/tools/gen_defaults/data/dialog.json @@ -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", diff --git a/dev/tools/gen_defaults/data/dialog_fullscreen.json b/dev/tools/gen_defaults/data/dialog_fullscreen.json index 048c67cca6..3a350b57eb 100644 --- a/dev/tools/gen_defaults/data/dialog_fullscreen.json +++ b/dev/tools/gen_defaults/data/dialog_fullscreen.json @@ -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", diff --git a/dev/tools/gen_defaults/data/divider.json b/dev/tools/gen_defaults/data/divider.json index 22b6ea39c8..6843312730 100644 --- a/dev/tools/gen_defaults/data/divider.json +++ b/dev/tools/gen_defaults/data/divider.json @@ -1,5 +1,5 @@ { - "version": "v4_1_0", + "version": "5_0_0", "md.comp.divider.color": "outlineVariant", "md.comp.divider.thickness": 1.0 diff --git a/dev/tools/gen_defaults/data/elevation.json b/dev/tools/gen_defaults/data/elevation.json index f4539fb649..cd3800cad0 100644 --- a/dev/tools/gen_defaults/data/elevation.json +++ b/dev/tools/gen_defaults/data/elevation.json @@ -1,5 +1,5 @@ { - "version": "v4_1_0", + "version": "5_0_0", "md.sys.elevation.level0": 0.0, "md.sys.elevation.level1": 1.0, diff --git a/dev/tools/gen_defaults/data/fab_extended_primary.json b/dev/tools/gen_defaults/data/fab_extended_primary.json index c2a7bd9d4b..f0ffeb7d18 100644 --- a/dev/tools/gen_defaults/data/fab_extended_primary.json +++ b/dev/tools/gen_defaults/data/fab_extended_primary.json @@ -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", diff --git a/dev/tools/gen_defaults/data/fab_large_primary.json b/dev/tools/gen_defaults/data/fab_large_primary.json index 209bf1a7e1..0fce9ad1fa 100644 --- a/dev/tools/gen_defaults/data/fab_large_primary.json +++ b/dev/tools/gen_defaults/data/fab_large_primary.json @@ -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", diff --git a/dev/tools/gen_defaults/data/fab_primary.json b/dev/tools/gen_defaults/data/fab_primary.json index 122be08f78..8e9f84bc39 100644 --- a/dev/tools/gen_defaults/data/fab_primary.json +++ b/dev/tools/gen_defaults/data/fab_primary.json @@ -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", diff --git a/dev/tools/gen_defaults/data/fab_small_primary.json b/dev/tools/gen_defaults/data/fab_small_primary.json index 5e960cd2c3..3fc0d53f43 100644 --- a/dev/tools/gen_defaults/data/fab_small_primary.json +++ b/dev/tools/gen_defaults/data/fab_small_primary.json @@ -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", diff --git a/dev/tools/gen_defaults/data/icon_button.json b/dev/tools/gen_defaults/data/icon_button.json index f7113f922c..58ce58e2d2 100644 --- a/dev/tools/gen_defaults/data/icon_button.json +++ b/dev/tools/gen_defaults/data/icon_button.json @@ -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, diff --git a/dev/tools/gen_defaults/data/icon_button_filled.json b/dev/tools/gen_defaults/data/icon_button_filled.json index 6e8cba5c2e..f8751eb509 100644 --- a/dev/tools/gen_defaults/data/icon_button_filled.json +++ b/dev/tools/gen_defaults/data/icon_button_filled.json @@ -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, diff --git a/dev/tools/gen_defaults/data/icon_button_filled_tonal.json b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json index ce16420609..6ac2f463be 100644 --- a/dev/tools/gen_defaults/data/icon_button_filled_tonal.json +++ b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json @@ -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, diff --git a/dev/tools/gen_defaults/data/icon_button_outlined.json b/dev/tools/gen_defaults/data/icon_button_outlined.json index 200449702e..c2757573cf 100644 --- a/dev/tools/gen_defaults/data/icon_button_outlined.json +++ b/dev/tools/gen_defaults/data/icon_button_outlined.json @@ -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", diff --git a/dev/tools/gen_defaults/data/list.json b/dev/tools/gen_defaults/data/list.json index acbd599fd2..d58cf87530 100644 --- a/dev/tools/gen_defaults/data/list.json +++ b/dev/tools/gen_defaults/data/list.json @@ -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", diff --git a/dev/tools/gen_defaults/data/menu.json b/dev/tools/gen_defaults/data/menu.json index fd3c50572d..41d9f13f2b 100644 --- a/dev/tools/gen_defaults/data/menu.json +++ b/dev/tools/gen_defaults/data/menu.json @@ -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" } diff --git a/dev/tools/gen_defaults/data/motion.json b/dev/tools/gen_defaults/data/motion.json index 1ea861226b..8ea27b6234 100644 --- a/dev/tools/gen_defaults/data/motion.json +++ b/dev/tools/gen_defaults/data/motion.json @@ -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, diff --git a/dev/tools/gen_defaults/data/navigation_bar.json b/dev/tools/gen_defaults/data/navigation_bar.json index 4b017bab2a..1fdfeb8278 100644 --- a/dev/tools/gen_defaults/data/navigation_bar.json +++ b/dev/tools/gen_defaults/data/navigation_bar.json @@ -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", diff --git a/dev/tools/gen_defaults/data/navigation_drawer.json b/dev/tools/gen_defaults/data/navigation_drawer.json index f0a7e9fed9..94a706879b 100644 --- a/dev/tools/gen_defaults/data/navigation_drawer.json +++ b/dev/tools/gen_defaults/data/navigation_drawer.json @@ -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", diff --git a/dev/tools/gen_defaults/data/navigation_rail.json b/dev/tools/gen_defaults/data/navigation_rail.json index 4804d6e55a..de81844542 100644 --- a/dev/tools/gen_defaults/data/navigation_rail.json +++ b/dev/tools/gen_defaults/data/navigation_rail.json @@ -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", diff --git a/dev/tools/gen_defaults/data/navigation_tab_primary.json b/dev/tools/gen_defaults/data/navigation_tab_primary.json index 2126e5e49c..400719833a 100644 --- a/dev/tools/gen_defaults/data/navigation_tab_primary.json +++ b/dev/tools/gen_defaults/data/navigation_tab_primary.json @@ -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", diff --git a/dev/tools/gen_defaults/data/navigation_tab_secondary.json b/dev/tools/gen_defaults/data/navigation_tab_secondary.json index 31263bd583..d69e6315bb 100644 --- a/dev/tools/gen_defaults/data/navigation_tab_secondary.json +++ b/dev/tools/gen_defaults/data/navigation_tab_secondary.json @@ -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, diff --git a/dev/tools/gen_defaults/data/palette.json b/dev/tools/gen_defaults/data/palette.json index 57880cacfe..7fed7bca75 100644 --- a/dev/tools/gen_defaults/data/palette.json +++ b/dev/tools/gen_defaults/data/palette.json @@ -1,5 +1,5 @@ { - "version": "v4_1_0", + "version": "5_0_0", "md.ref.palette.black": "0xFF000000", "md.ref.palette.blue0": "0xFF000000", diff --git a/dev/tools/gen_defaults/data/progress_indicator.json b/dev/tools/gen_defaults/data/progress_indicator.json index b97b9891a0..98e25bae64 100644 --- a/dev/tools/gen_defaults/data/progress_indicator.json +++ b/dev/tools/gen_defaults/data/progress_indicator.json @@ -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", diff --git a/dev/tools/gen_defaults/data/radio_button.json b/dev/tools/gen_defaults/data/radio_button.json index b85db5db37..024d43a79d 100644 --- a/dev/tools/gen_defaults/data/radio_button.json +++ b/dev/tools/gen_defaults/data/radio_button.json @@ -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, diff --git a/dev/tools/gen_defaults/data/search_bar.json b/dev/tools/gen_defaults/data/search_bar.json index aaf2779d28..2feb74074f 100644 --- a/dev/tools/gen_defaults/data/search_bar.json +++ b/dev/tools/gen_defaults/data/search_bar.json @@ -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, diff --git a/dev/tools/gen_defaults/data/search_view.json b/dev/tools/gen_defaults/data/search_view.json index e779b9b2e9..f08363fc12 100644 --- a/dev/tools/gen_defaults/data/search_view.json +++ b/dev/tools/gen_defaults/data/search_view.json @@ -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", diff --git a/dev/tools/gen_defaults/data/segmented_button_outlined.json b/dev/tools/gen_defaults/data/segmented_button_outlined.json index b2bf4c2a00..85ed082be4 100644 --- a/dev/tools/gen_defaults/data/segmented_button_outlined.json +++ b/dev/tools/gen_defaults/data/segmented_button_outlined.json @@ -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", diff --git a/dev/tools/gen_defaults/data/shape.json b/dev/tools/gen_defaults/data/shape.json index 4f7c071186..d1a7630307 100644 --- a/dev/tools/gen_defaults/data/shape.json +++ b/dev/tools/gen_defaults/data/shape.json @@ -1,5 +1,5 @@ { - "version": "v4_1_0", + "version": "5_0_0", "md.sys.shape.corner.extra-large": { "family": "SHAPE_FAMILY_ROUNDED_CORNERS", diff --git a/dev/tools/gen_defaults/data/sheet_bottom.json b/dev/tools/gen_defaults/data/sheet_bottom.json index b2da2da7bb..0b889ae7ec 100644 --- a/dev/tools/gen_defaults/data/sheet_bottom.json +++ b/dev/tools/gen_defaults/data/sheet_bottom.json @@ -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", diff --git a/dev/tools/gen_defaults/data/slider.json b/dev/tools/gen_defaults/data/slider.json index b397f69bd0..5fdb2f013b 100644 --- a/dev/tools/gen_defaults/data/slider.json +++ b/dev/tools/gen_defaults/data/slider.json @@ -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, diff --git a/dev/tools/gen_defaults/data/snackbar.json b/dev/tools/gen_defaults/data/snackbar.json index efba8d6a79..2aef5e0d33 100644 --- a/dev/tools/gen_defaults/data/snackbar.json +++ b/dev/tools/gen_defaults/data/snackbar.json @@ -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", diff --git a/dev/tools/gen_defaults/data/state.json b/dev/tools/gen_defaults/data/state.json index 390b5321a2..40f9186a85 100644 --- a/dev/tools/gen_defaults/data/state.json +++ b/dev/tools/gen_defaults/data/state.json @@ -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, diff --git a/dev/tools/gen_defaults/data/switch.json b/dev/tools/gen_defaults/data/switch.json index 47dfc8ed3a..084ffe7cbb 100644 --- a/dev/tools/gen_defaults/data/switch.json +++ b/dev/tools/gen_defaults/data/switch.json @@ -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, diff --git a/dev/tools/gen_defaults/data/text_field_filled.json b/dev/tools/gen_defaults/data/text_field_filled.json index cfa05b771e..66af318bbc 100644 --- a/dev/tools/gen_defaults/data/text_field_filled.json +++ b/dev/tools/gen_defaults/data/text_field_filled.json @@ -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, diff --git a/dev/tools/gen_defaults/data/text_field_outlined.json b/dev/tools/gen_defaults/data/text_field_outlined.json index 7c29c47f9a..e3d3a666b8 100644 --- a/dev/tools/gen_defaults/data/text_field_outlined.json +++ b/dev/tools/gen_defaults/data/text_field_outlined.json @@ -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", diff --git a/dev/tools/gen_defaults/data/text_style.json b/dev/tools/gen_defaults/data/text_style.json index 450b10adba..38ab4784db 100644 --- a/dev/tools/gen_defaults/data/text_style.json +++ b/dev/tools/gen_defaults/data/text_style.json @@ -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, diff --git a/dev/tools/gen_defaults/data/time_picker.json b/dev/tools/gen_defaults/data/time_picker.json index 8fcff53781..6e7999dd1b 100644 --- a/dev/tools/gen_defaults/data/time_picker.json +++ b/dev/tools/gen_defaults/data/time_picker.json @@ -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, diff --git a/dev/tools/gen_defaults/data/top_app_bar_large.json b/dev/tools/gen_defaults/data/top_app_bar_large.json index f4a5ef7b01..17cb6dd9da 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_large.json +++ b/dev/tools/gen_defaults/data/top_app_bar_large.json @@ -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", diff --git a/dev/tools/gen_defaults/data/top_app_bar_medium.json b/dev/tools/gen_defaults/data/top_app_bar_medium.json index d6bf4bbe6f..64b333f05f 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_medium.json +++ b/dev/tools/gen_defaults/data/top_app_bar_medium.json @@ -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", diff --git a/dev/tools/gen_defaults/data/top_app_bar_small.json b/dev/tools/gen_defaults/data/top_app_bar_small.json index 6be95432ac..441fb2deda 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_small.json +++ b/dev/tools/gen_defaults/data/top_app_bar_small.json @@ -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", diff --git a/dev/tools/gen_defaults/data/typeface.json b/dev/tools/gen_defaults/data/typeface.json index 71a47b8443..f3e07539c9 100644 --- a/dev/tools/gen_defaults/data/typeface.json +++ b/dev/tools/gen_defaults/data/typeface.json @@ -1,5 +1,5 @@ { - "version": "v4_1_0", + "version": "5_0_0", "md.ref.typeface.brand": "Roboto", "md.ref.typeface.plain": "Roboto", diff --git a/dev/tools/gen_defaults/generated/used_tokens.csv b/dev/tools/gen_defaults/generated/used_tokens.csv index 0dad3f3665..19db288b8e 100644 --- a/dev/tools/gen_defaults/generated/used_tokens.csv +++ b/dev/tools/gen_defaults/generated/used_tokens.csv @@ -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, diff --git a/packages/flutter/lib/src/material/theme_data.dart b/packages/flutter/lib/src/material/theme_data.dart index 5d81917dc3..74ea59fe5c 100644 --- a/packages/flutter/lib/src/material/theme_data.dart +++ b/packages/flutter/lib/src/material/theme_data.dart @@ -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), diff --git a/packages/flutter/test/material/theme_data_test.dart b/packages/flutter/test/material/theme_data_test.dart index 9da298f131..0844a93ee8 100644 --- a/packages/flutter/test/material/theme_data_test.dart +++ b/packages/flutter/test/material/theme_data_test.dart @@ -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));