zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Updated InputDecorator to no longer reference ThemeData.accentColor. (#77999)

Browse Source
This commit is contained in:
Darren Austin
2021-03-12 16:48:05 -08:00
committed by GitHub
parent 2820d21cd0
commit a5d0d0e506
2 changed files with 92 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/flutter/lib/src/material/input_decorator.dart
View File

@@ -2019,24 +2019,14 @@ class _InputDecoratorState extends State<InputDecorator> with TickerProviderStat
Color _getActiveColor(ThemeData themeData) {
if (isFocused) {
switch (themeData.brightness) {
case Brightness.dark:
return themeData.accentColor;
case Brightness.light:
return themeData.primaryColor;
}
return themeData.colorScheme.primary;
}
return themeData.hintColor;
}
Color _getDefaultBorderColor(ThemeData themeData) {
if (isFocused) {
switch (themeData.brightness) {
case Brightness.dark:
return themeData.accentColor;
case Brightness.light:
return themeData.primaryColor;
}
return themeData.colorScheme.primary;
}
if (decoration!.filled!) {
return themeData.hintColor;

91
packages/flutter/test/material/input_decorator_test.dart
View File

@@ -13,6 +13,7 @@ import '../rendering/mock_canvas.dart';
Widget buildInputDecorator({
InputDecoration decoration = const InputDecoration(),
ThemeData? theme,
InputDecorationTheme? inputDecorationTheme,
TextDirection textDirection = TextDirection.ltr,
bool expands = false,
@@ -33,7 +34,7 @@ Widget buildInputDecorator({
child: Builder(
builder: (BuildContext context) {
return Theme(
data: Theme.of(context).copyWith(
data: (theme ?? Theme.of(context)).copyWith(
inputDecorationTheme: inputDecorationTheme,
visualDensity: visualDensity,
fixTextFieldOutlineLabel: fixTextFieldOutlineLabel,
@@ -3595,6 +3596,94 @@ void main() {
expect(debugString, contains('focusedBorder: OutlineInputBorder()'));
});
testWidgets('InputDecoration default border uses colorScheme', (WidgetTester tester) async {
final ThemeData theme = ThemeData.from(colorScheme: const ColorScheme.light());
final Color enabledColor = theme.colorScheme.onSurface.withOpacity(0.38);
final Color hoverColor = Color.alphaBlend(theme.hoverColor.withOpacity(0.12), enabledColor);
// Enabled
await tester.pumpWidget(
buildInputDecorator(
theme: theme,
decoration: const InputDecoration(),
),
);
await tester.pumpAndSettle();
expect(getBorderColor(tester), enabledColor);
// Filled
await tester.pumpWidget(
buildInputDecorator(
theme: theme,
decoration: const InputDecoration(
filled: true,
),
),
);
await tester.pumpAndSettle();
expect(getBorderColor(tester), theme.hintColor);
// Hovering
await tester.pumpWidget(
buildInputDecorator(
theme: theme,
isHovering: true,
decoration: const InputDecoration(),
),
);
await tester.pumpAndSettle();
expect(getBorderColor(tester), hoverColor);
// Focused
await tester.pumpWidget(
buildInputDecorator(
theme: theme,
isFocused: true,
decoration: const InputDecoration(),
),
);
await tester.pumpAndSettle();
expect(getBorderColor(tester), theme.colorScheme.primary);
// Error
await tester.pumpWidget(
buildInputDecorator(
theme: theme,
decoration: const InputDecoration(
errorText: 'Nope',
),
),
);
await tester.pumpAndSettle();
expect(getBorderColor(tester), theme.errorColor);
// Disabled
await tester.pumpWidget(
buildInputDecorator(
theme: theme,
decoration: const InputDecoration(
enabled: false,
),
),
);
await tester.pumpAndSettle();
expect(getBorderColor(tester), theme.disabledColor);
// Disabled, filled
await tester.pumpWidget(
buildInputDecorator(
theme: theme,
decoration: const InputDecoration(
enabled: false,
filled: true,
),
),
);
await tester.pumpAndSettle();
expect(getBorderColor(tester), Colors.transparent);
});
testWidgets('InputDecoration borders', (WidgetTester tester) async {
const InputBorder errorBorder = OutlineInputBorder(
borderSide: BorderSide(color: Colors.red, width: 1.5),