Skip to content

Commit 9e9e3e9

Browse files
authored
[material_ui] Migrate M3 progress indicator defaults to new gen_defaults (flutter#13026)
Work toward flutter#187899 Fix flutter#188427 ## Pre-Review Checklist
1 parent a64e51a commit 9e9e3e9

6 files changed

Lines changed: 132 additions & 154 deletions

File tree

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/progress_indicator_defaults.g.dart renamed to packages/material_ui/lib/src/generated/progress_indicator_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 '../progress_indicator.dart';
9+
510
class _CircularProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
611
_CircularProgressIndicatorDefaultsM3(this.context, {required this.indeterminate});
712

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

Lines changed: 2 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import 'material.dart';
1818
import 'progress_indicator_theme.dart';
1919
import 'theme.dart';
2020

21+
part 'generated/progress_indicator_defaults_m3.g.dart';
22+
2123
// This value is extracted from
2224
// https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/res/res/anim/progress_indeterminate_material.xml;drc=9cb5b4c2d93acb9d6f5e14167e265c328c487d6b
2325
const int _kIndeterminateLinearDuration = 1800;
@@ -1597,74 +1599,3 @@ class _LinearProgressIndicatorDefaultsM3Year2023 extends ProgressIndicatorThemeD
15971599
@override
15981600
double get linearMinHeight => 4.0;
15991601
}
1600-
1601-
// BEGIN GENERATED TOKEN PROPERTIES - ProgressIndicator
1602-
1603-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
1604-
// "END GENERATED" comments are generated from data in the Material
1605-
// Design token database by the script:
1606-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
1607-
1608-
// dart format off
1609-
class _CircularProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
1610-
_CircularProgressIndicatorDefaultsM3(this.context, { required this.indeterminate });
1611-
1612-
final BuildContext context;
1613-
late final ColorScheme _colors = Theme.of(context).colorScheme;
1614-
final bool indeterminate;
1615-
1616-
@override
1617-
Color get color => _colors.primary;
1618-
1619-
@override
1620-
Color? get circularTrackColor => indeterminate ? null : _colors.secondaryContainer;
1621-
1622-
@override
1623-
double get strokeWidth => 4.0;
1624-
1625-
@override
1626-
double? get strokeAlign => CircularProgressIndicator.strokeAlignInside;
1627-
1628-
@override
1629-
BoxConstraints get constraints => const BoxConstraints(
1630-
minWidth: 40.0,
1631-
minHeight: 40.0,
1632-
);
1633-
1634-
@override
1635-
double? get trackGap => 4.0;
1636-
1637-
@override
1638-
EdgeInsetsGeometry? get circularTrackPadding => const EdgeInsets.all(4.0);
1639-
}
1640-
1641-
class _LinearProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
1642-
_LinearProgressIndicatorDefaultsM3(this.context);
1643-
1644-
final BuildContext context;
1645-
late final ColorScheme _colors = Theme.of(context).colorScheme;
1646-
1647-
@override
1648-
Color get color => _colors.primary;
1649-
1650-
@override
1651-
Color get linearTrackColor => _colors.secondaryContainer;
1652-
1653-
@override
1654-
double get linearMinHeight => 4.0;
1655-
1656-
@override
1657-
BorderRadius get borderRadius => const BorderRadius.all(Radius.circular(4.0 / 2));
1658-
1659-
@override
1660-
Color get stopIndicatorColor => _colors.primary;
1661-
1662-
@override
1663-
double? get stopIndicatorRadius => 4.0 / 2;
1664-
1665-
@override
1666-
double? get trackGap => 4.0;
1667-
}
1668-
// dart format on
1669-
1670-
// END GENERATED TOKEN PROPERTIES - ProgressIndicator

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ import '../templates/motion_template.dart';
4040
// import '../templates/navigation_drawer_template.dart';
4141
// import '../templates/navigation_rail_template.dart';
4242
// import '../templates/popup_menu_template.dart';
43-
// import '../templates/progress_indicator_template.dart';
43+
import '../templates/progress_indicator_template.dart';
44+
4445
// import '../templates/radio_template.dart';
4546
// import '../templates/range_slider_template.dart';
4647
// import '../templates/search_bar_template.dart';
@@ -102,7 +103,7 @@ Future<void> main(List<String> args) async {
102103
// const NavigationDrawerTemplateM3().generateFile(verbose: verbose);
103104
// const NavigationRailTemplateM3().generateFile(verbose: verbose);
104105
// const PopupMenuTemplateM3().generateFile(verbose: verbose);
105-
// const ProgressIndicatorTemplateM3().generateFile(verbose: verbose);
106+
const ProgressIndicatorTemplateM3().generateFile(verbose: verbose);
106107
// const RadioTemplateM3().generateFile(verbose: verbose);
107108
// const RangeSliderTemplateM3().generateFile(verbose: verbose);
108109
// const SearchBarTemplateM3().generateFile(verbose: verbose);
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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/progress_indicator.dart';
6+
import '../data/progress_indicator_circular.dart';
7+
import '../data/progress_indicator_linear.dart';
8+
import 'template.dart';
9+
10+
class ProgressIndicatorTemplateM3 extends TokenTemplateM3 {
11+
const ProgressIndicatorTemplateM3();
12+
13+
@override
14+
String get name => 'Progress Indicator';
15+
16+
@override
17+
String get parentFilePath => 'progress_indicator.dart';
18+
19+
@override
20+
String get className => '';
21+
22+
@override
23+
String generateContents(String className) =>
24+
'''
25+
class _CircularProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
26+
_CircularProgressIndicatorDefaultsM3(this.context, { required this.indeterminate });
27+
28+
final BuildContext context;
29+
late final ColorScheme _colors = Theme.of(context).colorScheme;
30+
final bool indeterminate;
31+
32+
@override
33+
Color get color => ${color(TokenProgressIndicator.activeIndicatorColor)};
34+
35+
@override
36+
Color? get circularTrackColor => indeterminate ? null : ${color(TokenProgressIndicator.trackColor)};
37+
38+
@override
39+
double get strokeWidth => ${TokenProgressIndicatorCircular.trackThickness};
40+
41+
@override
42+
double? get strokeAlign => CircularProgressIndicator.strokeAlignInside;
43+
44+
@override
45+
BoxConstraints get constraints => const BoxConstraints(
46+
minWidth: 40.0,
47+
minHeight: 40.0,
48+
);
49+
50+
@override
51+
double? get trackGap => ${TokenProgressIndicatorCircular.trackActiveIndicatorSpace};
52+
53+
@override
54+
EdgeInsetsGeometry? get circularTrackPadding => const EdgeInsets.all(4.0);
55+
}
56+
57+
class _LinearProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData {
58+
_LinearProgressIndicatorDefaultsM3(this.context);
59+
60+
final BuildContext context;
61+
late final ColorScheme _colors = Theme.of(context).colorScheme;
62+
63+
@override
64+
Color get color => ${color(TokenProgressIndicator.activeIndicatorColor)};
65+
66+
@override
67+
Color get linearTrackColor => ${color(TokenProgressIndicator.trackColor)};
68+
69+
@override
70+
double get linearMinHeight => ${TokenProgressIndicatorLinear.trackThickness};
71+
72+
@override
73+
BorderRadius get borderRadius => const BorderRadius.all(Radius.circular(${TokenProgressIndicatorLinear.trackThickness} / 2));
74+
75+
@override
76+
Color get stopIndicatorColor => ${color(TokenProgressIndicator.stopIndicatorColor)};
77+
78+
@override
79+
double? get stopIndicatorRadius => ${TokenProgressIndicatorLinear.stopIndicatorSize} / 2;
80+
81+
@override
82+
double? get trackGap => ${TokenProgressIndicatorLinear.trackActiveIndicatorSpace};
83+
}
84+
''';
85+
}

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

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

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

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import '../templates/motion_template.dart';
3838
// import '../templates/navigation_drawer_template.dart';
3939
// import '../templates/navigation_rail_template.dart';
4040
// import '../templates/popup_menu_template.dart';
41-
// import '../templates/progress_indicator_template.dart';
41+
import '../templates/progress_indicator_template.dart';
4242
// import '../templates/radio_template.dart';
4343
// import '../templates/range_slider_template.dart';
4444
// import '../templates/search_bar_template.dart';
@@ -750,8 +750,42 @@ void main() {
750750
});
751751

