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..30d76ff11b07 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.1.12 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..ac7606010c7e 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenAppBarLarge { @@ -11,11 +12,5 @@ class TokenAppBarLarge { 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..baf1982c5670 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenAppBarLargeFlexible { @@ -11,22 +12,10 @@ class TokenAppBarLargeFlexible { 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..00e8597088aa 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenAppBarMedium { @@ -11,11 +12,5 @@ class TokenAppBarMedium { 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..db1a13134407 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenAppBarMediumFlexible { @@ -11,22 +12,10 @@ class TokenAppBarMediumFlexible { 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..b848e912869d 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,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenAppBarSmall { @@ -24,29 +25,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..284722c4ab00 100644 --- a/packages/material_ui/tool/gen_defaults/data/assist_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/assist_chip.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenAssistChip { @@ -119,13 +120,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..90c09f286427 100644 --- a/packages/material_ui/tool/gen_defaults/data/badge.dart +++ b/packages/material_ui/tool/gen_defaults/data/badge.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenBadge { @@ -19,13 +20,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 deleted file mode 100644 index 81de4e9374d1..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/banner.dart +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenBanner { - /// md.comp.banner.container.color - static const TokenColorRole containerColor = - TokenColorRole.surfaceContainerLow; - - /// md.comp.banner.container.elevation - static const double containerElevation = 1.00; - - /// md.comp.banner.container.shape - static const ShapeStruct containerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.banner.desktop.with-single-line.container.height - static const double desktopWithSingleLineContainerHeight = 52.00; - - /// md.comp.banner.desktop.with-three-lines.container.height - static const double desktopWithThreeLinesContainerHeight = 90.00; - - /// md.comp.banner.desktop.with-two-lines.with-image.container.height - static const double desktopWithTwoLinesWithImageContainerHeight = 72.00; - - /// md.comp.banner.mobile.with-single-line.container.height - static const double mobileWithSingleLineContainerHeight = 54.00; - - /// md.comp.banner.mobile.with-two-lines.container.height - static const double mobileWithTwoLinesContainerHeight = 112.00; - - /// md.comp.banner.mobile.with-two-lines.with-image.container.height - static const double mobileWithTwoLinesWithImageContainerHeight = 120.00; - - /// md.comp.banner.supporting-text.color - static const TokenColorRole supportingTextColor = - 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, - ); - - /// md.comp.banner.with-image.image.shape - static const ShapeStruct withImageImageShape = ShapeStruct( - family: 'SHAPE_FAMILY_CIRCULAR', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.banner.with-image.image.size - static const double withImageImageSize = 40.00; -} diff --git a/packages/material_ui/tool/gen_defaults/data/banners.dart b/packages/material_ui/tool/gen_defaults/data/banners.dart deleted file mode 100644 index 5030095bd31d..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/banners.dart +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; - -class TokenBanners { - /// md.comp.banners.banners.close-button.pressed.state-layer.color - static const TokenColorRole bannersCloseButtonPressedStateLayerColor = - TokenColorRole.primary; - - /// md.comp.banners.close-button.color - static const TokenColorRole closeButtonColor = TokenColorRole.primary; - - /// md.comp.banners.close-button.focused.state-layer.color - static const TokenColorRole closeButtonFocusedStateLayerColor = - TokenColorRole.primary; - - /// md.comp.banners.close-button.hovered.state-layer.color - static const TokenColorRole closeButtonHoveredStateLayerColor = - TokenColorRole.primary; - - /// md.comp.banners.standard.body-text.color - static const TokenColorRole standardBodyTextColor = TokenColorRole.onSurface; - - /// md.comp.banners.standard.color - static const TokenColorRole standardColor = TokenColorRole.surfaceContainer; - - /// md.comp.banners.standard.icon.color - static const TokenColorRole standardIconColor = TokenColorRole.onSurface; - - /// md.comp.banners.standard.title-text.color - static const TokenColorRole standardTitleTextColor = TokenColorRole.onSurface; - - /// md.comp.banners.vibrant.body-text.color - static const TokenColorRole vibrantBodyTextColor = - TokenColorRole.onPrimaryContainer; - - /// md.comp.banners.vibrant.color - static const TokenColorRole vibrantColor = TokenColorRole.primaryContainer; - - /// md.comp.banners.vibrant.icon.color - static const TokenColorRole vibrantIconColor = - TokenColorRole.onPrimaryContainer; - - /// md.comp.banners.vibrant.title-text.color - static const TokenColorRole vibrantTitleTextColor = - TokenColorRole.onPrimaryContainer; -} diff --git a/packages/material_ui/tool/gen_defaults/data/banners_basic.dart b/packages/material_ui/tool/gen_defaults/data/banners_basic.dart deleted file mode 100644 index a6fa2129a012..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/banners_basic.dart +++ /dev/null @@ -1,124 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenBannersBasic { - /// md.comp.banners.basic.actions.between-space - static const double actionsBetweenSpace = 8.00; - - /// md.comp.banners.basic.actions.bottom-space - static const double actionsBottomSpace = 0.00; - - /// md.comp.banners.basic.actions-close-button-space - static const double actionsCloseButtonSpace = 8.00; - - /// md.comp.banners.basic.actions.leading-space - static const double actionsLeadingSpace = 8.00; - - /// md.comp.banners.basic.actions.top-space - static const double actionsTopSpace = 0.00; - - /// md.comp.banners.basic.actions.trailing-space - static const double actionsTrailingSpace = 8.00; - - /// md.comp.banners.basic.body-text.bottom-space - static const double bodyTextBottomSpace = 14.00; - - /// md.comp.banners.basic.body-text.leading-space - static const double bodyTextLeadingSpace = 0.00; - - /// md.comp.banners.basic.body-text.top-space - static const double bodyTextTopSpace = 14.00; - - /// md.comp.banners.basic.body-text.trailing-space - 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, - ); - - /// md.comp.banners.basic.bottom-space - static const double bottomSpace = 4.00; - - /// md.comp.banners.basic.centered.body-text.trailing-space - static const double centeredBodyTextTrailingSpace = 0.00; - - /// md.comp.banners.basic.height - static const double height = 56.00; - - /// md.comp.banners.basic.icon.container.size - static const double iconContainerSize = 48.00; - - /// md.comp.banners.basic.icon.size - static const double iconSize = 24.00; - - /// md.comp.banners.basic.leading-space - static const double leadingSpace = 4.00; - - /// md.comp.banners.basic.mobile.actions-close-button-space - static const double mobileActionsCloseButtonSpace = 4.00; - - /// md.comp.banners.basic.mobile.actions.trailing-space - static const double mobileActionsTrailingSpace = 4.00; - - /// md.comp.banners.basic.mobile.height - static const double mobileHeight = 112.00; - - /// md.comp.banners.basic.mobile.top-space - static const double mobileTopSpace = 8.00; - - /// md.comp.banners.basic.round.no-icon.body-text.leading-space - static const double roundNoIconBodyTextLeadingSpace = 16.00; - - /// md.comp.banners.basic.shape.round - static const ShapeStruct shapeRound = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 28.00, - topRight: 28.00, - bottomLeft: 28.00, - bottomRight: 28.00, - ); - - /// md.comp.banners.basic.shape.square - static const ShapeStruct shapeSquare = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.banners.basic.square.no-icon.body-text.leading-space - static const double squareNoIconBodyTextLeadingSpace = 12.00; - - /// md.comp.banners.basic.top-space - static const double topSpace = 4.00; - - /// md.comp.banners.basic.trailing-space - static const double trailingSpace = 4.00; - - /// md.comp.banners.basic.two-lines.body-text.bottom-space - static const double twoLinesBodyTextBottomSpace = 8.00; - - /// md.comp.banners.basic.two-lines.body-text.top-space - static const double twoLinesBodyTextTopSpace = 8.00; - - /// md.comp.banners.basic.two-lines.container-buttons-bottom-space - static const double twoLinesContainerButtonsBottomSpace = 4.00; - - /// md.comp.banners.basic.two-lines.container-buttons-top-space - static const double twoLinesContainerButtonsTopSpace = 4.00; - - /// md.comp.banners.basic.two-lines.height - static const double twoLinesHeight = 64.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 deleted file mode 100644 index 12af5f3d536b..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/banners_rich.dart +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenBannersRich { - /// md.comp.banners.rich.actions.between-space - static const double actionsBetweenSpace = 8.00; - - /// md.comp.banners.rich.actions.bottom-space - static const double actionsBottomSpace = 12.00; - - /// md.comp.banners.rich.actions.leading-space - static const double actionsLeadingSpace = 12.00; - - /// md.comp.banners.rich.actions.top-space - static const double actionsTopSpace = 12.00; - - /// md.comp.banners.rich.actions.trailing-space - static const double actionsTrailingSpace = 12.00; - - /// md.comp.banners.rich.body-text.bottom-space - static const double bodyTextBottomSpace = 0.00; - - /// md.comp.banners.rich.body-text.leading-space - static const double bodyTextLeadingSpace = 0.00; - - /// md.comp.banners.rich.body-text.text-actions-space - static const double bodyTextTextActionsSpace = 8.00; - - /// md.comp.banners.rich.body-text.top-space - static const double bodyTextTopSpace = 0.00; - - /// md.comp.banners.rich.body-text.trailing-space - 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, - ); - - /// md.comp.banners.rich.bottom-space - static const double bottomSpace = 12.00; - - /// md.comp.banners.rich.icon.size - static const double iconSize = 24.00; - - /// md.comp.banners.rich.icon-text-space - static const double iconTextSpace = 4.00; - - /// md.comp.banners.rich.image.shape - static const ShapeStruct imageShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.banners.rich.image.size - static const double imageSize = 80.00; - - /// md.comp.banners.rich.image-text-space - static const double imageTextSpace = 8.00; - - /// md.comp.banners.rich.leading-element.bottom-space - static const double leadingElementBottomSpace = 12.00; - - /// md.comp.banners.rich.leading-element.leading-space - static const double leadingElementLeadingSpace = 4.00; - - /// md.comp.banners.rich.leading-element.top-space - static const double leadingElementTopSpace = 12.00; - - /// md.comp.banners.rich.leading-element.trailing-space - static const double leadingElementTrailingSpace = 4.00; - - /// md.comp.banners.rich.leading-space - static const double leadingSpace = 12.00; - - /// md.comp.banners.rich.shape - static const ShapeStruct shape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 28.00, - topRight: 28.00, - bottomLeft: 28.00, - bottomRight: 28.00, - ); - - /// md.comp.banners.rich.title-text.bottom-space - static const double titleTextBottomSpace = 14.00; - - /// md.comp.banners.rich.title-text.height - static const double titleTextHeight = 48.00; - - /// md.comp.banners.rich.title-text.leading-space - static const double titleTextLeadingSpace = 0.00; - - /// md.comp.banners.rich.title-text.top-space - static const double titleTextTopSpace = 14.00; - - /// md.comp.banners.rich.title-text.trailing-space - 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, - ); - - /// md.comp.banners.rich.top-space - static const double topSpace = 12.00; - - /// md.comp.banners.rich.trailing-space - static const double trailingSpace = 12.00; - - /// md.comp.banners.rich.with-image-leading-space - static const double withImageLeadingSpace = 20.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..de1ae7e29547 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.1.12 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..c48a890f8826 100644 --- a/packages/material_ui/tool/gen_defaults/data/button.dart +++ b/packages/material_ui/tool/gen_defaults/data/button.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenButton { @@ -106,13 +107,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..a8454cbf3e5f 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.1.12 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..716acf2417f0 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.1.12 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..e2b7980275d2 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.1.12 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..f88abe685205 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.1.12 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..3cf4594ee408 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.1.12 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..ca90395c2ac4 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.1.12 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..f3459ae20aba 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.1.12 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..be921e26a5d2 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.1.12 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..646d73fa4951 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.1.12 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..58e4fc14d6f8 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.1.12 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..5490bf0b740f 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.1.12 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..e25a7a46f044 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.1.12 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..791c35154738 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_large.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_large.dart @@ -2,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenButtonLarge { @@ -36,13 +37,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..3d58dfe83f56 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_medium.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_medium.dart @@ -2,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenButtonMedium { @@ -36,13 +37,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..7dfe6d7adfee 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.1.12 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..d881cb3cf28b 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_small.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_small.dart @@ -2,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenButtonSmall { @@ -36,13 +37,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..4ee4ed1fb8e9 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.1.12 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..810741683000 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.1.12 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..c2b97b11898b 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_xlarge.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_xlarge.dart @@ -2,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenButtonXlarge { @@ -36,13 +37,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..70d3c5a356ed 100644 --- a/packages/material_ui/tool/gen_defaults/data/button_xsmall.dart +++ b/packages/material_ui/tool/gen_defaults/data/button_xsmall.dart @@ -2,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenButtonXsmall { @@ -36,13 +37,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..af7c9b6c0900 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.1.12 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..19ae64e38aab 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.1.12 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..4d68938c5375 100644 --- a/packages/material_ui/tool/gen_defaults/data/chips.dart +++ b/packages/material_ui/tool/gen_defaults/data/chips.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenChips { @@ -78,13 +79,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_dark.dart b/packages/material_ui/tool/gen_defaults/data/color_dark.dart index b22f14827b4a..22705e14d2aa 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.1.12 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..ce5f4512195d 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,12 +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.1.12 class TokenColorDarkHighContrast { - /// md.sys.color.background - static const String background = '0xFF141218'; - /// md.sys.color.error static const String error = '0xFFFCEEEE'; @@ -20,9 +17,6 @@ class TokenColorDarkHighContrast { /// md.sys.color.inverse-primary static const String inversePrimary = '0xFF381E72'; - /// md.sys.color.inverse-surface - static const String inverseSurface = '0xFFE6E0E9'; - /// md.sys.color.on-background static const String onBackground = '0xFFFFFFFF'; @@ -92,9 +86,6 @@ class TokenColorDarkHighContrast { /// md.sys.color.primary-fixed-dim static const String primaryFixedDim = '0xFFD0BCFF'; - /// md.sys.color.scrim - static const String scrim = '0xFF000000'; - /// md.sys.color.secondary static const String secondary = '0xFFF6EDFF'; @@ -107,36 +98,6 @@ class TokenColorDarkHighContrast { /// md.sys.color.secondary-fixed-dim static const String secondaryFixedDim = '0xFFCCC2DC'; - /// md.sys.color.shadow - static const String shadow = '0xFF000000'; - - /// md.sys.color.surface - static const String surface = '0xFF141218'; - - /// md.sys.color.surface-bright - static const String surfaceBright = '0xFF3B383E'; - - /// md.sys.color.surface-container - static const String surfaceContainer = '0xFF211F26'; - - /// md.sys.color.surface-container-high - static const String surfaceContainerHigh = '0xFF2B2930'; - - /// md.sys.color.surface-container-highest - static const String surfaceContainerHighest = '0xFF36343B'; - - /// md.sys.color.surface-container-low - static const String surfaceContainerLow = '0xFF1D1B20'; - - /// md.sys.color.surface-container-lowest - static const String surfaceContainerLowest = '0xFF0F0D13'; - - /// md.sys.color.surface-dim - static const String surfaceDim = '0xFF141218'; - - /// md.sys.color.surface-variant - static const String surfaceVariant = '0xFF49454F'; - /// md.sys.color.tertiary static const String tertiary = '0xFFFFECF1'; 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..65235c35e7a2 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,12 +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.1.12 class TokenColorDarkMediumContrast { - /// md.sys.color.background - static const String background = '0xFF141218'; - /// md.sys.color.error static const String error = '0xFFF9DEDC'; @@ -20,9 +17,6 @@ class TokenColorDarkMediumContrast { /// md.sys.color.inverse-primary static const String inversePrimary = '0xFF4F378B'; - /// md.sys.color.inverse-surface - static const String inverseSurface = '0xFFE6E0E9'; - /// md.sys.color.on-background static const String onBackground = '0xFFFFFFFF'; @@ -92,9 +86,6 @@ class TokenColorDarkMediumContrast { /// md.sys.color.primary-fixed-dim static const String primaryFixedDim = '0xFFD0BCFF'; - /// md.sys.color.scrim - static const String scrim = '0xFF000000'; - /// md.sys.color.secondary static const String secondary = '0xFFE8DEF8'; @@ -107,36 +98,6 @@ class TokenColorDarkMediumContrast { /// md.sys.color.secondary-fixed-dim static const String secondaryFixedDim = '0xFFCCC2DC'; - /// md.sys.color.shadow - static const String shadow = '0xFF000000'; - - /// md.sys.color.surface - static const String surface = '0xFF141218'; - - /// md.sys.color.surface-bright - static const String surfaceBright = '0xFF3B383E'; - - /// md.sys.color.surface-container - static const String surfaceContainer = '0xFF211F26'; - - /// md.sys.color.surface-container-high - static const String surfaceContainerHigh = '0xFF2B2930'; - - /// md.sys.color.surface-container-highest - static const String surfaceContainerHighest = '0xFF36343B'; - - /// md.sys.color.surface-container-low - static const String surfaceContainerLow = '0xFF1D1B20'; - - /// md.sys.color.surface-container-lowest - static const String surfaceContainerLowest = '0xFF0F0D13'; - - /// md.sys.color.surface-dim - static const String surfaceDim = '0xFF141218'; - - /// md.sys.color.surface-variant - static const String surfaceVariant = '0xFF49454F'; - /// md.sys.color.tertiary static const String tertiary = '0xFFFFD8E4'; diff --git a/packages/material_ui/tool/gen_defaults/data/color.dart b/packages/material_ui/tool/gen_defaults/data/color_light.dart similarity index 99% rename from packages/material_ui/tool/gen_defaults/data/color.dart rename to packages/material_ui/tool/gen_defaults/data/color_light.dart index 4dc5fa814cd3..6d6cd6627054 100644 --- a/packages/material_ui/tool/gen_defaults/data/color.dart +++ b/packages/material_ui/tool/gen_defaults/data/color_light.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.1.12 -class TokenColor { +class TokenColorLight { /// md.sys.color.background static const String background = '0xFFFEF7FF'; 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..c100ecbe5628 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,12 +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.1.12 class TokenColorLightHighContrast { - /// md.sys.color.background - static const String background = '0xFFFEF7FF'; - /// md.sys.color.error static const String error = '0xFF601410'; @@ -17,12 +14,6 @@ class TokenColorLightHighContrast { /// md.sys.color.inverse-on-surface static const String inverseOnSurface = '0xFFFFFFFF'; - /// md.sys.color.inverse-primary - static const String inversePrimary = '0xFFD0BCFF'; - - /// md.sys.color.inverse-surface - static const String inverseSurface = '0xFF322F35'; - /// md.sys.color.on-background static const String onBackground = '0xFF000000'; @@ -92,9 +83,6 @@ class TokenColorLightHighContrast { /// md.sys.color.primary-fixed-dim static const String primaryFixedDim = '0xFF381E72'; - /// md.sys.color.scrim - static const String scrim = '0xFF000000'; - /// md.sys.color.secondary static const String secondary = '0xFF332D41'; @@ -107,36 +95,6 @@ class TokenColorLightHighContrast { /// md.sys.color.secondary-fixed-dim static const String secondaryFixedDim = '0xFF332D41'; - /// md.sys.color.shadow - static const String shadow = '0xFF000000'; - - /// md.sys.color.surface - static const String surface = '0xFFFEF7FF'; - - /// md.sys.color.surface-bright - static const String surfaceBright = '0xFFFEF7FF'; - - /// md.sys.color.surface-container - static const String surfaceContainer = '0xFFF3EDF7'; - - /// md.sys.color.surface-container-high - static const String surfaceContainerHigh = '0xFFECE6F0'; - - /// md.sys.color.surface-container-highest - static const String surfaceContainerHighest = '0xFFE6E0E9'; - - /// md.sys.color.surface-container-low - static const String surfaceContainerLow = '0xFFF7F2FA'; - - /// md.sys.color.surface-container-lowest - static const String surfaceContainerLowest = '0xFFFFFFFF'; - - /// md.sys.color.surface-dim - static const String surfaceDim = '0xFFDED8E1'; - - /// md.sys.color.surface-variant - static const String surfaceVariant = '0xFFE7E0EC'; - /// md.sys.color.tertiary static const String tertiary = '0xFF492532'; 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..3c642498ddf5 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,12 +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.1.12 class TokenColorLightMediumContrast { - /// md.sys.color.background - static const String background = '0xFFFEF7FF'; - /// md.sys.color.error static const String error = '0xFF8C1D18'; @@ -17,12 +14,6 @@ class TokenColorLightMediumContrast { /// md.sys.color.inverse-on-surface static const String inverseOnSurface = '0xFFFFFFFF'; - /// md.sys.color.inverse-primary - static const String inversePrimary = '0xFFD0BCFF'; - - /// md.sys.color.inverse-surface - static const String inverseSurface = '0xFF322F35'; - /// md.sys.color.on-background static const String onBackground = '0xFF000000'; @@ -92,9 +83,6 @@ class TokenColorLightMediumContrast { /// md.sys.color.primary-fixed-dim static const String primaryFixedDim = '0xFF4F378B'; - /// md.sys.color.scrim - static const String scrim = '0xFF000000'; - /// md.sys.color.secondary static const String secondary = '0xFF4A4458'; @@ -107,36 +95,6 @@ class TokenColorLightMediumContrast { /// md.sys.color.secondary-fixed-dim static const String secondaryFixedDim = '0xFF4A4458'; - /// md.sys.color.shadow - static const String shadow = '0xFF000000'; - - /// md.sys.color.surface - static const String surface = '0xFFFEF7FF'; - - /// md.sys.color.surface-bright - static const String surfaceBright = '0xFFFEF7FF'; - - /// md.sys.color.surface-container - static const String surfaceContainer = '0xFFF3EDF7'; - - /// md.sys.color.surface-container-high - static const String surfaceContainerHigh = '0xFFECE6F0'; - - /// md.sys.color.surface-container-highest - static const String surfaceContainerHighest = '0xFFE6E0E9'; - - /// md.sys.color.surface-container-low - static const String surfaceContainerLow = '0xFFF7F2FA'; - - /// md.sys.color.surface-container-lowest - static const String surfaceContainerLowest = '0xFFFFFFFF'; - - /// md.sys.color.surface-dim - static const String surfaceDim = '0xFFDED8E1'; - - /// md.sys.color.surface-variant - static const String surfaceVariant = '0xFFE7E0EC'; - /// md.sys.color.tertiary static const String tertiary = '0xFF633B48'; 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..754bdffbda90 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.1.12 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 deleted file mode 100644 index 075a3311b9c5..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/data_table.dart +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; - -class TokenDataTable { - /// md.comp.data-table.container.shape - static const ShapeStruct containerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 4.00, - bottomRight: 4.00, - ); - - /// md.comp.data-table.footer.container.color - static const TokenColorRole footerContainerColor = TokenColorRole.surface; - - /// md.comp.data-table.footer.container.height - static const double footerContainerHeight = 52.00; - - /// md.comp.data-table.footer.supporting-text.color - static const TokenColorRole footerSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.data-table.header.container.color - static const TokenColorRole headerContainerColor = TokenColorRole.surface; - - /// md.comp.data-table.header.container.height - static const double headerContainerHeight = 56.00; - - /// md.comp.data-table.header.headline.color - static const TokenColorRole headerHeadlineColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.data-table.header.hover.headline.color - static const TokenColorRole headerHoverHeadlineColor = - TokenColorRole.onSurface; - - /// md.comp.data-table.header.hover.sorting.icon-button.color - static const TokenColorRole headerHoverSortingIconButtonColor = - TokenColorRole.onSurface; - - /// md.comp.data-table.outline.color - static const TokenColorRole outlineColor = TokenColorRole.outlineVariant; - - /// md.comp.data-table.outline.width - static const double outlineWidth = 1.00; - - /// md.comp.data-table.row-item.container.height - static const double rowItemContainerHeight = 52.00; - - /// md.comp.data-table.row-item.disabled.label-text.color - static const TokenColorRole rowItemDisabledLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.data-table.row-item.disabled.label-text.opacity - static const double rowItemDisabledLabelTextOpacity = 0.38; - - /// md.comp.data-table.row-item.label-text.color - static const TokenColorRole rowItemLabelTextColor = TokenColorRole.onSurface; - - /// md.comp.data-table.row-item.outline.color - static const TokenColorRole rowItemOutlineColor = - TokenColorRole.outlineVariant; - - /// md.comp.data-table.row-item.outline.width - static const double rowItemOutlineWidth = 1.00; - - /// md.comp.data-table.row-item.selected.container.color - static const TokenColorRole rowItemSelectedContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.data-table.row-item.selected.hover.state-layer.color - static const TokenColorRole rowItemSelectedHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.data-table.row-item.selected.hover.state-layer.opacity - static const double rowItemSelectedHoverStateLayerOpacity = 0.08; - - /// md.comp.data-table.row-item.unselected.container.color - static const TokenColorRole rowItemUnselectedContainerColor = - TokenColorRole.surface; - - /// md.comp.data-table.row-item.unselected.hover.state-layer.color - static const TokenColorRole rowItemUnselectedHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.data-table.row-item.unselected.hover.state-layer.opacity - static const double rowItemUnselectedHoverStateLayerOpacity = 0.08; -} 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..977b8e531a5f 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenDateInputModal { @@ -42,24 +43,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..fed57e72a31e 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenDatePickerDocked { @@ -53,13 +54,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 +210,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 +258,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 +299,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..ebff437d3567 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenDatePickerModal { @@ -53,13 +54,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 +143,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 +213,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 +242,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..1a11ee2b5521 100644 --- a/packages/material_ui/tool/gen_defaults/data/dialog.dart +++ b/packages/material_ui/tool/gen_defaults/data/dialog.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenDialog { @@ -35,13 +36,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 +69,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..97b0487bbc79 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.1.12 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..2e533703842a 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.1.12 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..abc8fba1f9f2 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.1.12 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..2e62c6f34739 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.1.12 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..186593cd25f5 100644 --- a/packages/material_ui/tool/gen_defaults/data/extended_fab.dart +++ b/packages/material_ui/tool/gen_defaults/data/extended_fab.dart @@ -2,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenExtendedFab { @@ -27,13 +28,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..6e891d78b667 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,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenExtendedFabLarge { @@ -27,13 +28,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..b5ac47dc24b9 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,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenExtendedFabMedium { @@ -27,13 +28,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..0f784d5e3b24 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.1.12 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..586bddbc1234 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.1.12 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..447b52e0fea8 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.1.12 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..1af885b189d2 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.1.12 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..b1fe93f7f393 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,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenExtendedFabSmall { @@ -27,13 +28,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..9f18c87ad30a 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenExtendedFabSurface { @@ -80,13 +81,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..2a688f7887b3 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.1.12 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..16e407e059a3 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.1.12 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..472eaa23fff5 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.1.12 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..c9c31cba5aa2 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.1.12 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..dca8b087bfd5 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.1.12 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..2571b1cff57e 100644 --- a/packages/material_ui/tool/gen_defaults/data/fab_menu.dart +++ b/packages/material_ui/tool/gen_defaults/data/fab_menu.dart @@ -2,9 +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.1.12 import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenFabMenu { @@ -57,13 +58,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..18e30b85ae74 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.1.12 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..acd16e733e0e 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.1.12 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..5200b9f5343e 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.1.12 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..ce6ddbc2a29b 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.1.12 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..7dac8bcf9396 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.1.12 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..6088340505fc 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.1.12 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..efb0b6f7b371 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.1.12 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..fd7f8e6e9b33 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.1.12 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..3689888322ee 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.1.12 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..690734c6337f 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.1.12 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..6b0b0148124a 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.1.12 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..baed333cd364 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.1.12 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..fb4736c7b5cd 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.1.12 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..d742d8f6a959 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.1.12 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 deleted file mode 100644 index 520c4fa3dfd5..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/filled_autocomplete.dart +++ /dev/null @@ -1,309 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenFilledAutocomplete { - /// md.comp.filled-autocomplete.menu.cascading-menu-indicator.icon.color - static const TokenColorRole menuCascadingMenuIndicatorIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.menu.cascading-menu-indicator.icon.size - static const double menuCascadingMenuIndicatorIconSize = 24.00; - - /// md.comp.filled-autocomplete.menu.container.color - static const TokenColorRole menuContainerColor = - TokenColorRole.surfaceContainer; - - /// md.comp.filled-autocomplete.menu.container.elevation - static const double menuContainerElevation = 3.00; - - /// md.comp.filled-autocomplete.menu.container.shadow-color - static const TokenColorRole menuContainerShadowColor = TokenColorRole.shadow; - - /// md.comp.filled-autocomplete.menu.container.shape - static const ShapeStruct menuContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 4.00, - bottomRight: 4.00, - ); - - /// md.comp.filled-autocomplete.text-field.active-indicator.color - static const TokenColorRole textFieldActiveIndicatorColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.active-indicator.height - static const double textFieldActiveIndicatorHeight = 1.00; - - /// md.comp.filled-autocomplete.text-field.caret.color - static const TokenColorRole textFieldCaretColor = TokenColorRole.primary; - - /// md.comp.filled-autocomplete.text-field.container.color - static const TokenColorRole textFieldContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.filled-autocomplete.text-field.container.shape - static const ShapeStruct textFieldContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.filled-autocomplete.text-field.disabled.active-indicator.color - static const TokenColorRole textFieldDisabledActiveIndicatorColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.disabled.active-indicator.height - static const double textFieldDisabledActiveIndicatorHeight = 1.00; - - /// md.comp.filled-autocomplete.text-field.disabled.active-indicator.opacity - static const double textFieldDisabledActiveIndicatorOpacity = 0.38; - - /// md.comp.filled-autocomplete.text-field.disabled.container.color - static const TokenColorRole textFieldDisabledContainerColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.disabled.container.opacity - static const double textFieldDisabledContainerOpacity = 0.04; - - /// md.comp.filled-autocomplete.text-field.disabled.input-text.color - static const TokenColorRole textFieldDisabledInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.disabled.input-text.opacity - static const double textFieldDisabledInputTextOpacity = 0.38; - - /// md.comp.filled-autocomplete.text-field.disabled.label-text.color - static const TokenColorRole textFieldDisabledLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.disabled.label-text.opacity - static const double textFieldDisabledLabelTextOpacity = 0.38; - - /// md.comp.filled-autocomplete.text-field.disabled.leading-icon.color - static const TokenColorRole textFieldDisabledLeadingIconColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.disabled.leading-icon.opacity - static const double textFieldDisabledLeadingIconOpacity = 0.38; - - /// md.comp.filled-autocomplete.text-field.disabled.supporting-text.color - static const TokenColorRole textFieldDisabledSupportingTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.disabled.supporting-text.opacity - static const double textFieldDisabledSupportingTextOpacity = 0.38; - - /// md.comp.filled-autocomplete.text-field.disabled.trailing-icon.color - static const TokenColorRole textFieldDisabledTrailingIconColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.disabled.trailing-icon.opacity - static const double textFieldDisabledTrailingIconOpacity = 0.38; - - /// md.comp.filled-autocomplete.text-field.error.active-indicator.color - static const TokenColorRole textFieldErrorActiveIndicatorColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.focus.active-indicator.color - static const TokenColorRole textFieldErrorFocusActiveIndicatorColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.focus.caret.color - static const TokenColorRole textFieldErrorFocusCaretColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.focus.input-text.color - static const TokenColorRole textFieldErrorFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.error.focus.label-text.color - static const TokenColorRole textFieldErrorFocusLabelTextColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.focus.leading-icon.color - static const TokenColorRole textFieldErrorFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.error.focus.supporting-text.color - static const TokenColorRole textFieldErrorFocusSupportingTextColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.focus.trailing-icon.color - static const TokenColorRole textFieldErrorFocusTrailingIconColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.hover.active-indicator.color - static const TokenColorRole textFieldErrorHoverActiveIndicatorColor = - TokenColorRole.onErrorContainer; - - /// md.comp.filled-autocomplete.text-field.error.hover.input-text.color - static const TokenColorRole textFieldErrorHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.error.hover.label-text.color - static const TokenColorRole textFieldErrorHoverLabelTextColor = - TokenColorRole.onErrorContainer; - - /// md.comp.filled-autocomplete.text-field.error.hover.leading-icon.color - static const TokenColorRole textFieldErrorHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.error.hover.state-layer.color - static const TokenColorRole textFieldErrorHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.error.hover.state-layer.opacity - static const double textFieldErrorHoverStateLayerOpacity = 0.08; - - /// md.comp.filled-autocomplete.text-field.error.hover.supporting-text.color - static const TokenColorRole textFieldErrorHoverSupportingTextColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.hover.trailing-icon.color - static const TokenColorRole textFieldErrorHoverTrailingIconColor = - TokenColorRole.onErrorContainer; - - /// md.comp.filled-autocomplete.text-field.error.input-text.color - static const TokenColorRole textFieldErrorInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.error.label-text.color - static const TokenColorRole textFieldErrorLabelTextColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.leading-icon.color - static const TokenColorRole textFieldErrorLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.error.supporting-text.color - static const TokenColorRole textFieldErrorSupportingTextColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.error.trailing-icon.color - static const TokenColorRole textFieldErrorTrailingIconColor = - TokenColorRole.error; - - /// md.comp.filled-autocomplete.text-field.focus.active-indicator.color - static const TokenColorRole textFieldFocusActiveIndicatorColor = - TokenColorRole.primary; - - /// md.comp.filled-autocomplete.text-field.focus.active-indicator.height - static const double textFieldFocusActiveIndicatorHeight = 2.00; - - /// md.comp.filled-autocomplete.text-field.focus.input-text.color - static const TokenColorRole textFieldFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.focus.label-text.color - static const TokenColorRole textFieldFocusLabelTextColor = - TokenColorRole.primary; - - /// md.comp.filled-autocomplete.text-field.focus.leading-icon.color - static const TokenColorRole textFieldFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.focus.supporting-text.color - static const TokenColorRole textFieldFocusSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.focus.trailing-icon.color - static const TokenColorRole textFieldFocusTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.hover.active-indicator.color - static const TokenColorRole textFieldHoverActiveIndicatorColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.hover.active-indicator.height - static const double textFieldHoverActiveIndicatorHeight = 1.00; - - /// md.comp.filled-autocomplete.text-field.hover.input-text.color - static const TokenColorRole textFieldHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.hover.label-text.color - static const TokenColorRole textFieldHoverLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.hover.leading-icon.color - static const TokenColorRole textFieldHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.hover.state-layer.color - static const TokenColorRole textFieldHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.filled-autocomplete.text-field.hover.state-layer.opacity - static const double textFieldHoverStateLayerOpacity = 0.08; - - /// md.comp.filled-autocomplete.text-field.hover.supporting-text.color - static const TokenColorRole textFieldHoverSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.hover.trailing-icon.color - static const TokenColorRole textFieldHoverTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.input-text.color - static const TokenColorRole textFieldInputTextColor = - 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, - ); - - /// md.comp.filled-autocomplete.text-field.label-text.color - static const TokenColorRole textFieldLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// 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, - ); - - /// md.comp.filled-autocomplete.text-field.leading-icon.color - static const TokenColorRole textFieldLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.leading-icon.size - static const double textFieldLeadingIconSize = 20.00; - - /// md.comp.filled-autocomplete.text-field.supporting-text.color - static const TokenColorRole textFieldSupportingTextColor = - 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, - ); - - /// md.comp.filled-autocomplete.text-field.trailing-icon.color - static const TokenColorRole textFieldTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-autocomplete.text-field.trailing-icon.size - static const double textFieldTrailingIconSize = 24.00; -} 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..e418b94b65e1 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.1.12 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 deleted file mode 100644 index 3813f0b7667f..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/filled_menu_button.dart +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenFilledMenuButton { - /// md.comp.filled-menu-button.container.color - static const TokenColorRole containerColor = TokenColorRole.primary; - - /// md.comp.filled-menu-button.container.elevation - static const double containerElevation = 0.00; - - /// md.comp.filled-menu-button.container.height - static const double containerHeight = 40.00; - - /// md.comp.filled-menu-button.disabled.container.color - static const TokenColorRole disabledContainerColor = TokenColorRole.onSurface; - - /// md.comp.filled-menu-button.disabled.container.elevation - static const double disabledContainerElevation = 0.00; - - /// md.comp.filled-menu-button.disabled.container.opacity - static const double disabledContainerOpacity = 0.12; - - /// md.comp.filled-menu-button.disabled.label-text.color - static const TokenColorRole disabledLabelTextColor = TokenColorRole.onSurface; - - /// md.comp.filled-menu-button.disabled.label-text.opacity - static const double disabledLabelTextOpacity = 0.38; - - /// md.comp.filled-menu-button.disabled.trailing-icon.color - static const TokenColorRole disabledTrailingIconColor = - TokenColorRole.onSurface; - - /// md.comp.filled-menu-button.disabled.trailing-icon.opacity - static const double disabledTrailingIconOpacity = 0.38; - - /// md.comp.filled-menu-button.focus.container.elevation - static const double focusContainerElevation = 0.00; - - /// md.comp.filled-menu-button.focus.indicator.color - static const TokenColorRole focusIndicatorColor = TokenColorRole.secondary; - - /// md.comp.filled-menu-button.focus.indicator.outline.offset - static const double focusIndicatorOutlineOffset = 2.00; - - /// md.comp.filled-menu-button.focus.indicator.thickness - static const double focusIndicatorThickness = 3.00; - - /// md.comp.filled-menu-button.focus.label-text.color - static const TokenColorRole focusLabelTextColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.focus.state-layer.color - static const TokenColorRole focusStateLayerColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.focus.state-layer.opacity - static const double focusStateLayerOpacity = 0.10; - - /// md.comp.filled-menu-button.focus.trailing-icon.color - static const TokenColorRole focusTrailingIconColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.hover.container.elevation - static const double hoverContainerElevation = 1.00; - - /// md.comp.filled-menu-button.hover.label-text.color - static const TokenColorRole hoverLabelTextColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.hover.state-layer.color - static const TokenColorRole hoverStateLayerColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.hover.state-layer.opacity - static const double hoverStateLayerOpacity = 0.08; - - /// md.comp.filled-menu-button.hover.trailing-icon.color - static const TokenColorRole hoverTrailingIconColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.label-text.color - 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, - ); - - /// md.comp.filled-menu-button.pressed.label-text.color - static const TokenColorRole pressedLabelTextColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.pressed.state-layer.color - static const TokenColorRole pressedStateLayerColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.pressed.state-layer.opacity - static const double pressedStateLayerOpacity = 0.10; - - /// md.comp.filled-menu-button.pressed.trailing-icon.color - static const TokenColorRole pressedTrailingIconColor = - TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.shape - static const ShapeStruct shape = ShapeStruct( - family: 'SHAPE_FAMILY_CIRCULAR', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.filled-menu-button.trailing-icon.color - static const TokenColorRole trailingIconColor = TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.trailing-icon.size - static const double trailingIconSize = 18.00; - - /// md.comp.filled-menu-button.with-icon.disabled.leading-icon.color - static const TokenColorRole withIconDisabledLeadingIconColor = - TokenColorRole.onSurface; - - /// md.comp.filled-menu-button.with-icon.disabled.leading-icon.opacity - static const double withIconDisabledLeadingIconOpacity = 0.38; - - /// md.comp.filled-menu-button.with-icon.focus.leading-icon.color - static const TokenColorRole withIconFocusLeadingIconColor = - TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.with-icon.hover.leading-icon.color - static const TokenColorRole withIconHoverLeadingIconColor = - TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.with-icon.leading-icon.color - static const TokenColorRole withIconLeadingIconColor = - TokenColorRole.onPrimary; - - /// md.comp.filled-menu-button.with-icon.leading-icon.size - static const double withIconLeadingIconSize = 18.00; - - /// md.comp.filled-menu-button.with-icon.pressed.leading-icon.color - static const TokenColorRole withIconPressedLeadingIconColor = - 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 deleted file mode 100644 index edb99729f8e6..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/filled_select.dart +++ /dev/null @@ -1,342 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenFilledSelect { - /// md.comp.filled-select.menu.cascading-menu-indicator.icon.color - static const TokenColorRole menuCascadingMenuIndicatorIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.menu.cascading-menu-indicator.icon.size - static const double menuCascadingMenuIndicatorIconSize = 24.00; - - /// md.comp.filled-select.menu.container.color - static const TokenColorRole menuContainerColor = - TokenColorRole.surfaceContainer; - - /// md.comp.filled-select.menu.container.elevation - static const double menuContainerElevation = 3.00; - - /// md.comp.filled-select.menu.container.shadow-color - static const TokenColorRole menuContainerShadowColor = TokenColorRole.shadow; - - /// md.comp.filled-select.menu.container.shape - static const ShapeStruct menuContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 4.00, - bottomRight: 4.00, - ); - - /// md.comp.filled-select.menu.divider.color - static const TokenColorRole menuDividerColor = TokenColorRole.surfaceVariant; - - /// md.comp.filled-select.menu.divider.height - static const double menuDividerHeight = 1.00; - - /// md.comp.filled-select.menu.list-item.container.height - static const double menuListItemContainerHeight = 48.00; - - /// md.comp.filled-select.menu.list-item.label-text.color - static const TokenColorRole menuListItemLabelTextColor = - 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, - ); - - /// md.comp.filled-select.menu.list-item.selected.container.color - static const TokenColorRole menuListItemSelectedContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.filled-select.menu.list-item.with-leading-icon.leading-icon.color - static const TokenColorRole menuListItemWithLeadingIconLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.menu.list-item.with-leading-icon.leading-icon.size - static const double menuListItemWithLeadingIconLeadingIconSize = 24.00; - - /// md.comp.filled-select.menu.list-item.with-trailing-icon.trailing-icon.color - static const TokenColorRole menuListItemWithTrailingIconTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.menu.list-item.with-trailing-icon.trailing-icon.size - static const double menuListItemWithTrailingIconTrailingIconSize = 24.00; - - /// md.comp.filled-select.text-field.active-indicator.color - static const TokenColorRole textFieldActiveIndicatorColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.active-indicator.height - static const double textFieldActiveIndicatorHeight = 1.00; - - /// md.comp.filled-select.text-field.container.color - static const TokenColorRole textFieldContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.filled-select.text-field.container.shape - static const ShapeStruct textFieldContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.filled-select.text-field.disabled.active-indicator.color - static const TokenColorRole textFieldDisabledActiveIndicatorColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.disabled.active-indicator.height - static const double textFieldDisabledActiveIndicatorHeight = 1.00; - - /// md.comp.filled-select.text-field.disabled.active-indicator.opacity - static const double textFieldDisabledActiveIndicatorOpacity = 0.38; - - /// md.comp.filled-select.text-field.disabled.container.color - static const TokenColorRole textFieldDisabledContainerColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.disabled.container.opacity - static const double textFieldDisabledContainerOpacity = 0.04; - - /// md.comp.filled-select.text-field.disabled.input-text.color - static const TokenColorRole textFieldDisabledInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.disabled.input-text.opacity - static const double textFieldDisabledInputTextOpacity = 0.38; - - /// md.comp.filled-select.text-field.disabled.label-text.color - static const TokenColorRole textFieldDisabledLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.disabled.label-text.opacity - static const double textFieldDisabledLabelTextOpacity = 0.38; - - /// md.comp.filled-select.text-field.disabled.leading-icon.color - static const TokenColorRole textFieldDisabledLeadingIconColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.disabled.leading-icon.opacity - static const double textFieldDisabledLeadingIconOpacity = 0.38; - - /// md.comp.filled-select.text-field.disabled.supporting-text.color - static const TokenColorRole textFieldDisabledSupportingTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.disabled.supporting-text.opacity - static const double textFieldDisabledSupportingTextOpacity = 0.38; - - /// md.comp.filled-select.text-field.disabled.trailing-icon.color - static const TokenColorRole textFieldDisabledTrailingIconColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.disabled.trailing-icon.opacity - static const double textFieldDisabledTrailingIconOpacity = 0.38; - - /// md.comp.filled-select.text-field.error.active-indicator.color - static const TokenColorRole textFieldErrorActiveIndicatorColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.focus.active-indicator.color - static const TokenColorRole textFieldErrorFocusActiveIndicatorColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.focus.input-text.color - static const TokenColorRole textFieldErrorFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.error.focus.label-text.color - static const TokenColorRole textFieldErrorFocusLabelTextColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.focus.leading-icon.color - static const TokenColorRole textFieldErrorFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.error.focus.supporting-text.color - static const TokenColorRole textFieldErrorFocusSupportingTextColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.focus.trailing-icon.color - static const TokenColorRole textFieldErrorFocusTrailingIconColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.hover.active-indicator.color - static const TokenColorRole textFieldErrorHoverActiveIndicatorColor = - TokenColorRole.onErrorContainer; - - /// md.comp.filled-select.text-field.error.hover.input-text.color - static const TokenColorRole textFieldErrorHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.error.hover.label-text.color - static const TokenColorRole textFieldErrorHoverLabelTextColor = - TokenColorRole.onErrorContainer; - - /// md.comp.filled-select.text-field.error.hover.leading-icon.color - static const TokenColorRole textFieldErrorHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.error.hover.state-layer.color - static const TokenColorRole textFieldErrorHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.error.hover.state-layer.opacity - static const double textFieldErrorHoverStateLayerOpacity = 0.08; - - /// md.comp.filled-select.text-field.error.hover.supporting-text.color - static const TokenColorRole textFieldErrorHoverSupportingTextColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.hover.trailing-icon.color - static const TokenColorRole textFieldErrorHoverTrailingIconColor = - TokenColorRole.onErrorContainer; - - /// md.comp.filled-select.text-field.error.input-text.color - static const TokenColorRole textFieldErrorInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.error.label-text.color - static const TokenColorRole textFieldErrorLabelTextColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.leading-icon.color - static const TokenColorRole textFieldErrorLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.error.supporting-text.color - static const TokenColorRole textFieldErrorSupportingTextColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.error.trailing-icon.color - static const TokenColorRole textFieldErrorTrailingIconColor = - TokenColorRole.error; - - /// md.comp.filled-select.text-field.focus.active-indicator.color - static const TokenColorRole textFieldFocusActiveIndicatorColor = - TokenColorRole.primary; - - /// md.comp.filled-select.text-field.focus.active-indicator.height - static const double textFieldFocusActiveIndicatorHeight = 2.00; - - /// md.comp.filled-select.text-field.focus.input-text.color - static const TokenColorRole textFieldFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.focus.label-text.color - static const TokenColorRole textFieldFocusLabelTextColor = - TokenColorRole.primary; - - /// md.comp.filled-select.text-field.focus.leading-icon.color - static const TokenColorRole textFieldFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.focus.supporting-text.color - static const TokenColorRole textFieldFocusSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.focus.trailing-icon.color - static const TokenColorRole textFieldFocusTrailingIconColor = - TokenColorRole.primary; - - /// md.comp.filled-select.text-field.hover.active-indicator.color - static const TokenColorRole textFieldHoverActiveIndicatorColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.hover.active-indicator.height - static const double textFieldHoverActiveIndicatorHeight = 1.00; - - /// md.comp.filled-select.text-field.hover.input-text.color - static const TokenColorRole textFieldHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.hover.label-text.color - static const TokenColorRole textFieldHoverLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.hover.leading-icon.color - static const TokenColorRole textFieldHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.hover.state-layer.color - static const TokenColorRole textFieldHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.filled-select.text-field.hover.state-layer.opacity - static const double textFieldHoverStateLayerOpacity = 0.08; - - /// md.comp.filled-select.text-field.hover.supporting-text.color - static const TokenColorRole textFieldHoverSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.hover.trailing-icon.color - static const TokenColorRole textFieldHoverTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.input-text.color - static const TokenColorRole textFieldInputTextColor = - 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, - ); - - /// md.comp.filled-select.text-field.label-text.color - static const TokenColorRole textFieldLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// 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, - ); - - /// md.comp.filled-select.text-field.leading-icon.color - static const TokenColorRole textFieldLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.leading-icon.size - static const double textFieldLeadingIconSize = 24.00; - - /// md.comp.filled-select.text-field.supporting-text.color - static const TokenColorRole textFieldSupportingTextColor = - 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, - ); - - /// md.comp.filled-select.text-field.trailing-icon.color - static const TokenColorRole textFieldTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.filled-select.text-field.trailing-icon.size - static const double textFieldTrailingIconSize = 24.00; -} 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..6c6b79d68eb2 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenFilledTextField { @@ -233,25 +234,13 @@ 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.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 +254,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..1c378a38ea6a 100644 --- a/packages/material_ui/tool/gen_defaults/data/filter_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/filter_chip.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenFilterChip { @@ -127,13 +128,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..aac4aafb85dc 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenFullScreenDialog { @@ -51,13 +52,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 +79,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 deleted file mode 100644 index cc8abaaadbe4..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/glass_button.dart +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; - -class TokenGlassButton { - /// md.comp.glass.button.text.container.color - static const TokenColorRole textContainerColor = TokenColorRole.surface; - - /// md.comp.glass.button.text.disabled.container.color - static const TokenColorRole textDisabledContainerColor = - TokenColorRole.surfaceContainer; - - /// md.comp.glass.button.text.disabled.icon.color - static const TokenColorRole textDisabledIconColor = TokenColorRole.onSurface; - - /// md.comp.glass.button.text.disabled.label-text.color - static const TokenColorRole textDisabledLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.glass.button.text.icon.color - static const TokenColorRole textIconColor = TokenColorRole.primary; - - /// md.comp.glass.button.text.label-text.color - static const TokenColorRole textLabelTextColor = TokenColorRole.primary; - - /// md.comp.glass.button.text.pressed.selected.state-layer.color - static const TokenColorRole textPressedSelectedStateLayerColor = - TokenColorRole.onSecondary; - - /// md.comp.glass.button.text.pressed.state-layer.color - static const TokenColorRole textPressedStateLayerColor = - TokenColorRole.primary; - - /// md.comp.glass.button.text.pressed.unselected.state-layer.color - static const TokenColorRole textPressedUnselectedStateLayerColor = - TokenColorRole.primary; - - /// md.comp.glass.button.text.selected.container.color - static const TokenColorRole textSelectedContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.glass.button.text.selected.icon.color - static const TokenColorRole textSelectedIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.glass.button.text.selected.label-text.color - static const TokenColorRole textSelectedLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.glass.button.text.unselected.container.color - static const TokenColorRole textUnselectedContainerColor = - TokenColorRole.surface; - - /// md.comp.glass.button.text.unselected.icon.color - static const TokenColorRole textUnselectedIconColor = TokenColorRole.primary; - - /// md.comp.glass.button.text.unselected.label-text.color - static const TokenColorRole textUnselectedLabelTextColor = - TokenColorRole.primary; -} 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 deleted file mode 100644 index e29f29521fae..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/glass_icon_button.dart +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; - -class TokenGlassIconButton { - /// md.comp.glass.icon-button.filled.disabled.container.color - static const TokenColorRole filledDisabledContainerColor = - TokenColorRole.surfaceContainer; - - /// md.comp.glass.icon-button.standard.container.color - static const TokenColorRole standardContainerColor = TokenColorRole.surface; - - /// md.comp.glass.icon-button.standard.disabled.container.color - static const TokenColorRole standardDisabledContainerColor = - TokenColorRole.surface; - - /// md.comp.glass.icon-button.standard.disabled.selected.container.color - static const TokenColorRole standardDisabledSelectedContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.glass.icon-button.standard.disabled.unselected.container.color - static const TokenColorRole standardDisabledUnselectedContainerColor = - TokenColorRole.surface; - - /// md.comp.glass.icon-button.standard.pressed.state-layer.color - static const TokenColorRole standardPressedStateLayerColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.glass.icon-button.standard.selected.container.color - static const TokenColorRole standardSelectedContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.glass.icon-button.standard.selected.pressed.state-layer.color - static const TokenColorRole standardSelectedPressedStateLayerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.glass.icon-button.standard.unselected.container.color - static const TokenColorRole standardUnselectedContainerColor = - TokenColorRole.surface; - - /// md.comp.glass.icon-button.standard.unselected.pressed.state-layer.color - static const TokenColorRole standardUnselectedPressedStateLayerColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.glass.icon-button.tonal.disabled.container.color - static const TokenColorRole tonalDisabledContainerColor = - TokenColorRole.surfaceContainer; -} 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..2b2a004f2a21 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.1.12 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..1993290af64d 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.1.12 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..0f03b6c8246e 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.1.12 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..17c3cd6999b3 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.1.12 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..bb0830098e3a 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.1.12 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..9f7eecc93fe2 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.1.12 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..adac481d3c14 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.1.12 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..2269232399f8 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.1.12 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..9a078b5e3c73 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.1.12 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..1f9a61b6ff17 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.1.12 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..b9037949c2d0 100644 --- a/packages/material_ui/tool/gen_defaults/data/input_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/input_chip.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenInputChip { @@ -57,13 +58,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..bf43ade6fecc 100644 --- a/packages/material_ui/tool/gen_defaults/data/list.dart +++ b/packages/material_ui/tool/gen_defaults/data/list.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenList { @@ -215,13 +216,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 +233,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 +305,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 +582,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 +610,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..b938336aa536 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.1.12 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 deleted file mode 100644 index ab6c6a2cdf69..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/list_reorder.dart +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; - -class TokenListReorder { - /// md.comp.list.reorder.list-item.container.color - static const TokenColorRole listItemContainerColor = - TokenColorRole.tertiaryContainer; - - /// md.comp.list.reorder.list-item.drop-zone.color - static const TokenColorRole listItemDropZoneColor = - TokenColorRole.surfaceContainerLow; - - /// md.comp.list.reorder.list-item.label-text.color - static const TokenColorRole listItemLabelTextColor = - TokenColorRole.onTertiaryContainer; - - /// md.comp.list.reorder.list-item.leading-icon.color - static const TokenColorRole listItemLeadingIconColor = - TokenColorRole.onTertiaryContainer; - - /// md.comp.list.reorder.list-item.overline.color - static const TokenColorRole listItemOverlineColor = - TokenColorRole.onTertiaryContainer; - - /// md.comp.list.reorder.list-item.shadow-color - static const TokenColorRole listItemShadowColor = TokenColorRole.shadow; - - /// md.comp.list.reorder.list-item.shape - static const ShapeStruct listItemShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 16.00, - topRight: 16.00, - bottomLeft: 16.00, - bottomRight: 16.00, - ); - - /// md.comp.list.reorder.list-item.state-layer.color - static const TokenColorRole listItemStateLayerColor = - TokenColorRole.onTertiaryContainer; - - /// md.comp.list.reorder.list-item.state-layer.opacity - static const double listItemStateLayerOpacity = 0.10; - - /// md.comp.list.reorder.list-item.supporting-text.color - static const TokenColorRole listItemSupportingTextColor = - TokenColorRole.onTertiaryContainer; - - /// md.comp.list.reorder.list-item.trailing-icon.color - static const TokenColorRole listItemTrailingIconColor = - TokenColorRole.onTertiaryContainer; - - /// md.comp.list.reorder.list-item.trailing-supporting-text.color - static const TokenColorRole listItemTrailingSupportingTextColor = - TokenColorRole.onTertiaryContainer; -} diff --git a/packages/material_ui/tool/gen_defaults/data/list_reveal.dart b/packages/material_ui/tool/gen_defaults/data/list_reveal.dart deleted file mode 100644 index 77e708e0a677..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/list_reveal.dart +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; - -class TokenListReveal { - /// md.comp.list.reveal.list-item.action.icon-button.container.color - static const TokenColorRole listItemActionIconButtonContainerColor = - TokenColorRole.primary; - - /// md.comp.list.reveal.list-item.action.icon-button.focused.state-layer.color - static const TokenColorRole listItemActionIconButtonFocusedStateLayerColor = - TokenColorRole.onPrimary; - - /// md.comp.list.reveal.list-item.action.icon-button.hovered.state-layer.color - static const TokenColorRole listItemActionIconButtonHoveredStateLayerColor = - TokenColorRole.onPrimary; - - /// md.comp.list.reveal.list-item.action.icon-button.icon.color - static const TokenColorRole listItemActionIconButtonIconColor = - TokenColorRole.onPrimary; - - /// md.comp.list.reveal.list-item.action.icon-button.pressed.state-layer.color - static const TokenColorRole listItemActionIconButtonPressedStateLayerColor = - TokenColorRole.onPrimary; - - /// md.comp.list.reveal.list-item.container.color - static const TokenColorRole listItemContainerColor = TokenColorRole.surface; - - /// md.comp.list.reveal.list-item.container.shape - static const ShapeStruct listItemContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 16.00, - topRight: 16.00, - bottomLeft: 16.00, - bottomRight: 16.00, - ); - - /// md.comp.list.reveal.list-item.icon-button.action.container.shape - static const ShapeStruct listItemIconButtonActionContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 16.00, - topRight: 16.00, - bottomLeft: 16.00, - bottomRight: 16.00, - ); - - /// md.comp.list.reveal.list-item.icon-button.container.color - static const TokenColorRole listItemIconButtonContainerColor = - TokenColorRole.secondaryContainer; - - /// md.comp.list.reveal.list-item.icon-button.container.shape - static const ShapeStruct listItemIconButtonContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_CIRCULAR', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.list.reveal.list-item.icon-button.focused.state-layer.color - static const TokenColorRole listItemIconButtonFocusedStateLayerColor = - TokenColorRole.onSecondaryContainer; - - /// md.comp.list.reveal.list-item.icon-button.hovered.state-layer.color - static const TokenColorRole listItemIconButtonHoveredStateLayerColor = - TokenColorRole.onSecondaryContainer; - - /// md.comp.list.reveal.list-item.icon-button.icon.color - static const TokenColorRole listItemIconButtonIconColor = - TokenColorRole.onSecondaryContainer; - - /// md.comp.list.reveal.list-item.icon-button.pressed.state-layer.color - static const TokenColorRole listItemIconButtonPressedStateLayerColor = - TokenColorRole.onSecondaryContainer; - - /// md.comp.list.reveal.list-item.segmented.container.shape - static const ShapeStruct listItemSegmentedContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 16.00, - topRight: 16.00, - bottomLeft: 16.00, - bottomRight: 16.00, - ); -} 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..d294eecbe2a9 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.1.12 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..a9e605339874 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.1.12 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..933f0c77bb74 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.1.12 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..7dbafa4def41 100644 --- a/packages/material_ui/tool/gen_defaults/data/menus.dart +++ b/packages/material_ui/tool/gen_defaults/data/menus.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; 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..ed5f92db6aed 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.1.12 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..5ca1466a277b 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.1.12 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..35025d0e4871 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.1.12 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..089b95f4dab1 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.1.12 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..deb14fb9fda1 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.1.12 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..286775101e76 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenNavBarItemHorizontal { @@ -20,11 +21,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..6e5b8a0d8926 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenNavBarItemVertical { @@ -20,11 +21,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..7041dc2f9649 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.1.12 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..e29f84200080 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.1.12 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..ef7120db8e0e 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.1.12 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..5f013573ddc4 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.1.12 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..5fc37e82b367 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenNavRailItemHorizontal { @@ -20,11 +21,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..940d4ebf697e 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,8 +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.1.12 +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenNavRailItemVertical { @@ -17,13 +18,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..13bb4984ebf2 100644 --- a/packages/material_ui/tool/gen_defaults/data/navigation_bar.dart +++ b/packages/material_ui/tool/gen_defaults/data/navigation_bar.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenNavigationBar { @@ -150,13 +151,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..26511f2c2fe0 100644 --- a/packages/material_ui/tool/gen_defaults/data/navigation_drawer.dart +++ b/packages/material_ui/tool/gen_defaults/data/navigation_drawer.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenNavigationDrawer { @@ -112,13 +113,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 +164,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..df9a56bfe8d1 100644 --- a/packages/material_ui/tool/gen_defaults/data/navigation_rail.dart +++ b/packages/material_ui/tool/gen_defaults/data/navigation_rail.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenNavigationRail { @@ -141,13 +142,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 deleted file mode 100644 index 21b643039cba..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/outlined_autocomplete.dart +++ /dev/null @@ -1,300 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenOutlinedAutocomplete { - /// md.comp.outlined-autocomplete.menu.cascading-menu-indicator.icon.color - static const TokenColorRole menuCascadingMenuIndicatorIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.menu.cascading-menu-indicator.icon.size - static const double menuCascadingMenuIndicatorIconSize = 24.00; - - /// md.comp.outlined-autocomplete.menu.container.color - static const TokenColorRole menuContainerColor = - TokenColorRole.surfaceContainer; - - /// md.comp.outlined-autocomplete.menu.container.elevation - static const double menuContainerElevation = 3.00; - - /// md.comp.outlined-autocomplete.menu.container.shadow-color - static const TokenColorRole menuContainerShadowColor = TokenColorRole.shadow; - - /// md.comp.outlined-autocomplete.menu.container.shape - static const ShapeStruct menuContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 4.00, - bottomRight: 4.00, - ); - - /// md.comp.outlined-autocomplete.text-field.caret.color - static const TokenColorRole textFieldCaretColor = TokenColorRole.primary; - - /// md.comp.outlined-autocomplete.text-field.container.color - static const TokenColorRole textFieldContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.outlined-autocomplete.text-field.container.shape - static const ShapeStruct textFieldContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 4.00, - bottomRight: 4.00, - ); - - /// md.comp.outlined-autocomplete.text-field.disabled.input-text.color - static const TokenColorRole textFieldDisabledInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.disabled.input-text.opacity - static const double textFieldDisabledInputTextOpacity = 0.38; - - /// md.comp.outlined-autocomplete.text-field.disabled.label-text.color - static const TokenColorRole textFieldDisabledLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.disabled.label-text.opacity - static const double textFieldDisabledLabelTextOpacity = 0.38; - - /// md.comp.outlined-autocomplete.text-field.disabled.leading-icon.color - static const TokenColorRole textFieldDisabledLeadingIconColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.disabled.leading-icon.opacity - static const double textFieldDisabledLeadingIconOpacity = 0.38; - - /// md.comp.outlined-autocomplete.text-field.disabled.outline.color - static const TokenColorRole textFieldDisabledOutlineColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.disabled.outline.opacity - static const double textFieldDisabledOutlineOpacity = 0.12; - - /// md.comp.outlined-autocomplete.text-field.disabled.outline.width - static const double textFieldDisabledOutlineWidth = 1.00; - - /// md.comp.outlined-autocomplete.text-field.disabled.supporting-text.color - static const TokenColorRole textFieldDisabledSupportingTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.disabled.supporting-text.opacity - static const double textFieldDisabledSupportingTextOpacity = 0.38; - - /// md.comp.outlined-autocomplete.text-field.disabled.trailing-icon.color - static const TokenColorRole textFieldDisabledTrailingIconColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.disabled.trailing-icon.opacity - static const double textFieldDisabledTrailingIconOpacity = 0.38; - - /// md.comp.outlined-autocomplete.text-field.error.focus.caret.color - static const TokenColorRole textFieldErrorFocusCaretColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.focus.input-text.color - static const TokenColorRole textFieldErrorFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.error.focus.label-text.color - static const TokenColorRole textFieldErrorFocusLabelTextColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.focus.leading-icon.color - static const TokenColorRole textFieldErrorFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.error.focus.outline.color - static const TokenColorRole textFieldErrorFocusOutlineColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.focus.supporting-text.color - static const TokenColorRole textFieldErrorFocusSupportingTextColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.focus.trailing-icon.color - static const TokenColorRole textFieldErrorFocusTrailingIconColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.hover.input-text.color - static const TokenColorRole textFieldErrorHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.error.hover.label-text.color - static const TokenColorRole textFieldErrorHoverLabelTextColor = - TokenColorRole.onErrorContainer; - - /// md.comp.outlined-autocomplete.text-field.error.hover.leading-icon.color - static const TokenColorRole textFieldErrorHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.error.hover.outline.color - static const TokenColorRole textFieldErrorHoverOutlineColor = - TokenColorRole.onErrorContainer; - - /// md.comp.outlined-autocomplete.text-field.error.hover.state-layer.color - static const TokenColorRole textFieldErrorHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.error.hover.state-layer.opacity - static const double textFieldErrorHoverStateLayerOpacity = 0.08; - - /// md.comp.outlined-autocomplete.text-field.error.hover.supporting-text.color - static const TokenColorRole textFieldErrorHoverSupportingTextColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.hover.trailing-icon.color - static const TokenColorRole textFieldErrorHoverTrailingIconColor = - TokenColorRole.onErrorContainer; - - /// md.comp.outlined-autocomplete.text-field.error.input-text.color - static const TokenColorRole textFieldErrorInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.error.label-text.color - static const TokenColorRole textFieldErrorLabelTextColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.leading-icon.color - static const TokenColorRole textFieldErrorLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.error.outline.color - static const TokenColorRole textFieldErrorOutlineColor = TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.supporting-text.color - static const TokenColorRole textFieldErrorSupportingTextColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.error.trailing-icon.color - static const TokenColorRole textFieldErrorTrailingIconColor = - TokenColorRole.error; - - /// md.comp.outlined-autocomplete.text-field.focus.input-text.color - static const TokenColorRole textFieldFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.focus.label-text.color - static const TokenColorRole textFieldFocusLabelTextColor = - TokenColorRole.primary; - - /// md.comp.outlined-autocomplete.text-field.focus.leading-icon.color - static const TokenColorRole textFieldFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.focus.outline.color - static const TokenColorRole textFieldFocusOutlineColor = - TokenColorRole.primary; - - /// md.comp.outlined-autocomplete.text-field.focus.outline.width - static const double textFieldFocusOutlineWidth = 2.00; - - /// md.comp.outlined-autocomplete.text-field.focus.supporting-text.color - static const TokenColorRole textFieldFocusSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.focus.trailing-icon.color - static const TokenColorRole textFieldFocusTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.hover.input-text.color - static const TokenColorRole textFieldHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.hover.label-text.color - static const TokenColorRole textFieldHoverLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.hover.leading-icon.color - static const TokenColorRole textFieldHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.hover.outline.color - static const TokenColorRole textFieldHoverOutlineColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.hover.outline.width - static const double textFieldHoverOutlineWidth = 1.00; - - /// md.comp.outlined-autocomplete.text-field.hover.state-layer.color - static const TokenColorRole textFieldHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-autocomplete.text-field.hover.state-layer.opacity - static const double textFieldHoverStateLayerOpacity = 0.08; - - /// md.comp.outlined-autocomplete.text-field.hover.supporting-text.color - static const TokenColorRole textFieldHoverSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.hover.trailing-icon.color - static const TokenColorRole textFieldHoverTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.input-text.color - static const TokenColorRole textFieldInputTextColor = - 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, - ); - - /// md.comp.outlined-autocomplete.text-field.label-text.color - static const TokenColorRole textFieldLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// 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, - ); - - /// md.comp.outlined-autocomplete.text-field.leading-icon.color - static const TokenColorRole textFieldLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.leading-icon.size - static const double textFieldLeadingIconSize = 24.00; - - /// md.comp.outlined-autocomplete.text-field.outline.color - static const TokenColorRole textFieldOutlineColor = TokenColorRole.outline; - - /// md.comp.outlined-autocomplete.text-field.outline.width - static const double textFieldOutlineWidth = 1.00; - - /// md.comp.outlined-autocomplete.text-field.supporting-text.color - static const TokenColorRole textFieldSupportingTextColor = - 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, - ); - - /// md.comp.outlined-autocomplete.text-field.trailing-icon.color - static const TokenColorRole textFieldTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-autocomplete.text-field.trailing-icon.size - static const double textFieldTrailingIconSize = 24.00; -} 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..eca6a6320b55 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.1.12 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 deleted file mode 100644 index 4dee879a8241..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/outlined_menu_button.dart +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenOutlinedMenuButton { - /// md.comp.outlined-menu-button.container.height - static const double containerHeight = 40.00; - - /// md.comp.outlined-menu-button.disabled.container.opacity - static const double disabledContainerOpacity = 0.12; - - /// md.comp.outlined-menu-button.disabled.label-text.color - static const TokenColorRole disabledLabelTextColor = TokenColorRole.onSurface; - - /// md.comp.outlined-menu-button.disabled.label-text.opacity - static const double disabledLabelTextOpacity = 0.38; - - /// md.comp.outlined-menu-button.disabled.outline.color - static const TokenColorRole disabledOutlineColor = TokenColorRole.onSurface; - - /// md.comp.outlined-menu-button.disabled.trailing-icon.color - static const TokenColorRole disabledTrailingIconColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-menu-button.disabled.trailing-icon.opacity - static const double disabledTrailingIconOpacity = 0.38; - - /// md.comp.outlined-menu-button.focus.indicator.color - static const TokenColorRole focusIndicatorColor = TokenColorRole.secondary; - - /// md.comp.outlined-menu-button.focus.indicator.outline.offset - static const double focusIndicatorOutlineOffset = 2.00; - - /// md.comp.outlined-menu-button.focus.indicator.thickness - static const double focusIndicatorThickness = 3.00; - - /// md.comp.outlined-menu-button.focus.label-text.color - static const TokenColorRole focusLabelTextColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.focus.outline.color - static const TokenColorRole focusOutlineColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.focus.state-layer.color - static const TokenColorRole focusStateLayerColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.focus.state-layer.opacity - static const double focusStateLayerOpacity = 0.10; - - /// md.comp.outlined-menu-button.focus.trailing-icon.color - static const TokenColorRole focusTrailingIconColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.hover.label-text.color - static const TokenColorRole hoverLabelTextColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.hover.outline.color - static const TokenColorRole hoverOutlineColor = TokenColorRole.outline; - - /// md.comp.outlined-menu-button.hover.state-layer.color - static const TokenColorRole hoverStateLayerColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.hover.state-layer.opacity - static const double hoverStateLayerOpacity = 0.08; - - /// md.comp.outlined-menu-button.hover.trailing-icon.color - static const TokenColorRole hoverTrailingIconColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.label-text.color - 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, - ); - - /// md.comp.outlined-menu-button.outline.color - static const TokenColorRole outlineColor = TokenColorRole.outline; - - /// md.comp.outlined-menu-button.outline.width - static const double outlineWidth = 1.00; - - /// md.comp.outlined-menu-button.pressed.label-text.color - static const TokenColorRole pressedLabelTextColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.pressed.outline.color - static const TokenColorRole pressedOutlineColor = TokenColorRole.outline; - - /// md.comp.outlined-menu-button.pressed.state-layer.color - static const TokenColorRole pressedStateLayerColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.pressed.state-layer.opacity - static const double pressedStateLayerOpacity = 0.10; - - /// md.comp.outlined-menu-button.pressed.trailing-icon.color - static const TokenColorRole pressedTrailingIconColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.shape - static const ShapeStruct shape = ShapeStruct( - family: 'SHAPE_FAMILY_CIRCULAR', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.outlined-menu-button.trailing-icon.color - static const TokenColorRole trailingIconColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.trailing-icon.size - static const double trailingIconSize = 18.00; - - /// md.comp.outlined-menu-button.with-icon.disabled.icon.color - static const TokenColorRole withIconDisabledIconColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-menu-button.with-icon.disabled.icon.opacity - static const double withIconDisabledIconOpacity = 0.38; - - /// md.comp.outlined-menu-button.with-icon.focus.leading-icon.color - static const TokenColorRole withIconFocusLeadingIconColor = - TokenColorRole.primary; - - /// md.comp.outlined-menu-button.with-icon.hover.leading-icon.color - static const TokenColorRole withIconHoverLeadingIconColor = - TokenColorRole.primary; - - /// md.comp.outlined-menu-button.with-icon.leading-icon.color - static const TokenColorRole withIconLeadingIconColor = TokenColorRole.primary; - - /// md.comp.outlined-menu-button.with-icon.leading-icon.size - static const double withIconLeadingIconSize = 18.00; - - /// md.comp.outlined-menu-button.with-icon.pressed.leading-icon.color - static const TokenColorRole withIconPressedLeadingIconColor = - TokenColorRole.primary; -} 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..9e4d729a8a74 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenOutlinedSegmentedButton { @@ -46,13 +47,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 deleted file mode 100644 index da70a7f8b5e9..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/outlined_select.dart +++ /dev/null @@ -1,333 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenOutlinedSelect { - /// md.comp.outlined-select.menu.cascading-menu-indicator.icon.color - static const TokenColorRole menuCascadingMenuIndicatorIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.menu.cascading-menu-indicator.icon.size - static const double menuCascadingMenuIndicatorIconSize = 24.00; - - /// md.comp.outlined-select.menu.container.color - static const TokenColorRole menuContainerColor = - TokenColorRole.surfaceContainer; - - /// md.comp.outlined-select.menu.container.elevation - static const double menuContainerElevation = 3.00; - - /// md.comp.outlined-select.menu.container.shadow-color - static const TokenColorRole menuContainerShadowColor = TokenColorRole.shadow; - - /// md.comp.outlined-select.menu.container.shape - static const ShapeStruct menuContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 4.00, - bottomRight: 4.00, - ); - - /// md.comp.outlined-select.menu.divider.color - static const TokenColorRole menuDividerColor = TokenColorRole.surfaceVariant; - - /// md.comp.outlined-select.menu.divider.height - static const double menuDividerHeight = 1.00; - - /// md.comp.outlined-select.menu.list-item.container.height - static const double menuListItemContainerHeight = 48.00; - - /// md.comp.outlined-select.menu.list-item.label-text.color - static const TokenColorRole menuListItemLabelTextColor = - 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, - ); - - /// md.comp.outlined-select.menu.list-item.selected.container.color - static const TokenColorRole menuListItemSelectedContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.outlined-select.menu.list-item.with-leading-icon.leading-icon.color - static const TokenColorRole menuListItemWithLeadingIconLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.menu.list-item.with-leading-icon.leading-icon.size - static const double menuListItemWithLeadingIconLeadingIconSize = 24.00; - - /// md.comp.outlined-select.menu.list-item.with-trailing-icon.trailing-icon.color - static const TokenColorRole menuListItemWithTrailingIconTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.menu.list-item.with-trailing-icon.trailing-icon.size - static const double menuListItemWithTrailingIconTrailingIconSize = 24.00; - - /// md.comp.outlined-select.text-field.container.color - static const TokenColorRole textFieldContainerColor = - TokenColorRole.surfaceContainerHighest; - - /// md.comp.outlined-select.text-field.container.shape - static const ShapeStruct textFieldContainerShape = ShapeStruct( - family: 'SHAPE_FAMILY_ROUNDED_CORNERS', - topLeft: 4.00, - topRight: 4.00, - bottomLeft: 4.00, - bottomRight: 4.00, - ); - - /// md.comp.outlined-select.text-field.disabled.input-text.color - static const TokenColorRole textFieldDisabledInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.disabled.input-text.opacity - static const double textFieldDisabledInputTextOpacity = 0.38; - - /// md.comp.outlined-select.text-field.disabled.label-text.color - static const TokenColorRole textFieldDisabledLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.disabled.label-text.opacity - static const double textFieldDisabledLabelTextOpacity = 0.38; - - /// md.comp.outlined-select.text-field.disabled.leading-icon.color - static const TokenColorRole textFieldDisabledLeadingIconColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.disabled.leading-icon.opacity - static const double textFieldDisabledLeadingIconOpacity = 0.38; - - /// md.comp.outlined-select.text-field.disabled.outline.color - static const TokenColorRole textFieldDisabledOutlineColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.disabled.outline.opacity - static const double textFieldDisabledOutlineOpacity = 0.12; - - /// md.comp.outlined-select.text-field.disabled.outline.width - static const double textFieldDisabledOutlineWidth = 1.00; - - /// md.comp.outlined-select.text-field.disabled.supporting-text.color - static const TokenColorRole textFieldDisabledSupportingTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.disabled.supporting-text.opacity - static const double textFieldDisabledSupportingTextOpacity = 0.38; - - /// md.comp.outlined-select.text-field.disabled.trailing-icon.color - static const TokenColorRole textFieldDisabledTrailingIconColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.disabled.trailing-icon.opacity - static const double textFieldDisabledTrailingIconOpacity = 0.38; - - /// md.comp.outlined-select.text-field.error.focus.input-text.color - static const TokenColorRole textFieldErrorFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.error.focus.label-text.color - static const TokenColorRole textFieldErrorFocusLabelTextColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.focus.leading-icon.color - static const TokenColorRole textFieldErrorFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.error.focus.outline.color - static const TokenColorRole textFieldErrorFocusOutlineColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.focus.supporting-text.color - static const TokenColorRole textFieldErrorFocusSupportingTextColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.focus.trailing-icon.color - static const TokenColorRole textFieldErrorFocusTrailingIconColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.hover.input-text.color - static const TokenColorRole textFieldErrorHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.error.hover.label-text.color - static const TokenColorRole textFieldErrorHoverLabelTextColor = - TokenColorRole.onErrorContainer; - - /// md.comp.outlined-select.text-field.error.hover.leading-icon.color - static const TokenColorRole textFieldErrorHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.error.hover.outline.color - static const TokenColorRole textFieldErrorHoverOutlineColor = - TokenColorRole.onErrorContainer; - - /// md.comp.outlined-select.text-field.error.hover.state-layer.color - static const TokenColorRole textFieldErrorHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.error.hover.state-layer.opacity - static const double textFieldErrorHoverStateLayerOpacity = 0.08; - - /// md.comp.outlined-select.text-field.error.hover.supporting-text.color - static const TokenColorRole textFieldErrorHoverSupportingTextColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.hover.trailing-icon.color - static const TokenColorRole textFieldErrorHoverTrailingIconColor = - TokenColorRole.onErrorContainer; - - /// md.comp.outlined-select.text-field.error.input-text.color - static const TokenColorRole textFieldErrorInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.error.label-text.color - static const TokenColorRole textFieldErrorLabelTextColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.leading-icon.color - static const TokenColorRole textFieldErrorLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.error.outline.color - static const TokenColorRole textFieldErrorOutlineColor = TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.supporting-text.color - static const TokenColorRole textFieldErrorSupportingTextColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.error.trailing-icon.color - static const TokenColorRole textFieldErrorTrailingIconColor = - TokenColorRole.error; - - /// md.comp.outlined-select.text-field.focus.input-text.color - static const TokenColorRole textFieldFocusInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.focus.label-text.color - static const TokenColorRole textFieldFocusLabelTextColor = - TokenColorRole.primary; - - /// md.comp.outlined-select.text-field.focus.leading-icon.color - static const TokenColorRole textFieldFocusLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.focus.outline.color - static const TokenColorRole textFieldFocusOutlineColor = - TokenColorRole.primary; - - /// md.comp.outlined-select.text-field.focus.outline.width - static const double textFieldFocusOutlineWidth = 3.00; - - /// md.comp.outlined-select.text-field.focus.supporting-text.color - static const TokenColorRole textFieldFocusSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.focus.trailing-icon.color - static const TokenColorRole textFieldFocusTrailingIconColor = - TokenColorRole.primary; - - /// md.comp.outlined-select.text-field.hover.input-text.color - static const TokenColorRole textFieldHoverInputTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.hover.label-text.color - static const TokenColorRole textFieldHoverLabelTextColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.hover.leading-icon.color - static const TokenColorRole textFieldHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.hover.outline.color - static const TokenColorRole textFieldHoverOutlineColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.hover.outline.width - static const double textFieldHoverOutlineWidth = 1.00; - - /// md.comp.outlined-select.text-field.hover.state-layer.color - static const TokenColorRole textFieldHoverStateLayerColor = - TokenColorRole.onSurface; - - /// md.comp.outlined-select.text-field.hover.state-layer.opacity - static const double textFieldHoverStateLayerOpacity = 0.08; - - /// md.comp.outlined-select.text-field.hover.supporting-text.color - static const TokenColorRole textFieldHoverSupportingTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.hover.trailing-icon.color - static const TokenColorRole textFieldHoverTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.input-text.color - static const TokenColorRole textFieldInputTextColor = - 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, - ); - - /// md.comp.outlined-select.text-field.label-text.color - static const TokenColorRole textFieldLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// 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, - ); - - /// md.comp.outlined-select.text-field.leading-icon.color - static const TokenColorRole textFieldLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.leading-icon.size - static const double textFieldLeadingIconSize = 24.00; - - /// md.comp.outlined-select.text-field.outline.color - static const TokenColorRole textFieldOutlineColor = TokenColorRole.outline; - - /// md.comp.outlined-select.text-field.outline.width - static const double textFieldOutlineWidth = 1.00; - - /// md.comp.outlined-select.text-field.supporting-text.color - static const TokenColorRole textFieldSupportingTextColor = - 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, - ); - - /// md.comp.outlined-select.text-field.trailing-icon.color - static const TokenColorRole textFieldTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.outlined-select.text-field.trailing-icon.size - static const double textFieldTrailingIconSize = 24.00; -} 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..5714137be8ad 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenOutlinedTextField { @@ -195,25 +196,13 @@ 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.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 +222,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..7e81c49c2e78 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.1.12 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..4bcaaffde3f8 100644 --- a/packages/material_ui/tool/gen_defaults/data/plain_tooltip.dart +++ b/packages/material_ui/tool/gen_defaults/data/plain_tooltip.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenPlainTooltip { @@ -26,11 +27,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..1c28c2481eba 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenPrimaryNavigationTab { @@ -163,11 +164,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..093d568de7ab 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.1.12 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..0c7b0e3aadfb 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.1.12 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..dc7ac161c514 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.1.12 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..3af0a28846f6 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.1.12 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..7541f8521501 100644 --- a/packages/material_ui/tool/gen_defaults/data/rich_tooltip.dart +++ b/packages/material_ui/tool/gen_defaults/data/rich_tooltip.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenRichTooltip { @@ -35,13 +36,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 +71,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 deleted file mode 100644 index c70b66d5d58c..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/scrim.dart +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; - -class TokenScrim { - /// md.comp.scrim.container.color - static const TokenColorRole containerColor = TokenColorRole.scrim; - - /// md.comp.scrim.container.opacity - static const double containerOpacity = 0.32; -} 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..5e912f35375a 100644 --- a/packages/material_ui/tool/gen_defaults/data/search_bar.dart +++ b/packages/material_ui/tool/gen_defaults/data/search_bar.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenSearchBar { @@ -99,13 +100,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 +126,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..5ddb3fb83cf4 100644 --- a/packages/material_ui/tool/gen_defaults/data/search_view.dart +++ b/packages/material_ui/tool/gen_defaults/data/search_view.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenSearchView { @@ -84,13 +85,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 +95,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..a5c286d6269c 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,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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenSecondaryNavigationTab { @@ -71,13 +72,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..c08b79d243f5 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.1.12 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..246410c3c8b0 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.1.12 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..735857a2d95d 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.1.12 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..7e759af5e9b4 100644 --- a/packages/material_ui/tool/gen_defaults/data/sheet_side.dart +++ b/packages/material_ui/tool/gen_defaults/data/sheet_side.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenSheetSide { @@ -84,13 +85,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..31d24a1d7c35 100644 --- a/packages/material_ui/tool/gen_defaults/data/slider.dart +++ b/packages/material_ui/tool/gen_defaults/data/slider.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; 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..b3b4f47e9978 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.1.12 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..ed780f913d4c 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.1.12 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..6d69f3a35984 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.1.12 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..c3391c5a063a 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.1.12 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..65a7ce03d297 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.1.12 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..2c969e3d37be 100644 --- a/packages/material_ui/tool/gen_defaults/data/snackbar.dart +++ b/packages/material_ui/tool/gen_defaults/data/snackbar.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenSnackbar { @@ -36,13 +37,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 +112,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..d9544ae5bfaa 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.1.12 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..d2a47481bcd5 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.1.12 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..084fb7b52336 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.1.12 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..84bb014df058 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.1.12 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..b8e879f4f0c0 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.1.12 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 deleted file mode 100644 index 2fee1d741d08..000000000000 --- a/packages/material_ui/tool/gen_defaults/data/standard_menu_button.dart +++ /dev/null @@ -1,135 +0,0 @@ -// Copyright 2013 The Flutter Authors. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Version: 38.0.15 - -import 'color_role.dart'; -import 'shape_struct.dart'; -import 'typescale_struct.dart'; - -class TokenStandardMenuButton { - /// md.comp.standard-menu-button.container.height - static const double containerHeight = 40.00; - - /// md.comp.standard-menu-button.container.shape - static const ShapeStruct containerShape = ShapeStruct( - family: 'SHAPE_FAMILY_CIRCULAR', - topLeft: 0.00, - topRight: 0.00, - bottomLeft: 0.00, - bottomRight: 0.00, - ); - - /// md.comp.standard-menu-button.disabled.label-text.color - static const TokenColorRole disabledLabelTextColor = TokenColorRole.onSurface; - - /// md.comp.standard-menu-button.disabled.label-text.opacity - static const double disabledLabelTextOpacity = 0.38; - - /// md.comp.standard-menu-button.disabled.trailing-icon.color - static const TokenColorRole disabledTrailingIconColor = - TokenColorRole.onSurface; - - /// md.comp.standard-menu-button.disabled.trailing-icon.opacity - static const double disabledTrailingIconOpacity = 0.38; - - /// md.comp.standard-menu-button.focus.indicator.color - static const TokenColorRole focusIndicatorColor = TokenColorRole.secondary; - - /// md.comp.standard-menu-button.focus.indicator.outline.offset - static const double focusIndicatorOutlineOffset = 2.00; - - /// md.comp.standard-menu-button.focus.indicator.thickness - static const double focusIndicatorThickness = 3.00; - - /// md.comp.standard-menu-button.focus.label-text.color - static const TokenColorRole focusLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.focus.state-layer.color - static const TokenColorRole focusStateLayerColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.focus.state-layer.opacity - static const double focusStateLayerOpacity = 0.10; - - /// md.comp.standard-menu-button.focus.trailing-icon.color - static const TokenColorRole focusTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.hover.label-text.color - static const TokenColorRole hoverLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.hover.state-layer.color - static const TokenColorRole hoverStateLayerColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.hover.state-layer.opacity - static const double hoverStateLayerOpacity = 0.08; - - /// md.comp.standard-menu-button.hover.trailing-icon.color - static const TokenColorRole hoverTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.label-text.color - 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, - ); - - /// md.comp.standard-menu-button.pressed.label-text.color - static const TokenColorRole pressedLabelTextColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.pressed.state-layer.color - static const TokenColorRole pressedStateLayerColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.pressed.state-layer.opacity - static const double pressedStateLayerOpacity = 0.10; - - /// md.comp.standard-menu-button.pressed.trailing-icon.color - static const TokenColorRole pressedTrailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.trailing-icon.color - static const TokenColorRole trailingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.trailing-icon.size - static const double trailingIconSize = 18.00; - - /// md.comp.standard-menu-button.with-icon.disabled.leading-icon.color - static const TokenColorRole withIconDisabledLeadingIconColor = - TokenColorRole.onSurface; - - /// md.comp.standard-menu-button.with-icon.disabled.leading-icon.opacity - static const double withIconDisabledLeadingIconOpacity = 0.38; - - /// md.comp.standard-menu-button.with-icon.focus.icon.color - static const TokenColorRole withIconFocusIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.with-icon.hover.leading-icon.color - static const TokenColorRole withIconHoverLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.with-icon.leading-icon.color - static const TokenColorRole withIconLeadingIconColor = - TokenColorRole.onSurfaceVariant; - - /// md.comp.standard-menu-button.with-icon.leading-icon.size - static const double withIconLeadingIconSize = 18.00; - - /// md.comp.standard-menu-button.with-icon.pressed.icon.color - static const TokenColorRole withIconPressedIconColor = - TokenColorRole.onSurfaceVariant; -} diff --git a/packages/material_ui/tool/gen_defaults/data/state.dart b/packages/material_ui/tool/gen_defaults/data/state.dart index 2aa2bec2dc2d..bdb72e234b18 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.1.12 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..a1563288996b 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.1.12 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..394b8d5ab47d 100644 --- a/packages/material_ui/tool/gen_defaults/data/suggestion_chip.dart +++ b/packages/material_ui/tool/gen_defaults/data/suggestion_chip.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenSuggestionChip { @@ -126,13 +127,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..c0173e0f2903 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.1.12 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..a3ca8bb99951 100644 --- a/packages/material_ui/tool/gen_defaults/data/time_input.dart +++ b/packages/material_ui/tool/gen_defaults/data/time_input.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenTimeInput { @@ -38,13 +39,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 +63,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 +186,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 +203,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..7d51982c3469 100644 --- a/packages/material_ui/tool/gen_defaults/data/time_picker.dart +++ b/packages/material_ui/tool/gen_defaults/data/time_picker.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.1.12 import 'color_role.dart'; import 'shape_struct.dart'; +import 'typescale.dart'; import 'typescale_struct.dart'; class TokenTimePicker { @@ -17,13 +18,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 +97,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 +121,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 +225,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 +268,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..7768630b335b 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.1.12 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..504dcfd3771a 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.1.12 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..9696cec19cd0 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.1.12 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..a09682f6d34b 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.1.12 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..916f2a593d22 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.1.12 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..7b412a6093ec 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.1.12 class TokenTypeface { /// md.ref.typeface.brand diff --git a/packages/material_ui/tool/gen_defaults/data/typescale.dart b/packages/material_ui/tool/gen_defaults/data/typescale.dart index 4d2cf6f319ad..b439d426989e 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.1.12 import 'typescale_struct.dart'; 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..3f2e7053ee54 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.1.12 import 'typescale_struct.dart'; 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..ee8dd6d4326a 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.1.12 import 'typescale_struct.dart'; 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..4ad25847850d 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.1.12 import 'typescale_struct.dart';