Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit d8b7eb6

Browse files
authored
Updated token templates to sync with master code. (#117097)
1 parent aa0b681 commit d8b7eb6

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

dev/tools/gen_defaults/lib/action_chip_template.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class _${blockName}DefaultsM3 extends ChipThemeData {
7272
EdgeInsetsGeometry? get labelPadding => EdgeInsets.lerp(
7373
const EdgeInsets.symmetric(horizontal: 8.0),
7474
const EdgeInsets.symmetric(horizontal: 4.0),
75-
clampDouble(MediaQuery.of(context).textScaleFactor - 1.0, 0.0, 1.0),
75+
clampDouble(MediaQuery.textScaleFactorOf(context) - 1.0, 0.0, 1.0),
7676
)!;
7777
}
7878
''';

dev/tools/gen_defaults/lib/filter_chip_template.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class _${blockName}DefaultsM3 extends ChipThemeData {
7878
EdgeInsetsGeometry? get labelPadding => EdgeInsets.lerp(
7979
const EdgeInsets.symmetric(horizontal: 8.0),
8080
const EdgeInsets.symmetric(horizontal: 4.0),
81-
clampDouble(MediaQuery.of(context).textScaleFactor - 1.0, 0.0, 1.0),
81+
clampDouble(MediaQuery.textScaleFactorOf(context) - 1.0, 0.0, 1.0),
8282
)!;
8383
}
8484
''';

dev/tools/gen_defaults/lib/input_chip_template.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class _${blockName}DefaultsM3 extends ChipThemeData {
7171
EdgeInsetsGeometry? get labelPadding => EdgeInsets.lerp(
7272
const EdgeInsets.symmetric(horizontal: 8.0),
7373
const EdgeInsets.symmetric(horizontal: 4.0),
74-
clampDouble(MediaQuery.of(context).textScaleFactor - 1.0, 0.0, 1.0),
74+
clampDouble(MediaQuery.textScaleFactorOf(context) - 1.0, 0.0, 1.0),
7575
)!;
7676
}
7777
''';

dev/tools/gen_defaults/lib/menu_template.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class _MenuBarDefaultsM3 extends MenuStyle {
1818
shape: const MaterialStatePropertyAll<OutlinedBorder>(_defaultMenuBorder),
1919
alignment: AlignmentDirectional.bottomStart,
2020
);
21+
2122
static const RoundedRectangleBorder _defaultMenuBorder =
2223
${shape('md.comp.menu.container', '')};
2324
@@ -60,6 +61,7 @@ class _MenuButtonDefaultsM3 extends ButtonStyle {
6061
enableFeedback: true,
6162
alignment: AlignmentDirectional.centerStart,
6263
);
64+
6365
final BuildContext context;
6466
6567
late final ColorScheme _colors = Theme.of(context).colorScheme;
@@ -190,7 +192,7 @@ class _MenuButtonDefaultsM3 extends ButtonStyle {
190192
const EdgeInsets.symmetric(horizontal: 12),
191193
const EdgeInsets.symmetric(horizontal: 8),
192194
const EdgeInsets.symmetric(horizontal: 4),
193-
MediaQuery.maybeOf(context)?.textScaleFactor ?? 1,
195+
MediaQuery.maybeTextScaleFactorOf(context) ?? 1,
194196
);
195197
}
196198
}
@@ -202,6 +204,7 @@ class _MenuDefaultsM3 extends MenuStyle {
202204
shape: const MaterialStatePropertyAll<OutlinedBorder>(_defaultMenuBorder),
203205
alignment: AlignmentDirectional.topEnd,
204206
);
207+
205208
static const RoundedRectangleBorder _defaultMenuBorder =
206209
${shape('md.comp.menu.container', '')};
207210

dev/tools/gen_defaults/lib/time_picker_template.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,11 @@ class _${blockName}DefaultsM3 extends _TimePickerDefaults {
306306
InputDecorationTheme get inputDecorationTheme {
307307
// This is NOT correct, but there's no token for
308308
// 'time-input.container.shape', so this is using the radius from the shape
309-
// for the hour/minute selector.
310-
final BorderRadiusGeometry selectorRadius = ${shape('$hourMinuteComponent.container')}.borderRadius;
309+
// for the hour/minute selector. It's a BorderRadiusGeometry, so we have to
310+
// resolve it before we can use it.
311+
final BorderRadius selectorRadius = ${shape('$hourMinuteComponent.container')}
312+
.borderRadius
313+
.resolve(Directionality.of(context));
311314
return InputDecorationTheme(
312315
contentPadding: EdgeInsets.zero,
313316
filled: true,

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,9 +3684,7 @@ class _TimePickerDefaultsM3 extends _TimePickerDefaults {
36843684
// 'time-input.container.shape', so this is using the radius from the shape
36853685
// for the hour/minute selector. It's a BorderRadiusGeometry, so we have to
36863686
// resolve it before we can use it.
3687-
final BorderRadius selectorRadius = const RoundedRectangleBorder(
3688-
borderRadius: BorderRadius.all(Radius.circular(8.0)),
3689-
)
3687+
final BorderRadius selectorRadius = const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8.0)))
36903688
.borderRadius
36913689
.resolve(Directionality.of(context));
36923690
return InputDecorationTheme(

0 commit comments

Comments
 (0)