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

Corrected splash color for TextButton, ElevatedButton, OutlinedButton (#61576)

Browse Source
This commit is contained in:
Hans Muller 2020-07-16 09:40:11 -07:00 committed by GitHub
parent fc09119d0a
commit d90a246461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1071,7 +1071,10 @@ class _InkResponseState extends State<_InkResponseStateWidget>
for (final _HighlightType type in _highlights.keys) {
_highlights[type]?.color = getHighlightColorForType(type);
}
_currentSplash?.color = widget.splashColor ?? Theme.of(context).splashColor;
const Set<MaterialState> pressed = <MaterialState>{MaterialState.pressed};
_currentSplash?.color = widget.overlayColor?.resolve(pressed) ?? widget.splashColor ?? Theme.of(context).splashColor;
final MouseCursor effectiveMouseCursor = MaterialStateProperty.resolveAs<MouseCursor>(
widget.mouseCursor ?? MaterialStateMouseCursor.clickable,
<MaterialState>{

10
packages/flutter/test/material/elevated_button_test.dart
View File

@ -50,8 +50,11 @@ void main() {
expect(material.type, MaterialType.button);
final Offset center = tester.getCenter(find.byType(ElevatedButton));
await tester.startGesture(center);
await tester.pumpAndSettle();
final TestGesture gesture = await tester.startGesture(center);
await tester.pump(); // start the splash animation
await tester.pump(const Duration(milliseconds: 100)); // splash is underway
final RenderObject inkFeatures = tester.allRenderObjects.firstWhere((RenderObject object) => object.runtimeType.toString() == '_RenderInkFeatures');
expect(inkFeatures, paints..circle(color: colorScheme.onPrimary.withAlpha(0x3d))); // splash color is onPrimary(0.24)
// Only elevation changes when enabled and pressed.
material = tester.widget<Material>(rawButtonMaterial);
@ -69,6 +72,9 @@ void main() {
expect(material.textStyle.fontWeight, FontWeight.w500);
expect(material.type, MaterialType.button);
await gesture.up();
await tester.pumpAndSettle();
// Disabled ElevatedButton
await tester.pumpWidget(
MaterialApp(

9
packages/flutter/test/material/outlined_button_test.dart
View File

@ -56,9 +56,14 @@ void main() {
expect(material.type, MaterialType.button);
final Offset center = tester.getCenter(find.byType(OutlinedButton));
await tester.startGesture(center);
await tester.pumpAndSettle();
final TestGesture gesture = await tester.startGesture(center);
await tester.pump(); // start the splash animation
await tester.pump(const Duration(milliseconds: 100)); // splash is underway
final RenderObject inkFeatures = tester.allRenderObjects.firstWhere((RenderObject object) => object.runtimeType.toString() == '_RenderInkFeatures');
expect(inkFeatures, paints..circle(color: colorScheme.primary.withAlpha(0x1f))); // splash color is primary(0.12)
await gesture.up();
await tester.pumpAndSettle();
// No change vs enabled and not pressed.
material = tester.widget<Material>(rawButtonMaterial);
expect(material.animationDuration, const Duration(milliseconds: 200));

10
packages/flutter/test/material/text_button_test.dart
View File

@ -50,9 +50,14 @@ void main() {
expect(material.type, MaterialType.button);
final Offset center = tester.getCenter(find.byType(TextButton));
await tester.startGesture(center);
await tester.pumpAndSettle();
final TestGesture gesture = await tester.startGesture(center);
await tester.pump(); // start the splash animation
await tester.pump(const Duration(milliseconds: 100)); // splash is underway
final RenderObject inkFeatures = tester.allRenderObjects.firstWhere((RenderObject object) => object.runtimeType.toString() == '_RenderInkFeatures');
expect(inkFeatures, paints..circle(color: colorScheme.primary.withAlpha(0x1f))); // splash color is primary(0.12)
await gesture.up();
await tester.pumpAndSettle();
material = tester.widget<Material>(buttonMaterial);
// No change vs enabled and not pressed.
expect(material.animationDuration, const Duration(milliseconds: 200));
@ -969,6 +974,7 @@ void main() {
);
expect(paddingWidget.padding, const EdgeInsets.all(22));
});
}