Skip to content

Commit 2fa9692

Browse files
authored
[material_ui] Migrate M3 Card defaults to new gen_defaults (flutter#12795)
Work towards flutter/flutter#187899 Fixes flutter/flutter#188406 ## Pre-Review Checklist
1 parent 8a35b16 commit 2fa9692

8 files changed

Lines changed: 170 additions & 171 deletions

File tree

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

Lines changed: 4 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import 'colors.dart';
1515
import 'material.dart';
1616
import 'theme.dart';
1717

18+
part 'generated/card_defaults_m3.g.dart';
19+
part 'generated/filled_card_defaults_m3.g.dart';
20+
part 'generated/outlined_card_defaults_m3.g.dart';
21+
1822
enum _CardVariant { elevated, filled, outlined }
1923

2024
/// A Material Design card: a panel with slightly rounded corners and an
@@ -307,111 +311,3 @@ class _CardDefaultsM2 extends CardThemeData {
307311
@override
308312
Color? get shadowColor => Theme.of(context).shadowColor;
309313
}
310-
311-
// BEGIN GENERATED TOKEN PROPERTIES - Card
312-
313-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
314-
// "END GENERATED" comments are generated from data in the Material
315-
// Design token database by the script:
316-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
317-
318-
// dart format off
319-
class _CardDefaultsM3 extends CardThemeData {
320-
_CardDefaultsM3(this.context)
321-
: super(
322-
clipBehavior: Clip.none,
323-
elevation: 1.0,
324-
margin: const EdgeInsets.all(4.0),
325-
);
326-
327-
final BuildContext context;
328-
late final ColorScheme _colors = Theme.of(context).colorScheme;
329-
330-
@override
331-
Color? get color => _colors.surfaceContainerLow;
332-
333-
@override
334-
Color? get shadowColor => _colors.shadow;
335-
336-
@override
337-
Color? get surfaceTintColor => Colors.transparent;
338-
339-
@override
340-
ShapeBorder? get shape =>const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12.0)));
341-
}
342-
// dart format on
343-
344-
// END GENERATED TOKEN PROPERTIES - Card
345-
346-
// BEGIN GENERATED TOKEN PROPERTIES - FilledCard
347-
348-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
349-
// "END GENERATED" comments are generated from data in the Material
350-
// Design token database by the script:
351-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
352-
353-
// dart format off
354-
class _FilledCardDefaultsM3 extends CardThemeData {
355-
_FilledCardDefaultsM3(this.context)
356-
: super(
357-
clipBehavior: Clip.none,
358-
elevation: 0.0,
359-
margin: const EdgeInsets.all(4.0),
360-
);
361-
362-
final BuildContext context;
363-
late final ColorScheme _colors = Theme.of(context).colorScheme;
364-
365-
@override
366-
Color? get color => _colors.surfaceContainerHighest;
367-
368-
@override
369-
Color? get shadowColor => _colors.shadow;
370-
371-
@override
372-
Color? get surfaceTintColor => Colors.transparent;
373-
374-
@override
375-
ShapeBorder? get shape =>const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12.0)));
376-
}
377-
// dart format on
378-
379-
// END GENERATED TOKEN PROPERTIES - FilledCard
380-
381-
// BEGIN GENERATED TOKEN PROPERTIES - OutlinedCard
382-
383-
// Do not edit by hand. The code between the "BEGIN GENERATED" and
384-
// "END GENERATED" comments are generated from data in the Material
385-
// Design token database by the script:
386-
// dev/tools/gen_defaults/bin/gen_defaults.dart.
387-
388-
// dart format off
389-
class _OutlinedCardDefaultsM3 extends CardThemeData {
390-
_OutlinedCardDefaultsM3(this.context)
391-
: super(
392-
clipBehavior: Clip.none,
393-
elevation: 0.0,
394-
margin: const EdgeInsets.all(4.0),
395-
);
396-
397-
final BuildContext context;
398-
late final ColorScheme _colors = Theme.of(context).colorScheme;
399-
400-
@override
401-
Color? get color => _colors.surface;
402-
403-
@override
404-
Color? get shadowColor => _colors.shadow;
405-
406-
@override
407-
Color? get surfaceTintColor => Colors.transparent;
408-
409-
@override
410-
ShapeBorder? get shape =>
411-
const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12.0))).copyWith(
412-
side: BorderSide(color: _colors.outlineVariant)
413-
);
414-
}
415-
// dart format on
416-
417-
// END GENERATED TOKEN PROPERTIES - OutlinedCard

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/card_defaults.g.dart renamed to packages/material_ui/lib/src/generated/card_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 '../card.dart';
9+
510
class _CardDefaultsM3 extends CardThemeData {
611
_CardDefaultsM3(this.context)
712
: super(clipBehavior: Clip.none, elevation: 1.0, margin: const EdgeInsets.all(4.0));

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/filled_card_defaults.g.dart renamed to packages/material_ui/lib/src/generated/filled_card_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 '../card.dart';
9+
510
class _FilledCardDefaultsM3 extends CardThemeData {
611
_FilledCardDefaultsM3(this.context)
712
: super(clipBehavior: Clip.none, elevation: 0.0, margin: const EdgeInsets.all(4.0));

packages/material_ui/tool/gen_defaults/temporarily_excluded/generated/outlined_card_defaults.g.dart renamed to packages/material_ui/lib/src/generated/outlined_card_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 '../card.dart';
9+
510
class _OutlinedCardDefaultsM3 extends CardThemeData {
611
_OutlinedCardDefaultsM3(this.context)
712
: super(clipBehavior: Clip.none, elevation: 0.0, margin: const EdgeInsets.all(4.0));

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import '../templates/banner_template.dart';
1919
// import '../templates/bottom_app_bar_template.dart';
2020
import '../templates/bottom_sheet_template.dart';
2121
import '../templates/button_template.dart';
22+
import '../templates/card_template.dart';
2223

23-
// import '../templates/card_template.dart';
2424
// import '../templates/checkbox_template.dart';
2525
// import '../templates/chip_template.dart';
2626
// import '../templates/color_scheme_template.dart';
@@ -75,7 +75,9 @@ Future<void> main(List<String> args) async {
7575
const ButtonTemplateM3('Filled Tonal Button').generateFile(verbose: verbose);
7676
const ButtonTemplateM3('Outlined Button').generateFile(verbose: verbose);
7777
const ButtonTemplateM3('Text Button').generateFile(verbose: verbose);
78-
// const CardTemplateM3().generateFile(verbose: verbose);
78+
const CardTemplateM3('Card').generateFile(verbose: verbose);
79+
const CardTemplateM3('Filled Card').generateFile(verbose: verbose);
80+
const CardTemplateM3('Outlined Card').generateFile(verbose: verbose);
7981
// const CheckboxTemplateM3().generateFile(verbose: verbose);
8082
// const ChipTemplateM3().generateFile(verbose: verbose);
8183
// const ColorSchemeTemplateM3().generateFile(verbose: verbose);
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
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/elevated_card.dart';
7+
import '../data/filled_card.dart';
8+
import '../data/outlined_card.dart';
9+
import '../data/shape_struct.dart';
10+
import 'template.dart';
11+
12+
enum _CardVariant { elevated, filled, outlined }
13+
14+
class CardTemplateM3 extends TokenTemplateM3 {
15+
const CardTemplateM3(this.name);
16+
17+
@override
18+
final String name;
19+
20+
@override
21+
String get parentFilePath => 'card.dart';
22+
23+
_CardVariant get _variant => switch (name) {
24+
'Card' => _CardVariant.elevated,
25+
'Filled Card' => _CardVariant.filled,
26+
'Outlined Card' => _CardVariant.outlined,
27+
_ => throw UnsupportedError('Unsupported card template name: $name'),
28+
};
29+
30+
double get _containerElevation => switch (_variant) {
31+
_CardVariant.elevated => TokenElevatedCard.containerElevation,
32+
_CardVariant.filled => TokenFilledCard.containerElevation,
33+
_CardVariant.outlined => TokenOutlinedCard.containerElevation,
34+
};
35+
36+
TokenColorRole get _containerColor => switch (_variant) {
37+
_CardVariant.elevated => TokenElevatedCard.containerColor,
38+
_CardVariant.filled => TokenFilledCard.containerColor,
39+
_CardVariant.outlined => TokenOutlinedCard.containerColor,
40+
};
41+
42+
TokenColorRole get _containerShadowColor => switch (_variant) {
43+
_CardVariant.elevated => TokenElevatedCard.containerShadowColor,
44+
_CardVariant.filled => TokenFilledCard.containerShadowColor,
45+
_CardVariant.outlined => TokenOutlinedCard.containerShadowColor,
46+
};
47+
48+
ShapeStruct get _containerShape => switch (_variant) {
49+
_CardVariant.elevated => TokenElevatedCard.containerShape,
50+
_CardVariant.filled => TokenFilledCard.containerShape,
51+
_CardVariant.outlined => TokenOutlinedCard.containerShape,
52+
};
53+
54+
String get _shape {
55+
final String cardShape = shape(_containerShape);
56+
if (_variant != _CardVariant.outlined) {
57+
return cardShape;
58+
}
59+
return '''
60+
$cardShape.copyWith(
61+
side: ${border(color(TokenOutlinedCard.outlineColor, '_colors'))},
62+
)''';
63+
}
64+
65+
@override
66+
String generateContents(String className) =>
67+
'''
68+
class $className extends CardThemeData {
69+
$className(this.context)
70+
: super(
71+
clipBehavior: Clip.none,
72+
elevation: ${number(_containerElevation)},
73+
margin: const EdgeInsets.all(4.0),
74+
);
75+
76+
final BuildContext context;
77+
late final ColorScheme _colors = Theme.of(context).colorScheme;
78+
79+
@override
80+
Color? get color => ${color(_containerColor, '_colors')};
81+
82+
@override
83+
Color? get shadowColor => ${color(_containerShadowColor, '_colors')};
84+
85+
@override
86+
Color? get surfaceTintColor => Colors.transparent;
87+
88+
@override
89+
ShapeBorder? get shape => $_shape;
90+
}
91+
''';
92+
}

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

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

0 commit comments

Comments
 (0)