mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
9d96df2364
WIP Commits separated as follows: - Update lints in analysis_options files - Run `dart fix --apply` - Clean up leftover analysis issues - Run `dart format .` in the right places. Local analysis and testing passes. Checking CI now. Part of https://github.com/flutter/flutter/issues/178827 - Adoption of flutter_lints in examples/api coming in a separate change (cc @loic-sharma) ## Pre-launch Checklist - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [ ] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [ ] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
411 lines
14 KiB
Dart
411 lines
14 KiB
Dart
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
|
|
void main() {
|
|
TextStyle iconStyle(WidgetTester tester, IconData icon) {
|
|
final RichText iconRichText = tester.widget<RichText>(
|
|
find.descendant(of: find.byIcon(icon), matching: find.byType(RichText)),
|
|
);
|
|
return iconRichText.text.style!;
|
|
}
|
|
|
|
test('FilledButtonThemeData lerp special cases', () {
|
|
expect(FilledButtonThemeData.lerp(null, null, 0), null);
|
|
const data = FilledButtonThemeData();
|
|
expect(identical(FilledButtonThemeData.lerp(data, data, 0.5), data), true);
|
|
});
|
|
|
|
testWidgets('Passing no FilledButtonTheme returns defaults', (WidgetTester tester) async {
|
|
const colorScheme = ColorScheme.light();
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData.from(colorScheme: colorScheme),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: FilledButton(onPressed: () {}, child: const Text('button')),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
final Finder buttonMaterial = find.descendant(
|
|
of: find.byType(FilledButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
final Material material = tester.widget<Material>(buttonMaterial);
|
|
expect(material.animationDuration, const Duration(milliseconds: 200));
|
|
expect(material.borderRadius, null);
|
|
expect(material.color, colorScheme.primary);
|
|
expect(material.elevation, 0);
|
|
expect(material.shadowColor, const Color(0xff000000));
|
|
expect(material.shape, const StadiumBorder());
|
|
expect(material.textStyle!.color, colorScheme.onPrimary);
|
|
expect(material.textStyle!.fontFamily, 'Roboto');
|
|
expect(material.textStyle!.fontSize, 14);
|
|
expect(material.textStyle!.fontWeight, FontWeight.w500);
|
|
|
|
final Align align = tester.firstWidget<Align>(
|
|
find.ancestor(of: find.text('button'), matching: find.byType(Align)),
|
|
);
|
|
expect(align.alignment, Alignment.center);
|
|
});
|
|
|
|
group('[Theme, TextTheme, FilledButton style overrides]', () {
|
|
const foregroundColor = Color(0xff000001);
|
|
const backgroundColor = Color(0xff000002);
|
|
const disabledForegroundColor = Color(0xff000003);
|
|
const disabledBackgroundColor = Color(0xff000004);
|
|
const shadowColor = Color(0xff000005);
|
|
const double elevation = 1;
|
|
const textStyle = TextStyle(fontSize: 12.0);
|
|
const padding = EdgeInsets.all(3);
|
|
const minimumSize = Size(200, 200);
|
|
const side = BorderSide(color: Colors.green, width: 2);
|
|
const OutlinedBorder shape = RoundedRectangleBorder(
|
|
side: side,
|
|
borderRadius: BorderRadius.all(Radius.circular(2)),
|
|
);
|
|
const MouseCursor enabledMouseCursor = SystemMouseCursors.text;
|
|
const MouseCursor disabledMouseCursor = SystemMouseCursors.grab;
|
|
const MaterialTapTargetSize tapTargetSize = MaterialTapTargetSize.shrinkWrap;
|
|
const animationDuration = Duration(milliseconds: 25);
|
|
const enableFeedback = false;
|
|
const AlignmentGeometry alignment = Alignment.centerLeft;
|
|
|
|
final ButtonStyle style = FilledButton.styleFrom(
|
|
foregroundColor: foregroundColor,
|
|
backgroundColor: backgroundColor,
|
|
disabledForegroundColor: disabledForegroundColor,
|
|
disabledBackgroundColor: disabledBackgroundColor,
|
|
shadowColor: shadowColor,
|
|
elevation: elevation,
|
|
textStyle: textStyle,
|
|
padding: padding,
|
|
minimumSize: minimumSize,
|
|
side: side,
|
|
shape: shape,
|
|
enabledMouseCursor: enabledMouseCursor,
|
|
disabledMouseCursor: disabledMouseCursor,
|
|
tapTargetSize: tapTargetSize,
|
|
animationDuration: animationDuration,
|
|
enableFeedback: enableFeedback,
|
|
alignment: alignment,
|
|
);
|
|
|
|
Widget buildFrame({
|
|
ButtonStyle? buttonStyle,
|
|
ButtonStyle? themeStyle,
|
|
ButtonStyle? overallStyle,
|
|
}) {
|
|
final Widget child = Builder(
|
|
builder: (BuildContext context) {
|
|
return FilledButton(style: buttonStyle, onPressed: () {}, child: const Text('button'));
|
|
},
|
|
);
|
|
return MaterialApp(
|
|
theme: ThemeData.from(
|
|
colorScheme: const ColorScheme.light(),
|
|
).copyWith(filledButtonTheme: FilledButtonThemeData(style: overallStyle)),
|
|
home: Scaffold(
|
|
body: Center(
|
|
// If the FilledButtonTheme widget is present, it's used
|
|
// instead of the Theme's ThemeData.FilledButtonTheme.
|
|
child: themeStyle == null
|
|
? child
|
|
: FilledButtonTheme(
|
|
data: FilledButtonThemeData(style: themeStyle),
|
|
child: child,
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
final Finder findMaterial = find.descendant(
|
|
of: find.byType(FilledButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
final Finder findInkWell = find.descendant(
|
|
of: find.byType(FilledButton),
|
|
matching: find.byType(InkWell),
|
|
);
|
|
|
|
const enabled = <WidgetState>{};
|
|
const disabled = <WidgetState>{WidgetState.disabled};
|
|
const hovered = <WidgetState>{WidgetState.hovered};
|
|
const focused = <WidgetState>{WidgetState.focused};
|
|
const pressed = <WidgetState>{WidgetState.pressed};
|
|
|
|
void checkButton(WidgetTester tester) {
|
|
final Material material = tester.widget<Material>(findMaterial);
|
|
final InkWell inkWell = tester.widget<InkWell>(findInkWell);
|
|
expect(material.textStyle!.color, foregroundColor);
|
|
expect(material.textStyle!.fontSize, 12);
|
|
expect(material.color, backgroundColor);
|
|
expect(material.shadowColor, shadowColor);
|
|
expect(material.elevation, elevation);
|
|
expect(
|
|
WidgetStateProperty.resolveAs<MouseCursor>(inkWell.mouseCursor!, enabled),
|
|
enabledMouseCursor,
|
|
);
|
|
expect(
|
|
WidgetStateProperty.resolveAs<MouseCursor>(inkWell.mouseCursor!, disabled),
|
|
disabledMouseCursor,
|
|
);
|
|
expect(inkWell.overlayColor!.resolve(hovered), foregroundColor.withOpacity(0.08));
|
|
expect(inkWell.overlayColor!.resolve(focused), foregroundColor.withOpacity(0.1));
|
|
expect(inkWell.overlayColor!.resolve(pressed), foregroundColor.withOpacity(0.1));
|
|
expect(inkWell.enableFeedback, enableFeedback);
|
|
expect(material.borderRadius, null);
|
|
expect(material.shape, shape);
|
|
expect(material.animationDuration, animationDuration);
|
|
expect(tester.getSize(find.byType(FilledButton)), const Size(200, 200));
|
|
final Align align = tester.firstWidget<Align>(
|
|
find.ancestor(of: find.text('button'), matching: find.byType(Align)),
|
|
);
|
|
expect(align.alignment, alignment);
|
|
}
|
|
|
|
testWidgets('Button style overrides defaults', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(buttonStyle: style));
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets('Button theme style overrides defaults', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(themeStyle: style));
|
|
await tester.pumpAndSettle();
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets('Overall Theme button theme style overrides defaults', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(overallStyle: style));
|
|
await tester.pumpAndSettle();
|
|
checkButton(tester);
|
|
});
|
|
|
|
// Same as the previous tests with empty ButtonStyle's instead of null.
|
|
|
|
testWidgets('Button style overrides defaults, empty theme and overall styles', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
buildFrame(
|
|
buttonStyle: style,
|
|
themeStyle: const ButtonStyle(),
|
|
overallStyle: const ButtonStyle(),
|
|
),
|
|
);
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets('Button theme style overrides defaults, empty button and overall styles', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
buildFrame(
|
|
buttonStyle: const ButtonStyle(),
|
|
themeStyle: style,
|
|
overallStyle: const ButtonStyle(),
|
|
),
|
|
);
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets(
|
|
'Overall Theme button theme style overrides defaults, null theme and empty overall style',
|
|
(WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(buttonStyle: const ButtonStyle(), overallStyle: style));
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
},
|
|
);
|
|
});
|
|
|
|
testWidgets('FilledButton repsects Theme shadowColor', (WidgetTester tester) async {
|
|
const colorScheme = ColorScheme.light();
|
|
const shadowColor = Color(0xff000001);
|
|
const overriddenColor = Color(0xff000002);
|
|
|
|
Widget buildFrame({Color? overallShadowColor, Color? themeShadowColor, Color? shadowColor}) {
|
|
return MaterialApp(
|
|
theme: ThemeData.from(colorScheme: colorScheme).copyWith(shadowColor: overallShadowColor),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: FilledButtonTheme(
|
|
data: FilledButtonThemeData(
|
|
style: FilledButton.styleFrom(shadowColor: themeShadowColor),
|
|
),
|
|
child: Builder(
|
|
builder: (BuildContext context) {
|
|
return FilledButton(
|
|
style: FilledButton.styleFrom(shadowColor: shadowColor),
|
|
onPressed: () {},
|
|
child: const Text('button'),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
final Finder buttonMaterialFinder = find.descendant(
|
|
of: find.byType(FilledButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
await tester.pumpWidget(buildFrame());
|
|
Material material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, Colors.black); //default
|
|
|
|
await tester.pumpWidget(buildFrame(themeShadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(buildFrame(shadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(
|
|
buildFrame(overallShadowColor: overriddenColor, themeShadowColor: shadowColor),
|
|
);
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(
|
|
buildFrame(themeShadowColor: overriddenColor, shadowColor: shadowColor),
|
|
);
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
});
|
|
|
|
testWidgets('FilledButton.icon respects FilledButtonTheme ButtonStyle.iconAlignment', (
|
|
WidgetTester tester,
|
|
) async {
|
|
Widget buildButton({IconAlignment? iconAlignment}) {
|
|
return MaterialApp(
|
|
theme: ThemeData(
|
|
filledButtonTheme: FilledButtonThemeData(
|
|
style: ButtonStyle(iconAlignment: iconAlignment),
|
|
),
|
|
),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: FilledButton.icon(
|
|
onPressed: () {},
|
|
icon: const Icon(Icons.add),
|
|
label: const Text('button'),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
await tester.pumpWidget(buildButton());
|
|
|
|
final Offset buttonTopLeft = tester.getTopLeft(find.byType(Material).last);
|
|
final Offset iconTopLeft = tester.getTopLeft(find.byIcon(Icons.add));
|
|
|
|
expect(buttonTopLeft.dx, iconTopLeft.dx - 16.0);
|
|
|
|
await tester.pumpWidget(buildButton(iconAlignment: IconAlignment.end));
|
|
await tester.pumpAndSettle();
|
|
|
|
final Offset buttonTopRight = tester.getTopRight(find.byType(Material).last);
|
|
final Offset iconTopRight = tester.getTopRight(find.byIcon(Icons.add));
|
|
|
|
expect(buttonTopRight.dx, iconTopRight.dx + 24.0);
|
|
});
|
|
|
|
testWidgets('Filled tonal button icon respects FilledButtonTheme ButtonStyle.iconAlignment', (
|
|
WidgetTester tester,
|
|
) async {
|
|
Widget buildButton({IconAlignment? iconAlignment}) {
|
|
return MaterialApp(
|
|
theme: ThemeData(
|
|
filledButtonTheme: FilledButtonThemeData(
|
|
style: ButtonStyle(iconAlignment: iconAlignment),
|
|
),
|
|
),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: FilledButton.tonalIcon(
|
|
onPressed: () {},
|
|
icon: const Icon(Icons.add),
|
|
label: const Text('button'),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
await tester.pumpWidget(buildButton());
|
|
|
|
final Offset buttonTopLeft = tester.getTopLeft(find.byType(Material).last);
|
|
final Offset iconTopLeft = tester.getTopLeft(find.byIcon(Icons.add));
|
|
|
|
expect(buttonTopLeft.dx, iconTopLeft.dx - 16.0);
|
|
|
|
await tester.pumpWidget(buildButton(iconAlignment: IconAlignment.end));
|
|
await tester.pumpAndSettle();
|
|
|
|
final Offset buttonTopRight = tester.getTopRight(find.byType(Material).last);
|
|
final Offset iconTopRight = tester.getTopRight(find.byIcon(Icons.add));
|
|
|
|
expect(buttonTopRight.dx, iconTopRight.dx + 24.0);
|
|
});
|
|
|
|
// Regression test for https://github.com/flutter/flutter/issues/162839.
|
|
testWidgets(
|
|
'FilledButton icon uses provided FilledButtonTheme foregroundColor over default icon color',
|
|
(WidgetTester tester) async {
|
|
const foregroundColor = Color(0xFFFFA500);
|
|
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData(
|
|
filledButtonTheme: FilledButtonThemeData(
|
|
style: FilledButton.styleFrom(foregroundColor: foregroundColor),
|
|
),
|
|
),
|
|
home: Material(
|
|
child: Center(
|
|
child: Column(
|
|
children: <Widget>[
|
|
FilledButton.icon(
|
|
onPressed: () {},
|
|
icon: const Icon(Icons.add),
|
|
label: const Text('Button'),
|
|
),
|
|
FilledButton.icon(
|
|
onPressed: () {},
|
|
icon: const Icon(Icons.mail),
|
|
label: const Text('Button'),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
expect(iconStyle(tester, Icons.add).color, foregroundColor);
|
|
expect(iconStyle(tester, Icons.mail).color, foregroundColor);
|
|
},
|
|
);
|
|
}
|