firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Chip slightly (#47254)

Browse Source
This commit is contained in:
Michael Goderbauer 2019-12-17 16:23:05 -08:00 committed by GitHub
parent 0f8c0da0a9
commit b7d221227c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/material/chip.dart
View File

@ -1851,10 +1851,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
animation: Listenable.merge(<Listenable>[selectController, enableController]),
builder: (BuildContext context, Widget child) {
return Container(
decoration: ShapeDecoration(
shape: shape,
color: getBackgroundColor(chipTheme),
),
color: getBackgroundColor(chipTheme),
child: child,
);
},

22
packages/flutter/test/material/chip_test.dart
View File

@ -178,13 +178,7 @@ Future<void> _pumpCheckmarkChip(
void _expectCheckmarkColor(Finder finder, Color color) {
expect(
finder,
paints
// The first path that is painted is the selection overlay. We do not care
// how it is painted but it has to be added it to this pattern so that the
// check mark can be checked next.
..path()
// The second path that is painted is the check mark.
..path(color: color),
paints..path(color: color)
);
}
@ -1435,7 +1429,7 @@ void main() {
),
);
expect(materialBox, paints..path(color: chipTheme.disabledColor));
expect(materialBox, paints..rect(color: chipTheme.disabledColor));
});
testWidgets('Chip size is configurable by ThemeData.materialTapTargetSize', (WidgetTester tester) async {
@ -1535,13 +1529,13 @@ void main() {
DefaultTextStyle labelStyle = getLabelStyle(tester);
// Check default theme for enabled widget.
expect(materialBox, paints..path(color: defaultChipTheme.backgroundColor));
expect(materialBox, paints..rect(color: defaultChipTheme.backgroundColor));
expect(iconData.color, equals(const Color(0xde000000)));
expect(labelStyle.style.color, equals(Colors.black.withAlpha(0xde)));
await tester.tap(find.byType(RawChip));
await tester.pumpAndSettle();
materialBox = getMaterialBox(tester);
expect(materialBox, paints..path(color: defaultChipTheme.selectedColor));
expect(materialBox, paints..rect(color: defaultChipTheme.selectedColor));
await tester.tap(find.byType(RawChip));
await tester.pumpAndSettle();
@ -1550,7 +1544,7 @@ void main() {
await tester.pumpAndSettle();
materialBox = getMaterialBox(tester);
labelStyle = getLabelStyle(tester);
expect(materialBox, paints..path(color: defaultChipTheme.disabledColor));
expect(materialBox, paints..rect(color: defaultChipTheme.disabledColor));
expect(labelStyle.style.color, equals(Colors.black.withAlpha(0xde)));
// Apply a custom theme.
@ -1572,13 +1566,13 @@ void main() {
labelStyle = getLabelStyle(tester);
// Check custom theme for enabled widget.
expect(materialBox, paints..path(color: customTheme.backgroundColor));
expect(materialBox, paints..rect(color: customTheme.backgroundColor));
expect(iconData.color, equals(customTheme.deleteIconColor));
expect(labelStyle.style.color, equals(Colors.black.withAlpha(0xde)));
await tester.tap(find.byType(RawChip));
await tester.pumpAndSettle();
materialBox = getMaterialBox(tester);
expect(materialBox, paints..path(color: customTheme.selectedColor));
expect(materialBox, paints..rect(color: customTheme.selectedColor));
await tester.tap(find.byType(RawChip));
await tester.pumpAndSettle();
@ -1592,7 +1586,7 @@ void main() {
await tester.pumpAndSettle();
materialBox = getMaterialBox(tester);
labelStyle = getLabelStyle(tester);
expect(materialBox, paints..path(color: customTheme.disabledColor));
expect(materialBox, paints..rect(color: customTheme.disabledColor));
expect(labelStyle.style.color, equals(Colors.black.withAlpha(0xde)));
});

4
packages/flutter/test/material/chip_theme_test.dart
View File

@ -107,7 +107,7 @@ void main() {
final RenderBox materialBox = getMaterialBox(tester);
expect(materialBox, paints..path(color: chipTheme.backgroundColor));
expect(materialBox, paints..rect(color: chipTheme.backgroundColor));
});
testWidgets('Chip overrides ThemeData theme if ChipTheme present', (WidgetTester tester) async {
@ -161,7 +161,7 @@ void main() {
final RenderBox materialBox = getMaterialBox(tester);
final Material material = getMaterial(tester);
expect(materialBox, paints..path(color: Color(customTheme.backgroundColor.value)));
expect(materialBox, paints..rect(color: Color(customTheme.backgroundColor.value)));
expect(material.elevation, customTheme.elevation);
expect(material.shadowColor, customTheme.shadowColor);
}, skip: isBrowser);