Update tokens to 4.0.0 (flutter#148789)

This PR is to * Update the Material Design tokens to 4.0.0 Since the last token update(flutter#145356), only `Slider` tokens have been updated. The M3 `Slider` has significant visual changes, compared to the original M3 Slider, so a separate PR would be needed. I commented out `SliderTemplate` and added a TODO when we are ready to add new widgets again.
victorsanni · May 31, 2024 · 49b123d · 49b123d
1 parent 2334f6f
commit 49b123d
Show file tree

Hide file tree

Showing 64 changed files with 99 additions and 122 deletions.
diff --git a/dev/tools/gen_defaults/bin/gen_defaults.dart b/dev/tools/gen_defaults/bin/gen_defaults.dart
@@ -47,7 +47,6 @@ import 'package:gen_defaults/radio_template.dart';
 import 'package:gen_defaults/search_bar_template.dart';
 import 'package:gen_defaults/search_view_template.dart';
 import 'package:gen_defaults/segmented_button_template.dart';
-import 'package:gen_defaults/slider_template.dart';
 import 'package:gen_defaults/snackbar_template.dart';
 import 'package:gen_defaults/surface_tint.dart';
 import 'package:gen_defaults/switch_template.dart';
@@ -143,7 +142,8 @@ Future<void> main(List<String> args) async {
  SearchViewTemplate('SearchView', '$materialLib/search_anchor.dart', tokens).updateFile();
  SegmentedButtonTemplate('md.comp.outlined-segmented-button', 'SegmentedButton', '$materialLib/segmented_button.dart', tokens).updateFile();
  SnackbarTemplate('md.comp.snackbar', 'Snackbar', '$materialLib/snack_bar.dart', tokens).updateFile();
- SliderTemplate('md.comp.slider', 'Slider', '$materialLib/slider.dart', tokens).updateFile();
+ // TODO(QuncCccccc): uncomment `SliderTemplate` once `Slider` widget is updated to match the latest M3 specs.
+ // SliderTemplate('md.comp.slider', 'Slider', '$materialLib/slider.dart', tokens).updateFile();
  SurfaceTintTemplate('SurfaceTint', '$materialLib/elevation_overlay.dart', tokens).updateFile();
  SwitchTemplate('Switch', '$materialLib/switch.dart', tokens).updateFile();
  TimePickerTemplate('TimePicker', '$materialLib/time_picker.dart', tokens).updateFile();

diff --git a/dev/tools/gen_defaults/data/badge.json b/dev/tools/gen_defaults/data/badge.json
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_0_0",
 
  "md.sys.color.background": "md.ref.palette.neutral98",
  "md.sys.color.error": "md.ref.palette.error40",

diff --git 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": "v2_3_5",
+ "version": "4_0_0",
 
  "md.comp.date-picker.docked.container.color": "surfaceContainerHigh",
  "md.comp.date-picker.docked.container.elevation": "md.sys.elevation.level3",

diff --git 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": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_0_0",
 
  "md.comp.list.divider.leading-space": 16.0,
  "md.comp.list.divider.trailing-space": 16.0,

diff --git a/dev/tools/gen_defaults/data/menu.json b/dev/tools/gen_defaults/data/menu.json
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_0_0",
 
  "md.comp.menu.container.color": "surfaceContainer",
  "md.comp.menu.container.elevation": "md.sys.elevation.level2",

diff --git a/dev/tools/gen_defaults/data/motion.json b/dev/tools/gen_defaults/data/motion.json
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_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
@@ -1,5 +1,5 @@
 {
- "version": "v2_3_5",
+ "version": "4_0_0",
 
  "md.comp.sheet.bottom.docked.container.color": "surfaceContainerLow",
  "md.comp.sheet.bottom.docked.container.shape": "md.sys.shape.corner.extra-large.top",