Skip to content

Commit 5eb35f5

Browse files
authored
[material_ui] Migrate M3 ExpansionTile template to use new gen_defaults (flutter#12920)
Work toward flutter#187899. Fixes flutter#188414. This PR migrates the M3 ExpansionTile defaults template to use the new `gen_defaults` in `material_ui`. The generated defaults remain unchanged. ## Pre-Review Checklist
1 parent c983254 commit 5eb35f5

6 files changed

Lines changed: 56 additions & 75 deletions

File tree

‎packages/material_ui/lib/src/expansion_tile.dart‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import 'material_localizations.dart';
2323
import 'theme.dart';
2424
import 'theme_data.dart';
2525

26+
part 'generated/expansion_tile_defaults_m3.g.dart';
27+
2628
const Duration _kExpand = Duration(milliseconds: 200);
2729

2830
/// Enables control over a single [ExpansionTile]'s expanded/collapsed state.
@@ -919,34 +921,3 @@ class _ExpansionTileDefaultsM2 extends ExpansionTileThemeData {
919921
@override
920922
Color? get collapsedIconColor => _theme.unselectedWidgetColor;
921923
}
922-
923-
// BEGIN GENERATED TOKEN PROPERTIES - ExpansionTile
924-
925-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
926-
// "END GENERATED" comments are generated from data in the Material
927-
// Design token database by the script:
928-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
929-
930-
// dart format off
931-
class _ExpansionTileDefaultsM3 extends ExpansionTileThemeData {
932-
_ExpansionTileDefaultsM3(this.context);
933-
934-
final BuildContext context;
935-
late final ThemeData _theme = Theme.of(context);
936-
late final ColorScheme _colors = _theme.colorScheme;
937-
938-
@override
939-
Color? get textColor => _colors.onSurface;
940-
941-
@override
942-
Color? get iconColor => _colors.primary;
943-
944-
@override
945-
Color? get collapsedTextColor => _colors.onSurface;
946-
947-
@override
948-
Color? get collapsedIconColor => _colors.onSurfaceVariant;
949-
}
950-
// dart format on
951-
952-
// END GENERATED TOKEN PROPERTIES - ExpansionTile

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/expansion_tile_defaults.g.dart renamed to packages/material_ui/lib/src/generated/expansion_tile_defaults_m3.g.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// Do not edit by hand. The code is generated from data in the Material
6+
// Design token database by the script:
7+
// packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart.
8+
part of '../expansion_tile.dart';
9+
510
class _ExpansionTileDefaultsM3 extends ExpansionTileThemeData {
611
_ExpansionTileDefaultsM3(this.context);
712

‎packages/material_ui/tool/gen_defaults/bin/gen_defaults.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import '../templates/color_scheme_template.dart';
2727
// import '../templates/dialog_template.dart';
2828
import '../templates/divider_template.dart';
2929
import '../templates/drawer_template.dart';
30-
31-
// import '../templates/expansion_tile_template.dart';
30+
import '../templates/expansion_tile_template.dart';
3231
// import '../templates/fab_template.dart';
3332
import '../templates/filter_chip_template.dart';
3433

@@ -87,7 +86,7 @@ Future<void> main(List<String> args) async {
8786
// const DialogTemplateM3().generateFile(verbose: verbose);
8887
const DividerTemplateM3().generateFile(verbose: verbose);
8988
const DrawerTemplateM3().generateFile(verbose: verbose);
90-
// const ExpansionTileTemplateM3().generateFile(verbose: verbose);
89+
const ExpansionTileTemplateM3().generateFile(verbose: verbose);
9190
// const FabTemplateM3().generateFile(verbose: verbose);
9291
const FilterChipTemplateM3().generateFile(verbose: verbose);
9392
// const IconButtonTemplateM3().generateFile(verbose: verbose);
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright 2013 The Flutter Authors
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import '../data/color_role.dart';
6+
import '../data/list.dart';
7+
import 'template.dart';
8+
9+
class ExpansionTileTemplateM3 extends TokenTemplateM3 {
10+
const ExpansionTileTemplateM3();
11+
12+
@override
13+
String get name => 'Expansion Tile';
14+
15+
@override
16+
String get parentFilePath => 'expansion_tile.dart';
17+
18+
@override
19+
String generateContents(String className) =>
20+
'''
21+
class $className extends ExpansionTileThemeData {
22+
$className(this.context);
23+
24+
final BuildContext context;
25+
late final ThemeData _theme = Theme.of(context);
26+
late final ColorScheme _colors = _theme.colorScheme;
27+
28+
@override
29+
Color? get textColor => ${color(TokenList.listItemLabelTextColor)};
30+
31+
@override
32+
Color? get iconColor => ${color(TokenColorRole.primary)};
33+
34+
@override
35+
Color? get collapsedTextColor => ${color(TokenList.listItemLabelTextColor)};
36+
37+
@override
38+
Color? get collapsedIconColor => ${color(TokenList.listItemTrailingIconColor)};
39+
}
40+
''';
41+
}

‎packages/material_ui/tool/gen_defaults/temporarily_excluded/templates/expansion_tile_template.dart‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎packages/material_ui/tool/gen_defaults/test/gen_defaults_test.dart‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import '../templates/color_scheme_template.dart';
2424
// import '../templates/dialog_template.dart';
2525
import '../templates/divider_template.dart';
2626
import '../templates/drawer_template.dart';
27-
// import '../templates/expansion_tile_template.dart';
27+
import '../templates/expansion_tile_template.dart';
2828
// import '../templates/fab_template.dart';
2929
import '../templates/filter_chip_template.dart';
3030
// import '../templates/icon_button_template.dart';
@@ -573,8 +573,11 @@ void main() {
573573
});
574574

575575
test('ExpansionTileTemplateM3 emits M3 ExpansionTile defaults from tokens', () {
576-
// Intentionally empty, will be implemented during migration. See:
577-
// https://github.com/flutter/flutter/issues/187899
576+
final String contents = _generateContents(const ExpansionTileTemplateM3());
577+
expect(contents, contains('class _ExpansionTileDefaultsM3 extends ExpansionTileThemeData'));
578+
expect(contents, contains('Color? get textColor => _colors.onSurface'));
579+
expect(contents, contains('Color? get iconColor => _colors.primary'));
580+
expect(contents, contains('Color? get collapsedIconColor => _colors.onSurfaceVariant'));
578581
});
579582

580583
test('FabTemplateM3 emits M3 Fab defaults from tokens', () {

0 commit comments

Comments
 (0)