diff --git a/dev/tools/gen_defaults/data/banner.json b/dev/tools/gen_defaults/data/banner.json index 510a97ade07..468aa86353e 100644 --- a/dev/tools/gen_defaults/data/banner.json +++ b/dev/tools/gen_defaults/data/banner.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.banner.action.focus.label-text.color": "primary", "md.comp.banner.action.focus.state-layer.color": "primary", diff --git a/dev/tools/gen_defaults/data/button_elevated.json b/dev/tools/gen_defaults/data/button_elevated.json index 8b0b352363b..24bff499cf7 100644 --- a/dev/tools/gen_defaults/data/button_elevated.json +++ b/dev/tools/gen_defaults/data/button_elevated.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.elevated-button.container.color": "surface", "md.comp.elevated-button.container.elevation": "md.sys.elevation.level1", diff --git a/dev/tools/gen_defaults/data/button_filled.json b/dev/tools/gen_defaults/data/button_filled.json index 691f85fa404..0271f2cf15c 100644 --- a/dev/tools/gen_defaults/data/button_filled.json +++ b/dev/tools/gen_defaults/data/button_filled.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.filled-button.container.color": "primary", "md.comp.filled-button.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/button_filled_tonal.json b/dev/tools/gen_defaults/data/button_filled_tonal.json index 3b8fd7e3c9a..644f8e5a068 100644 --- a/dev/tools/gen_defaults/data/button_filled_tonal.json +++ b/dev/tools/gen_defaults/data/button_filled_tonal.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.filled-tonal-button.container.color": "secondaryContainer", "md.comp.filled-tonal-button.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/button_outlined.json b/dev/tools/gen_defaults/data/button_outlined.json index b8de58511d3..8f53ebcac70 100644 --- a/dev/tools/gen_defaults/data/button_outlined.json +++ b/dev/tools/gen_defaults/data/button_outlined.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.outlined-button.container.height": 40.0, "md.comp.outlined-button.container.shape": "md.sys.shape.corner.full", diff --git a/dev/tools/gen_defaults/data/button_text.json b/dev/tools/gen_defaults/data/button_text.json index 1a1c2bdb295..4b8afafedc1 100644 --- a/dev/tools/gen_defaults/data/button_text.json +++ b/dev/tools/gen_defaults/data/button_text.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.text-button.container.height": 40.0, "md.comp.text-button.container.shape": "md.sys.shape.corner.full", diff --git a/dev/tools/gen_defaults/data/card_elevated.json b/dev/tools/gen_defaults/data/card_elevated.json index e5d31a07d75..b03c2d765bf 100644 --- a/dev/tools/gen_defaults/data/card_elevated.json +++ b/dev/tools/gen_defaults/data/card_elevated.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.elevated-card.container.color": "surface", "md.comp.elevated-card.container.elevation": "md.sys.elevation.level1", diff --git a/dev/tools/gen_defaults/data/card_filled.json b/dev/tools/gen_defaults/data/card_filled.json index 7f5bff68e5d..08df53998e2 100644 --- a/dev/tools/gen_defaults/data/card_filled.json +++ b/dev/tools/gen_defaults/data/card_filled.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.filled-card.container.color": "surfaceVariant", "md.comp.filled-card.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/card_outlined.json b/dev/tools/gen_defaults/data/card_outlined.json index 5409fc8ac67..4b25627a834 100644 --- a/dev/tools/gen_defaults/data/card_outlined.json +++ b/dev/tools/gen_defaults/data/card_outlined.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.outlined-card.container.color": "surface", "md.comp.outlined-card.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/chip_assist.json b/dev/tools/gen_defaults/data/chip_assist.json index f4811693393..acf7273a633 100644 --- a/dev/tools/gen_defaults/data/chip_assist.json +++ b/dev/tools/gen_defaults/data/chip_assist.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.assist-chip.container.height": 32.0, "md.comp.assist-chip.container.shape": "md.sys.shape.corner.small", diff --git a/dev/tools/gen_defaults/data/chip_filter.json b/dev/tools/gen_defaults/data/chip_filter.json index 2a226e64fe8..ef9727792b6 100644 --- a/dev/tools/gen_defaults/data/chip_filter.json +++ b/dev/tools/gen_defaults/data/chip_filter.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.filter-chip.container.height": 32.0, "md.comp.filter-chip.container.shadow-color": "shadow", diff --git a/dev/tools/gen_defaults/data/chip_input.json b/dev/tools/gen_defaults/data/chip_input.json index 9e8af707a72..5cd5b899b21 100644 --- a/dev/tools/gen_defaults/data/chip_input.json +++ b/dev/tools/gen_defaults/data/chip_input.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.input-chip.container.elevation": "md.sys.elevation.level0", "md.comp.input-chip.container.height": 32.0, diff --git a/dev/tools/gen_defaults/data/chip_suggestion.json b/dev/tools/gen_defaults/data/chip_suggestion.json index ed025fda878..b1871753eb6 100644 --- a/dev/tools/gen_defaults/data/chip_suggestion.json +++ b/dev/tools/gen_defaults/data/chip_suggestion.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.suggestion-chip.container.height": 32.0, "md.comp.suggestion-chip.container.shape": "md.sys.shape.corner.small", diff --git a/dev/tools/gen_defaults/data/color_dark.json b/dev/tools/gen_defaults/data/color_dark.json index a8246a9d886..d4f3c2eca1c 100644 --- a/dev/tools/gen_defaults/data/color_dark.json +++ b/dev/tools/gen_defaults/data/color_dark.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.sys.color.background": "md.ref.palette.neutral10", "md.sys.color.error": "md.ref.palette.error80", diff --git a/dev/tools/gen_defaults/data/color_light.json b/dev/tools/gen_defaults/data/color_light.json index 2376cdf53f6..e8f93908c8e 100644 --- a/dev/tools/gen_defaults/data/color_light.json +++ b/dev/tools/gen_defaults/data/color_light.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.sys.color.background": "md.ref.palette.neutral99", "md.sys.color.error": "md.ref.palette.error40", diff --git a/dev/tools/gen_defaults/data/dialog.json b/dev/tools/gen_defaults/data/dialog.json index 16eacc90781..f6c0eea2251 100644 --- a/dev/tools/gen_defaults/data/dialog.json +++ b/dev/tools/gen_defaults/data/dialog.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.dialog.action.focus.label-text.color": "primary", "md.comp.dialog.action.focus.state-layer.color": "primary", @@ -16,8 +16,8 @@ "md.comp.dialog.container.elevation": "md.sys.elevation.level3", "md.comp.dialog.container.shape": "md.sys.shape.corner.extra-large", "md.comp.dialog.container.surface-tint-layer.color": "surfaceTint", - "md.comp.dialog.subhead.color": "onSurface", - "md.comp.dialog.subhead.text-style": "headlineSmall", + "md.comp.dialog.headline.color": "onSurface", + "md.comp.dialog.headline.text-style": "headlineSmall", "md.comp.dialog.supporting-text.color": "onSurfaceVariant", "md.comp.dialog.supporting-text.text-style": "bodyMedium", "md.comp.dialog.with-divider.divider.color": "outline", diff --git a/dev/tools/gen_defaults/data/elevation.json b/dev/tools/gen_defaults/data/elevation.json index 27d86be10e9..91a6ba96f1d 100644 --- a/dev/tools/gen_defaults/data/elevation.json +++ b/dev/tools/gen_defaults/data/elevation.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.sys.elevation.level0": 0.0, "md.sys.elevation.level1": 1.0, diff --git a/dev/tools/gen_defaults/data/fab_extended_primary.json b/dev/tools/gen_defaults/data/fab_extended_primary.json index a4acc70f8f6..f9c04d0dbe2 100644 --- a/dev/tools/gen_defaults/data/fab_extended_primary.json +++ b/dev/tools/gen_defaults/data/fab_extended_primary.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.extended-fab.primary.container.color": "primaryContainer", "md.comp.extended-fab.primary.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/fab_large_primary.json b/dev/tools/gen_defaults/data/fab_large_primary.json index f623cb6016a..775cb46de78 100644 --- a/dev/tools/gen_defaults/data/fab_large_primary.json +++ b/dev/tools/gen_defaults/data/fab_large_primary.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.fab.primary.large.container.color": "primaryContainer", "md.comp.fab.primary.large.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/fab_primary.json b/dev/tools/gen_defaults/data/fab_primary.json index 8e537d66a05..802702c3530 100644 --- a/dev/tools/gen_defaults/data/fab_primary.json +++ b/dev/tools/gen_defaults/data/fab_primary.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.fab.primary.container.color": "primaryContainer", "md.comp.fab.primary.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/fab_small_primary.json b/dev/tools/gen_defaults/data/fab_small_primary.json index 66620ff3e8a..72f2d988142 100644 --- a/dev/tools/gen_defaults/data/fab_small_primary.json +++ b/dev/tools/gen_defaults/data/fab_small_primary.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.fab.primary.small.container.color": "primaryContainer", "md.comp.fab.primary.small.container.elevation": "md.sys.elevation.level3", diff --git a/dev/tools/gen_defaults/data/icon_button.json b/dev/tools/gen_defaults/data/icon_button.json new file mode 100644 index 00000000000..ee77bc9ede9 --- /dev/null +++ b/dev/tools/gen_defaults/data/icon_button.json @@ -0,0 +1,29 @@ +{ + "version": "v0_98", + + "md.comp.icon-button.disabled.icon.color": "onSurface", + "md.comp.icon-button.disabled.icon.opacity": 0.38, + "md.comp.icon-button.icon.size": 24.0, + "md.comp.icon-button.selected.focus.icon.color": "primary", + "md.comp.icon-button.selected.focus.state-layer.color": "primary", + "md.comp.icon-button.selected.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity", + "md.comp.icon-button.selected.hover.icon.color": "primary", + "md.comp.icon-button.selected.hover.state-layer.color": "primary", + "md.comp.icon-button.selected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity", + "md.comp.icon-button.selected.icon.color": "primary", + "md.comp.icon-button.selected.pressed.icon.color": "primary", + "md.comp.icon-button.selected.pressed.state-layer.color": "primary", + "md.comp.icon-button.selected.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity", + "md.comp.icon-button.state-layer.shape": "md.sys.shape.corner.full", + "md.comp.icon-button.state-layer.size": 40.0, + "md.comp.icon-button.unselected.focus.icon.color": "onSurfaceVariant", + "md.comp.icon-button.unselected.focus.state-layer.color": "onSurfaceVariant", + "md.comp.icon-button.unselected.focus.state-layer.opacity": "md.sys.state.hover.state-layer-opacity", + "md.comp.icon-button.unselected.hover.icon.color": "onSurfaceVariant", + "md.comp.icon-button.unselected.hover.state-layer.color": "onSurfaceVariant", + "md.comp.icon-button.unselected.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity", + "md.comp.icon-button.unselected.icon.color": "onSurfaceVariant", + "md.comp.icon-button.unselected.pressed.icon.color": "onSurfaceVariant", + "md.comp.icon-button.unselected.pressed.state-layer.color": "onSurfaceVariant", + "md.comp.icon-button.unselected.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity" +} diff --git a/dev/tools/gen_defaults/data/icon_button_filled.json b/dev/tools/gen_defaults/data/icon_button_filled.json new file mode 100644 index 00000000000..e1a9d0bfd14 --- /dev/null +++ b/dev/tools/gen_defaults/data/icon_button_filled.json @@ -0,0 +1,38 @@ +{ + "version": "v0_98", + + "md.comp.filled-icon-button.container.color": "primary", + "md.comp.filled-icon-button.container.shape": "md.sys.shape.corner.full", + "md.comp.filled-icon-button.container.size": 40.0, + "md.comp.filled-icon-button.disabled.container.color": "onSurface", + "md.comp.filled-icon-button.disabled.container.opacity": 0.12, + "md.comp.filled-icon-button.disabled.icon.color": "onSurface", + "md.comp.filled-icon-button.disabled.icon.opacity": 0.38, + "md.comp.filled-icon-button.focus.icon.color": "onPrimary", + "md.comp.filled-icon-button.focus.state-layer.color": "onPrimary", + "md.comp.filled-icon-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity", + "md.comp.filled-icon-button.hover.icon.color": "onPrimary", + "md.comp.filled-icon-button.hover.state-layer.color": "onPrimary", + "md.comp.filled-icon-button.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity", + "md.comp.filled-icon-button.icon.color": "onPrimary", + "md.comp.filled-icon-button.icon.size": 24.0, + "md.comp.filled-icon-button.pressed.icon.color": "onPrimary", + "md.comp.filled-icon-button.pressed.state-layer.color": "onPrimary", + "md.comp.filled-icon-button.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity", + "md.comp.filled-icon-button.selected.container.color": "primary", + "md.comp.filled-icon-button.toggle.selected.focus.icon.color": "onPrimary", + "md.comp.filled-icon-button.toggle.selected.focus.state-layer.color": "onPrimary", + "md.comp.filled-icon-button.toggle.selected.hover.icon.color": "onPrimary", + "md.comp.filled-icon-button.toggle.selected.hover.state-layer.color": "onPrimary", + "md.comp.filled-icon-button.toggle.selected.icon.color": "onPrimary", + "md.comp.filled-icon-button.toggle.selected.pressed.icon.color": "onPrimary", + "md.comp.filled-icon-button.toggle.selected.pressed.state-layer.color": "onPrimary", + "md.comp.filled-icon-button.toggle.unselected.focus.icon.color": "primary", + "md.comp.filled-icon-button.toggle.unselected.focus.state-layer.color": "primary", + "md.comp.filled-icon-button.toggle.unselected.hover.icon.color": "primary", + "md.comp.filled-icon-button.toggle.unselected.hover.state-layer.color": "primary", + "md.comp.filled-icon-button.toggle.unselected.icon.color": "primary", + "md.comp.filled-icon-button.toggle.unselected.pressed.icon.color": "primary", + "md.comp.filled-icon-button.toggle.unselected.pressed.state-layer.color": "primary", + "md.comp.filled-icon-button.unselected.container.color": "surfaceVariant" +} diff --git a/dev/tools/gen_defaults/data/icon_button_filled_tonal.json b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json new file mode 100644 index 00000000000..6949bee2476 --- /dev/null +++ b/dev/tools/gen_defaults/data/icon_button_filled_tonal.json @@ -0,0 +1,38 @@ +{ + "version": "v0_98", + + "md.comp.filled-tonal-icon-button.container.color": "secondaryContainer", + "md.comp.filled-tonal-icon-button.container.shape": "md.sys.shape.corner.full", + "md.comp.filled-tonal-icon-button.container.size": 40.0, + "md.comp.filled-tonal-icon-button.disabled.container.color": "onSurface", + "md.comp.filled-tonal-icon-button.disabled.container.opacity": 0.12, + "md.comp.filled-tonal-icon-button.disabled.icon.color": "onSurface", + "md.comp.filled-tonal-icon-button.disabled.icon.opacity": 0.38, + "md.comp.filled-tonal-icon-button.focus.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.focus.state-layer.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity", + "md.comp.filled-tonal-icon-button.hover.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.hover.state-layer.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity", + "md.comp.filled-tonal-icon-button.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.icon.size": 24.0, + "md.comp.filled-tonal-icon-button.pressed.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.pressed.state-layer.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity", + "md.comp.filled-tonal-icon-button.selected.container.color": "secondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.selected.focus.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.selected.focus.state-layer.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.selected.hover.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.selected.hover.state-layer.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.selected.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.selected.pressed.icon.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.selected.pressed.state-layer.color": "onSecondaryContainer", + "md.comp.filled-tonal-icon-button.toggle.unselected.focus.icon.color": "onSurfaceVariant", + "md.comp.filled-tonal-icon-button.toggle.unselected.focus.state-layer.color": "onSurfaceVariant", + "md.comp.filled-tonal-icon-button.toggle.unselected.hover.icon.color": "onSurfaceVariant", + "md.comp.filled-tonal-icon-button.toggle.unselected.hover.state-layer.color": "onSurfaceVariant", + "md.comp.filled-tonal-icon-button.toggle.unselected.icon.color": "onSurfaceVariant", + "md.comp.filled-tonal-icon-button.toggle.unselected.pressed.icon.color": "onSurfaceVariant", + "md.comp.filled-tonal-icon-button.toggle.unselected.pressed.state-layer.color": "onSurfaceVariant", + "md.comp.filled-tonal-icon-button.unselected.container.color": "surfaceVariant" +} diff --git a/dev/tools/gen_defaults/data/menu.json b/dev/tools/gen_defaults/data/menu.json new file mode 100644 index 00000000000..9a96ed82952 --- /dev/null +++ b/dev/tools/gen_defaults/data/menu.json @@ -0,0 +1,42 @@ +{ + "version": "v0_98", + + "md.comp.menu.cascading-menu-indicator.icon.color": "onSurfaceVariant", + "md.comp.menu.cascading-menu-indicator.icon.size": 24.0, + "md.comp.menu.container.color": "surface", + "md.comp.menu.container.elevation": "md.sys.elevation.level2", + "md.comp.menu.container.shadow-color": "shadow", + "md.comp.menu.container.shape": "md.sys.shape.corner.extra-small", + "md.comp.menu.container.surface-tint-layer.color": "surfaceTint", + "md.comp.menu.divider.color": "surfaceVariant", + "md.comp.menu.divider.height": 1.0, + "md.comp.menu.list-item.container.height": 48.0, + "md.comp.menu.list-item.disabled.label-text.color": "onSurface", + "md.comp.menu.list-item.disabled.label-text.opacity": 0.38, + "md.comp.menu.list-item.focus.label-text.color": "onSurface", + "md.comp.menu.list-item.focus.state-layer.color": "onSurface", + "md.comp.menu.list-item.focus.state-layer.opacity": "md.sys.state.focus.state-layer-opacity", + "md.comp.menu.list-item.hover.label-text.color": "onSurface", + "md.comp.menu.list-item.hover.state-layer.color": "onSurface", + "md.comp.menu.list-item.hover.state-layer.opacity": "md.sys.state.hover.state-layer-opacity", + "md.comp.menu.list-item.label-text.color": "onSurface", + "md.comp.menu.list-item.label-text.text-style": "labelLarge", + "md.comp.menu.list-item.pressed.label-text.color": "onSurface", + "md.comp.menu.list-item.pressed.state-layer.color": "onSurface", + "md.comp.menu.list-item.pressed.state-layer.opacity": "md.sys.state.pressed.state-layer-opacity", + "md.comp.menu.list-item.selected.container.color": "surfaceVariant", + "md.comp.menu.list-item.with-leading-icon.disabled.leading-icon.color": "onSurface", + "md.comp.menu.list-item.with-leading-icon.disabled.leading-icon.opacity": 0.38, + "md.comp.menu.list-item.with-leading-icon.focus.icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-leading-icon.hover.icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-leading-icon.leading-icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-leading-icon.leading-icon.size": 24.0, + "md.comp.menu.list-item.with-leading-icon.pressed.icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-trailing-icon.disabled.trailing-icon.color": "onSurface", + "md.comp.menu.list-item.with-trailing-icon.disabled.trailing-icon.opacity": 0.38, + "md.comp.menu.list-item.with-trailing-icon.focus.icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-trailing-icon.hover.icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-trailing-icon.pressed.icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-trailing-icon.trailing-icon.color": "onSurfaceVariant", + "md.comp.menu.list-item.with-trailing-icon.trailing-icon.size": 24.0 +} diff --git a/dev/tools/gen_defaults/data/motion.json b/dev/tools/gen_defaults/data/motion.json index 79dfd44a09f..d3aaf9f21ea 100644 --- a/dev/tools/gen_defaults/data/motion.json +++ b/dev/tools/gen_defaults/data/motion.json @@ -1,22 +1,22 @@ { - "version": "v0_92", + "version": "v0_98", - "md.sys.motion.duration.100Ms": 100.0, - "md.sys.motion.duration.1000Ms": 1000.0, - "md.sys.motion.duration.150Ms": 150.0, - "md.sys.motion.duration.200Ms": 200.0, - "md.sys.motion.duration.250Ms": 250.0, - "md.sys.motion.duration.300Ms": 300.0, - "md.sys.motion.duration.350Ms": 350.0, - "md.sys.motion.duration.400Ms": 400.0, - "md.sys.motion.duration.450Ms": 450.0, - "md.sys.motion.duration.50Ms": 50.0, - "md.sys.motion.duration.500Ms": 500.0, - "md.sys.motion.duration.550Ms": 550.0, - "md.sys.motion.duration.600Ms": 600.0, - "md.sys.motion.duration.700Ms": 700.0, - "md.sys.motion.duration.800Ms": 800.0, - "md.sys.motion.duration.900Ms": 900.0, + "md.sys.motion.duration.extra-long1Ms": 700.0, + "md.sys.motion.duration.extra-long2Ms": 800.0, + "md.sys.motion.duration.extra-long3Ms": 900.0, + "md.sys.motion.duration.extra-long4Ms": 1000.0, + "md.sys.motion.duration.long1Ms": 450.0, + "md.sys.motion.duration.long2Ms": 500.0, + "md.sys.motion.duration.long3Ms": 550.0, + "md.sys.motion.duration.long4Ms": 600.0, + "md.sys.motion.duration.medium1Ms": 250.0, + "md.sys.motion.duration.medium2Ms": 300.0, + "md.sys.motion.duration.medium3Ms": 350.0, + "md.sys.motion.duration.medium4Ms": 400.0, + "md.sys.motion.duration.short1Ms": 50.0, + "md.sys.motion.duration.short2Ms": 100.0, + "md.sys.motion.duration.short3Ms": 150.0, + "md.sys.motion.duration.short4Ms": 200.0, "md.sys.motion.easing.emphasized": "Cubic(0.2, 0.0, 0.0, 1.0)", "md.sys.motion.easing.emphasized.accelerate": "Cubic(0.3, 0.0, 0.8, 0.15)", "md.sys.motion.easing.emphasized.decelerate": "Cubic(0.05, 0.7, 0.1, 1.0)", diff --git a/dev/tools/gen_defaults/data/navigation_bar.json b/dev/tools/gen_defaults/data/navigation_bar.json index fe3bec3a53f..d391b83e3d6 100644 --- a/dev/tools/gen_defaults/data/navigation_bar.json +++ b/dev/tools/gen_defaults/data/navigation_bar.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.navigation-bar.active.focus.icon.color": "onSecondaryContainer", "md.comp.navigation-bar.active.focus.label-text.color": "onSurface", diff --git a/dev/tools/gen_defaults/data/navigation_rail.json b/dev/tools/gen_defaults/data/navigation_rail.json index 3aa4ace3aa1..b71e504e45f 100644 --- a/dev/tools/gen_defaults/data/navigation_rail.json +++ b/dev/tools/gen_defaults/data/navigation_rail.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.navigation-rail.active.focus.icon.color": "onSecondaryContainer", "md.comp.navigation-rail.active.focus.label-text.color": "onSurface", diff --git a/dev/tools/gen_defaults/data/palette.json b/dev/tools/gen_defaults/data/palette.json index d9fc41e0ba2..7cfcb226e65 100644 --- a/dev/tools/gen_defaults/data/palette.json +++ b/dev/tools/gen_defaults/data/palette.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.ref.palette.black": "0xFF000000", "md.ref.palette.error0": "0xFF000000", diff --git a/dev/tools/gen_defaults/data/shape.json b/dev/tools/gen_defaults/data/shape.json index f8f3080c726..3504e2b0557 100644 --- a/dev/tools/gen_defaults/data/shape.json +++ b/dev/tools/gen_defaults/data/shape.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.sys.shape.corner.extra-large": { "family": "SHAPE_FAMILY_ROUNDED_CORNERS", diff --git a/dev/tools/gen_defaults/data/slider.json b/dev/tools/gen_defaults/data/slider.json index b976d0f492e..492bb1cf8e3 100644 --- a/dev/tools/gen_defaults/data/slider.json +++ b/dev/tools/gen_defaults/data/slider.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.slider.active.track.color": "primary", "md.comp.slider.active.track.height": 6.0, diff --git a/dev/tools/gen_defaults/data/state.json b/dev/tools/gen_defaults/data/state.json index 98d9b672768..c6e4930511f 100644 --- a/dev/tools/gen_defaults/data/state.json +++ b/dev/tools/gen_defaults/data/state.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.sys.state.dragged.state-layer-opacity": 0.16, "md.sys.state.focus.state-layer-opacity": 0.12, diff --git a/dev/tools/gen_defaults/data/text_style.json b/dev/tools/gen_defaults/data/text_style.json index aaa0fe0d4bc..74432e15749 100644 --- a/dev/tools/gen_defaults/data/text_style.json +++ b/dev/tools/gen_defaults/data/text_style.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.sys.typescale.body-large.font": "md.ref.typeface.plain", "md.sys.typescale.body-large.line-height": 24.0, diff --git a/dev/tools/gen_defaults/data/top_app_bar_large.json b/dev/tools/gen_defaults/data/top_app_bar_large.json index 29aa47318d4..d75bd9dc4d4 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_large.json +++ b/dev/tools/gen_defaults/data/top_app_bar_large.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.top-app-bar.large.container.color": "surface", "md.comp.top-app-bar.large.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/top_app_bar_medium.json b/dev/tools/gen_defaults/data/top_app_bar_medium.json index ad140cd8370..f78adb05dff 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_medium.json +++ b/dev/tools/gen_defaults/data/top_app_bar_medium.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.top-app-bar.medium.container.color": "surface", "md.comp.top-app-bar.medium.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/top_app_bar_small.json b/dev/tools/gen_defaults/data/top_app_bar_small.json index 3ddf1c3cf25..f3f66214e91 100644 --- a/dev/tools/gen_defaults/data/top_app_bar_small.json +++ b/dev/tools/gen_defaults/data/top_app_bar_small.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.comp.top-app-bar.small.container.color": "surface", "md.comp.top-app-bar.small.container.elevation": "md.sys.elevation.level0", diff --git a/dev/tools/gen_defaults/data/typeface.json b/dev/tools/gen_defaults/data/typeface.json index d8b93cb6d62..c5a1527f0b7 100644 --- a/dev/tools/gen_defaults/data/typeface.json +++ b/dev/tools/gen_defaults/data/typeface.json @@ -1,5 +1,5 @@ { - "version": "v0_92", + "version": "v0_98", "md.ref.typeface.brand": "Roboto", "md.ref.typeface.plain": "Roboto", diff --git a/dev/tools/gen_defaults/lib/dialog_template.dart b/dev/tools/gen_defaults/lib/dialog_template.dart index b4856b18171..62d5ab29b30 100644 --- a/dev/tools/gen_defaults/lib/dialog_template.dart +++ b/dev/tools/gen_defaults/lib/dialog_template.dart @@ -30,7 +30,7 @@ class _TokenDefaultsM3 extends DialogTheme { Color? get backgroundColor => ElevationOverlay.colorWithOverlay(${componentColor("md.comp.dialog.container")}, _colors.primary, ${elevation("md.comp.dialog.container")}); @override - TextStyle? get titleTextStyle => ${textStyle("md.comp.dialog.subhead")}; + TextStyle? get titleTextStyle => ${textStyle("md.comp.dialog.headline")}; @override TextStyle? get contentTextStyle => ${textStyle("md.comp.dialog.supporting-text")}; diff --git a/packages/flutter/lib/src/material/app_bar.dart b/packages/flutter/lib/src/material/app_bar.dart index 529df9690f4..436bbec594c 100644 --- a/packages/flutter/lib/src/material/app_bar.dart +++ b/packages/flutter/lib/src/material/app_bar.dart @@ -1957,7 +1957,7 @@ class _DefaultsM2 extends AppBarTheme { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends AppBarTheme { _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/card.dart b/packages/flutter/lib/src/material/card.dart index 38fad2d5c15..4d4891516b9 100644 --- a/packages/flutter/lib/src/material/card.dart +++ b/packages/flutter/lib/src/material/card.dart @@ -211,7 +211,7 @@ class _DefaultsM2 extends CardTheme { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends CardTheme { const _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart index fcc519d7d8a..3bbe176800d 100644 --- a/packages/flutter/lib/src/material/dialog.dart +++ b/packages/flutter/lib/src/material/dialog.dart @@ -1214,7 +1214,7 @@ class _DefaultsM2 extends DialogTheme { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends DialogTheme { _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/elevated_button.dart b/packages/flutter/lib/src/material/elevated_button.dart index 8d7c38371f7..59f0e61ec5b 100644 --- a/packages/flutter/lib/src/material/elevated_button.dart +++ b/packages/flutter/lib/src/material/elevated_button.dart @@ -496,7 +496,7 @@ class _ElevatedButtonWithIconChild extends StatelessWidget { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends ButtonStyle { _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/elevation_overlay.dart b/packages/flutter/lib/src/material/elevation_overlay.dart index 75457a511e2..f44dd97e96b 100644 --- a/packages/flutter/lib/src/material/elevation_overlay.dart +++ b/packages/flutter/lib/src/material/elevation_overlay.dart @@ -157,7 +157,7 @@ class _ElevationOpacity { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 // Surface tint opacities based on elevations according to the // Material Design 3 specification: diff --git a/packages/flutter/lib/src/material/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart index 1c0a6683a33..ee97b6746f5 100644 --- a/packages/flutter/lib/src/material/floating_action_button.dart +++ b/packages/flutter/lib/src/material/floating_action_button.dart @@ -782,7 +782,7 @@ class _M2Defaults extends FloatingActionButtonThemeData { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends FloatingActionButtonThemeData { _TokenDefaultsM3(this.context, this.type, this.hasChild) : super( diff --git a/packages/flutter/lib/src/material/navigation_bar.dart b/packages/flutter/lib/src/material/navigation_bar.dart index 364db9b7b92..30e968c3e5d 100644 --- a/packages/flutter/lib/src/material/navigation_bar.dart +++ b/packages/flutter/lib/src/material/navigation_bar.dart @@ -1210,7 +1210,7 @@ class _Defaults extends NavigationBarThemeData { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends NavigationBarThemeData { _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/navigation_rail.dart b/packages/flutter/lib/src/material/navigation_rail.dart index 732de8bfa9e..2b8656974b4 100644 --- a/packages/flutter/lib/src/material/navigation_rail.dart +++ b/packages/flutter/lib/src/material/navigation_rail.dart @@ -955,7 +955,7 @@ class _DefaultsM2 extends NavigationRailThemeData { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends NavigationRailThemeData { _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/outlined_button.dart b/packages/flutter/lib/src/material/outlined_button.dart index 82eacdca65d..6cfe6d316a3 100644 --- a/packages/flutter/lib/src/material/outlined_button.dart +++ b/packages/flutter/lib/src/material/outlined_button.dart @@ -419,7 +419,7 @@ class _OutlinedButtonWithIconChild extends StatelessWidget { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends ButtonStyle { _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/text_button.dart b/packages/flutter/lib/src/material/text_button.dart index eb80ed448cd..3f68aed5310 100644 --- a/packages/flutter/lib/src/material/text_button.dart +++ b/packages/flutter/lib/src/material/text_button.dart @@ -457,7 +457,7 @@ class _TextButtonWithIconChild extends StatelessWidget { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _TokenDefaultsM3 extends ButtonStyle { _TokenDefaultsM3(this.context) : super( diff --git a/packages/flutter/lib/src/material/typography.dart b/packages/flutter/lib/src/material/typography.dart index 79ef493687d..b122253efbf 100644 --- a/packages/flutter/lib/src/material/typography.dart +++ b/packages/flutter/lib/src/material/typography.dart @@ -729,7 +729,7 @@ class Typography with Diagnosticable { // These defaults are generated from the Material Design Token // database by the script dev/tools/gen_defaults/bin/gen_defaults.dart. -// Generated version v0_92 +// Generated version v0_98 class _M3Typography { _M3Typography._();