From d63dcb95b2b6d7a1bb332682aacc49b5c91f21cd Mon Sep 17 00:00:00 2001 From: Flutter Material Tokens Copybara Bot Date: Fri, 17 Jul 2026 00:31:31 +0000 Subject: [PATCH] Project import generated by Copybara. FolderOrigin-RevId: /google/src/cloud/elliottbrooks/resolved-typescale/google3/javascript/materialdesign/tokens/compiler/formats/flutter/staging_output --- .../tool/gen_defaults/data/app_bar.dart | 2 +- .../tool/gen_defaults/data/app_bar_large.dart | 12 +--- .../data/app_bar_large_flexible.dart | 20 ++---- .../gen_defaults/data/app_bar_medium.dart | 12 +--- .../data/app_bar_medium_flexible.dart | 20 ++---- .../tool/gen_defaults/data/app_bar_small.dart | 28 ++------ .../tool/gen_defaults/data/assist_chip.dart | 12 +--- .../tool/gen_defaults/data/badge.dart | 12 +--- .../tool/gen_defaults/data/banner.dart | 12 +--- .../tool/gen_defaults/data/banners.dart | 2 +- .../tool/gen_defaults/data/banners_basic.dart | 12 +--- .../tool/gen_defaults/data/banners_rich.dart | 21 ++---- .../gen_defaults/data/bottom_app_bar.dart | 2 +- .../tool/gen_defaults/data/button.dart | 12 +--- .../gen_defaults/data/button_elevated.dart | 2 +- .../tool/gen_defaults/data/button_filled.dart | 2 +- .../data/button_group_connected_large.dart | 2 +- .../data/button_group_connected_medium.dart | 2 +- .../data/button_group_connected_small.dart | 2 +- .../data/button_group_connected_xlarge.dart | 2 +- .../data/button_group_connected_xsmall.dart | 2 +- .../data/button_group_standard_large.dart | 2 +- .../data/button_group_standard_medium.dart | 2 +- .../data/button_group_standard_small.dart | 2 +- .../data/button_group_standard_xlarge.dart | 2 +- .../data/button_group_standard_xsmall.dart | 2 +- .../tool/gen_defaults/data/button_large.dart | 12 +--- .../tool/gen_defaults/data/button_medium.dart | 12 +--- .../gen_defaults/data/button_outlined.dart | 2 +- .../tool/gen_defaults/data/button_small.dart | 12 +--- .../tool/gen_defaults/data/button_text.dart | 2 +- .../tool/gen_defaults/data/button_tonal.dart | 2 +- .../tool/gen_defaults/data/button_xlarge.dart | 12 +--- .../tool/gen_defaults/data/button_xsmall.dart | 12 +--- .../tool/gen_defaults/data/carousel_item.dart | 2 +- .../tool/gen_defaults/data/checkbox.dart | 2 +- .../tool/gen_defaults/data/chips.dart | 12 +--- .../tool/gen_defaults/data/color.dart | 2 +- .../tool/gen_defaults/data/color_dark.dart | 2 +- .../data/color_dark_high_contrast.dart | 2 +- .../data/color_dark_medium_contrast.dart | 2 +- .../data/color_light_high_contrast.dart | 2 +- .../data/color_light_medium_contrast.dart | 2 +- .../tool/gen_defaults/data/color_role.dart | 2 +- .../tool/gen_defaults/data/data_table.dart | 60 ++++++++++++++++- .../gen_defaults/data/date_input_modal.dart | 22 ++----- .../gen_defaults/data/date_picker_docked.dart | 38 +++-------- .../gen_defaults/data/date_picker_modal.dart | 64 ++++--------------- .../tool/gen_defaults/data/dialog.dart | 28 ++------ .../tool/gen_defaults/data/divider.dart | 2 +- .../tool/gen_defaults/data/drag_handle.dart | 2 +- .../tool/gen_defaults/data/elevated_card.dart | 2 +- .../tool/gen_defaults/data/elevation.dart | 2 +- .../tool/gen_defaults/data/extended_fab.dart | 12 +--- .../gen_defaults/data/extended_fab_large.dart | 12 +--- .../data/extended_fab_medium.dart | 12 +--- .../data/extended_fab_primary.dart | 2 +- .../data/extended_fab_primary_container.dart | 2 +- .../data/extended_fab_secondary.dart | 2 +- .../extended_fab_secondary_container.dart | 2 +- .../gen_defaults/data/extended_fab_small.dart | 12 +--- .../data/extended_fab_surface.dart | 12 +--- .../data/extended_fab_tertiary.dart | 2 +- .../data/extended_fab_tertiary_container.dart | 2 +- .../tool/gen_defaults/data/fab.dart | 2 +- .../tool/gen_defaults/data/fab_large.dart | 2 +- .../tool/gen_defaults/data/fab_medium.dart | 2 +- .../tool/gen_defaults/data/fab_menu.dart | 12 +--- .../data/fab_menu_primary_close_button.dart | 2 +- .../data/fab_menu_primary_container.dart | 2 +- .../data/fab_menu_secondary_close_button.dart | 2 +- .../data/fab_menu_secondary_container.dart | 2 +- .../data/fab_menu_tertiary_close_button.dart | 2 +- .../data/fab_menu_tertiary_container.dart | 2 +- .../tool/gen_defaults/data/fab_primary.dart | 2 +- .../data/fab_primary_container.dart | 2 +- .../tool/gen_defaults/data/fab_secondary.dart | 2 +- .../data/fab_secondary_container.dart | 2 +- .../tool/gen_defaults/data/fab_small.dart | 2 +- .../tool/gen_defaults/data/fab_surface.dart | 2 +- .../tool/gen_defaults/data/fab_tertiary.dart | 2 +- .../data/fab_tertiary_container.dart | 2 +- .../data/filled_autocomplete.dart | 39 +++++------ .../tool/gen_defaults/data/filled_card.dart | 2 +- .../gen_defaults/data/filled_menu_button.dart | 12 +--- .../tool/gen_defaults/data/filled_select.dart | 48 ++++++-------- .../gen_defaults/data/filled_text_field.dart | 36 ++++------- .../tool/gen_defaults/data/filter_chip.dart | 12 +--- .../gen_defaults/data/full_screen_dialog.dart | 21 ++---- .../tool/gen_defaults/data/glass_button.dart | 2 +- .../gen_defaults/data/glass_icon_button.dart | 2 +- .../tool/gen_defaults/data/icon_button.dart | 2 +- .../gen_defaults/data/icon_button_filled.dart | 2 +- .../gen_defaults/data/icon_button_large.dart | 2 +- .../gen_defaults/data/icon_button_medium.dart | 2 +- .../data/icon_button_outlined.dart | 2 +- .../gen_defaults/data/icon_button_small.dart | 2 +- .../data/icon_button_standard.dart | 2 +- .../gen_defaults/data/icon_button_tonal.dart | 2 +- .../gen_defaults/data/icon_button_xlarge.dart | 2 +- .../gen_defaults/data/icon_button_xsmall.dart | 2 +- .../tool/gen_defaults/data/input_chip.dart | 12 +--- .../tool/gen_defaults/data/list.dart | 46 +++---------- .../tool/gen_defaults/data/list_expand.dart | 2 +- .../tool/gen_defaults/data/list_reorder.dart | 2 +- .../tool/gen_defaults/data/list_reveal.dart | 2 +- .../gen_defaults/data/loading_indicator.dart | 2 +- .../tool/gen_defaults/data/measurement.dart | 2 +- .../tool/gen_defaults/data/menu.dart | 2 +- .../tool/gen_defaults/data/menus.dart | 63 +++++++++++++++++- .../gen_defaults/data/menus_standard.dart | 2 +- .../tool/gen_defaults/data/menus_vibrant.dart | 2 +- .../gen_defaults/data/motion_expressive.dart | 2 +- .../gen_defaults/data/motion_standard.dart | 2 +- .../tool/gen_defaults/data/nav_bar.dart | 2 +- .../data/nav_bar_item_horizontal.dart | 12 +--- .../data/nav_bar_item_vertical.dart | 12 +--- .../tool/gen_defaults/data/nav_rail.dart | 2 +- .../gen_defaults/data/nav_rail_collapsed.dart | 2 +- .../gen_defaults/data/nav_rail_expanded.dart | 2 +- .../tool/gen_defaults/data/nav_rail_item.dart | 2 +- .../data/nav_rail_item_horizontal.dart | 12 +--- .../data/nav_rail_item_vertical.dart | 12 +--- .../gen_defaults/data/navigation_bar.dart | 15 ++--- .../gen_defaults/data/navigation_drawer.dart | 31 +++------ .../gen_defaults/data/navigation_rail.dart | 15 ++--- .../data/outlined_autocomplete.dart | 39 +++++------ .../tool/gen_defaults/data/outlined_card.dart | 2 +- .../data/outlined_menu_button.dart | 12 +--- .../data/outlined_segmented_button.dart | 12 +--- .../gen_defaults/data/outlined_select.dart | 48 ++++++-------- .../data/outlined_text_field.dart | 36 ++++------- .../tool/gen_defaults/data/palette.dart | 2 +- .../tool/gen_defaults/data/plain_tooltip.dart | 12 +--- .../data/primary_navigation_tab.dart | 13 ++-- .../gen_defaults/data/progress_indicator.dart | 2 +- .../data/progress_indicator_circular.dart | 2 +- .../data/progress_indicator_linear.dart | 2 +- .../tool/gen_defaults/data/radio_button.dart | 2 +- .../tool/gen_defaults/data/rich_tooltip.dart | 28 ++------ .../tool/gen_defaults/data/scrim.dart | 2 +- .../tool/gen_defaults/data/search_bar.dart | 20 ++---- .../tool/gen_defaults/data/search_view.dart | 21 ++---- .../data/secondary_navigation_tab.dart | 12 +--- .../tool/gen_defaults/data/shape.dart | 2 +- .../tool/gen_defaults/data/sheet_bottom.dart | 2 +- .../gen_defaults/data/sheet_floating.dart | 2 +- .../tool/gen_defaults/data/sheet_side.dart | 12 +--- .../tool/gen_defaults/data/slider.dart | 23 ++++++- .../tool/gen_defaults/data/slider_large.dart | 2 +- .../tool/gen_defaults/data/slider_medium.dart | 2 +- .../tool/gen_defaults/data/slider_small.dart | 2 +- .../tool/gen_defaults/data/slider_xlarge.dart | 2 +- .../tool/gen_defaults/data/slider_xsmall.dart | 2 +- .../tool/gen_defaults/data/snackbar.dart | 20 ++---- .../gen_defaults/data/split_button_large.dart | 2 +- .../data/split_button_medium.dart | 2 +- .../gen_defaults/data/split_button_small.dart | 2 +- .../data/split_button_xlarge.dart | 2 +- .../data/split_button_xsmall.dart | 2 +- .../data/standard_menu_button.dart | 12 +--- .../tool/gen_defaults/data/state.dart | 2 +- .../data/state_focus_indicator.dart | 2 +- .../gen_defaults/data/suggestion_chip.dart | 12 +--- .../tool/gen_defaults/data/switch.dart | 2 +- .../tool/gen_defaults/data/time_input.dart | 47 +++----------- .../tool/gen_defaults/data/time_picker.dart | 48 ++++---------- .../gen_defaults/data/toolbar_docked.dart | 2 +- .../gen_defaults/data/toolbar_floating.dart | 2 +- .../data/toolbar_floating_fab.dart | 2 +- .../gen_defaults/data/toolbar_standard.dart | 2 +- .../gen_defaults/data/toolbar_vibrant.dart | 2 +- .../tool/gen_defaults/data/typeface.dart | 14 +++- .../tool/gen_defaults/data/typescale.dart | 17 ++++- .../data/typescale_emphasized.dart | 17 ++++- .../gen_defaults/data/typescale_struct.dart | 2 + .../gen_defaults/data/typescale_variable.dart | 17 ++++- .../data/typescale_variable_emphasized.dart | 17 ++++- 178 files changed, 652 insertions(+), 1006 deletions(-) diff --git a/packages/material_ui/tool/gen_defaults/data/app_bar.dart b/packages/material_ui/tool/gen_defaults/data/app_bar.dart index 508d88f2e127..01980f2f9720 100644 --- a/packages/material_ui/tool/gen_defaults/data/app_bar.dart +++ b/packages/material_ui/tool/gen_defaults/data/app_bar.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/app_bar_large.dart b/packages/material_ui/tool/gen_defaults/data/app_bar_large.dart index abcf9977cc8b..e114be98f791 100644 --- a/packages/material_ui/tool/gen_defaults/data/app_bar_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/app_bar_large.dart @@ -2,20 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenAppBarLarge { /// md.comp.app-bar.large.container.height static const double containerHeight = 152.00; /// md.comp.app-bar.large.title.font - static const TypescaleStruct titleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 28.00, - fontWeight: 400, - lineHeight: 36.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct titleFont = TokenTypescale.headlineMedium; } diff --git a/packages/material_ui/tool/gen_defaults/data/app_bar_large_flexible.dart b/packages/material_ui/tool/gen_defaults/data/app_bar_large_flexible.dart index 9d733d7739d4..0c2db093449e 100644 --- a/packages/material_ui/tool/gen_defaults/data/app_bar_large_flexible.dart +++ b/packages/material_ui/tool/gen_defaults/data/app_bar_large_flexible.dart @@ -2,31 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenAppBarLargeFlexible { /// md.comp.app-bar.large-flexible.container.height static const double containerHeight = 120.00; /// md.comp.app-bar.large-flexible.subtitle.font - static const TypescaleStruct subtitleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 500, - lineHeight: 24.00, - letterSpacing: 0.15, - ); + static const TypescaleStruct subtitleFont = TokenTypescale.titleMedium; /// md.comp.app-bar.large-flexible.title.font - static const TypescaleStruct titleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 36.00, - fontWeight: 400, - lineHeight: 44.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct titleFont = TokenTypescale.displaySmall; /// md.comp.app-bar.large-flexible.with-subtitle.container.height static const double withSubtitleContainerHeight = 152.00; diff --git a/packages/material_ui/tool/gen_defaults/data/app_bar_medium.dart b/packages/material_ui/tool/gen_defaults/data/app_bar_medium.dart index d5d0b55fa5a7..dad3b89202ef 100644 --- a/packages/material_ui/tool/gen_defaults/data/app_bar_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/app_bar_medium.dart @@ -2,20 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenAppBarMedium { /// md.comp.app-bar.medium.container.height static const double containerHeight = 112.00; /// md.comp.app-bar.medium.title.font - static const TypescaleStruct titleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 24.00, - fontWeight: 400, - lineHeight: 32.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct titleFont = TokenTypescale.headlineSmall; } diff --git a/packages/material_ui/tool/gen_defaults/data/app_bar_medium_flexible.dart b/packages/material_ui/tool/gen_defaults/data/app_bar_medium_flexible.dart index 288559b63ade..2558735db68d 100644 --- a/packages/material_ui/tool/gen_defaults/data/app_bar_medium_flexible.dart +++ b/packages/material_ui/tool/gen_defaults/data/app_bar_medium_flexible.dart @@ -2,31 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenAppBarMediumFlexible { /// md.comp.app-bar.medium-flexible.container.height static const double containerHeight = 112.00; /// md.comp.app-bar.medium-flexible.subtitle.font - static const TypescaleStruct subtitleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct subtitleFont = TokenTypescale.labelLarge; /// md.comp.app-bar.medium-flexible.title.font - static const TypescaleStruct titleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 28.00, - fontWeight: 400, - lineHeight: 36.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct titleFont = TokenTypescale.headlineMedium; /// md.comp.app-bar.medium-flexible.with-subtitle.container.height static const double withSubtitleContainerHeight = 136.00; diff --git a/packages/material_ui/tool/gen_defaults/data/app_bar_small.dart b/packages/material_ui/tool/gen_defaults/data/app_bar_small.dart index 91c257ad00a0..ddbbcc5c0699 100644 --- a/packages/material_ui/tool/gen_defaults/data/app_bar_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/app_bar_small.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenAppBarSmall { /// md.comp.app-bar.small.container.height @@ -24,29 +24,11 @@ class TokenAppBarSmall { ); /// md.comp.app-bar.small.search.label-text.font - static const TypescaleStruct searchLabelTextFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct searchLabelTextFont = TokenTypescale.bodyLarge; /// md.comp.app-bar.small.subtitle.font - static const TypescaleStruct subtitleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct subtitleFont = TokenTypescale.labelMedium; /// md.comp.app-bar.small.title.font - static const TypescaleStruct titleFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 22.00, - fontWeight: 400, - lineHeight: 28.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct titleFont = TokenTypescale.titleLarge; } diff --git a/packages/material_ui/tool/gen_defaults/data/assist_chip.dart b/packages/material_ui/tool/gen_defaults/data/assist_chip.dart index 46ea9e677bab..89086193cc1c 100644 --- a/packages/material_ui/tool/gen_defaults/data/assist_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/assist_chip.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenAssistChip { /// md.comp.assist-chip.container.height @@ -119,13 +119,7 @@ class TokenAssistChip { static const TokenColorRole labelTextColor = TokenColorRole.onSurface; /// md.comp.assist-chip.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.assist-chip.pressed.label-text.color static const TokenColorRole pressedLabelTextColor = TokenColorRole.onSurface; diff --git a/packages/material_ui/tool/gen_defaults/data/badge.dart b/packages/material_ui/tool/gen_defaults/data/badge.dart index 3dddb2b80a89..d9e6a8b3e355 100644 --- a/packages/material_ui/tool/gen_defaults/data/badge.dart +++ b/packages/material_ui/tool/gen_defaults/data/badge.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenBadge { /// md.comp.badge.color @@ -19,13 +19,7 @@ class TokenBadge { static const TokenColorRole largeLabelTextColor = TokenColorRole.onError; /// md.comp.badge.large.label-text.type - static const TypescaleStruct largeLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 11.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct largeLabelTextType = TokenTypescale.labelSmall; /// md.comp.badge.large.shape static const ShapeStruct largeShape = ShapeStruct( diff --git a/packages/material_ui/tool/gen_defaults/data/banner.dart b/packages/material_ui/tool/gen_defaults/data/banner.dart index 81de4e9374d1..ec30fedb849c 100644 --- a/packages/material_ui/tool/gen_defaults/data/banner.dart +++ b/packages/material_ui/tool/gen_defaults/data/banner.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenBanner { /// md.comp.banner.container.color @@ -48,13 +48,7 @@ class TokenBanner { TokenColorRole.onSurfaceVariant; /// md.comp.banner.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 400, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodyMedium; /// md.comp.banner.with-image.image.shape static const ShapeStruct withImageImageShape = ShapeStruct( diff --git a/packages/material_ui/tool/gen_defaults/data/banners.dart b/packages/material_ui/tool/gen_defaults/data/banners.dart index 5030095bd31d..157a917dbe51 100644 --- a/packages/material_ui/tool/gen_defaults/data/banners.dart +++ b/packages/material_ui/tool/gen_defaults/data/banners.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/banners_basic.dart b/packages/material_ui/tool/gen_defaults/data/banners_basic.dart index a6fa2129a012..c4532929c00b 100644 --- a/packages/material_ui/tool/gen_defaults/data/banners_basic.dart +++ b/packages/material_ui/tool/gen_defaults/data/banners_basic.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenBannersBasic { /// md.comp.banners.basic.actions.between-space @@ -39,13 +39,7 @@ class TokenBannersBasic { static const double bodyTextTrailingSpace = 48.00; /// md.comp.banners.basic.body-text.type - static const TypescaleStruct bodyTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 400, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct bodyTextType = TokenTypescale.bodyMedium; /// md.comp.banners.basic.bottom-space static const double bottomSpace = 4.00; diff --git a/packages/material_ui/tool/gen_defaults/data/banners_rich.dart b/packages/material_ui/tool/gen_defaults/data/banners_rich.dart index 12af5f3d536b..1b6d6ae76d33 100644 --- a/packages/material_ui/tool/gen_defaults/data/banners_rich.dart +++ b/packages/material_ui/tool/gen_defaults/data/banners_rich.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenBannersRich { /// md.comp.banners.rich.actions.between-space @@ -39,13 +39,7 @@ class TokenBannersRich { static const double bodyTextTrailingSpace = 48.00; /// md.comp.banners.rich.body-text.type - static const TypescaleStruct bodyTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 400, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct bodyTextType = TokenTypescale.bodyMedium; /// md.comp.banners.rich.bottom-space static const double bottomSpace = 12.00; @@ -111,13 +105,8 @@ class TokenBannersRich { static const double titleTextTrailingSpace = 0.00; /// md.comp.banners.rich.title-text.type - static const TypescaleStruct titleTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct titleTextType = + TokenTypescale.emphasizedBodyMedium; /// md.comp.banners.rich.top-space static const double topSpace = 12.00; diff --git a/packages/material_ui/tool/gen_defaults/data/bottom_app_bar.dart b/packages/material_ui/tool/gen_defaults/data/bottom_app_bar.dart index 75e8ea4b7d51..16d4d65f731f 100644 --- a/packages/material_ui/tool/gen_defaults/data/bottom_app_bar.dart +++ b/packages/material_ui/tool/gen_defaults/data/bottom_app_bar.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button.dart b/packages/material_ui/tool/gen_defaults/data/button.dart index efff5a39c1a4..4b9fca7a9ced 100644 --- a/packages/material_ui/tool/gen_defaults/data/button.dart +++ b/packages/material_ui/tool/gen_defaults/data/button.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenButton { /// md.comp.button.container.color @@ -106,13 +106,7 @@ class TokenButton { static const double iconSize = 20.00; /// md.comp.button.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelText = TokenTypescale.labelLarge; /// md.comp.button.label-text.color static const TokenColorRole labelTextColor = TokenColorRole.onPrimary; diff --git a/packages/material_ui/tool/gen_defaults/data/button_elevated.dart b/packages/material_ui/tool/gen_defaults/data/button_elevated.dart index 85b03e7bbaa5..46169c1f2fd6 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_elevated.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_elevated.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_filled.dart b/packages/material_ui/tool/gen_defaults/data/button_filled.dart index c3a8ee39ed0b..01be7cdcbf43 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_filled.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_filled.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_connected_large.dart b/packages/material_ui/tool/gen_defaults/data/button_group_connected_large.dart index 9ed92b9d0267..8b8d425d9176 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_connected_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_connected_large.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_connected_medium.dart b/packages/material_ui/tool/gen_defaults/data/button_group_connected_medium.dart index a75e6a0f3170..743ba40d7ca2 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_connected_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_connected_medium.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_connected_small.dart b/packages/material_ui/tool/gen_defaults/data/button_group_connected_small.dart index 746e63845dbb..66ea649a7eb1 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_connected_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_connected_small.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_connected_xlarge.dart b/packages/material_ui/tool/gen_defaults/data/button_group_connected_xlarge.dart index 819a097c6fd6..554cc5f16cd0 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_connected_xlarge.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_connected_xlarge.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_connected_xsmall.dart b/packages/material_ui/tool/gen_defaults/data/button_group_connected_xsmall.dart index cffb515a769f..b1ab3bf5a750 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_connected_xsmall.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_connected_xsmall.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_standard_large.dart b/packages/material_ui/tool/gen_defaults/data/button_group_standard_large.dart index 53abe66b2127..1065b1a05df2 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_standard_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_standard_large.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenButtonGroupStandardLarge { /// md.comp.button-group.standard.large.between-space diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_standard_medium.dart b/packages/material_ui/tool/gen_defaults/data/button_group_standard_medium.dart index 34e01613a923..a70c9b6634ef 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_standard_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_standard_medium.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenButtonGroupStandardMedium { /// md.comp.button-group.standard.medium.between-space diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_standard_small.dart b/packages/material_ui/tool/gen_defaults/data/button_group_standard_small.dart index 776cfca20404..fa47263ac66e 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_standard_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_standard_small.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenButtonGroupStandardSmall { /// md.comp.button-group.standard.small.between-space diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_standard_xlarge.dart b/packages/material_ui/tool/gen_defaults/data/button_group_standard_xlarge.dart index 7217aa659e4e..6ad2dc9bb46f 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_standard_xlarge.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_standard_xlarge.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenButtonGroupStandardXlarge { /// md.comp.button-group.standard.xlarge.between-space diff --git a/packages/material_ui/tool/gen_defaults/data/button_group_standard_xsmall.dart b/packages/material_ui/tool/gen_defaults/data/button_group_standard_xsmall.dart index b0efd322bbe2..6d85a58e0f88 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_group_standard_xsmall.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_group_standard_xsmall.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenButtonGroupStandardXsmall { /// md.comp.button-group.standard.xsmall.between-space diff --git a/packages/material_ui/tool/gen_defaults/data/button_large.dart b/packages/material_ui/tool/gen_defaults/data/button_large.dart index 5ecebfaa1d49..3077398d0e26 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_large.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenButtonLarge { /// md.comp.button.large.container.height @@ -36,13 +36,7 @@ class TokenButtonLarge { static const double iconSize = 32.00; /// md.comp.button.large.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 24.00, - fontWeight: 400, - lineHeight: 32.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct labelText = TokenTypescale.headlineSmall; /// md.comp.button.large.leading-space static const double leadingSpace = 48.00; diff --git a/packages/material_ui/tool/gen_defaults/data/button_medium.dart b/packages/material_ui/tool/gen_defaults/data/button_medium.dart index 7982c76d5e1e..19c9c12bbe88 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_medium.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenButtonMedium { /// md.comp.button.medium.container.height @@ -36,13 +36,7 @@ class TokenButtonMedium { static const double iconSize = 24.00; /// md.comp.button.medium.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 500, - lineHeight: 24.00, - letterSpacing: 0.15, - ); + static const TypescaleStruct labelText = TokenTypescale.titleMedium; /// md.comp.button.medium.leading-space static const double leadingSpace = 24.00; diff --git a/packages/material_ui/tool/gen_defaults/data/button_outlined.dart b/packages/material_ui/tool/gen_defaults/data/button_outlined.dart index e229272dd1ce..1cd7124eae15 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_outlined.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_outlined.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_small.dart b/packages/material_ui/tool/gen_defaults/data/button_small.dart index 291a87dbc625..79a6063ee7ac 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_small.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenButtonSmall { /// md.comp.button.small.container.height @@ -36,13 +36,7 @@ class TokenButtonSmall { static const double iconSize = 20.00; /// md.comp.button.small.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelText = TokenTypescale.labelLarge; /// md.comp.button.small.leading-space static const double leadingSpace = 16.00; diff --git a/packages/material_ui/tool/gen_defaults/data/button_text.dart b/packages/material_ui/tool/gen_defaults/data/button_text.dart index 8e06c003ee95..45a382d52e6c 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_text.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_text.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_tonal.dart b/packages/material_ui/tool/gen_defaults/data/button_tonal.dart index 8e6ca7d0a33d..296ddcacbb73 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_tonal.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_tonal.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/button_xlarge.dart b/packages/material_ui/tool/gen_defaults/data/button_xlarge.dart index 2aaee0c7c7e0..986267187402 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_xlarge.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_xlarge.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenButtonXlarge { /// md.comp.button.xlarge.container.height @@ -36,13 +36,7 @@ class TokenButtonXlarge { static const double iconSize = 40.00; /// md.comp.button.xlarge.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 32.00, - fontWeight: 400, - lineHeight: 40.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct labelText = TokenTypescale.headlineLarge; /// md.comp.button.xlarge.leading-space static const double leadingSpace = 64.00; diff --git a/packages/material_ui/tool/gen_defaults/data/button_xsmall.dart b/packages/material_ui/tool/gen_defaults/data/button_xsmall.dart index 5aa44d5f4b8f..b400226aee09 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_xsmall.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_xsmall.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenButtonXsmall { /// md.comp.button.xsmall.container.height @@ -36,13 +36,7 @@ class TokenButtonXsmall { static const double iconSize = 20.00; /// md.comp.button.xsmall.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelText = TokenTypescale.labelLarge; /// md.comp.button.xsmall.leading-space static const double leadingSpace = 12.00; diff --git a/packages/material_ui/tool/gen_defaults/data/carousel_item.dart b/packages/material_ui/tool/gen_defaults/data/carousel_item.dart index c11bab18fb3a..e242320b6a8c 100644 --- a/packages/material_ui/tool/gen_defaults/data/carousel_item.dart +++ b/packages/material_ui/tool/gen_defaults/data/carousel_item.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/checkbox.dart b/packages/material_ui/tool/gen_defaults/data/checkbox.dart index 403f6f45bc72..8b5548844318 100644 --- a/packages/material_ui/tool/gen_defaults/data/checkbox.dart +++ b/packages/material_ui/tool/gen_defaults/data/checkbox.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/chips.dart b/packages/material_ui/tool/gen_defaults/data/chips.dart index ce81499e2353..62ebcb438e3f 100644 --- a/packages/material_ui/tool/gen_defaults/data/chips.dart +++ b/packages/material_ui/tool/gen_defaults/data/chips.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenChips { /// md.comp.chips.avatar.shape @@ -78,13 +78,7 @@ class TokenChips { static const double inputPaddingTrailing = 12.00; /// md.comp.chips.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelText = TokenTypescale.labelLarge; /// md.comp.chips.leading-icon.size static const double leadingIconSize = 18.00; diff --git a/packages/material_ui/tool/gen_defaults/data/color.dart b/packages/material_ui/tool/gen_defaults/data/color.dart index 4dc5fa814cd3..17483994cd82 100644 --- a/packages/material_ui/tool/gen_defaults/data/color.dart +++ b/packages/material_ui/tool/gen_defaults/data/color.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenColor { /// md.sys.color.background diff --git a/packages/material_ui/tool/gen_defaults/data/color_dark.dart b/packages/material_ui/tool/gen_defaults/data/color_dark.dart index b22f14827b4a..e7c93e4488de 100644 --- a/packages/material_ui/tool/gen_defaults/data/color_dark.dart +++ b/packages/material_ui/tool/gen_defaults/data/color_dark.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenColorDark { /// md.sys.color.background diff --git a/packages/material_ui/tool/gen_defaults/data/color_dark_high_contrast.dart b/packages/material_ui/tool/gen_defaults/data/color_dark_high_contrast.dart index 337c78555f60..fc0dec686def 100644 --- a/packages/material_ui/tool/gen_defaults/data/color_dark_high_contrast.dart +++ b/packages/material_ui/tool/gen_defaults/data/color_dark_high_contrast.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenColorDarkHighContrast { /// md.sys.color.background diff --git a/packages/material_ui/tool/gen_defaults/data/color_dark_medium_contrast.dart b/packages/material_ui/tool/gen_defaults/data/color_dark_medium_contrast.dart index 676073b34e59..f9f0512b322f 100644 --- a/packages/material_ui/tool/gen_defaults/data/color_dark_medium_contrast.dart +++ b/packages/material_ui/tool/gen_defaults/data/color_dark_medium_contrast.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenColorDarkMediumContrast { /// md.sys.color.background diff --git a/packages/material_ui/tool/gen_defaults/data/color_light_high_contrast.dart b/packages/material_ui/tool/gen_defaults/data/color_light_high_contrast.dart index 322c58d1a73d..d30eaa57dae3 100644 --- a/packages/material_ui/tool/gen_defaults/data/color_light_high_contrast.dart +++ b/packages/material_ui/tool/gen_defaults/data/color_light_high_contrast.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenColorLightHighContrast { /// md.sys.color.background diff --git a/packages/material_ui/tool/gen_defaults/data/color_light_medium_contrast.dart b/packages/material_ui/tool/gen_defaults/data/color_light_medium_contrast.dart index 82ce1c7d1092..b0d303eeafbb 100644 --- a/packages/material_ui/tool/gen_defaults/data/color_light_medium_contrast.dart +++ b/packages/material_ui/tool/gen_defaults/data/color_light_medium_contrast.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenColorLightMediumContrast { /// md.sys.color.background diff --git a/packages/material_ui/tool/gen_defaults/data/color_role.dart b/packages/material_ui/tool/gen_defaults/data/color_role.dart index ca49130e0f08..5a584b9a4173 100644 --- a/packages/material_ui/tool/gen_defaults/data/color_role.dart +++ b/packages/material_ui/tool/gen_defaults/data/color_role.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 enum TokenColorRole { /// md.sys.color.background diff --git a/packages/material_ui/tool/gen_defaults/data/data_table.dart b/packages/material_ui/tool/gen_defaults/data/data_table.dart index 075a3311b9c5..a7d1c687256f 100644 --- a/packages/material_ui/tool/gen_defaults/data/data_table.dart +++ b/packages/material_ui/tool/gen_defaults/data/data_table.dart @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; class TokenDataTable { /// md.comp.data-table.container.shape @@ -27,6 +28,26 @@ class TokenDataTable { static const TokenColorRole footerSupportingTextColor = TokenColorRole.onSurfaceVariant; + /// md.comp.data-table.footer.supporting-text.font + static const String footerSupportingTextFont = + TokenTypescale.bodyMedium.fontFamily; + + /// md.comp.data-table.footer.supporting-text.line-height + static const double footerSupportingTextLineHeight = + TokenTypescale.bodyMedium.lineHeight; + + /// md.comp.data-table.footer.supporting-text.size + static const double footerSupportingTextSize = + TokenTypescale.bodyMedium.fontSize; + + /// md.comp.data-table.footer.supporting-text.tracking + static const double footerSupportingTextTracking = + TokenTypescale.bodyMedium.letterSpacing; + + /// md.comp.data-table.footer.supporting-text.weight + static const double footerSupportingTextWeight = + TokenTypescale.bodyMedium.fontWeight; + /// md.comp.data-table.header.container.color static const TokenColorRole headerContainerColor = TokenColorRole.surface; @@ -37,6 +58,24 @@ class TokenDataTable { static const TokenColorRole headerHeadlineColor = TokenColorRole.onSurfaceVariant; + /// md.comp.data-table.header.headline.font + static const String headerHeadlineFont = TokenTypescale.titleSmall.fontFamily; + + /// md.comp.data-table.header.headline.line-height + static const double headerHeadlineLineHeight = + TokenTypescale.titleSmall.lineHeight; + + /// md.comp.data-table.header.headline.size + static const double headerHeadlineSize = TokenTypescale.titleSmall.fontSize; + + /// md.comp.data-table.header.headline.tracking + static const double headerHeadlineTracking = + TokenTypescale.titleSmall.letterSpacing; + + /// md.comp.data-table.header.headline.weight + static const double headerHeadlineWeight = + TokenTypescale.titleSmall.fontWeight; + /// md.comp.data-table.header.hover.headline.color static const TokenColorRole headerHoverHeadlineColor = TokenColorRole.onSurface; @@ -64,6 +103,25 @@ class TokenDataTable { /// md.comp.data-table.row-item.label-text.color static const TokenColorRole rowItemLabelTextColor = TokenColorRole.onSurface; + /// md.comp.data-table.row-item.label-text.font + static const String rowItemLabelTextFont = + TokenTypescale.bodyMedium.fontFamily; + + /// md.comp.data-table.row-item.label-text.line-height + static const double rowItemLabelTextLineHeight = + TokenTypescale.bodyMedium.lineHeight; + + /// md.comp.data-table.row-item.label-text.size + static const double rowItemLabelTextSize = TokenTypescale.bodyMedium.fontSize; + + /// md.comp.data-table.row-item.label-text.tracking + static const double rowItemLabelTextTracking = + TokenTypescale.bodyMedium.letterSpacing; + + /// md.comp.data-table.row-item.label-text.weight + static const double rowItemLabelTextWeight = + TokenTypescale.bodyMedium.fontWeight; + /// md.comp.data-table.row-item.outline.color static const TokenColorRole rowItemOutlineColor = TokenColorRole.outlineVariant; diff --git a/packages/material_ui/tool/gen_defaults/data/date_input_modal.dart b/packages/material_ui/tool/gen_defaults/data/date_input_modal.dart index f546524685ad..c7544047c95c 100644 --- a/packages/material_ui/tool/gen_defaults/data/date_input_modal.dart +++ b/packages/material_ui/tool/gen_defaults/data/date_input_modal.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenDateInputModal { /// md.comp.date-input.modal.container.color @@ -42,24 +42,14 @@ class TokenDateInputModal { TokenColorRole.onSurfaceVariant; /// md.comp.date-input.modal.header.headline.type - static const TypescaleStruct headerHeadlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 32.00, - fontWeight: 400, - lineHeight: 40.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct headerHeadlineType = + TokenTypescale.headlineLarge; /// md.comp.date-input.modal.header.supporting-text.color static const TokenColorRole headerSupportingTextColor = TokenColorRole.onSurfaceVariant; /// md.comp.date-input.modal.header.supporting-text.type - static const TypescaleStruct headerSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct headerSupportingTextType = + TokenTypescale.labelLarge; } diff --git a/packages/material_ui/tool/gen_defaults/data/date_picker_docked.dart b/packages/material_ui/tool/gen_defaults/data/date_picker_docked.dart index 320859823449..74f25e49d516 100644 --- a/packages/material_ui/tool/gen_defaults/data/date_picker_docked.dart +++ b/packages/material_ui/tool/gen_defaults/data/date_picker_docked.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenDatePickerDocked { /// md.comp.date-picker.docked.container.color @@ -53,13 +53,7 @@ class TokenDatePickerDocked { static const double dateHoverStateLayerOpacity = 0.08; /// md.comp.date-picker.docked.date.label-text.type - static const TypescaleStruct dateLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct dateLabelTextType = TokenTypescale.bodyLarge; /// md.comp.date-picker.docked.date.pressed.state-layer.opacity static const double datePressedStateLayerOpacity = 0.10; @@ -215,13 +209,8 @@ class TokenDatePickerDocked { TokenColorRole.onSurfaceVariant; /// md.comp.date-picker.docked.menu-button.label-text.type - static const TypescaleStruct menuButtonLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct menuButtonLabelTextType = + TokenTypescale.labelLarge; /// md.comp.date-picker.docked.menu-button.pressed.icon.color static const TokenColorRole menuButtonPressedIconColor = @@ -268,13 +257,8 @@ class TokenDatePickerDocked { TokenColorRole.onSurface; /// md.comp.date-picker.docked.menu.list-item.label-text.type - static const TypescaleStruct menuListItemLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct menuListItemLabelTextType = + TokenTypescale.bodyLarge; /// md.comp.date-picker.docked.menu.list-item.pressed.label-text.color static const TokenColorRole menuListItemPressedLabelTextColor = @@ -314,11 +298,5 @@ class TokenDatePickerDocked { static const TokenColorRole weekdaysLabelTextColor = TokenColorRole.onSurface; /// md.comp.date-picker.docked.weekdays.label-text.type - static const TypescaleStruct weekdaysLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct weekdaysLabelTextType = TokenTypescale.bodyLarge; } diff --git a/packages/material_ui/tool/gen_defaults/data/date_picker_modal.dart b/packages/material_ui/tool/gen_defaults/data/date_picker_modal.dart index b850820ec7b8..86d3d3caf3d5 100644 --- a/packages/material_ui/tool/gen_defaults/data/date_picker_modal.dart +++ b/packages/material_ui/tool/gen_defaults/data/date_picker_modal.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenDatePickerModal { /// md.comp.date-picker.modal.container.color @@ -53,13 +53,7 @@ class TokenDatePickerModal { static const double dateHoverStateLayerOpacity = 0.08; /// md.comp.date-picker.modal.date.label-text.type - static const TypescaleStruct dateLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct dateLabelTextType = TokenTypescale.bodyLarge; /// md.comp.date-picker.modal.date.pressed.state-layer.opacity static const double datePressedStateLayerOpacity = 0.10; @@ -148,26 +142,16 @@ class TokenDatePickerModal { TokenColorRole.onSurfaceVariant; /// md.comp.date-picker.modal.header.headline.type - static const TypescaleStruct headerHeadlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 32.00, - fontWeight: 400, - lineHeight: 40.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct headerHeadlineType = + TokenTypescale.headlineLarge; /// md.comp.date-picker.modal.header.supporting-text.color static const TokenColorRole headerSupportingTextColor = TokenColorRole.onSurfaceVariant; /// md.comp.date-picker.modal.header.supporting-text.type - static const TypescaleStruct headerSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct headerSupportingTextType = + TokenTypescale.labelLarge; /// md.comp.date-picker.modal.range-selection.active-indicator.container.color static const TokenColorRole rangeSelectionActiveIndicatorContainerColor = @@ -228,38 +212,21 @@ class TokenDatePickerModal { /// md.comp.date-picker.modal.range-selection.header.headline.type static const TypescaleStruct rangeSelectionHeaderHeadlineType = - TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 22.00, - fontWeight: 400, - lineHeight: 28.00, - letterSpacing: 0.00, - ); + TokenTypescale.titleLarge; /// md.comp.date-picker.modal.range-selection.month.subhead.color static const TokenColorRole rangeSelectionMonthSubheadColor = TokenColorRole.onSurfaceVariant; /// md.comp.date-picker.modal.range-selection.month.subhead.type - static const TypescaleStruct rangeSelectionMonthSubheadType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct rangeSelectionMonthSubheadType = + TokenTypescale.titleSmall; /// md.comp.date-picker.modal.weekdays.label-text.color static const TokenColorRole weekdaysLabelTextColor = TokenColorRole.onSurface; /// md.comp.date-picker.modal.weekdays.label-text.type - static const TypescaleStruct weekdaysLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct weekdaysLabelTextType = TokenTypescale.bodyLarge; /// md.comp.date-picker.modal.year-selection.year.container.height static const double yearSelectionYearContainerHeight = 36.00; @@ -274,13 +241,8 @@ class TokenDatePickerModal { static const double yearSelectionYearHoverStateLayerOpacity = 0.08; /// md.comp.date-picker.modal.year-selection.year.label-text.type - static const TypescaleStruct yearSelectionYearLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct yearSelectionYearLabelTextType = + TokenTypescale.bodyLarge; /// md.comp.date-picker.modal.year-selection.year.pressed.state-layer.opacity static const double yearSelectionYearPressedStateLayerOpacity = 0.10; diff --git a/packages/material_ui/tool/gen_defaults/data/dialog.dart b/packages/material_ui/tool/gen_defaults/data/dialog.dart index cc006c1d8bfa..4219942c8d71 100644 --- a/packages/material_ui/tool/gen_defaults/data/dialog.dart +++ b/packages/material_ui/tool/gen_defaults/data/dialog.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenDialog { /// md.comp.dialog.action.focus.label-text.color @@ -35,13 +35,7 @@ class TokenDialog { static const TokenColorRole actionLabelTextColor = TokenColorRole.primary; /// md.comp.dialog.action.label-text.type - static const TypescaleStruct actionLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct actionLabelTextType = TokenTypescale.labelLarge; /// md.comp.dialog.action.pressed.label-text.color static const TokenColorRole actionPressedLabelTextColor = @@ -74,26 +68,14 @@ class TokenDialog { static const TokenColorRole headlineColor = TokenColorRole.onSurface; /// md.comp.dialog.headline.type - static const TypescaleStruct headlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 24.00, - fontWeight: 400, - lineHeight: 32.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct headlineType = TokenTypescale.headlineSmall; /// md.comp.dialog.supporting-text.color static const TokenColorRole supportingTextColor = TokenColorRole.onSurfaceVariant; /// md.comp.dialog.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 400, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodyMedium; /// md.comp.dialog.with-icon.icon.color static const TokenColorRole withIconIconColor = TokenColorRole.secondary; diff --git a/packages/material_ui/tool/gen_defaults/data/divider.dart b/packages/material_ui/tool/gen_defaults/data/divider.dart index 4603f760138c..719a0227b979 100644 --- a/packages/material_ui/tool/gen_defaults/data/divider.dart +++ b/packages/material_ui/tool/gen_defaults/data/divider.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/drag_handle.dart b/packages/material_ui/tool/gen_defaults/data/drag_handle.dart index e748fe69f6e2..783de36cdddb 100644 --- a/packages/material_ui/tool/gen_defaults/data/drag_handle.dart +++ b/packages/material_ui/tool/gen_defaults/data/drag_handle.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/elevated_card.dart b/packages/material_ui/tool/gen_defaults/data/elevated_card.dart index 3b1c4ecd68fb..00054de268ac 100644 --- a/packages/material_ui/tool/gen_defaults/data/elevated_card.dart +++ b/packages/material_ui/tool/gen_defaults/data/elevated_card.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/elevation.dart b/packages/material_ui/tool/gen_defaults/data/elevation.dart index b24b2e9369ae..147517804c1b 100644 --- a/packages/material_ui/tool/gen_defaults/data/elevation.dart +++ b/packages/material_ui/tool/gen_defaults/data/elevation.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenElevation { /// md.sys.elevation.level0 diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab.dart index 3e176ab537f7..fb02ac1b13ea 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenExtendedFab { /// md.comp.extended-fab.container.height @@ -27,13 +27,7 @@ class TokenExtendedFab { static const double iconSize = 24.00; /// md.comp.extended-fab.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelText = TokenTypescale.labelLarge; /// md.comp.extended-fab.leading-space static const double leadingSpace = 16.00; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_large.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_large.dart index 6108fc093b35..ee262b89962e 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_large.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenExtendedFabLarge { /// md.comp.extended-fab.large.container.height @@ -27,13 +27,7 @@ class TokenExtendedFabLarge { static const double iconSize = 36.00; /// md.comp.extended-fab.large.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 24.00, - fontWeight: 400, - lineHeight: 32.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct labelText = TokenTypescale.headlineSmall; /// md.comp.extended-fab.large.leading-space static const double leadingSpace = 28.00; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_medium.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_medium.dart index e45e30775ad7..6369e970945c 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_medium.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenExtendedFabMedium { /// md.comp.extended-fab.medium.container.height @@ -27,13 +27,7 @@ class TokenExtendedFabMedium { static const double iconSize = 28.00; /// md.comp.extended-fab.medium.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 22.00, - fontWeight: 400, - lineHeight: 28.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct labelText = TokenTypescale.titleLarge; /// md.comp.extended-fab.medium.leading-space static const double leadingSpace = 26.00; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_primary.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_primary.dart index cc7e634ff8bb..48e882d923c2 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_primary.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_primary.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_primary_container.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_primary_container.dart index bbc633ab3d79..ed07ade54c00 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_primary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_primary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary.dart index 654e626f751b..d573058ac372 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary_container.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary_container.dart index d33de9590da2..b2458bfdb112 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_secondary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_small.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_small.dart index d80ac08b9bed..ea176f2a92ad 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_small.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenExtendedFabSmall { /// md.comp.extended-fab.small.container.height @@ -27,13 +27,7 @@ class TokenExtendedFabSmall { static const double iconSize = 24.00; /// md.comp.extended-fab.small.label-text - static const TypescaleStruct labelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 500, - lineHeight: 24.00, - letterSpacing: 0.15, - ); + static const TypescaleStruct labelText = TokenTypescale.titleMedium; /// md.comp.extended-fab.small.leading-space static const double leadingSpace = 16.00; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_surface.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_surface.dart index 712c2033dea0..bfffd999f2f9 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_surface.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_surface.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenExtendedFabSurface { /// md.comp.extended-fab.surface.container.color @@ -80,13 +80,7 @@ class TokenExtendedFabSurface { static const TokenColorRole labelTextColor = TokenColorRole.primary; /// md.comp.extended-fab.surface.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.extended-fab.surface.lowered.container.color static const TokenColorRole loweredContainerColor = diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary.dart index ed740ee8b19f..9c42758a95f9 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary_container.dart b/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary_container.dart index 4a342a21a2d9..f4cb48e96eb9 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab_tertiary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab.dart b/packages/material_ui/tool/gen_defaults/data/fab.dart index 9a4503d48963..54b5afee7570 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_large.dart b/packages/material_ui/tool/gen_defaults/data/fab_large.dart index 01f319748bbb..8139c432bc1d 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_large.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_medium.dart b/packages/material_ui/tool/gen_defaults/data/fab_medium.dart index 5325532e2a42..53125035e6f0 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_medium.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_menu.dart b/packages/material_ui/tool/gen_defaults/data/fab_menu.dart index 65beac495882..e4b2bb059b85 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu.dart @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenFabMenu { /// md.comp.fab-menu.close-button.between-space @@ -57,13 +57,7 @@ class TokenFabMenu { static const double menuItemIconSize = 24.00; /// md.comp.fab-menu.menu-item.label-text - static const TypescaleStruct menuItemLabelText = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 500, - lineHeight: 24.00, - letterSpacing: 0.15, - ); + static const TypescaleStruct menuItemLabelText = TokenTypescale.titleMedium; /// md.comp.fab-menu.menu-item.leading-space static const double menuItemLeadingSpace = 24.00; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_close_button.dart b/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_close_button.dart index 9c0772e240af..95a6c4917d9d 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_close_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_close_button.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_container.dart b/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_container.dart index 98332d420cec..7fded1653af1 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu_primary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_close_button.dart b/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_close_button.dart index a9fe789f6100..fb3cce7de326 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_close_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_close_button.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_container.dart b/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_container.dart index 4abbe4195a56..d2d6f51fedff 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu_secondary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_close_button.dart b/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_close_button.dart index 414711ae72cd..063c576b886d 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_close_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_close_button.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_container.dart b/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_container.dart index 136e93c1f430..02bd864f4077 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu_tertiary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_primary.dart b/packages/material_ui/tool/gen_defaults/data/fab_primary.dart index 9813c4f1682b..9a9fe26c2779 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_primary.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_primary.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_primary_container.dart b/packages/material_ui/tool/gen_defaults/data/fab_primary_container.dart index e47bbca543cc..8b225edfdf0d 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_primary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_primary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_secondary.dart b/packages/material_ui/tool/gen_defaults/data/fab_secondary.dart index c92e77eb872d..129c3a8c3886 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_secondary.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_secondary.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_secondary_container.dart b/packages/material_ui/tool/gen_defaults/data/fab_secondary_container.dart index 9bf288b35ede..7a39e57e3191 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_secondary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_secondary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_small.dart b/packages/material_ui/tool/gen_defaults/data/fab_small.dart index bfb04be9be61..5360df941758 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_small.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_surface.dart b/packages/material_ui/tool/gen_defaults/data/fab_surface.dart index 9f90c9320f85..b903cfeb58ad 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_surface.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_surface.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_tertiary.dart b/packages/material_ui/tool/gen_defaults/data/fab_tertiary.dart index 304eb2ab2a48..e38f13ee4b31 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_tertiary.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_tertiary.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/fab_tertiary_container.dart b/packages/material_ui/tool/gen_defaults/data/fab_tertiary_container.dart index c6da0c0ead5a..9d212549d50c 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_tertiary_container.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_tertiary_container.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/filled_autocomplete.dart b/packages/material_ui/tool/gen_defaults/data/filled_autocomplete.dart index 520c4fa3dfd5..33c7f3cd5447 100644 --- a/packages/material_ui/tool/gen_defaults/data/filled_autocomplete.dart +++ b/packages/material_ui/tool/gen_defaults/data/filled_autocomplete.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenFilledAutocomplete { /// md.comp.filled-autocomplete.menu.cascading-menu-indicator.icon.color @@ -259,26 +259,24 @@ class TokenFilledAutocomplete { TokenColorRole.onSurface; /// md.comp.filled-autocomplete.text-field.input-text.type - static const TypescaleStruct textFieldInputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldInputTextType = + TokenTypescale.bodyLarge; /// md.comp.filled-autocomplete.text-field.label-text.color static const TokenColorRole textFieldLabelTextColor = TokenColorRole.onSurfaceVariant; + /// md.comp.filled-autocomplete.text-field.label-text.populated.line-height + static const double textFieldLabelTextPopulatedLineHeight = + TokenTypescale.bodySmall.lineHeight; + + /// md.comp.filled-autocomplete.text-field.label-text.populated.size + static const double textFieldLabelTextPopulatedSize = + TokenTypescale.bodySmall.fontSize; + /// md.comp.filled-autocomplete.text-field.label-text.type - static const TypescaleStruct textFieldLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldLabelTextType = + TokenTypescale.bodyLarge; /// md.comp.filled-autocomplete.text-field.leading-icon.color static const TokenColorRole textFieldLeadingIconColor = @@ -292,13 +290,8 @@ class TokenFilledAutocomplete { TokenColorRole.onSurfaceVariant; /// md.comp.filled-autocomplete.text-field.supporting-text.type - static const TypescaleStruct textFieldSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + static const TypescaleStruct textFieldSupportingTextType = + TokenTypescale.bodySmall; /// md.comp.filled-autocomplete.text-field.trailing-icon.color static const TokenColorRole textFieldTrailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/filled_card.dart b/packages/material_ui/tool/gen_defaults/data/filled_card.dart index 234e4b8b1934..bfa3c7a61ec8 100644 --- a/packages/material_ui/tool/gen_defaults/data/filled_card.dart +++ b/packages/material_ui/tool/gen_defaults/data/filled_card.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/filled_menu_button.dart b/packages/material_ui/tool/gen_defaults/data/filled_menu_button.dart index 3813f0b7667f..c33dcb1a1ec5 100644 --- a/packages/material_ui/tool/gen_defaults/data/filled_menu_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/filled_menu_button.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenFilledMenuButton { /// md.comp.filled-menu-button.container.color @@ -83,13 +83,7 @@ class TokenFilledMenuButton { static const TokenColorRole labelTextColor = TokenColorRole.onPrimary; /// md.comp.filled-menu-button.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.filled-menu-button.pressed.label-text.color static const TokenColorRole pressedLabelTextColor = TokenColorRole.onPrimary; diff --git a/packages/material_ui/tool/gen_defaults/data/filled_select.dart b/packages/material_ui/tool/gen_defaults/data/filled_select.dart index edb99729f8e6..9ed2ea33ddbc 100644 --- a/packages/material_ui/tool/gen_defaults/data/filled_select.dart +++ b/packages/material_ui/tool/gen_defaults/data/filled_select.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenFilledSelect { /// md.comp.filled-select.menu.cascading-menu-indicator.icon.color @@ -49,13 +49,8 @@ class TokenFilledSelect { TokenColorRole.onSurface; /// md.comp.filled-select.menu.list-item.label-text.type - static const TypescaleStruct menuListItemLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct menuListItemLabelTextType = + TokenTypescale.labelLarge; /// md.comp.filled-select.menu.list-item.selected.container.color static const TokenColorRole menuListItemSelectedContainerColor = @@ -292,26 +287,24 @@ class TokenFilledSelect { TokenColorRole.onSurface; /// md.comp.filled-select.text-field.input-text.type - static const TypescaleStruct textFieldInputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldInputTextType = + TokenTypescale.bodyLarge; /// md.comp.filled-select.text-field.label-text.color static const TokenColorRole textFieldLabelTextColor = TokenColorRole.onSurfaceVariant; + /// md.comp.filled-select.text-field.label-text.populated.line-height + static const double textFieldLabelTextPopulatedLineHeight = + TokenTypescale.bodySmall.lineHeight; + + /// md.comp.filled-select.text-field.label-text.populated.size + static const double textFieldLabelTextPopulatedSize = + TokenTypescale.bodySmall.fontSize; + /// md.comp.filled-select.text-field.label-text.type - static const TypescaleStruct textFieldLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldLabelTextType = + TokenTypescale.bodyLarge; /// md.comp.filled-select.text-field.leading-icon.color static const TokenColorRole textFieldLeadingIconColor = @@ -325,13 +318,8 @@ class TokenFilledSelect { TokenColorRole.onSurfaceVariant; /// md.comp.filled-select.text-field.supporting-text.type - static const TypescaleStruct textFieldSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + static const TypescaleStruct textFieldSupportingTextType = + TokenTypescale.bodySmall; /// md.comp.filled-select.text-field.trailing-icon.color static const TokenColorRole textFieldTrailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/filled_text_field.dart b/packages/material_ui/tool/gen_defaults/data/filled_text_field.dart index 27c15a9b22ec..f0a672843bcb 100644 --- a/packages/material_ui/tool/gen_defaults/data/filled_text_field.dart +++ b/packages/material_ui/tool/gen_defaults/data/filled_text_field.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenFilledTextField { /// md.comp.filled-text-field.active-indicator.color @@ -233,25 +233,21 @@ class TokenFilledTextField { TokenColorRole.onSurfaceVariant; /// md.comp.filled-text-field.input-text.type - static const TypescaleStruct inputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct inputTextType = TokenTypescale.bodyLarge; /// md.comp.filled-text-field.label-text.color static const TokenColorRole labelTextColor = TokenColorRole.onSurfaceVariant; + /// md.comp.filled-text-field.label-text.populated.line-height + static const double labelTextPopulatedLineHeight = + TokenTypescale.bodySmall.lineHeight; + + /// md.comp.filled-text-field.label-text.populated.size + static const double labelTextPopulatedSize = + TokenTypescale.bodySmall.fontSize; + /// md.comp.filled-text-field.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct labelTextType = TokenTypescale.bodyLarge; /// md.comp.filled-text-field.leading-icon.color static const TokenColorRole leadingIconColor = @@ -265,13 +261,7 @@ class TokenFilledTextField { TokenColorRole.onSurfaceVariant; /// md.comp.filled-text-field.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodySmall; /// md.comp.filled-text-field.trailing-icon.color static const TokenColorRole trailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/filter_chip.dart b/packages/material_ui/tool/gen_defaults/data/filter_chip.dart index 70178c722343..4d605f99dea5 100644 --- a/packages/material_ui/tool/gen_defaults/data/filter_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/filter_chip.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenFilterChip { /// md.comp.filter-chip.container.height @@ -127,13 +127,7 @@ class TokenFilterChip { static const double focusIndicatorThickness = 3.00; /// md.comp.filter-chip.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.filter-chip.selected.dragged.label-text.color static const TokenColorRole selectedDraggedLabelTextColor = diff --git a/packages/material_ui/tool/gen_defaults/data/full_screen_dialog.dart b/packages/material_ui/tool/gen_defaults/data/full_screen_dialog.dart index d0c6eca56900..589595dbb2df 100644 --- a/packages/material_ui/tool/gen_defaults/data/full_screen_dialog.dart +++ b/packages/material_ui/tool/gen_defaults/data/full_screen_dialog.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenFullScreenDialog { /// md.comp.full-screen-dialog.container.color @@ -51,13 +51,8 @@ class TokenFullScreenDialog { TokenColorRole.primary; /// md.comp.full-screen-dialog.header.action.label-text.type - static const TypescaleStruct headerActionLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct headerActionLabelTextType = + TokenTypescale.labelLarge; /// md.comp.full-screen-dialog.header.action.pressed.label-text.color static const TokenColorRole headerActionPressedLabelTextColor = @@ -83,13 +78,7 @@ class TokenFullScreenDialog { static const TokenColorRole headerHeadlineColor = TokenColorRole.onSurface; /// md.comp.full-screen-dialog.header.headline.type - static const TypescaleStruct headerHeadlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 22.00, - fontWeight: 400, - lineHeight: 28.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct headerHeadlineType = TokenTypescale.titleLarge; /// md.comp.full-screen-dialog.header.icon.color static const TokenColorRole headerIconColor = TokenColorRole.onSurface; diff --git a/packages/material_ui/tool/gen_defaults/data/glass_button.dart b/packages/material_ui/tool/gen_defaults/data/glass_button.dart index cc8abaaadbe4..c043ede6ee7d 100644 --- a/packages/material_ui/tool/gen_defaults/data/glass_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/glass_button.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/glass_icon_button.dart b/packages/material_ui/tool/gen_defaults/data/glass_icon_button.dart index e29f29521fae..2109ea4f329b 100644 --- a/packages/material_ui/tool/gen_defaults/data/glass_icon_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/glass_icon_button.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button.dart b/packages/material_ui/tool/gen_defaults/data/icon_button.dart index 2f8778d2e4c0..4fd26b233eee 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_filled.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_filled.dart index 1e2436f8d431..30bbb9823b67 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_filled.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_filled.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_large.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_large.dart index de87ffc30367..6d20a75f2d30 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_large.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_medium.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_medium.dart index 2383dcfd0ef2..025d1819d960 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_medium.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_outlined.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_outlined.dart index 37d216ba7d9d..85738164f566 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_outlined.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_outlined.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_small.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_small.dart index 31857815a938..94efabdf0e77 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_small.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_standard.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_standard.dart index b08f2bb25b9a..cdd7a9240f95 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_standard.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_standard.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_tonal.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_tonal.dart index 6ed1c064960a..65f624d262b9 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_tonal.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_tonal.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_xlarge.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_xlarge.dart index bc2b7face1d0..95d4ceda122e 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_xlarge.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_xlarge.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/icon_button_xsmall.dart b/packages/material_ui/tool/gen_defaults/data/icon_button_xsmall.dart index 7102e2444fc9..aaaf746dcdb8 100644 --- a/packages/material_ui/tool/gen_defaults/data/icon_button_xsmall.dart +++ b/packages/material_ui/tool/gen_defaults/data/icon_button_xsmall.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/input_chip.dart b/packages/material_ui/tool/gen_defaults/data/input_chip.dart index b34cd52bc6b7..e92335f4bd7e 100644 --- a/packages/material_ui/tool/gen_defaults/data/input_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/input_chip.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenInputChip { /// md.comp.input-chip.container.elevation @@ -57,13 +57,7 @@ class TokenInputChip { static const double focusIndicatorThickness = 3.00; /// md.comp.input-chip.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.input-chip.selected.container.color static const TokenColorRole selectedContainerColor = diff --git a/packages/material_ui/tool/gen_defaults/data/list.dart b/packages/material_ui/tool/gen_defaults/data/list.dart index 0f1e8386e420..559002b0a2f8 100644 --- a/packages/material_ui/tool/gen_defaults/data/list.dart +++ b/packages/material_ui/tool/gen_defaults/data/list.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenList { /// md.comp.list.container.shape @@ -215,13 +215,7 @@ class TokenList { static const TokenColorRole listItemLabelTextColor = TokenColorRole.onSurface; /// md.comp.list.list-item.label-text.type - static const TypescaleStruct listItemLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct listItemLabelTextType = TokenTypescale.bodyLarge; /// md.comp.list.list-item.large.leading-video.height static const double listItemLargeLeadingVideoHeight = 64.00; @@ -238,13 +232,8 @@ class TokenList { TokenColorRole.onPrimaryContainer; /// md.comp.list.list-item.leading-avatar-label.type - static const TypescaleStruct listItemLeadingAvatarLabelType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 500, - lineHeight: 24.00, - letterSpacing: 0.15, - ); + static const TypescaleStruct listItemLeadingAvatarLabelType = + TokenTypescale.titleMedium; /// md.comp.list.list-item.leading-avatar.shape static const ShapeStruct listItemLeadingAvatarShape = ShapeStruct( @@ -315,13 +304,7 @@ class TokenList { TokenColorRole.onSurfaceVariant; /// md.comp.list.list-item.overline.type - static const TypescaleStruct listItemOverlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 11.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct listItemOverlineType = TokenTypescale.labelSmall; /// md.comp.list.list-item.pressed.container.expressive.shape static const ShapeStruct listItemPressedContainerExpressiveShape = @@ -598,13 +581,8 @@ class TokenList { TokenColorRole.onSurfaceVariant; /// md.comp.list.list-item.supporting-text.type - static const TypescaleStruct listItemSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 400, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct listItemSupportingTextType = + TokenTypescale.bodyMedium; /// md.comp.list.list-item.three-line.container.height static const double listItemThreeLineContainerHeight = 88.00; @@ -631,13 +609,7 @@ class TokenList { /// md.comp.list.list-item.trailing-supporting-text.type static const TypescaleStruct listItemTrailingSupportingTextType = - TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 11.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + TokenTypescale.labelSmall; /// md.comp.list.list-item.two-line.container.height static const double listItemTwoLineContainerHeight = 72.00; diff --git a/packages/material_ui/tool/gen_defaults/data/list_expand.dart b/packages/material_ui/tool/gen_defaults/data/list_expand.dart index 32822b7ff742..66fe751eedc5 100644 --- a/packages/material_ui/tool/gen_defaults/data/list_expand.dart +++ b/packages/material_ui/tool/gen_defaults/data/list_expand.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/list_reorder.dart b/packages/material_ui/tool/gen_defaults/data/list_reorder.dart index ab6c6a2cdf69..4bb0774745a4 100644 --- a/packages/material_ui/tool/gen_defaults/data/list_reorder.dart +++ b/packages/material_ui/tool/gen_defaults/data/list_reorder.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/list_reveal.dart b/packages/material_ui/tool/gen_defaults/data/list_reveal.dart index 77e708e0a677..cadebb252978 100644 --- a/packages/material_ui/tool/gen_defaults/data/list_reveal.dart +++ b/packages/material_ui/tool/gen_defaults/data/list_reveal.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/loading_indicator.dart b/packages/material_ui/tool/gen_defaults/data/loading_indicator.dart index 58936d66a748..fed949e21790 100644 --- a/packages/material_ui/tool/gen_defaults/data/loading_indicator.dart +++ b/packages/material_ui/tool/gen_defaults/data/loading_indicator.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/measurement.dart b/packages/material_ui/tool/gen_defaults/data/measurement.dart index 7db2d54992c6..cde9df74c99c 100644 --- a/packages/material_ui/tool/gen_defaults/data/measurement.dart +++ b/packages/material_ui/tool/gen_defaults/data/measurement.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenMeasurement { /// md.sys.measurement.space0 diff --git a/packages/material_ui/tool/gen_defaults/data/menu.dart b/packages/material_ui/tool/gen_defaults/data/menu.dart index 2dbe840cde73..b75554d13ca1 100644 --- a/packages/material_ui/tool/gen_defaults/data/menu.dart +++ b/packages/material_ui/tool/gen_defaults/data/menu.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/menus.dart b/packages/material_ui/tool/gen_defaults/data/menus.dart index 3b8835eb7265..9a175e65f644 100644 --- a/packages/material_ui/tool/gen_defaults/data/menus.dart +++ b/packages/material_ui/tool/gen_defaults/data/menus.dart @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; class TokenMenus { /// md.comp.menus.active.container.shape @@ -200,6 +201,26 @@ class TokenMenus { /// md.comp.menus.menu-item.height static const double menuItemHeight = 44.00; + /// md.comp.menus.menu-item.label-text.font + static const String menuItemLabelTextFont = + TokenTypescale.labelLarge.fontFamily; + + /// md.comp.menus.menu-item.label-text.line-height + static const double menuItemLabelTextLineHeight = + TokenTypescale.labelLarge.lineHeight; + + /// md.comp.menus.menu-item.label-text.size + static const double menuItemLabelTextSize = + TokenTypescale.labelLarge.fontSize; + + /// md.comp.menus.menu-item.label-text.tracking + static const double menuItemLabelTextTracking = + TokenTypescale.labelLarge.letterSpacing; + + /// md.comp.menus.menu-item.label-text.weight + static const double menuItemLabelTextWeight = + TokenTypescale.labelLarge.fontWeight; + /// md.comp.menus.menu-item.last-child.inner-corner.corner-size static const ShapeStruct menuItemLastChildInnerCornerCornerSize = ShapeStruct( family: 'SHAPE_FAMILY_ROUNDED_CORNERS', @@ -242,6 +263,26 @@ class TokenMenus { bottomRight: 4.00, ); + /// md.comp.menus.menu-item.supporting-text.font + static const String menuItemSupportingTextFont = + TokenTypescale.bodySmall.fontFamily; + + /// md.comp.menus.menu-item.supporting-text.line-height + static const double menuItemSupportingTextLineHeight = + TokenTypescale.bodySmall.lineHeight; + + /// md.comp.menus.menu-item.supporting-text.size + static const double menuItemSupportingTextSize = + TokenTypescale.bodySmall.fontSize; + + /// md.comp.menus.menu-item.supporting-text.tracking + static const double menuItemSupportingTextTracking = + TokenTypescale.bodySmall.letterSpacing; + + /// md.comp.menus.menu-item.supporting-text.weight + static const double menuItemSupportingTextWeight = + TokenTypescale.bodySmall.fontWeight; + /// md.comp.menus.menu-item.top-space static const double menuItemTopSpace = 8.00; @@ -250,4 +291,24 @@ class TokenMenus { /// md.comp.menus.menu-item.trailing-space static const double menuItemTrailingSpace = 16.00; + + /// md.comp.menus.menu-item.trailing-supporting-text.font + static const String menuItemTrailingSupportingTextFont = + TokenTypescale.labelLarge.fontFamily; + + /// md.comp.menus.menu-item.trailing-supporting-text.line-height + static const double menuItemTrailingSupportingTextLineHeight = + TokenTypescale.labelLarge.lineHeight; + + /// md.comp.menus.menu-item.trailing-supporting-text.size + static const double menuItemTrailingSupportingTextSize = + TokenTypescale.labelLarge.fontSize; + + /// md.comp.menus.menu-item.trailing-supporting-text.tracking + static const double menuItemTrailingSupportingTextTracking = + TokenTypescale.labelLarge.letterSpacing; + + /// md.comp.menus.menu-item.trailing-supporting-text.weight + static const double menuItemTrailingSupportingTextWeight = + TokenTypescale.labelLarge.fontWeight; } diff --git a/packages/material_ui/tool/gen_defaults/data/menus_standard.dart b/packages/material_ui/tool/gen_defaults/data/menus_standard.dart index 2339e10f102f..8a711846166e 100644 --- a/packages/material_ui/tool/gen_defaults/data/menus_standard.dart +++ b/packages/material_ui/tool/gen_defaults/data/menus_standard.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/menus_vibrant.dart b/packages/material_ui/tool/gen_defaults/data/menus_vibrant.dart index ec40f1c47192..428602fda677 100644 --- a/packages/material_ui/tool/gen_defaults/data/menus_vibrant.dart +++ b/packages/material_ui/tool/gen_defaults/data/menus_vibrant.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/motion_expressive.dart b/packages/material_ui/tool/gen_defaults/data/motion_expressive.dart index 4c558b75a028..1d89db949abb 100644 --- a/packages/material_ui/tool/gen_defaults/data/motion_expressive.dart +++ b/packages/material_ui/tool/gen_defaults/data/motion_expressive.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'package:flutter/animation.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/motion_standard.dart b/packages/material_ui/tool/gen_defaults/data/motion_standard.dart index 9934b66204bf..d3808af94e75 100644 --- a/packages/material_ui/tool/gen_defaults/data/motion_standard.dart +++ b/packages/material_ui/tool/gen_defaults/data/motion_standard.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'package:flutter/animation.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/nav_bar.dart b/packages/material_ui/tool/gen_defaults/data/nav_bar.dart index d8ade9ac6154..76683531b9b7 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_bar.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_bar.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/nav_bar_item_horizontal.dart b/packages/material_ui/tool/gen_defaults/data/nav_bar_item_horizontal.dart index 8965fa5c446a..e679f93c1891 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_bar_item_horizontal.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_bar_item_horizontal.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenNavBarItemHorizontal { /// md.comp.nav-bar.item.horizontal.active-indicator.height @@ -20,11 +20,5 @@ class TokenNavBarItemHorizontal { static const double activeIndicatorTrailingSpace = 16.00; /// md.comp.nav-bar.item.horizontal.label-text.font - static const TypescaleStruct labelTextFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct labelTextFont = TokenTypescale.labelMedium; } diff --git a/packages/material_ui/tool/gen_defaults/data/nav_bar_item_vertical.dart b/packages/material_ui/tool/gen_defaults/data/nav_bar_item_vertical.dart index be473e033069..aaaec32902e6 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_bar_item_vertical.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_bar_item_vertical.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenNavBarItemVertical { /// md.comp.nav-bar.item.vertical.active-indicator.height @@ -20,11 +20,5 @@ class TokenNavBarItemVertical { static const double containerBetweenSpace = 6.00; /// md.comp.nav-bar.item.vertical.label-text.font - static const TypescaleStruct labelTextFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct labelTextFont = TokenTypescale.labelMedium; } diff --git a/packages/material_ui/tool/gen_defaults/data/nav_rail.dart b/packages/material_ui/tool/gen_defaults/data/nav_rail.dart index 0ccbffc09b6e..c6118c6bf529 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_rail.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_rail.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/nav_rail_collapsed.dart b/packages/material_ui/tool/gen_defaults/data/nav_rail_collapsed.dart index 3178e2b4a770..de9804b508fe 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_rail_collapsed.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_rail_collapsed.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/nav_rail_expanded.dart b/packages/material_ui/tool/gen_defaults/data/nav_rail_expanded.dart index 00f003340153..0bdcdf11d1d4 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_rail_expanded.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_rail_expanded.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/nav_rail_item.dart b/packages/material_ui/tool/gen_defaults/data/nav_rail_item.dart index 0ddada5e2a17..7541eeb36b35 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_rail_item.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_rail_item.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/nav_rail_item_horizontal.dart b/packages/material_ui/tool/gen_defaults/data/nav_rail_item_horizontal.dart index 967ab6649323..b06874f300cd 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_rail_item_horizontal.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_rail_item_horizontal.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenNavRailItemHorizontal { /// md.comp.nav-rail.item.horizontal.active-indicator.height @@ -20,11 +20,5 @@ class TokenNavRailItemHorizontal { static const double iconLabelSpace = 8.00; /// md.comp.nav-rail.item.horizontal.label-text.font - static const TypescaleStruct labelTextFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextFont = TokenTypescale.labelLarge; } diff --git a/packages/material_ui/tool/gen_defaults/data/nav_rail_item_vertical.dart b/packages/material_ui/tool/gen_defaults/data/nav_rail_item_vertical.dart index 965b0a260f74..c4ed8cfdd720 100644 --- a/packages/material_ui/tool/gen_defaults/data/nav_rail_item_vertical.dart +++ b/packages/material_ui/tool/gen_defaults/data/nav_rail_item_vertical.dart @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenNavRailItemVertical { /// md.comp.nav-rail.item.vertical.active-indicator.height @@ -17,13 +17,7 @@ class TokenNavRailItemVertical { static const double iconLabelSpace = 4.00; /// md.comp.nav-rail.item.vertical.label-text.font - static const TypescaleStruct labelTextFont = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct labelTextFont = TokenTypescale.labelMedium; /// md.comp.nav-rail.item.vertical.leading-space static const double leadingSpace = 16.00; diff --git a/packages/material_ui/tool/gen_defaults/data/navigation_bar.dart b/packages/material_ui/tool/gen_defaults/data/navigation_bar.dart index 566ad3713ac1..f4291b2a31b9 100644 --- a/packages/material_ui/tool/gen_defaults/data/navigation_bar.dart +++ b/packages/material_ui/tool/gen_defaults/data/navigation_bar.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenNavigationBar { /// md.comp.navigation-bar.active.focus.icon.color @@ -59,6 +59,9 @@ class TokenNavigationBar { /// md.comp.navigation-bar.active.label-text.color static const TokenColorRole activeLabelTextColor = TokenColorRole.onSurface; + /// md.comp.navigation-bar.active.label-text.weight + static const double activeLabelTextWeight = 700.00; + /// md.comp.navigation-bar.active.pressed.icon.color static const TokenColorRole activePressedIconColor = TokenColorRole.onSecondaryContainer; @@ -150,13 +153,7 @@ class TokenNavigationBar { TokenColorRole.onSurface; /// md.comp.navigation-bar.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelMedium; /// md.comp.navigation-bar.pressed.state-layer.opacity static const double pressedStateLayerOpacity = 0.10; diff --git a/packages/material_ui/tool/gen_defaults/data/navigation_drawer.dart b/packages/material_ui/tool/gen_defaults/data/navigation_drawer.dart index 1199d6237d33..3463f5e37a54 100644 --- a/packages/material_ui/tool/gen_defaults/data/navigation_drawer.dart +++ b/packages/material_ui/tool/gen_defaults/data/navigation_drawer.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenNavigationDrawer { /// md.comp.navigation-drawer.active.focus.icon.color @@ -60,6 +60,9 @@ class TokenNavigationDrawer { static const TokenColorRole activeLabelTextColor = TokenColorRole.onSecondaryContainer; + /// md.comp.navigation-drawer.active.label-text.weight + static const double activeLabelTextWeight = 700.00; + /// md.comp.navigation-drawer.active.pressed.icon.color static const TokenColorRole activePressedIconColor = TokenColorRole.onSecondaryContainer; @@ -112,13 +115,7 @@ class TokenNavigationDrawer { static const TokenColorRole headlineColor = TokenColorRole.onSurfaceVariant; /// md.comp.navigation-drawer.headline.type - static const TypescaleStruct headlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct headlineType = TokenTypescale.titleSmall; /// md.comp.navigation-drawer.hover.state-layer.opacity static const double hoverStateLayerOpacity = 0.08; @@ -169,26 +166,14 @@ class TokenNavigationDrawer { TokenColorRole.onSecondaryContainer; /// md.comp.navigation-drawer.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.navigation-drawer.large-badge-label.color static const TokenColorRole largeBadgeLabelColor = TokenColorRole.onSurfaceVariant; /// md.comp.navigation-drawer.large-badge-label.type - static const TypescaleStruct largeBadgeLabelType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct largeBadgeLabelType = TokenTypescale.labelLarge; /// md.comp.navigation-drawer.modal.container.color static const TokenColorRole modalContainerColor = diff --git a/packages/material_ui/tool/gen_defaults/data/navigation_rail.dart b/packages/material_ui/tool/gen_defaults/data/navigation_rail.dart index d852eef0ad0e..7870c9f3a5ce 100644 --- a/packages/material_ui/tool/gen_defaults/data/navigation_rail.dart +++ b/packages/material_ui/tool/gen_defaults/data/navigation_rail.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenNavigationRail { /// md.comp.navigation-rail.active.focus.icon.color @@ -59,6 +59,9 @@ class TokenNavigationRail { /// md.comp.navigation-rail.active.label-text.color static const TokenColorRole activeLabelTextColor = TokenColorRole.onSurface; + /// md.comp.navigation-rail.active.label-text.weight + static const double activeLabelTextWeight = 700.00; + /// md.comp.navigation-rail.active.pressed.icon.color static const TokenColorRole activePressedIconColor = TokenColorRole.onSecondaryContainer; @@ -141,13 +144,7 @@ class TokenNavigationRail { TokenColorRole.onSurface; /// md.comp.navigation-rail.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelMedium; /// md.comp.navigation-rail.no-label.active-indicator.height static const double noLabelActiveIndicatorHeight = 56.00; diff --git a/packages/material_ui/tool/gen_defaults/data/outlined_autocomplete.dart b/packages/material_ui/tool/gen_defaults/data/outlined_autocomplete.dart index 21b643039cba..fd1da6916eac 100644 --- a/packages/material_ui/tool/gen_defaults/data/outlined_autocomplete.dart +++ b/packages/material_ui/tool/gen_defaults/data/outlined_autocomplete.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenOutlinedAutocomplete { /// md.comp.outlined-autocomplete.menu.cascading-menu-indicator.icon.color @@ -244,26 +244,24 @@ class TokenOutlinedAutocomplete { TokenColorRole.onSurface; /// md.comp.outlined-autocomplete.text-field.input-text.type - static const TypescaleStruct textFieldInputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldInputTextType = + TokenTypescale.bodyLarge; /// md.comp.outlined-autocomplete.text-field.label-text.color static const TokenColorRole textFieldLabelTextColor = TokenColorRole.onSurfaceVariant; + /// md.comp.outlined-autocomplete.text-field.label-text.populated.line-height + static const double textFieldLabelTextPopulatedLineHeight = + TokenTypescale.bodySmall.lineHeight; + + /// md.comp.outlined-autocomplete.text-field.label-text.populated.size + static const double textFieldLabelTextPopulatedSize = + TokenTypescale.bodySmall.fontSize; + /// md.comp.outlined-autocomplete.text-field.label-text.type - static const TypescaleStruct textFieldLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldLabelTextType = + TokenTypescale.bodyLarge; /// md.comp.outlined-autocomplete.text-field.leading-icon.color static const TokenColorRole textFieldLeadingIconColor = @@ -283,13 +281,8 @@ class TokenOutlinedAutocomplete { TokenColorRole.onSurfaceVariant; /// md.comp.outlined-autocomplete.text-field.supporting-text.type - static const TypescaleStruct textFieldSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + static const TypescaleStruct textFieldSupportingTextType = + TokenTypescale.bodySmall; /// md.comp.outlined-autocomplete.text-field.trailing-icon.color static const TokenColorRole textFieldTrailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/outlined_card.dart b/packages/material_ui/tool/gen_defaults/data/outlined_card.dart index aa0764648ae9..54cd8dea9ae3 100644 --- a/packages/material_ui/tool/gen_defaults/data/outlined_card.dart +++ b/packages/material_ui/tool/gen_defaults/data/outlined_card.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/outlined_menu_button.dart b/packages/material_ui/tool/gen_defaults/data/outlined_menu_button.dart index 4dee879a8241..9136a6dcc8f5 100644 --- a/packages/material_ui/tool/gen_defaults/data/outlined_menu_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/outlined_menu_button.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenOutlinedMenuButton { /// md.comp.outlined-menu-button.container.height @@ -74,13 +74,7 @@ class TokenOutlinedMenuButton { static const TokenColorRole labelTextColor = TokenColorRole.primary; /// md.comp.outlined-menu-button.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.outlined-menu-button.outline.color static const TokenColorRole outlineColor = TokenColorRole.outline; diff --git a/packages/material_ui/tool/gen_defaults/data/outlined_segmented_button.dart b/packages/material_ui/tool/gen_defaults/data/outlined_segmented_button.dart index 31e807c7bf7c..69855fa71e58 100644 --- a/packages/material_ui/tool/gen_defaults/data/outlined_segmented_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/outlined_segmented_button.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenOutlinedSegmentedButton { /// md.comp.outlined-segmented-button.container.height @@ -46,13 +46,7 @@ class TokenOutlinedSegmentedButton { static const double hoverStateLayerOpacity = 0.08; /// md.comp.outlined-segmented-button.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.outlined-segmented-button.outline.color static const TokenColorRole outlineColor = TokenColorRole.outline; diff --git a/packages/material_ui/tool/gen_defaults/data/outlined_select.dart b/packages/material_ui/tool/gen_defaults/data/outlined_select.dart index da70a7f8b5e9..22e74eeb4dc6 100644 --- a/packages/material_ui/tool/gen_defaults/data/outlined_select.dart +++ b/packages/material_ui/tool/gen_defaults/data/outlined_select.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenOutlinedSelect { /// md.comp.outlined-select.menu.cascading-menu-indicator.icon.color @@ -49,13 +49,8 @@ class TokenOutlinedSelect { TokenColorRole.onSurface; /// md.comp.outlined-select.menu.list-item.label-text.type - static const TypescaleStruct menuListItemLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct menuListItemLabelTextType = + TokenTypescale.labelLarge; /// md.comp.outlined-select.menu.list-item.selected.container.color static const TokenColorRole menuListItemSelectedContainerColor = @@ -277,26 +272,24 @@ class TokenOutlinedSelect { TokenColorRole.onSurface; /// md.comp.outlined-select.text-field.input-text.type - static const TypescaleStruct textFieldInputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldInputTextType = + TokenTypescale.bodyLarge; /// md.comp.outlined-select.text-field.label-text.color static const TokenColorRole textFieldLabelTextColor = TokenColorRole.onSurfaceVariant; + /// md.comp.outlined-select.text-field.label-text.populated.line-height + static const double textFieldLabelTextPopulatedLineHeight = + TokenTypescale.bodySmall.lineHeight; + + /// md.comp.outlined-select.text-field.label-text.populated.size + static const double textFieldLabelTextPopulatedSize = + TokenTypescale.bodySmall.fontSize; + /// md.comp.outlined-select.text-field.label-text.type - static const TypescaleStruct textFieldLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct textFieldLabelTextType = + TokenTypescale.bodyLarge; /// md.comp.outlined-select.text-field.leading-icon.color static const TokenColorRole textFieldLeadingIconColor = @@ -316,13 +309,8 @@ class TokenOutlinedSelect { TokenColorRole.onSurfaceVariant; /// md.comp.outlined-select.text-field.supporting-text.type - static const TypescaleStruct textFieldSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + static const TypescaleStruct textFieldSupportingTextType = + TokenTypescale.bodySmall; /// md.comp.outlined-select.text-field.trailing-icon.color static const TokenColorRole textFieldTrailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/outlined_text_field.dart b/packages/material_ui/tool/gen_defaults/data/outlined_text_field.dart index e339497881dd..67f94f04bf9e 100644 --- a/packages/material_ui/tool/gen_defaults/data/outlined_text_field.dart +++ b/packages/material_ui/tool/gen_defaults/data/outlined_text_field.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenOutlinedTextField { /// md.comp.outlined-text-field.caret.color @@ -195,25 +195,21 @@ class TokenOutlinedTextField { TokenColorRole.onSurfaceVariant; /// md.comp.outlined-text-field.input-text.type - static const TypescaleStruct inputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct inputTextType = TokenTypescale.bodyLarge; /// md.comp.outlined-text-field.label-text.color static const TokenColorRole labelTextColor = TokenColorRole.onSurfaceVariant; + /// md.comp.outlined-text-field.label-text.populated.line-height + static const double labelTextPopulatedLineHeight = + TokenTypescale.bodySmall.lineHeight; + + /// md.comp.outlined-text-field.label-text.populated.size + static const double labelTextPopulatedSize = + TokenTypescale.bodySmall.fontSize; + /// md.comp.outlined-text-field.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct labelTextType = TokenTypescale.bodyLarge; /// md.comp.outlined-text-field.leading-icon.color static const TokenColorRole leadingIconColor = @@ -233,13 +229,7 @@ class TokenOutlinedTextField { TokenColorRole.onSurfaceVariant; /// md.comp.outlined-text-field.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodySmall; /// md.comp.outlined-text-field.trailing-icon.color static const TokenColorRole trailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/palette.dart b/packages/material_ui/tool/gen_defaults/data/palette.dart index f573b364235d..d68abda4649b 100644 --- a/packages/material_ui/tool/gen_defaults/data/palette.dart +++ b/packages/material_ui/tool/gen_defaults/data/palette.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenPalette { /// md.ref.palette.black diff --git a/packages/material_ui/tool/gen_defaults/data/plain_tooltip.dart b/packages/material_ui/tool/gen_defaults/data/plain_tooltip.dart index bf4218e95398..3e5ad63792ab 100644 --- a/packages/material_ui/tool/gen_defaults/data/plain_tooltip.dart +++ b/packages/material_ui/tool/gen_defaults/data/plain_tooltip.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenPlainTooltip { /// md.comp.plain-tooltip.container.color @@ -26,11 +26,5 @@ class TokenPlainTooltip { TokenColorRole.inverseOnSurface; /// md.comp.plain-tooltip.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodySmall; } diff --git a/packages/material_ui/tool/gen_defaults/data/primary_navigation_tab.dart b/packages/material_ui/tool/gen_defaults/data/primary_navigation_tab.dart index d7d6e0f91248..9b4263b4f0e1 100644 --- a/packages/material_ui/tool/gen_defaults/data/primary_navigation_tab.dart +++ b/packages/material_ui/tool/gen_defaults/data/primary_navigation_tab.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenPrimaryNavigationTab { /// md.comp.primary-navigation-tab.active.focus.state-layer.color @@ -163,11 +163,6 @@ class TokenPrimaryNavigationTab { TokenColorRole.onSurface; /// md.comp.primary-navigation-tab.with-label-text.label-text.type - static const TypescaleStruct withLabelTextLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct withLabelTextLabelTextType = + TokenTypescale.titleSmall; } diff --git a/packages/material_ui/tool/gen_defaults/data/progress_indicator.dart b/packages/material_ui/tool/gen_defaults/data/progress_indicator.dart index f75149027928..2a9330268a6d 100644 --- a/packages/material_ui/tool/gen_defaults/data/progress_indicator.dart +++ b/packages/material_ui/tool/gen_defaults/data/progress_indicator.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/progress_indicator_circular.dart b/packages/material_ui/tool/gen_defaults/data/progress_indicator_circular.dart index 46ed920a6a87..27a5b8ea8e71 100644 --- a/packages/material_ui/tool/gen_defaults/data/progress_indicator_circular.dart +++ b/packages/material_ui/tool/gen_defaults/data/progress_indicator_circular.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenProgressIndicatorCircular { /// md.comp.progress-indicator.circular.active-indicator.thickness diff --git a/packages/material_ui/tool/gen_defaults/data/progress_indicator_linear.dart b/packages/material_ui/tool/gen_defaults/data/progress_indicator_linear.dart index bab73a9ced12..9b8b01121e7d 100644 --- a/packages/material_ui/tool/gen_defaults/data/progress_indicator_linear.dart +++ b/packages/material_ui/tool/gen_defaults/data/progress_indicator_linear.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenProgressIndicatorLinear { /// md.comp.progress-indicator.linear.active-indicator.thickness diff --git a/packages/material_ui/tool/gen_defaults/data/radio_button.dart b/packages/material_ui/tool/gen_defaults/data/radio_button.dart index 9f1198792779..eeb70fc699ee 100644 --- a/packages/material_ui/tool/gen_defaults/data/radio_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/radio_button.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/rich_tooltip.dart b/packages/material_ui/tool/gen_defaults/data/rich_tooltip.dart index 5896d2245854..2bddf14d1397 100644 --- a/packages/material_ui/tool/gen_defaults/data/rich_tooltip.dart +++ b/packages/material_ui/tool/gen_defaults/data/rich_tooltip.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenRichTooltip { /// md.comp.rich-tooltip.action.focus.label-text.color @@ -35,13 +35,7 @@ class TokenRichTooltip { static const TokenColorRole actionLabelTextColor = TokenColorRole.primary; /// md.comp.rich-tooltip.action.label-text.type - static const TypescaleStruct actionLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct actionLabelTextType = TokenTypescale.labelLarge; /// md.comp.rich-tooltip.action.pressed.label-text.color static const TokenColorRole actionPressedLabelTextColor = @@ -76,24 +70,12 @@ class TokenRichTooltip { static const TokenColorRole subheadColor = TokenColorRole.onSurfaceVariant; /// md.comp.rich-tooltip.subhead.type - static const TypescaleStruct subheadType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct subheadType = TokenTypescale.titleSmall; /// md.comp.rich-tooltip.supporting-text.color static const TokenColorRole supportingTextColor = TokenColorRole.onSurfaceVariant; /// md.comp.rich-tooltip.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 400, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodyMedium; } diff --git a/packages/material_ui/tool/gen_defaults/data/scrim.dart b/packages/material_ui/tool/gen_defaults/data/scrim.dart index c70b66d5d58c..8e5edec0ce6f 100644 --- a/packages/material_ui/tool/gen_defaults/data/scrim.dart +++ b/packages/material_ui/tool/gen_defaults/data/scrim.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/search_bar.dart b/packages/material_ui/tool/gen_defaults/data/search_bar.dart index 09652fe112b0..2e0d68339a99 100644 --- a/packages/material_ui/tool/gen_defaults/data/search_bar.dart +++ b/packages/material_ui/tool/gen_defaults/data/search_bar.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenSearchBar { /// md.comp.search-bar.avatar.shape @@ -99,13 +99,7 @@ class TokenSearchBar { static const TokenColorRole inputTextColor = TokenColorRole.onSurface; /// md.comp.search-bar.input-text.type - static const TypescaleStruct inputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct inputTextType = TokenTypescale.bodyLarge; /// md.comp.search-bar.leading-icon.color static const TokenColorRole leadingIconColor = TokenColorRole.onSurface; @@ -131,13 +125,7 @@ class TokenSearchBar { TokenColorRole.onSurfaceVariant; /// md.comp.search-bar.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodyLarge; /// md.comp.search-bar.trailing-icon.color static const TokenColorRole trailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/search_view.dart b/packages/material_ui/tool/gen_defaults/data/search_view.dart index afcf8c8262e6..306272183ed4 100644 --- a/packages/material_ui/tool/gen_defaults/data/search_view.dart +++ b/packages/material_ui/tool/gen_defaults/data/search_view.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenSearchView { /// md.comp.search-view.contained.background.color @@ -84,13 +84,7 @@ class TokenSearchView { static const TokenColorRole headerInputTextColor = TokenColorRole.onSurface; /// md.comp.search-view.header.input-text.type - static const TypescaleStruct headerInputTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct headerInputTextType = TokenTypescale.bodyLarge; /// md.comp.search-view.header.leading-icon.color static const TokenColorRole headerLeadingIconColor = TokenColorRole.onSurface; @@ -100,13 +94,8 @@ class TokenSearchView { TokenColorRole.onSurfaceVariant; /// md.comp.search-view.header.supporting-text.type - static const TypescaleStruct headerSupportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct headerSupportingTextType = + TokenTypescale.bodyLarge; /// md.comp.search-view.header.trailing-icon.color static const TokenColorRole headerTrailingIconColor = diff --git a/packages/material_ui/tool/gen_defaults/data/secondary_navigation_tab.dart b/packages/material_ui/tool/gen_defaults/data/secondary_navigation_tab.dart index d0df2a87dcc3..334ff7f26ab1 100644 --- a/packages/material_ui/tool/gen_defaults/data/secondary_navigation_tab.dart +++ b/packages/material_ui/tool/gen_defaults/data/secondary_navigation_tab.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenSecondaryNavigationTab { /// md.comp.secondary-navigation-tab.active-indicator.color @@ -71,13 +71,7 @@ class TokenSecondaryNavigationTab { TokenColorRole.onSurfaceVariant; /// md.comp.secondary-navigation-tab.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.titleSmall; /// md.comp.secondary-navigation-tab.pressed.label-text.color static const TokenColorRole pressedLabelTextColor = TokenColorRole.onSurface; diff --git a/packages/material_ui/tool/gen_defaults/data/shape.dart b/packages/material_ui/tool/gen_defaults/data/shape.dart index 8e7a8ae55ded..a3738afec3b4 100644 --- a/packages/material_ui/tool/gen_defaults/data/shape.dart +++ b/packages/material_ui/tool/gen_defaults/data/shape.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/sheet_bottom.dart b/packages/material_ui/tool/gen_defaults/data/sheet_bottom.dart index 04c86006b53b..ee0798484010 100644 --- a/packages/material_ui/tool/gen_defaults/data/sheet_bottom.dart +++ b/packages/material_ui/tool/gen_defaults/data/sheet_bottom.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/sheet_floating.dart b/packages/material_ui/tool/gen_defaults/data/sheet_floating.dart index 8674a1356e93..adb6962dc689 100644 --- a/packages/material_ui/tool/gen_defaults/data/sheet_floating.dart +++ b/packages/material_ui/tool/gen_defaults/data/sheet_floating.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/sheet_side.dart b/packages/material_ui/tool/gen_defaults/data/sheet_side.dart index f27faeacea3d..a2827cda025e 100644 --- a/packages/material_ui/tool/gen_defaults/data/sheet_side.dart +++ b/packages/material_ui/tool/gen_defaults/data/sheet_side.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenSheetSide { /// md.comp.sheet.side.detached.container.shape @@ -84,13 +84,7 @@ class TokenSheetSide { TokenColorRole.onSurfaceVariant; /// md.comp.sheet.side.docked.headline.type - static const TypescaleStruct dockedHeadlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 22.00, - fontWeight: 400, - lineHeight: 28.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct dockedHeadlineType = TokenTypescale.titleLarge; /// md.comp.sheet.side.docked.modal.container.color static const TokenColorRole dockedModalContainerColor = diff --git a/packages/material_ui/tool/gen_defaults/data/slider.dart b/packages/material_ui/tool/gen_defaults/data/slider.dart index b4d4523c4ecb..2f229413f27d 100644 --- a/packages/material_ui/tool/gen_defaults/data/slider.dart +++ b/packages/material_ui/tool/gen_defaults/data/slider.dart @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; class TokenSlider { /// md.comp.slider.active.handle.color @@ -206,4 +207,24 @@ class TokenSlider { /// md.comp.slider.value-indicator.label.label-text.color static const TokenColorRole valueIndicatorLabelLabelTextColor = TokenColorRole.inverseOnSurface; + + /// md.comp.slider.value-indicator.label.label-text.font + static const String valueIndicatorLabelLabelTextFont = + TokenTypescale.labelLarge.fontFamily; + + /// md.comp.slider.value-indicator.label.label-text.line-height + static const double valueIndicatorLabelLabelTextLineHeight = + TokenTypescale.labelLarge.lineHeight; + + /// md.comp.slider.value-indicator.label.label-text.size + static const double valueIndicatorLabelLabelTextSize = + TokenTypescale.labelLarge.fontSize; + + /// md.comp.slider.value-indicator.label.label-text.tracking + static const double valueIndicatorLabelLabelTextTracking = + TokenTypescale.bodyLarge.letterSpacing; + + /// md.comp.slider.value-indicator.label.label-text.weight + static const double valueIndicatorLabelLabelTextWeight = + TokenTypescale.bodyLarge.fontWeight; } diff --git a/packages/material_ui/tool/gen_defaults/data/slider_large.dart b/packages/material_ui/tool/gen_defaults/data/slider_large.dart index c23fc39ad0f4..be0307f661a9 100644 --- a/packages/material_ui/tool/gen_defaults/data/slider_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/slider_large.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenSliderLarge { /// md.comp.slider.large.active.handle.height diff --git a/packages/material_ui/tool/gen_defaults/data/slider_medium.dart b/packages/material_ui/tool/gen_defaults/data/slider_medium.dart index 0945630ef841..3809cf9fd716 100644 --- a/packages/material_ui/tool/gen_defaults/data/slider_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/slider_medium.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenSliderMedium { /// md.comp.slider.medium.active.handle.height diff --git a/packages/material_ui/tool/gen_defaults/data/slider_small.dart b/packages/material_ui/tool/gen_defaults/data/slider_small.dart index 1de61ef760cf..88a3deb64403 100644 --- a/packages/material_ui/tool/gen_defaults/data/slider_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/slider_small.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenSliderSmall { /// md.comp.slider.small.active.handle.height diff --git a/packages/material_ui/tool/gen_defaults/data/slider_xlarge.dart b/packages/material_ui/tool/gen_defaults/data/slider_xlarge.dart index d4f4185802e0..6c30c24f0ef8 100644 --- a/packages/material_ui/tool/gen_defaults/data/slider_xlarge.dart +++ b/packages/material_ui/tool/gen_defaults/data/slider_xlarge.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenSliderXlarge { /// md.comp.slider.xlarge.active.handle.height diff --git a/packages/material_ui/tool/gen_defaults/data/slider_xsmall.dart b/packages/material_ui/tool/gen_defaults/data/slider_xsmall.dart index 03d5941160ed..05e700c37b81 100644 --- a/packages/material_ui/tool/gen_defaults/data/slider_xsmall.dart +++ b/packages/material_ui/tool/gen_defaults/data/slider_xsmall.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenSliderXsmall { /// md.comp.slider.xsmall.active.handle.height diff --git a/packages/material_ui/tool/gen_defaults/data/snackbar.dart b/packages/material_ui/tool/gen_defaults/data/snackbar.dart index ea9189a14543..45022552973e 100644 --- a/packages/material_ui/tool/gen_defaults/data/snackbar.dart +++ b/packages/material_ui/tool/gen_defaults/data/snackbar.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenSnackbar { /// md.comp.snackbar.action.focus.label-text.color @@ -36,13 +36,7 @@ class TokenSnackbar { TokenColorRole.inversePrimary; /// md.comp.snackbar.action.label-text.type - static const TypescaleStruct actionLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct actionLabelTextType = TokenTypescale.labelLarge; /// md.comp.snackbar.action.pressed.label-text.color static const TokenColorRole actionPressedLabelTextColor = @@ -117,13 +111,7 @@ class TokenSnackbar { TokenColorRole.inverseOnSurface; /// md.comp.snackbar.supporting-text.type - static const TypescaleStruct supportingTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 400, - lineHeight: 20.00, - letterSpacing: 0.25, - ); + static const TypescaleStruct supportingTextType = TokenTypescale.bodyMedium; /// md.comp.snackbar.with-single-line.container.height static const double withSingleLineContainerHeight = 48.00; diff --git a/packages/material_ui/tool/gen_defaults/data/split_button_large.dart b/packages/material_ui/tool/gen_defaults/data/split_button_large.dart index fd92a0f8ce01..14a333ee118e 100644 --- a/packages/material_ui/tool/gen_defaults/data/split_button_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/split_button_large.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/split_button_medium.dart b/packages/material_ui/tool/gen_defaults/data/split_button_medium.dart index ebc6ff797112..66fb6c1a37dd 100644 --- a/packages/material_ui/tool/gen_defaults/data/split_button_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/split_button_medium.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/split_button_small.dart b/packages/material_ui/tool/gen_defaults/data/split_button_small.dart index 96713bb754ea..ff36a83d8601 100644 --- a/packages/material_ui/tool/gen_defaults/data/split_button_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/split_button_small.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/split_button_xlarge.dart b/packages/material_ui/tool/gen_defaults/data/split_button_xlarge.dart index b4ea792a6419..7663bcc9bfa8 100644 --- a/packages/material_ui/tool/gen_defaults/data/split_button_xlarge.dart +++ b/packages/material_ui/tool/gen_defaults/data/split_button_xlarge.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/split_button_xsmall.dart b/packages/material_ui/tool/gen_defaults/data/split_button_xsmall.dart index 091305e4dfec..b4076abd6a09 100644 --- a/packages/material_ui/tool/gen_defaults/data/split_button_xsmall.dart +++ b/packages/material_ui/tool/gen_defaults/data/split_button_xsmall.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/standard_menu_button.dart b/packages/material_ui/tool/gen_defaults/data/standard_menu_button.dart index 2fee1d741d08..404187b9c617 100644 --- a/packages/material_ui/tool/gen_defaults/data/standard_menu_button.dart +++ b/packages/material_ui/tool/gen_defaults/data/standard_menu_button.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenStandardMenuButton { /// md.comp.standard-menu-button.container.height @@ -77,13 +77,7 @@ class TokenStandardMenuButton { static const TokenColorRole labelTextColor = TokenColorRole.onSurfaceVariant; /// md.comp.standard-menu-button.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.standard-menu-button.pressed.label-text.color static const TokenColorRole pressedLabelTextColor = diff --git a/packages/material_ui/tool/gen_defaults/data/state.dart b/packages/material_ui/tool/gen_defaults/data/state.dart index 2aa2bec2dc2d..506910fb61b2 100644 --- a/packages/material_ui/tool/gen_defaults/data/state.dart +++ b/packages/material_ui/tool/gen_defaults/data/state.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenState { /// md.sys.state.disabled.state-layer-opacity diff --git a/packages/material_ui/tool/gen_defaults/data/state_focus_indicator.dart b/packages/material_ui/tool/gen_defaults/data/state_focus_indicator.dart index 311b6569756b..55a7b1152092 100644 --- a/packages/material_ui/tool/gen_defaults/data/state_focus_indicator.dart +++ b/packages/material_ui/tool/gen_defaults/data/state_focus_indicator.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenStateFocusIndicator { /// md.sys.state.focus-indicator.inner-offset diff --git a/packages/material_ui/tool/gen_defaults/data/suggestion_chip.dart b/packages/material_ui/tool/gen_defaults/data/suggestion_chip.dart index ed8631ec0877..f862ec5c9d9b 100644 --- a/packages/material_ui/tool/gen_defaults/data/suggestion_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/suggestion_chip.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenSuggestionChip { /// md.comp.suggestion-chip.container.height @@ -126,13 +126,7 @@ class TokenSuggestionChip { static const TokenColorRole labelTextColor = TokenColorRole.onSurfaceVariant; /// md.comp.suggestion-chip.label-text.type - static const TypescaleStruct labelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 14.00, - fontWeight: 500, - lineHeight: 20.00, - letterSpacing: 0.10, - ); + static const TypescaleStruct labelTextType = TokenTypescale.labelLarge; /// md.comp.suggestion-chip.pressed.label-text.color static const TokenColorRole pressedLabelTextColor = diff --git a/packages/material_ui/tool/gen_defaults/data/switch.dart b/packages/material_ui/tool/gen_defaults/data/switch.dart index b542d81edf1e..05e55a907455 100644 --- a/packages/material_ui/tool/gen_defaults/data/switch.dart +++ b/packages/material_ui/tool/gen_defaults/data/switch.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/time_input.dart b/packages/material_ui/tool/gen_defaults/data/time_input.dart index 5df8a8edd502..c9a696720888 100644 --- a/packages/material_ui/tool/gen_defaults/data/time_input.dart +++ b/packages/material_ui/tool/gen_defaults/data/time_input.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenTimeInput { /// md.comp.time-input.container.color @@ -38,13 +38,7 @@ class TokenTimeInput { static const TokenColorRole headlineColor = TokenColorRole.onSurfaceVariant; /// md.comp.time-input.headline.type - static const TypescaleStruct headlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct headlineType = TokenTypescale.labelMedium; /// md.comp.time-input.period-selector.container.height static const double periodSelectorContainerHeight = 72.00; @@ -68,13 +62,8 @@ class TokenTimeInput { static const double periodSelectorHoverStateLayerOpacity = 0.08; /// md.comp.time-input.period-selector.label-text.type - static const TypescaleStruct periodSelectorLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 500, - lineHeight: 24.00, - letterSpacing: 0.15, - ); + static const TypescaleStruct periodSelectorLabelTextType = + TokenTypescale.titleMedium; /// md.comp.time-input.period-selector.outline.color static const TokenColorRole periodSelectorOutlineColor = @@ -196,26 +185,16 @@ class TokenTimeInput { TokenColorRole.onSurface; /// md.comp.time-input.time-input-field.label-text.type - static const TypescaleStruct timeInputFieldLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 45.00, - fontWeight: 400, - lineHeight: 52.00, - letterSpacing: 0.00, - ); + static const TypescaleStruct timeInputFieldLabelTextType = + TokenTypescale.displayMedium; /// md.comp.time-input.time-input-field.separator.color static const TokenColorRole timeInputFieldSeparatorColor = TokenColorRole.onSurface; /// md.comp.time-input.time-input-field.separator.type - static const TypescaleStruct timeInputFieldSeparatorType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 57.00, - fontWeight: 400, - lineHeight: 64.00, - letterSpacing: -0.25, - ); + static const TypescaleStruct timeInputFieldSeparatorType = + TokenTypescale.displayLarge; /// md.comp.time-input.time-input-field.supporting-text.color static const TokenColorRole timeInputFieldSupportingTextColor = @@ -223,11 +202,5 @@ class TokenTimeInput { /// md.comp.time-input.time-input-field.supporting-text.type static const TypescaleStruct timeInputFieldSupportingTextType = - TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 400, - lineHeight: 16.00, - letterSpacing: 0.40, - ); + TokenTypescale.bodySmall; } diff --git a/packages/material_ui/tool/gen_defaults/data/time_picker.dart b/packages/material_ui/tool/gen_defaults/data/time_picker.dart index 5cd8fdc5596f..d42b43d84692 100644 --- a/packages/material_ui/tool/gen_defaults/data/time_picker.dart +++ b/packages/material_ui/tool/gen_defaults/data/time_picker.dart @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; -import 'typescale_struct.dart'; +import 'typescale.dart'; class TokenTimePicker { /// md.comp.time-picker.clock-dial.color @@ -17,13 +17,8 @@ class TokenTimePicker { static const double clockDialContainerSize = 256.00; /// md.comp.time-picker.clock-dial.label-text.type - static const TypescaleStruct clockDialLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 400, - lineHeight: 24.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct clockDialLabelTextType = + TokenTypescale.bodyLarge; /// md.comp.time-picker.clock-dial.selected.label-text.color static const TokenColorRole clockDialSelectedLabelTextColor = @@ -101,13 +96,7 @@ class TokenTimePicker { static const TokenColorRole headlineColor = TokenColorRole.onSurfaceVariant; /// md.comp.time-picker.headline.type - static const TypescaleStruct headlineType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 12.00, - fontWeight: 500, - lineHeight: 16.00, - letterSpacing: 0.50, - ); + static const TypescaleStruct headlineType = TokenTypescale.labelMedium; /// md.comp.time-picker.period-selector.container.shape static const ShapeStruct periodSelectorContainerShape = ShapeStruct( @@ -131,13 +120,8 @@ class TokenTimePicker { static const double periodSelectorHoverStateLayerOpacity = 0.08; /// md.comp.time-picker.period-selector.label-text.type - static const TypescaleStruct periodSelectorLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 16.00, - fontWeight: 500, - lineHeight: 24.00, - letterSpacing: 0.15, - ); + static const TypescaleStruct periodSelectorLabelTextType = + TokenTypescale.titleMedium; /// md.comp.time-picker.period-selector.outline.color static const TokenColorRole periodSelectorOutlineColor = @@ -240,13 +224,8 @@ class TokenTimePicker { static const double timeSelectorHoverStateLayerOpacity = 0.08; /// md.comp.time-picker.time-selector.label-text.type - static const TypescaleStruct timeSelectorLabelTextType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 57.00, - fontWeight: 400, - lineHeight: 64.00, - letterSpacing: -0.25, - ); + static const TypescaleStruct timeSelectorLabelTextType = + TokenTypescale.displayLarge; /// md.comp.time-picker.time-selector.pressed.state-layer.opacity static const double timeSelectorPressedStateLayerOpacity = 0.10; @@ -288,13 +267,8 @@ class TokenTimePicker { TokenColorRole.onSurface; /// md.comp.time-picker.time-selector.separator.type - static const TypescaleStruct timeSelectorSeparatorType = TypescaleStruct( - fontFamily: 'Roboto', - fontSize: 57.00, - fontWeight: 400, - lineHeight: 64.00, - letterSpacing: -0.25, - ); + static const TypescaleStruct timeSelectorSeparatorType = + TokenTypescale.displayLarge; /// md.comp.time-picker.time-selector.unselected.container.color static const TokenColorRole timeSelectorUnselectedContainerColor = diff --git a/packages/material_ui/tool/gen_defaults/data/toolbar_docked.dart b/packages/material_ui/tool/gen_defaults/data/toolbar_docked.dart index 3e1e50c933a1..ef71573010e1 100644 --- a/packages/material_ui/tool/gen_defaults/data/toolbar_docked.dart +++ b/packages/material_ui/tool/gen_defaults/data/toolbar_docked.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/toolbar_floating.dart b/packages/material_ui/tool/gen_defaults/data/toolbar_floating.dart index a918484c73a6..e2c54f648c9e 100644 --- a/packages/material_ui/tool/gen_defaults/data/toolbar_floating.dart +++ b/packages/material_ui/tool/gen_defaults/data/toolbar_floating.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/toolbar_floating_fab.dart b/packages/material_ui/tool/gen_defaults/data/toolbar_floating_fab.dart index 35dd75309084..95d10ad8c1dc 100644 --- a/packages/material_ui/tool/gen_defaults/data/toolbar_floating_fab.dart +++ b/packages/material_ui/tool/gen_defaults/data/toolbar_floating_fab.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/toolbar_standard.dart b/packages/material_ui/tool/gen_defaults/data/toolbar_standard.dart index e692e09f66b7..325d173fdaf8 100644 --- a/packages/material_ui/tool/gen_defaults/data/toolbar_standard.dart +++ b/packages/material_ui/tool/gen_defaults/data/toolbar_standard.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/toolbar_vibrant.dart b/packages/material_ui/tool/gen_defaults/data/toolbar_vibrant.dart index 4e47466ae6ff..2e8b9eeb1d82 100644 --- a/packages/material_ui/tool/gen_defaults/data/toolbar_vibrant.dart +++ b/packages/material_ui/tool/gen_defaults/data/toolbar_vibrant.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'color_role.dart'; import 'shape_struct.dart'; diff --git a/packages/material_ui/tool/gen_defaults/data/typeface.dart b/packages/material_ui/tool/gen_defaults/data/typeface.dart index ed362aae92c9..3d3301dba320 100644 --- a/packages/material_ui/tool/gen_defaults/data/typeface.dart +++ b/packages/material_ui/tool/gen_defaults/data/typeface.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 class TokenTypeface { /// md.ref.typeface.brand @@ -16,4 +16,16 @@ class TokenTypeface { /// md.ref.typeface.variable.plain static const String variablePlain = 'Roboto Flex'; + + /// md.ref.typeface.weight-bold + static const double weightBold = 700.00; + + /// md.ref.typeface.weight-medium + static const double weightMedium = 500.00; + + /// md.ref.typeface.weight-regular + static const double weightRegular = 400.00; + + /// md.ref.typeface.weight-semibold + static const double weightSemibold = 600.00; } diff --git a/packages/material_ui/tool/gen_defaults/data/typescale.dart b/packages/material_ui/tool/gen_defaults/data/typescale.dart index 4d2cf6f319ad..a10dcadb553b 100644 --- a/packages/material_ui/tool/gen_defaults/data/typescale.dart +++ b/packages/material_ui/tool/gen_defaults/data/typescale.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'typescale_struct.dart'; @@ -14,6 +14,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 24.00, letterSpacing: 0.50, + textStyle: 'body-large', ); /// md.sys.typescale.body-medium @@ -23,6 +24,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 20.00, letterSpacing: 0.25, + textStyle: 'body-medium', ); /// md.sys.typescale.body-small @@ -32,6 +34,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 16.00, letterSpacing: 0.40, + textStyle: 'body-small', ); /// md.sys.typescale.display-large @@ -41,6 +44,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 64.00, letterSpacing: -0.25, + textStyle: 'display-large', ); /// md.sys.typescale.display-medium @@ -50,6 +54,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 52.00, letterSpacing: 0.00, + textStyle: 'display-medium', ); /// md.sys.typescale.display-small @@ -59,6 +64,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 44.00, letterSpacing: 0.00, + textStyle: 'display-small', ); /// md.sys.typescale.headline-large @@ -68,6 +74,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 40.00, letterSpacing: 0.00, + textStyle: 'headline-large', ); /// md.sys.typescale.headline-medium @@ -77,6 +84,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 36.00, letterSpacing: 0.00, + textStyle: 'headline-medium', ); /// md.sys.typescale.headline-small @@ -86,6 +94,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 32.00, letterSpacing: 0.00, + textStyle: 'headline-small', ); /// md.sys.typescale.label-large @@ -95,6 +104,7 @@ class TokenTypescale { fontWeight: 500, lineHeight: 20.00, letterSpacing: 0.10, + textStyle: 'label-large', ); /// md.sys.typescale.label-medium @@ -104,6 +114,7 @@ class TokenTypescale { fontWeight: 500, lineHeight: 16.00, letterSpacing: 0.50, + textStyle: 'label-medium', ); /// md.sys.typescale.label-small @@ -113,6 +124,7 @@ class TokenTypescale { fontWeight: 500, lineHeight: 16.00, letterSpacing: 0.50, + textStyle: 'label-small', ); /// md.sys.typescale.title-large @@ -122,6 +134,7 @@ class TokenTypescale { fontWeight: 400, lineHeight: 28.00, letterSpacing: 0.00, + textStyle: 'title-large', ); /// md.sys.typescale.title-medium @@ -131,6 +144,7 @@ class TokenTypescale { fontWeight: 500, lineHeight: 24.00, letterSpacing: 0.15, + textStyle: 'title-medium', ); /// md.sys.typescale.title-small @@ -140,5 +154,6 @@ class TokenTypescale { fontWeight: 500, lineHeight: 20.00, letterSpacing: 0.10, + textStyle: 'title-small', ); } diff --git a/packages/material_ui/tool/gen_defaults/data/typescale_emphasized.dart b/packages/material_ui/tool/gen_defaults/data/typescale_emphasized.dart index 1f214a98675e..9b3d883a2c6d 100644 --- a/packages/material_ui/tool/gen_defaults/data/typescale_emphasized.dart +++ b/packages/material_ui/tool/gen_defaults/data/typescale_emphasized.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'typescale_struct.dart'; @@ -14,6 +14,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 24.00, letterSpacing: 0.50, + textStyle: 'emphasized.body-large', ); /// md.sys.typescale.emphasized.body-medium @@ -23,6 +24,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 20.00, letterSpacing: 0.25, + textStyle: 'emphasized.body-medium', ); /// md.sys.typescale.emphasized.body-small @@ -32,6 +34,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 16.00, letterSpacing: 0.40, + textStyle: 'emphasized.body-small', ); /// md.sys.typescale.emphasized.display-large @@ -41,6 +44,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 64.00, letterSpacing: -0.25, + textStyle: 'emphasized.display-large', ); /// md.sys.typescale.emphasized.display-medium @@ -50,6 +54,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 52.00, letterSpacing: 0.00, + textStyle: 'emphasized.display-medium', ); /// md.sys.typescale.emphasized.display-small @@ -59,6 +64,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 44.00, letterSpacing: 0.00, + textStyle: 'emphasized.display-small', ); /// md.sys.typescale.emphasized.headline-large @@ -68,6 +74,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 40.00, letterSpacing: 0.00, + textStyle: 'emphasized.headline-large', ); /// md.sys.typescale.emphasized.headline-medium @@ -77,6 +84,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 36.00, letterSpacing: 0.00, + textStyle: 'emphasized.headline-medium', ); /// md.sys.typescale.emphasized.headline-small @@ -86,6 +94,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 32.00, letterSpacing: 0.00, + textStyle: 'emphasized.headline-small', ); /// md.sys.typescale.emphasized.label-large @@ -95,6 +104,7 @@ class TokenTypescaleEmphasized { fontWeight: 700, lineHeight: 20.00, letterSpacing: 0.10, + textStyle: 'emphasized.label-large', ); /// md.sys.typescale.emphasized.label-medium @@ -104,6 +114,7 @@ class TokenTypescaleEmphasized { fontWeight: 700, lineHeight: 16.00, letterSpacing: 0.50, + textStyle: 'emphasized.label-medium', ); /// md.sys.typescale.emphasized.label-small @@ -113,6 +124,7 @@ class TokenTypescaleEmphasized { fontWeight: 700, lineHeight: 16.00, letterSpacing: 0.50, + textStyle: 'emphasized.label-small', ); /// md.sys.typescale.emphasized.title-large @@ -122,6 +134,7 @@ class TokenTypescaleEmphasized { fontWeight: 500, lineHeight: 28.00, letterSpacing: 0.00, + textStyle: 'emphasized.title-large', ); /// md.sys.typescale.emphasized.title-medium @@ -131,6 +144,7 @@ class TokenTypescaleEmphasized { fontWeight: 700, lineHeight: 24.00, letterSpacing: 0.15, + textStyle: 'emphasized.title-medium', ); /// md.sys.typescale.emphasized.title-small @@ -140,5 +154,6 @@ class TokenTypescaleEmphasized { fontWeight: 700, lineHeight: 20.00, letterSpacing: 0.10, + textStyle: 'emphasized.title-small', ); } diff --git a/packages/material_ui/tool/gen_defaults/data/typescale_struct.dart b/packages/material_ui/tool/gen_defaults/data/typescale_struct.dart index 1040cb9011fc..c3ca25886445 100644 --- a/packages/material_ui/tool/gen_defaults/data/typescale_struct.dart +++ b/packages/material_ui/tool/gen_defaults/data/typescale_struct.dart @@ -9,6 +9,7 @@ class TypescaleStruct { required this.fontWeight, required this.lineHeight, required this.letterSpacing, + this.textStyle, }); final String fontFamily; @@ -16,4 +17,5 @@ class TypescaleStruct { final double fontWeight; final double lineHeight; final double letterSpacing; + final String? textStyle; } diff --git a/packages/material_ui/tool/gen_defaults/data/typescale_variable.dart b/packages/material_ui/tool/gen_defaults/data/typescale_variable.dart index 8d2e6f9d3957..2e71f938cb62 100644 --- a/packages/material_ui/tool/gen_defaults/data/typescale_variable.dart +++ b/packages/material_ui/tool/gen_defaults/data/typescale_variable.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'typescale_struct.dart'; @@ -14,6 +14,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 24.00, letterSpacing: 0.00, + textStyle: 'variable.body-large', ); /// md.sys.typescale.variable.body-medium @@ -23,6 +24,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 20.00, letterSpacing: 0.00, + textStyle: 'variable.body-medium', ); /// md.sys.typescale.variable.body-small @@ -32,6 +34,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 16.00, letterSpacing: 0.00, + textStyle: 'variable.body-small', ); /// md.sys.typescale.variable.display-large @@ -41,6 +44,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 64.00, letterSpacing: 0.00, + textStyle: 'variable.display-large', ); /// md.sys.typescale.variable.display-medium @@ -50,6 +54,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 52.00, letterSpacing: 0.00, + textStyle: 'variable.display-medium', ); /// md.sys.typescale.variable.display-small @@ -59,6 +64,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 44.00, letterSpacing: 0.00, + textStyle: 'variable.display-small', ); /// md.sys.typescale.variable.headline-large @@ -68,6 +74,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 40.00, letterSpacing: 0.00, + textStyle: 'variable.headline-large', ); /// md.sys.typescale.variable.headline-medium @@ -77,6 +84,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 36.00, letterSpacing: 0.00, + textStyle: 'variable.headline-medium', ); /// md.sys.typescale.variable.headline-small @@ -86,6 +94,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 32.00, letterSpacing: 0.00, + textStyle: 'variable.headline-small', ); /// md.sys.typescale.variable.label-large @@ -95,6 +104,7 @@ class TokenTypescaleVariable { fontWeight: 500, lineHeight: 20.00, letterSpacing: 0.00, + textStyle: 'variable.label-large', ); /// md.sys.typescale.variable.label-medium @@ -104,6 +114,7 @@ class TokenTypescaleVariable { fontWeight: 500, lineHeight: 16.00, letterSpacing: 0.00, + textStyle: 'variable.label-medium', ); /// md.sys.typescale.variable.label-small @@ -113,6 +124,7 @@ class TokenTypescaleVariable { fontWeight: 500, lineHeight: 16.00, letterSpacing: 0.00, + textStyle: 'variable.label-small', ); /// md.sys.typescale.variable.title-large @@ -122,6 +134,7 @@ class TokenTypescaleVariable { fontWeight: 400, lineHeight: 28.00, letterSpacing: 0.00, + textStyle: 'variable.title-large', ); /// md.sys.typescale.variable.title-medium @@ -131,6 +144,7 @@ class TokenTypescaleVariable { fontWeight: 500, lineHeight: 24.00, letterSpacing: 0.00, + textStyle: 'variable.title-medium', ); /// md.sys.typescale.variable.title-small @@ -140,5 +154,6 @@ class TokenTypescaleVariable { fontWeight: 500, lineHeight: 20.00, letterSpacing: 0.00, + textStyle: 'variable.title-small', ); } diff --git a/packages/material_ui/tool/gen_defaults/data/typescale_variable_emphasized.dart b/packages/material_ui/tool/gen_defaults/data/typescale_variable_emphasized.dart index 761501dc4b9d..546bfb27c17b 100644 --- a/packages/material_ui/tool/gen_defaults/data/typescale_variable_emphasized.dart +++ b/packages/material_ui/tool/gen_defaults/data/typescale_variable_emphasized.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// Version: 38.0.15 +// Version: 38.0.58 import 'typescale_struct.dart'; @@ -14,6 +14,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 24.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.body-large', ); /// md.sys.typescale.variable.emphasized.body-medium @@ -23,6 +24,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 20.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.body-medium', ); /// md.sys.typescale.variable.emphasized.body-small @@ -32,6 +34,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 16.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.body-small', ); /// md.sys.typescale.variable.emphasized.display-large @@ -41,6 +44,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 64.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.display-large', ); /// md.sys.typescale.variable.emphasized.display-medium @@ -50,6 +54,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 52.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.display-medium', ); /// md.sys.typescale.variable.emphasized.display-small @@ -59,6 +64,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 44.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.display-small', ); /// md.sys.typescale.variable.emphasized.headline-large @@ -68,6 +74,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 40.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.headline-large', ); /// md.sys.typescale.variable.emphasized.headline-medium @@ -77,6 +84,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 36.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.headline-medium', ); /// md.sys.typescale.variable.emphasized.headline-small @@ -86,6 +94,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 32.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.headline-small', ); /// md.sys.typescale.variable.emphasized.label-large @@ -95,6 +104,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 600, lineHeight: 20.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.label-large', ); /// md.sys.typescale.variable.emphasized.label-medium @@ -104,6 +114,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 600, lineHeight: 16.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.label-medium', ); /// md.sys.typescale.variable.emphasized.label-small @@ -113,6 +124,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 600, lineHeight: 16.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.label-small', ); /// md.sys.typescale.variable.emphasized.title-large @@ -122,6 +134,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 500, lineHeight: 28.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.title-large', ); /// md.sys.typescale.variable.emphasized.title-medium @@ -131,6 +144,7 @@ class TokenTypescaleVariableEmphasized { fontWeight: 600, lineHeight: 24.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.title-medium', ); /// md.sys.typescale.variable.emphasized.title-small @@ -140,5 +154,6 @@ class TokenTypescaleVariableEmphasized { fontWeight: 600, lineHeight: 20.00, letterSpacing: 0.00, + textStyle: 'variable.emphasized.title-small', ); }