From 49b123df62eaa7e44cd92bd5f0ec21f4a83c483d Mon Sep 17 00:00:00 2001 From: Qun Cheng <36861262+QuncCccccc@users.noreply.github.com> Date: Wed, 22 May 2024 15:08:25 +0000 Subject: [PATCH] Update tokens to 4.0.0 (#148789) This PR is to * Update the Material Design tokens to 4.0.0 Since the last token update(#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. --- dev/tools/gen_defaults/bin/gen_defaults.dart | 4 +- 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 | 2 +- .../gen_defaults/data/date_picker_docked.json | 2 +- .../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 | 2 +- dev/tools/gen_defaults/data/menu.json | 2 +- 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 | 69 ++++++++++--------- 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 | 26 +------ 64 files changed, 99 insertions(+), 122 deletions(-) diff --git a/dev/tools/gen_defaults/bin/gen_defaults.dart b/dev/tools/gen_defaults/bin/gen_defaults.dart index 5431e708f59fc..78918ca431a41 100644 --- 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 main(List 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 index 3207fd9b093cc..f081c8bf7fb49 100644 --- 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 index 93fda146718b5..5031b0306cdaf 100644 --- 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 index 70b72375668c7..474e12b7e65e2 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": "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 index 030784a6e33db..4b872c6fc3295 100644 --- 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 index 67826b8461597..3f15c8a42961d 100644 --- 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 index 092c68c3a30f9..020bf1def47bf 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": "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 index a7cf4f5f6732e..1703b06967ec3 100644 --- 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 index ca199d7067f58..56144a6dba091 100644 --- 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 index 198853d630839..567d654583a07 100644 --- 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 index 297bf7f43f82e..413c055875e21 100644 --- 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 index 6c2697ca7d654..5ab477be41f50 100644 --- 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 index 7a48e0dd52679..db515a8e85a8b 100644 --- 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 index fcf0ea588fa74..558d6d650ab63 100644 --- 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 index 5e9fab3db4bbd..860b2062ba909 100644 --- 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 index 99129066a120d..c18baccee7ae8 100644 --- 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 index b87f3aa40d308..6cbfb54538086 100644 --- 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 index 4972a4a359b68..c9753fcba5299 100644 --- 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 index 5994b26e1eb4b..397c003860d3f 100644 --- 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 index ce24e5d2bcc37..f64a69a872328 100644 --- 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 index 1b7615d186eed..8b88f21cf7526 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": "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 index 932487c1e4503..0859932e43662 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": "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 index 9bcfc0cc8d06f..88336deb7a0ac 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": "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 index 73dffb6d717af..8a1169536d980 100644 --- 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 index 937ef818fe3df..d6d142eba1032 100644 --- 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 index d710ec7db94f3..1a0e48202d698 100644 --- 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 index 36eaa83ce0373..ccea559513dfb 100644 --- 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 index f292cb4e2ab23..a0747b155658b 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": "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 index dff62d37c0d9c..632dedf260ef5 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": "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 index 514aa72dad433..23064b8326e54 100644 --- 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 index ceedc57c3b194..4496ce86996ed 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": "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 index 1d7ffcebf8de4..669b13928b4f1 100644 --- 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 index a2f694432df03..c834276b66dd5 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": "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 index 8bb53c805db44..dab92e6cb0b58 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": "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 index 1a5a468efa946..8f2f48fe4d399 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": "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 index 391869ecb0523..3a55a1099735f 100644 --- 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 index 608dde4514791..455d94e08c16e 100644 --- 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 index 158b2d0627a29..acd5aca1a6e56 100644 --- 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 index 487e4bfc06074..335fa763d4071 100644 --- 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 index c3405a1fdaae6..bdac0e0194399 100644 --- 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 index b3f3e08a48e87..b4d79b964ce36 100644 --- 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 index 44f4d67c0481c..11b5550c8993a 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": "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 index e52e8636e89f6..239058b698f7f 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": "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 index b43a47159d14f..d415c0d69415a 100644 --- 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 index c0b3a2dfac7ef..c7e39cf5a32aa 100644 --- 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 index 4abf823de20db..ccc8e67c27517 100644 --- 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 index 64c468f3c13a1..c45d82e35957d 100644 --- 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 index 4fc737152a613..6c75abf044bb6 100644 --- 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 index 68d22f83cf697..8260697084936 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": "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 index 6c3a1b6977d6c..a0c81ccc85e28 100644 --- 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 index 5b8b3417c37ad..f53c62f0983a0 100644 --- 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", diff --git a/dev/tools/gen_defaults/data/slider.json b/dev/tools/gen_defaults/data/slider.json index 9dfda742b1468..d47f996ae75d7 100644 --- a/dev/tools/gen_defaults/data/slider.json +++ b/dev/tools/gen_defaults/data/slider.json @@ -1,49 +1,50 @@ { - "version": "v0_206", + "version": "4_0_0", + "md.comp.slider.active.handle.height": 44.0, + "md.comp.slider.active.handle.leading-space": 6.0, + "md.comp.slider.active.handle.padding": 6.0, + "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.track.color": "primary", - "md.comp.slider.active.track.height": 4.0, + "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.track.color": "onSurface", "md.comp.slider.disabled.active.track.opacity": 0.38, "md.comp.slider.disabled.handle.color": "onSurface", - "md.comp.slider.disabled.handle.elevation": "md.sys.elevation.level0", "md.comp.slider.disabled.handle.opacity": 0.38, + "md.comp.slider.disabled.handle.width": 4.0, "md.comp.slider.disabled.inactive.track.color": "onSurface", "md.comp.slider.disabled.inactive.track.opacity": 0.12, - "md.comp.slider.focus.handle.color": "primary", - "md.comp.slider.focus.state-layer.color": "primary", - "md.comp.slider.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity", + "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", + "md.comp.slider.focus.stop.color": "primary", "md.comp.slider.handle.color": "primary", - "md.comp.slider.handle.elevation": "md.sys.elevation.level1", - "md.comp.slider.handle.height": 20.0, - "md.comp.slider.handle.shadow-color": "shadow", + "md.comp.slider.handle.height": 44.0, "md.comp.slider.handle.shape": "md.sys.shape.corner.full", - "md.comp.slider.handle.width": 20.0, - "md.comp.slider.hover.handle.color": "primary", - "md.comp.slider.hover.state-layer.color": "primary", - "md.comp.slider.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity", - "md.comp.slider.inactive.track.color": "surfaceContainerHighest", - "md.comp.slider.inactive.track.height": 4.0, + "md.comp.slider.handle.width": 4.0, + "md.comp.slider.hover.handle.width": 4.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", - "md.comp.slider.label.container.color": "primary", - "md.comp.slider.label.container.elevation": "md.sys.elevation.level0", - "md.comp.slider.label.container.height": 28.0, - "md.comp.slider.label.label-text.color": "onPrimary", - "md.comp.slider.label.label-text.text-style": "labelMedium", + "md.comp.slider.label.label-text.color": "onInverseSurface", + "md.comp.slider.pressed.active.track.color": "primary", "md.comp.slider.pressed.handle.color": "primary", - "md.comp.slider.pressed.state-layer.color": "primary", - "md.comp.slider.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity", - "md.comp.slider.state-layer.size": 40.0, - "md.comp.slider.track.elevation": "md.sys.elevation.level0", - "md.comp.slider.with-overlap.handle.outline.color": "onPrimary", - "md.comp.slider.with-overlap.handle.outline.width": 1.0, - "md.comp.slider.with-tick-marks.active.container.color": "onPrimary", - "md.comp.slider.with-tick-marks.active.container.opacity": 0.38, - "md.comp.slider.with-tick-marks.container.shape": "md.sys.shape.corner.full", - "md.comp.slider.with-tick-marks.container.size": 2.0, - "md.comp.slider.with-tick-marks.disabled.container.color": "onSurface", - "md.comp.slider.with-tick-marks.disabled.container.opacity": 0.38, - "md.comp.slider.with-tick-marks.inactive.container.color": "onSurfaceVariant", - "md.comp.slider.with-tick-marks.inactive.container.opacity": 0.38 + "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.shape": "md.sys.shape.corner.full", + "md.comp.slider.stop-indicator.size": 4.0, + "md.comp.slider.stop-indicator.trailing-space": 6.0, + "md.comp.slider.value-indicator.active.bottom-space": 12.0, + "md.comp.slider.value-indicator.container.color": "inverseSurface", + "md.comp.slider.value-indicator.label.label-text.color": "onInverseSurface", + "md.comp.slider.value-indicator.label.label-text.text-style": "labelLarge" } diff --git a/dev/tools/gen_defaults/data/snackbar.json b/dev/tools/gen_defaults/data/snackbar.json index d2eb724542dba..22d1bd1f0b5e5 100644 --- a/dev/tools/gen_defaults/data/snackbar.json +++ b/dev/tools/gen_defaults/data/snackbar.json @@ -1,5 +1,5 @@ { - "version": "v2_3_5", + "version": "4_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 53274883b4d28..c265d8a9d3182 100644 --- a/dev/tools/gen_defaults/data/state.json +++ b/dev/tools/gen_defaults/data/state.json @@ -1,5 +1,5 @@ { - "version": "v2_3_5", + "version": "4_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 cf018bd80cac8..cfc1d64076470 100644 --- a/dev/tools/gen_defaults/data/switch.json +++ b/dev/tools/gen_defaults/data/switch.json @@ -1,5 +1,5 @@ { - "version": "v2_3_5", + "version": "4_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 25a144850d97b..ca4cf5b14f7b3 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": "v2_3_5", + "version": "4_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 3b6ba76fb2788..a75af88ccbfa6 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": "v2_3_5", + "version": "4_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 42aaa93b50053..4f4d45abf24b6 100644 --- a/dev/tools/gen_defaults/data/text_style.json +++ b/dev/tools/gen_defaults/data/text_style.json @@ -1,5 +1,5 @@ { - "version": "v2_3_5", + "version": "4_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 94be3c4a664d7..ca322467b644a 100644 --- a/dev/tools/gen_defaults/data/time_picker.json +++ b/dev/tools/gen_defaults/data/time_picker.json @@ -1,5 +1,5 @@ { - "version": "v2_3_5", + "version": "4_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 a863f97672b6c..c6e62801444ed 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": "v2_3_5", + "version": "4_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 edd86180c003a..f2a14c9b2adcf 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": "v2_3_5", + "version": "4_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 c4f27af4f6d41..418f892f6adc5 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": "v2_3_5", + "version": "4_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 c9e57078a3efe..75e5237836594 100644 --- a/dev/tools/gen_defaults/data/typeface.json +++ b/dev/tools/gen_defaults/data/typeface.json @@ -1,5 +1,5 @@ { - "version": "v2_3_5", + "version": "4_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 3e9c744667827..8b674a4fc6b7c 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, v2_3_5, v0_206 +Versions used, 4_0_0 md.comp.assist-chip.container.shape, md.comp.assist-chip.disabled.label-text.color, md.comp.assist-chip.elevated.container.color, @@ -620,30 +620,6 @@ md.comp.sheet.bottom.docked.drag-handle.height, md.comp.sheet.bottom.docked.drag-handle.width, md.comp.sheet.bottom.docked.modal.container.elevation, md.comp.sheet.bottom.docked.standard.container.elevation, -md.comp.slider.active.track.color, -md.comp.slider.active.track.height, -md.comp.slider.disabled.active.track.color, -md.comp.slider.disabled.active.track.opacity, -md.comp.slider.disabled.handle.color, -md.comp.slider.disabled.handle.opacity, -md.comp.slider.disabled.inactive.track.color, -md.comp.slider.disabled.inactive.track.opacity, -md.comp.slider.focus.state-layer.color, -md.comp.slider.focus.state-layer.opacity, -md.comp.slider.handle.color, -md.comp.slider.hover.state-layer.color, -md.comp.slider.hover.state-layer.opacity, -md.comp.slider.inactive.track.color, -md.comp.slider.label.label-text.color, -md.comp.slider.label.label-text.text-style, -md.comp.slider.pressed.state-layer.color, -md.comp.slider.pressed.state-layer.opacity, -md.comp.slider.with-tick-marks.active.container.color, -md.comp.slider.with-tick-marks.active.container.opacity, -md.comp.slider.with-tick-marks.disabled.container.color, -md.comp.slider.with-tick-marks.disabled.container.opacity, -md.comp.slider.with-tick-marks.inactive.container.color, -md.comp.slider.with-tick-marks.inactive.container.opacity, md.comp.snackbar.action.focus.label-text.color, md.comp.snackbar.action.hover.label-text.color, md.comp.snackbar.action.label-text.color,