Skip to content

Commit 897192a

Browse files
authored
[material_ui] Migrate M3 Divider template to use new gen_defaults (#12915)
Work toward flutter/flutter#187899. Fixes flutter/flutter#188412. This PR migrates the M3 Divider defaults template to the new packages/material_ui/tool/gen_defaults generator. ## Pre-Review Checklist
1 parent 756c474 commit 897192a

6 files changed

Lines changed: 51 additions & 55 deletions

File tree

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

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import 'package:flutter/widgets.dart';
1313
import 'divider_theme.dart';
1414
import 'theme.dart';
1515

16+
part 'generated/divider_defaults_m3.g.dart';
17+
1618
// Examples can assume:
1719
// late BuildContext context;
1820

@@ -383,27 +385,3 @@ class _DividerDefaultsM2 extends DividerThemeData {
383385
@override
384386
Color? get color => Theme.of(context).dividerColor;
385387
}
386-
387-
// BEGIN GENERATED TOKEN PROPERTIES - Divider
388-
389-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
390-
// "END GENERATED" comments are generated from data in the Material
391-
// Design token database by the script:
392-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
393-
394-
// dart format off
395-
class _DividerDefaultsM3 extends DividerThemeData {
396-
const _DividerDefaultsM3(this.context) : super(
397-
space: 16,
398-
thickness: 1.0,
399-
indent: 0,
400-
endIndent: 0,
401-
);
402-
403-
final BuildContext context;
404-
405-
@override Color? get color => Theme.of(context).colorScheme.outlineVariant;
406-
}
407-
// dart format on
408-
409-
// END GENERATED TOKEN PROPERTIES - Divider

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/divider_defaults.g.dart renamed to packages/material_ui/lib/src/generated/divider_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 '../divider.dart';
9+
510
class _DividerDefaultsM3 extends DividerThemeData {
611
const _DividerDefaultsM3(this.context)
712
: super(space: 16, thickness: 1.0, indent: 0, endIndent: 0);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ import '../templates/chip_template.dart';
2525
import '../templates/color_scheme_template.dart';
2626
// import '../templates/date_picker_template.dart';
2727
// import '../templates/dialog_template.dart';
28-
// import '../templates/divider_template.dart';
28+
import '../templates/divider_template.dart';
29+
2930
// import '../templates/drawer_template.dart';
3031
// import '../templates/expansion_tile_template.dart';
3132
// import '../templates/fab_template.dart';
@@ -84,7 +85,7 @@ Future<void> main(List<String> args) async {
8485
const ColorSchemeTemplateM3().generateFile(verbose: verbose);
8586
// const DatePickerTemplateM3().generateFile(verbose: verbose);
8687
// const DialogTemplateM3().generateFile(verbose: verbose);
87-
// const DividerTemplateM3().generateFile(verbose: verbose);
88+
const DividerTemplateM3().generateFile(verbose: verbose);
8889
// const DrawerTemplateM3().generateFile(verbose: verbose);
8990
// const ExpansionTileTemplateM3().generateFile(verbose: verbose);
9091
// const FabTemplateM3().generateFile(verbose: verbose);
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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/divider.dart';
6+
import 'template.dart';
7+
8+
class DividerTemplateM3 extends TokenTemplateM3 {
9+
const DividerTemplateM3();
10+
11+
@override
12+
String get name => 'Divider';
13+
14+
@override
15+
String get parentFilePath => 'divider.dart';
16+
17+
@override
18+
String generateContents(String className) =>
19+
'''
20+
class $className extends DividerThemeData {
21+
const $className(this.context) : super(
22+
space: 16,
23+
thickness: ${TokenDivider.thickness},
24+
indent: 0,
25+
endIndent: 0,
26+
);
27+
28+
final BuildContext context;
29+
30+
@override Color? get color => ${color(TokenDivider.color, 'Theme.of(context).colorScheme')};
31+
}
32+
''';
33+
}

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

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

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import '../templates/chip_template.dart';
2222
import '../templates/color_scheme_template.dart';
2323
// import '../templates/date_picker_template.dart';
2424
// import '../templates/dialog_template.dart';
25-
// import '../templates/divider_template.dart';
25+
import '../templates/divider_template.dart';
2626
// import '../templates/drawer_template.dart';
2727
// import '../templates/expansion_tile_template.dart';
2828
// import '../templates/fab_template.dart';
@@ -552,8 +552,13 @@ void main() {
552552
});
553553

554554
test('DividerTemplateM3 emits M3 Divider defaults from tokens', () {
555-
// Intentionally empty, will be implemented during migration. See:
556-
// https://github.com/flutter/flutter/issues/187899
555+
final String contents = _generateContents(const DividerTemplateM3());
556+
expect(contents, contains('class _DividerDefaultsM3 extends DividerThemeData'));
557+
expect(contents, contains('thickness: 1.0'));
558+
expect(
559+
contents,
560+
contains('Color? get color => Theme.of(context).colorScheme.outlineVariant;'),
561+
);
557562
});
558563

559564
test('DrawerTemplateM3 emits M3 Drawer defaults from tokens', () {

0 commit comments

Comments
 (0)