752752
test('ProgressIndicatorTemplateM3 emits M3 ProgressIndicator defaults from tokens', () {
753-
// Intentionally empty, will be implemented during migration. See:
754-
// https://github.com/flutter/flutter/issues/187899
753+
final String contents = _generateContents(const ProgressIndicatorTemplateM3());
754+
expect(
755+
contents,
756+
contains('class _CircularProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData'),
757+
);
758+
expect(contents, contains('Color get color => _colors.primary'));
759+
expect(
760+
contents,
761+
contains(
762+
'Color? get circularTrackColor => indeterminate ? null : _colors.secondaryContainer',
763+
),
764+
);
765+
expect(contents, contains('double get strokeWidth => 4.0'));
766+
expect(
767+
contents,
768+
contains('double? get strokeAlign => CircularProgressIndicator.strokeAlignInside;'),
769+
);
770+
expect(contents, contains('double? get trackGap => 4.0'));
771+
expect(
772+
contents,
773+
contains('EdgeInsetsGeometry? get circularTrackPadding => const EdgeInsets.all(4.0)'),
774+
);
775+
expect(
776+
contents,
777+
contains('class _LinearProgressIndicatorDefaultsM3 extends ProgressIndicatorThemeData'),
778+
);
779+
expect(contents, contains('Color get linearTrackColor => _colors.secondaryContainer'));
780+
expect(contents, contains('double get linearMinHeight => 4.0'));
781+
expect(
782+
contents,
783+
contains(
784+
'BorderRadius get borderRadius => const BorderRadius.all(Radius.circular(4.0 / 2))',
785+
),
786+
);
787+
expect(contents, contains('Color get stopIndicatorColor => _colors.primary'));
788+
expect(contents, contains('double? get stopIndicatorRadius => 4.0 / 2'));
755789
});
756790

757791
test('RadioTemplateM3 emits M3 Radio defaults from tokens', () {

0 commit comments

Comments
 (0)