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

[Material] FAB refactor - remove unnecessary IconTheme (#37269)

Browse Source 
* Remove unneeded IconTheme from FAB
This commit is contained in:
MH Johnson 2019-08-02 14:16:34 -04:00 committed by GitHub
parent 5df17acb1f
commit 4a9b687a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/flutter/lib/src/material/floating_action_button.dart
View File

@ -431,18 +431,7 @@ class FloatingActionButton extends StatelessWidget {
?? floatingActionButtonTheme.shape
?? (isExtended ? _defaultExtendedShape : _defaultShape);
Widget result;
if (child != null) {
result = IconTheme.merge(
data: IconThemeData(
color: foregroundColor,
),
child: child,
);
}
result = RawMaterialButton(
Widget result = RawMaterialButton(
onPressed: onPressed,
elevation: elevation,
focusElevation: focusElevation,
@ -458,7 +447,7 @@ class FloatingActionButton extends StatelessWidget {
shape: shape,
clipBehavior: clipBehavior ?? Clip.none,
focusNode: focusNode,
child: result,
child: child,
);
if (tooltip != null) {

17
packages/flutter/test/material/floating_action_button_test.dart
View File

@ -781,6 +781,23 @@ void main() {
),
);
}, semanticsEnabled: true);
testWidgets('Foreground color applies to icon on fab', (WidgetTester tester) async {
const Color foregroundColor = Color(0xcafefeed);
await tester.pumpWidget(MaterialApp(
home: FloatingActionButton(
onPressed: () {},
foregroundColor: foregroundColor,
child: const Icon(Icons.access_alarm),
),
));
final RichText iconRichText = tester.widget<RichText>(
find.descendant(of: find.byIcon(Icons.access_alarm), matching: find.byType(RichText)),
);
expect(iconRichText.text.style.color, foregroundColor);
});
}
Offset _rightEdgeOfFab(WidgetTester tester) {