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

Correct contentPadding type in InputDecoration.debugFillProperties (#19318)

Browse Source
This commit is contained in:
Hans Muller 2018-07-13 10:37:55 -07:00 committed by GitHub
parent 35f374036c
commit 698bda6ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2507,7 +2507,7 @@ class InputDecorationTheme extends Diagnosticable {
properties.add(new DiagnosticsProperty<TextStyle>('errorStyle', errorStyle, defaultValue: defaultTheme.errorStyle)); properties.add(new DiagnosticsProperty<TextStyle>('errorStyle', errorStyle, defaultValue: defaultTheme.errorStyle));
properties.add(new DiagnosticsProperty<int>('errorMaxLines', errorMaxLines, defaultValue: defaultTheme.errorMaxLines)); properties.add(new DiagnosticsProperty<int>('errorMaxLines', errorMaxLines, defaultValue: defaultTheme.errorMaxLines));
properties.add(new DiagnosticsProperty<bool>('isDense', isDense, defaultValue: defaultTheme.isDense)); properties.add(new DiagnosticsProperty<bool>('isDense', isDense, defaultValue: defaultTheme.isDense));
properties.add(new DiagnosticsProperty<EdgeInsets>('contentPadding', contentPadding, defaultValue: defaultTheme.contentPadding)); properties.add(new DiagnosticsProperty<EdgeInsetsDirectional>('contentPadding', contentPadding, defaultValue: defaultTheme.contentPadding));
properties.add(new DiagnosticsProperty<bool>('isCollapsed', isCollapsed, defaultValue: defaultTheme.isCollapsed)); properties.add(new DiagnosticsProperty<bool>('isCollapsed', isCollapsed, defaultValue: defaultTheme.isCollapsed));
properties.add(new DiagnosticsProperty<TextStyle>('prefixStyle', prefixStyle, defaultValue: defaultTheme.prefixStyle)); properties.add(new DiagnosticsProperty<TextStyle>('prefixStyle', prefixStyle, defaultValue: defaultTheme.prefixStyle));
properties.add(new DiagnosticsProperty<TextStyle>('suffixStyle', suffixStyle, defaultValue: defaultTheme.suffixStyle)); properties.add(new DiagnosticsProperty<TextStyle>('suffixStyle', suffixStyle, defaultValue: defaultTheme.suffixStyle));

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

@ -763,7 +763,7 @@ void main() {
), ),
); );
// Overall height for this InputDecorator is 48dps because the prefix icon's minimum size // Overall height for this InputDecorator is 48dps because the prefix icon's minimum size
// is 48x48 and the rest of the elements only require 40dps: // is 48x48 and the rest of the elements only require 40dps:
// 12 - top padding // 12 - top padding
// 16 - input text (ahem font size 16dps) // 16 - input text (ahem font size 16dps)
@ -799,7 +799,7 @@ void main() {
), ),
); );
// Overall height for this InputDecorator is 48dps because the prefix icon's minimum size // Overall height for this InputDecorator is 48dps because the prefix icon's minimum size
// is 48x48 and the rest of the elements only require 40dps: // is 48x48 and the rest of the elements only require 40dps:
// 12 - top padding // 12 - top padding
// 16 - input text (ahem font size 16dps) // 16 - input text (ahem font size 16dps)
@ -821,7 +821,7 @@ void main() {
), ),
); );
// Overall height for this InputDecorator is 100dps because the prefix icon's size // Overall height for this InputDecorator is 100dps because the prefix icon's size
// is 100x100 and the rest of the elements only require 40dps: // is 100x100 and the rest of the elements only require 40dps:
// 12 - top padding // 12 - top padding
// 16 - input text (ahem font size 16dps) // 16 - input text (ahem font size 16dps)
@ -864,7 +864,7 @@ void main() {
), ),
), ),
); );
// Margin for text decoration is 12 when filled and top left offset is (0, 0) // Margin for text decoration is 12 when filled and top left offset is (0, 0)
// 0 + 12 = 12. // 0 + 12 = 12.
expect(tester.getSize(find.byType(InputDecorator)), const Size(800.0, 60.0)); expect(tester.getSize(find.byType(InputDecorator)), const Size(800.0, 60.0));
@ -904,7 +904,7 @@ void main() {
), ),
), ),
); );
// Margin for text decoration is 12 when filled and top left offset is (0, 0) // Margin for text decoration is 12 when filled and top left offset is (0, 0)
// 0 + 12 = 12. // 0 + 12 = 12.
expect(tester.getSize(find.byType(InputDecorator)), const Size(800.0, 52.0)); expect(tester.getSize(find.byType(InputDecorator)), const Size(800.0, 52.0));
@ -1639,4 +1639,15 @@ void main() {
}, },
skip: !Platform.isLinux, skip: !Platform.isLinux,
); );
testWidgets('InputDecorationTheme.toString()', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/19305
expect(
const InputDecorationTheme(
contentPadding: const EdgeInsetsDirectional.only(start: 5.0),
).toString(),
contains('contentPadding: EdgeInsetsDirectional(5.0, 0.0, 0.0, 0.0)'),
);
});
} }