Cleanup M3 token templates for theme lookups (#122601)

Cleanup M3 token templates for theme lookups

dev/tools/gen_defaults/lib/action_chip_template.dart

@@ -5,8 +5,10 @@
 import 'template.dart';
 
 class ActionChipTemplate extends TokenTemplate {
-
+  const ActionChipTemplate(super.blockName, super.fileName, super.tokens, {
-  const ActionChipTemplate(super.blockName, super.fileName, super.tokens);
+    super.colorSchemePrefix = '_colors.',
+    super.textThemePrefix = '_textTheme.'
+  });
 
   static const String tokenGroup = 'md.comp.assist-chip';
   static const String variant = '.flat';
@@ -14,7 +16,7 @@ class ActionChipTemplate extends TokenTemplate {
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends ChipThemeData {
-  const _${blockName}DefaultsM3(this.context, this.isEnabled)
+  _${blockName}DefaultsM3(this.context, this.isEnabled)
     : super(
         elevation: ${elevation("$tokenGroup$variant.container")},
         shape: ${shape("$tokenGroup.container")},
@@ -23,6 +25,8 @@ class _${blockName}DefaultsM3 extends ChipThemeData {
 
   final BuildContext context;
   final bool isEnabled;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
   TextStyle? get labelStyle => ${textStyle("$tokenGroup.label-text")};

dev/tools/gen_defaults/lib/banner_template.dart

@@ -5,15 +5,20 @@
 import 'template.dart';
 
 class BannerTemplate extends TokenTemplate {
-  const BannerTemplate(super.blockName, super.fileName, super.tokens);
+  const BannerTemplate(super.blockName, super.fileName, super.tokens, {
+    super.colorSchemePrefix = '_colors.',
+    super.textThemePrefix = '_textTheme.'
+  });
 
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends MaterialBannerThemeData {
-  const _${blockName}DefaultsM3(this.context)
+  _${blockName}DefaultsM3(this.context)
     : super(elevation: ${elevation("md.comp.banner.container")});
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
   Color? get backgroundColor => ${componentColor("md.comp.banner.container")};

dev/tools/gen_defaults/lib/bottom_app_bar_template.dart

@@ -5,12 +5,14 @@
 import 'template.dart';
 
 class BottomAppBarTemplate extends TokenTemplate {
-  const BottomAppBarTemplate(super.blockName, super.fileName, super.tokens);
+  const BottomAppBarTemplate(super.blockName, super.fileName, super.tokens, {
+    super.colorSchemePrefix = '_colors.',
+  });
 
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends BottomAppBarTheme {
-  const _${blockName}DefaultsM3(this.context)
+  _${blockName}DefaultsM3(this.context)
     : super(
       elevation: ${elevation('md.comp.bottom-app-bar.container')},
       height: ${tokens['md.comp.bottom-app-bar.container.height']},
@@ -18,6 +20,7 @@ class _${blockName}DefaultsM3 extends BottomAppBarTheme {
     );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
   Color? get color => ${componentColor('md.comp.bottom-app-bar.container')};

dev/tools/gen_defaults/lib/bottom_sheet_template.dart

@@ -5,12 +5,14 @@
 import 'template.dart';
 
 class BottomSheetTemplate extends TokenTemplate {
-  const BottomSheetTemplate(super.blockName, super.fileName, super.tokens);
+  const BottomSheetTemplate(super.blockName, super.fileName, super.tokens, {
+    super.colorSchemePrefix = '_colors.',
+  });
 
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends BottomSheetThemeData {
-   const _${blockName}DefaultsM3(this.context)
+  _${blockName}DefaultsM3(this.context)
     : super(
       elevation: ${elevation("md.comp.sheet.bottom.docked.standard.container")},
       modalElevation: ${elevation("md.comp.sheet.bottom.docked.modal.container")},
@@ -18,6 +20,7 @@ class _${blockName}DefaultsM3 extends BottomSheetThemeData {
     );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
   Color? get backgroundColor => ${componentColor("md.comp.sheet.bottom.docked.container")};

dev/tools/gen_defaults/lib/card_template.dart

@@ -5,12 +5,14 @@
 import 'template.dart';
 
 class CardTemplate extends TokenTemplate {
-  const CardTemplate(super.blockName, super.fileName, super.tokens);
+  const CardTemplate(super.blockName, super.fileName, super.tokens, {
+    super.colorSchemePrefix = '_colors.',
+  });
 
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends CardTheme {
-  const _${blockName}DefaultsM3(this.context)
+  _${blockName}DefaultsM3(this.context)
     : super(
         clipBehavior: Clip.none,
         elevation: ${elevation("md.comp.elevated-card.container")},
@@ -19,6 +21,7 @@ class _${blockName}DefaultsM3 extends CardTheme {
       );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
   Color? get color => ${componentColor("md.comp.elevated-card.container")};

dev/tools/gen_defaults/lib/filter_chip_template.dart

@@ -5,7 +5,10 @@
 import 'template.dart';
 
 class FilterChipTemplate extends TokenTemplate {
-  const FilterChipTemplate(super.blockName, super.fileName, super.tokens);
+  const FilterChipTemplate(super.blockName, super.fileName, super.tokens, {
+    super.colorSchemePrefix = '_colors.',
+    super.textThemePrefix = '_textTheme.'
+  });
 
   static const String tokenGroup = 'md.comp.filter-chip';
   static const String variant = '.flat';
@@ -13,7 +16,7 @@ class FilterChipTemplate extends TokenTemplate {
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends ChipThemeData {
-  const _${blockName}DefaultsM3(this.context, this.isEnabled, this.isSelected)
+  _${blockName}DefaultsM3(this.context, this.isEnabled, this.isSelected)
     : super(
         elevation: ${elevation("$tokenGroup$variant.container")},
         shape: ${shape("$tokenGroup.container")},
@@ -23,6 +26,8 @@ class _${blockName}DefaultsM3 extends ChipThemeData {
   final BuildContext context;
   final bool isEnabled;
   final bool isSelected;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
   TextStyle? get labelStyle => ${textStyle("$tokenGroup.label-text")};

dev/tools/gen_defaults/lib/input_chip_template.dart

@@ -5,7 +5,10 @@
 import 'template.dart';
 
 class InputChipTemplate extends TokenTemplate {
-  const InputChipTemplate(super.blockName, super.fileName, super.tokens);
+  const InputChipTemplate(super.blockName, super.fileName, super.tokens, {
+    super.colorSchemePrefix = '_colors.',
+    super.textThemePrefix = '_textTheme.'
+  });
 
   static const String tokenGroup = 'md.comp.input-chip';
   static const String variant = '';
@@ -13,7 +16,7 @@ class InputChipTemplate extends TokenTemplate {
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends ChipThemeData {
-  const _${blockName}DefaultsM3(this.context, this.isEnabled, this.isSelected)
+  _${blockName}DefaultsM3(this.context, this.isEnabled, this.isSelected)
     : super(
         elevation: ${elevation("$tokenGroup$variant.container")},
         shape: ${shape("$tokenGroup.container")},
@@ -23,6 +26,8 @@ class _${blockName}DefaultsM3 extends ChipThemeData {
   final BuildContext context;
   final bool isEnabled;
   final bool isSelected;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
   TextStyle? get labelStyle => ${textStyle("$tokenGroup.label-text")};

dev/tools/gen_defaults/lib/navigation_drawer_template.dart

@@ -5,20 +5,25 @@
 import 'template.dart';
 
 class NavigationDrawerTemplate extends TokenTemplate {
-  const NavigationDrawerTemplate(super.blockName, super.fileName, super.tokens);
+  const NavigationDrawerTemplate(super.blockName, super.fileName, super.tokens, {
+    super.colorSchemePrefix = '_colors.',
+    super.textThemePrefix = '_textTheme.'
+  });
 
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends NavigationDrawerThemeData {
-  const _${blockName}DefaultsM3(this.context)
+  _${blockName}DefaultsM3(this.context)
-      : super(
+    : super(
-          elevation: ${elevation("md.comp.navigation-drawer.modal.container")},
+        elevation: ${elevation("md.comp.navigation-drawer.modal.container")},
-          tileHeight: ${tokens["md.comp.navigation-drawer.active-indicator.height"]},
+        tileHeight: ${tokens["md.comp.navigation-drawer.active-indicator.height"]},
-          indicatorShape: ${shape("md.comp.navigation-drawer.active-indicator")},
+        indicatorShape: ${shape("md.comp.navigation-drawer.active-indicator")},
-          indicatorSize: const Size(${tokens["md.comp.navigation-drawer.active-indicator.width"]}, ${tokens["md.comp.navigation-drawer.active-indicator.height"]}),
+        indicatorSize: const Size(${tokens["md.comp.navigation-drawer.active-indicator.width"]}, ${tokens["md.comp.navigation-drawer.active-indicator.height"]}),
-        );
+      );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
   Color? get backgroundColor => ${componentColor("md.comp.navigation-drawer.container")};

dev/tools/gen_defaults/lib/slider_template.dart

@@ -15,11 +15,10 @@ class SliderTemplate extends TokenTemplate {
   String generate() => '''
 class _${blockName}DefaultsM3 extends SliderThemeData {
   _${blockName}DefaultsM3(this.context)
-    : _colors = Theme.of(context).colorScheme,
+    : super(trackHeight: ${tokens['$tokenGroup.active.track.height']});
-      super(trackHeight: ${tokens['$tokenGroup.active.track.height']});
 
   final BuildContext context;
-  final ColorScheme _colors;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
   Color? get activeTrackColor => ${componentColor('$tokenGroup.active.track')};

dev/tools/gen_defaults/lib/snackbar_template.dart

@@ -19,7 +19,6 @@ class _${blockName}DefaultsM3 extends SnackBarThemeData {
 
   final BuildContext context;
   late final ThemeData _theme = Theme.of(context);
-
   late final ColorScheme _colors = _theme.colorScheme;
 
   @override

dev/tools/gen_defaults/lib/switch_template.dart

@@ -12,10 +12,10 @@ class SwitchTemplate extends TokenTemplate {
   @override
   String generate() => '''
 class _${blockName}DefaultsM3 extends SwitchThemeData {
-  _${blockName}DefaultsM3(BuildContext context)
+  _${blockName}DefaultsM3(this.context);
-    : _colors = Theme.of(context).colorScheme;
 
-  final ColorScheme _colors;
+  final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
   MaterialStateProperty<Color> get thumbColor {

packages/flutter/lib/src/material/action_chip.dart

@@ -7,8 +7,10 @@ import 'package:flutter/widgets.dart';
 
 import 'chip.dart';
 import 'chip_theme.dart';
+import 'color_scheme.dart';
 import 'colors.dart';
 import 'debug.dart';
+import 'text_theme.dart';
 import 'theme.dart';
 import 'theme_data.dart';
 
@@ -178,7 +180,7 @@ class ActionChip extends StatelessWidget implements ChipAttributes, TappableChip
 // Token database version: v0_162
 
 class _ActionChipDefaultsM3 extends ChipThemeData {
-  const _ActionChipDefaultsM3(this.context, this.isEnabled)
+  _ActionChipDefaultsM3(this.context, this.isEnabled)
     : super(
         elevation: 0.0,
         shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
@@ -187,9 +189,11 @@ class _ActionChipDefaultsM3 extends ChipThemeData {
 
   final BuildContext context;
   final bool isEnabled;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
-  TextStyle? get labelStyle => Theme.of(context).textTheme.labelLarge;
+  TextStyle? get labelStyle => _textTheme.labelLarge;
 
   @override
   Color? get backgroundColor => null;
@@ -198,7 +202,7 @@ class _ActionChipDefaultsM3 extends ChipThemeData {
   Color? get shadowColor => Colors.transparent;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
   Color? get selectedColor => null;
@@ -214,14 +218,14 @@ class _ActionChipDefaultsM3 extends ChipThemeData {
 
   @override
   BorderSide? get side => isEnabled
-    ? BorderSide(color: Theme.of(context).colorScheme.outline)
+    ? BorderSide(color: _colors.outline)
-    : BorderSide(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12));
+    : BorderSide(color: _colors.onSurface.withOpacity(0.12));
 
   @override
   IconThemeData? get iconTheme => IconThemeData(
     color: isEnabled
-      ? Theme.of(context).colorScheme.primary
+      ? _colors.primary
-      : Theme.of(context).colorScheme.onSurface,
+      : _colors.onSurface,
     size: 18.0,
   );
 

packages/flutter/lib/src/material/banner.dart

@@ -5,9 +5,11 @@
 import 'package:flutter/widgets.dart';
 
 import 'banner_theme.dart';
+import 'color_scheme.dart';
 import 'divider.dart';
 import 'material.dart';
 import 'scaffold.dart';
+import 'text_theme.dart';
 import 'theme.dart';
 
 // Examples can assume:
@@ -462,22 +464,24 @@ class _BannerDefaultsM2 extends MaterialBannerThemeData {
 // Token database version: v0_162
 
 class _BannerDefaultsM3 extends MaterialBannerThemeData {
-  const _BannerDefaultsM3(this.context)
+  _BannerDefaultsM3(this.context)
     : super(elevation: 1.0);
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
-  Color? get backgroundColor => Theme.of(context).colorScheme.surface;
+  Color? get backgroundColor => _colors.surface;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
-  Color? get dividerColor => Theme.of(context).colorScheme.outlineVariant;
+  Color? get dividerColor => _colors.outlineVariant;
 
   @override
-  TextStyle? get contentTextStyle => Theme.of(context).textTheme.bodyMedium;
+  TextStyle? get contentTextStyle => _textTheme.bodyMedium;
 }
 
 // END GENERATED TOKEN PROPERTIES - Banner

packages/flutter/lib/src/material/bottom_app_bar.dart

@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
 import 'bottom_app_bar_theme.dart';
+import 'color_scheme.dart';
 import 'colors.dart';
 import 'elevation_overlay.dart';
 import 'material.dart';
@@ -293,7 +294,7 @@ class _BottomAppBarDefaultsM2 extends BottomAppBarTheme {
 // Token database version: v0_162
 
 class _BottomAppBarDefaultsM3 extends BottomAppBarTheme {
-  const _BottomAppBarDefaultsM3(this.context)
+  _BottomAppBarDefaultsM3(this.context)
     : super(
       elevation: 3.0,
       height: 80.0,
@@ -301,15 +302,16 @@ class _BottomAppBarDefaultsM3 extends BottomAppBarTheme {
     );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
-  Color? get color => Theme.of(context).colorScheme.surface;
+  Color? get color => _colors.surface;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
-  Color get shadowColor => Colors.transparent;
+  Color? get shadowColor => Colors.transparent;
 }
 
 // END GENERATED TOKEN PROPERTIES - BottomAppBar

packages/flutter/lib/src/material/bottom_sheet.dart

@@ -9,6 +9,7 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
 import 'bottom_sheet_theme.dart';
+import 'color_scheme.dart';
 import 'colors.dart';
 import 'curves.dart';
 import 'debug.dart';
@@ -1148,7 +1149,7 @@ PersistentBottomSheetController<T> showBottomSheet<T>({
 // Token database version: v0_162
 
 class _BottomSheetDefaultsM3 extends BottomSheetThemeData {
-   const _BottomSheetDefaultsM3(this.context)
+  _BottomSheetDefaultsM3(this.context)
     : super(
       elevation: 1.0,
       modalElevation: 1.0,
@@ -1156,12 +1157,13 @@ class _BottomSheetDefaultsM3 extends BottomSheetThemeData {
     );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
-  Color? get backgroundColor => Theme.of(context).colorScheme.surface;
+  Color? get backgroundColor => _colors.surface;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
   Color? get shadowColor => Colors.transparent;

packages/flutter/lib/src/material/card.dart

@@ -5,6 +5,7 @@
 import 'package:flutter/widgets.dart';
 
 import 'card_theme.dart';
+import 'color_scheme.dart';
 import 'material.dart';
 import 'theme.dart';
 
@@ -217,7 +218,7 @@ class _CardDefaultsM2 extends CardTheme {
 // Token database version: v0_162
 
 class _CardDefaultsM3 extends CardTheme {
-  const _CardDefaultsM3(this.context)
+  _CardDefaultsM3(this.context)
     : super(
         clipBehavior: Clip.none,
         elevation: 1.0,
@@ -226,15 +227,16 @@ class _CardDefaultsM3 extends CardTheme {
       );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
-  Color? get color => Theme.of(context).colorScheme.surface;
+  Color? get color => _colors.surface;
 
   @override
-  Color? get shadowColor => Theme.of(context).colorScheme.shadow;
+  Color? get shadowColor => _colors.shadow;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 }
 
 // END GENERATED TOKEN PROPERTIES - Card

packages/flutter/lib/src/material/chip.dart

@@ -9,6 +9,7 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
 import 'chip_theme.dart';
+import 'color_scheme.dart';
 import 'colors.dart';
 import 'constants.dart';
 import 'debug.dart';
@@ -18,6 +19,7 @@ import 'material.dart';
 import 'material_localizations.dart';
 import 'material_state.dart';
 import 'material_state_mixin.dart';
+import 'text_theme.dart';
 import 'theme.dart';
 import 'theme_data.dart';
 import 'tooltip.dart';
@@ -2189,7 +2191,7 @@ bool _hitIsOnDeleteIcon({
 // Token database version: v0_162
 
 class _ChipDefaultsM3 extends ChipThemeData {
-  const _ChipDefaultsM3(this.context, this.isEnabled)
+  _ChipDefaultsM3(this.context, this.isEnabled)
     : super(
         elevation: 0.0,
         shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
@@ -2198,9 +2200,11 @@ class _ChipDefaultsM3 extends ChipThemeData {
 
   final BuildContext context;
   final bool isEnabled;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
-  TextStyle? get labelStyle => Theme.of(context).textTheme.labelLarge;
+  TextStyle? get labelStyle => _textTheme.labelLarge;
 
   @override
   Color? get backgroundColor => null;
@@ -2209,7 +2213,7 @@ class _ChipDefaultsM3 extends ChipThemeData {
   Color? get shadowColor => Colors.transparent;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
   Color? get selectedColor => null;
@@ -2225,14 +2229,14 @@ class _ChipDefaultsM3 extends ChipThemeData {
 
   @override
   BorderSide? get side => isEnabled
-    ? BorderSide(color: Theme.of(context).colorScheme.outline)
+    ? BorderSide(color: _colors.outline)
-    : BorderSide(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12));
+    : BorderSide(color: _colors.onSurface.withOpacity(0.12));
 
   @override
   IconThemeData? get iconTheme => IconThemeData(
     color: isEnabled
-      ? Theme.of(context).colorScheme.primary
+      ? _colors.primary
-      : Theme.of(context).colorScheme.onSurface,
+      : _colors.onSurface,
     size: 18.0,
   );
 

packages/flutter/lib/src/material/choice_chip.dart

@@ -7,8 +7,10 @@ import 'package:flutter/widgets.dart';
 
 import 'chip.dart';
 import 'chip_theme.dart';
+import 'color_scheme.dart';
 import 'colors.dart';
 import 'debug.dart';
+import 'text_theme.dart';
 import 'theme.dart';
 import 'theme_data.dart';
 
@@ -190,7 +192,7 @@ class ChoiceChip extends StatelessWidget
 // Token database version: v0_162
 
 class _ChoiceChipDefaultsM3 extends ChipThemeData {
-  const _ChoiceChipDefaultsM3(this.context, this.isEnabled, this.isSelected)
+  _ChoiceChipDefaultsM3(this.context, this.isEnabled, this.isSelected)
     : super(
         elevation: 0.0,
         shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
@@ -200,9 +202,11 @@ class _ChoiceChipDefaultsM3 extends ChipThemeData {
   final BuildContext context;
   final bool isEnabled;
   final bool isSelected;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
-  TextStyle? get labelStyle => Theme.of(context).textTheme.labelLarge;
+  TextStyle? get labelStyle => _textTheme.labelLarge;
 
   @override
   Color? get backgroundColor => null;
@@ -211,36 +215,36 @@ class _ChoiceChipDefaultsM3 extends ChipThemeData {
   Color? get shadowColor => Colors.transparent;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
   Color? get selectedColor => isEnabled
-    ? Theme.of(context).colorScheme.secondaryContainer
+    ? _colors.secondaryContainer
-    : Theme.of(context).colorScheme.onSurface.withOpacity(0.12);
+    : _colors.onSurface.withOpacity(0.12);
 
   @override
-  Color? get checkmarkColor => Theme.of(context).colorScheme.onSecondaryContainer;
+  Color? get checkmarkColor => _colors.onSecondaryContainer;
 
   @override
   Color? get disabledColor => isSelected
-   ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
+   ? _colors.onSurface.withOpacity(0.12)
    : null;
 
   @override
-  Color? get deleteIconColor => Theme.of(context).colorScheme.onSecondaryContainer;
+  Color? get deleteIconColor => _colors.onSecondaryContainer;
 
   @override
   BorderSide? get side => !isSelected
     ? isEnabled
-      ? BorderSide(color: Theme.of(context).colorScheme.outline)
+      ? BorderSide(color: _colors.outline)
-      : BorderSide(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12))
+      : BorderSide(color: _colors.onSurface.withOpacity(0.12))
     : const BorderSide(color: Colors.transparent);
 
   @override
   IconThemeData? get iconTheme => IconThemeData(
     color: isEnabled
       ? null
-      : Theme.of(context).colorScheme.onSurface,
+      : _colors.onSurface,
     size: 18.0,
   );
 

packages/flutter/lib/src/material/filter_chip.dart

@@ -7,8 +7,10 @@ import 'package:flutter/widgets.dart';
 
 import 'chip.dart';
 import 'chip_theme.dart';
+import 'color_scheme.dart';
 import 'colors.dart';
 import 'debug.dart';
+import 'text_theme.dart';
 import 'theme.dart';
 import 'theme_data.dart';
 
@@ -198,7 +200,7 @@ class FilterChip extends StatelessWidget
 // Token database version: v0_162
 
 class _FilterChipDefaultsM3 extends ChipThemeData {
-  const _FilterChipDefaultsM3(this.context, this.isEnabled, this.isSelected)
+  _FilterChipDefaultsM3(this.context, this.isEnabled, this.isSelected)
     : super(
         elevation: 0.0,
         shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
@@ -208,9 +210,11 @@ class _FilterChipDefaultsM3 extends ChipThemeData {
   final BuildContext context;
   final bool isEnabled;
   final bool isSelected;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
-  TextStyle? get labelStyle => Theme.of(context).textTheme.labelLarge;
+  TextStyle? get labelStyle => _textTheme.labelLarge;
 
   @override
   Color? get backgroundColor => null;
@@ -219,36 +223,36 @@ class _FilterChipDefaultsM3 extends ChipThemeData {
   Color? get shadowColor => Colors.transparent;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
   Color? get selectedColor => isEnabled
-    ? Theme.of(context).colorScheme.secondaryContainer
+    ? _colors.secondaryContainer
-    : Theme.of(context).colorScheme.onSurface.withOpacity(0.12);
+    : _colors.onSurface.withOpacity(0.12);
 
   @override
-  Color? get checkmarkColor => Theme.of(context).colorScheme.onSecondaryContainer;
+  Color? get checkmarkColor => _colors.onSecondaryContainer;
 
   @override
   Color? get disabledColor => isSelected
-   ? Theme.of(context).colorScheme.onSurface.withOpacity(0.12)
+   ? _colors.onSurface.withOpacity(0.12)
    : null;
 
   @override
-  Color? get deleteIconColor => Theme.of(context).colorScheme.onSecondaryContainer;
+  Color? get deleteIconColor => _colors.onSecondaryContainer;
 
   @override
   BorderSide? get side => !isSelected
     ? isEnabled
-      ? BorderSide(color: Theme.of(context).colorScheme.outline)
+      ? BorderSide(color: _colors.outline)
-      : BorderSide(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12))
+      : BorderSide(color: _colors.onSurface.withOpacity(0.12))
     : const BorderSide(color: Colors.transparent);
 
   @override
   IconThemeData? get iconTheme => IconThemeData(
     color: isEnabled
       ? null
-      : Theme.of(context).colorScheme.onSurface,
+      : _colors.onSurface,
     size: 18.0,
   );
 

packages/flutter/lib/src/material/input_chip.dart

@@ -7,9 +7,11 @@ import 'package:flutter/widgets.dart';
 
 import 'chip.dart';
 import 'chip_theme.dart';
+import 'color_scheme.dart';
 import 'colors.dart';
 import 'debug.dart';
 import 'icons.dart';
+import 'text_theme.dart';
 import 'theme.dart';
 import 'theme_data.dart';
 
@@ -247,7 +249,7 @@ class InputChip extends StatelessWidget
 // Token database version: v0_162
 
 class _InputChipDefaultsM3 extends ChipThemeData {
-  const _InputChipDefaultsM3(this.context, this.isEnabled, this.isSelected)
+  _InputChipDefaultsM3(this.context, this.isEnabled, this.isSelected)
     : super(
         elevation: 0.0,
         shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0))),
@@ -257,9 +259,11 @@ class _InputChipDefaultsM3 extends ChipThemeData {
   final BuildContext context;
   final bool isEnabled;
   final bool isSelected;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
-  TextStyle? get labelStyle => Theme.of(context).textTheme.labelLarge;
+  TextStyle? get labelStyle => _textTheme.labelLarge;
 
   @override
   Color? get backgroundColor => null;
@@ -272,8 +276,8 @@ class _InputChipDefaultsM3 extends ChipThemeData {
 
   @override
   Color? get selectedColor => isEnabled
-    ? Theme.of(context).colorScheme.secondaryContainer
+    ? _colors.secondaryContainer
-    : Theme.of(context).colorScheme.onSurface.withOpacity(0.12);
+    : _colors.onSurface.withOpacity(0.12);
 
   @override
   Color? get checkmarkColor => null;
@@ -282,20 +286,20 @@ class _InputChipDefaultsM3 extends ChipThemeData {
   Color? get disabledColor => null;
 
   @override
-  Color? get deleteIconColor => Theme.of(context).colorScheme.onSecondaryContainer;
+  Color? get deleteIconColor => _colors.onSecondaryContainer;
 
   @override
   BorderSide? get side => !isSelected
     ? isEnabled
-      ? BorderSide(color: Theme.of(context).colorScheme.outline)
+      ? BorderSide(color: _colors.outline)
-      : BorderSide(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12))
+      : BorderSide(color: _colors.onSurface.withOpacity(0.12))
     : const BorderSide(color: Colors.transparent);
 
   @override
   IconThemeData? get iconTheme => IconThemeData(
     color: isEnabled
       ? null
-      : Theme.of(context).colorScheme.onSurface,
+      : _colors.onSurface,
     size: 18.0,
   );
 

packages/flutter/lib/src/material/navigation_drawer.dart

@@ -661,27 +661,29 @@ bool _isForwardOrCompleted(Animation<double> animation) {
 // Token database version: v0_162
 
 class _NavigationDrawerDefaultsM3 extends NavigationDrawerThemeData {
-  const _NavigationDrawerDefaultsM3(this.context)
+  _NavigationDrawerDefaultsM3(this.context)
-      : super(
+    : super(
-          elevation: 1.0,
+        elevation: 1.0,
-          tileHeight: 56.0,
+        tileHeight: 56.0,
-          indicatorShape: const StadiumBorder(),
+        indicatorShape: const StadiumBorder(),
-          indicatorSize: const Size(336.0, 56.0),
+        indicatorSize: const Size(336.0, 56.0),
-        );
+      );
 
   final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
+  late final TextTheme _textTheme = Theme.of(context).textTheme;
 
   @override
-  Color? get backgroundColor => Theme.of(context).colorScheme.surface;
+  Color? get backgroundColor => _colors.surface;
 
   @override
-  Color? get surfaceTintColor => Theme.of(context).colorScheme.surfaceTint;
+  Color? get surfaceTintColor => _colors.surfaceTint;
 
   @override
   Color? get shadowColor => Colors.transparent;
 
   @override
-  Color? get indicatorColor => Theme.of(context).colorScheme.secondaryContainer;
+  Color? get indicatorColor => _colors.secondaryContainer;
 
   @override
   MaterialStateProperty<IconThemeData?>? get iconTheme {
@@ -690,7 +692,7 @@ class _NavigationDrawerDefaultsM3 extends NavigationDrawerThemeData {
         size: 24.0,
         color: states.contains(MaterialState.selected)
             ? null
-            : Theme.of(context).colorScheme.onSurfaceVariant,
+            : _colors.onSurfaceVariant,
       );
     });
   }
@@ -698,11 +700,11 @@ class _NavigationDrawerDefaultsM3 extends NavigationDrawerThemeData {
   @override
   MaterialStateProperty<TextStyle?>? get labelTextStyle {
     return MaterialStateProperty.resolveWith((Set<MaterialState> states) {
-      final TextStyle style = Theme.of(context).textTheme.labelLarge!;
+      final TextStyle style = _textTheme.labelLarge!;
       return style.apply(
         color: states.contains(MaterialState.selected)
-            ? Theme.of(context).colorScheme.onSecondaryContainer
+            ? _colors.onSecondaryContainer
-            : Theme.of(context).colorScheme.onSurfaceVariant,
+            : _colors.onSurfaceVariant,
       );
     });
   }

packages/flutter/lib/src/material/slider.dart

@@ -1882,11 +1882,10 @@ class _SliderDefaultsM2 extends SliderThemeData {
 
 class _SliderDefaultsM3 extends SliderThemeData {
   _SliderDefaultsM3(this.context)
-    : _colors = Theme.of(context).colorScheme,
+    : super(trackHeight: 4.0);
-      super(trackHeight: 4.0);
 
   final BuildContext context;
-  final ColorScheme _colors;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
   Color? get activeTrackColor => _colors.primary;

packages/flutter/lib/src/material/snack_bar.dart

@@ -854,7 +854,6 @@ class _SnackbarDefaultsM3 extends SnackBarThemeData {
 
   final BuildContext context;
   late final ThemeData _theme = Theme.of(context);
-
   late final ColorScheme _colors = _theme.colorScheme;
 
   @override

packages/flutter/lib/src/material/switch.dart

@@ -1698,10 +1698,10 @@ class _SwitchDefaultsM2 extends SwitchThemeData {
 // Token database version: v0_162
 
 class _SwitchDefaultsM3 extends SwitchThemeData {
-  _SwitchDefaultsM3(BuildContext context)
+  _SwitchDefaultsM3(this.context);
-    : _colors = Theme.of(context).colorScheme;
 
-  final ColorScheme _colors;
+  final BuildContext context;
+  late final ColorScheme _colors = Theme.of(context).colorScheme;
 
   @override
   MaterialStateProperty<Color> get thumbColor {