DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't animate fab in a new scaffold (#5015)

Browse Source 
If the scaffold is new and has a floating action button, we skip the entrance
animation for the fab.

Fixes #4445
This commit is contained in:
Adam Barth 2016-07-22 15:53:08 -07:00 committed by GitHub
parent 39e759212f
commit ae80d43364
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ class FloatingActionButton extends StatefulWidget {
/// Most commonly used in the [Scaffold.floatingActionButton] field.
const FloatingActionButton({
Key key,
this.child,
@required this.child,
this.tooltip,
this.backgroundColor,
this.elevation: 6,

6
packages/flutter/lib/src/material/scaffold.dart
View File

@ -155,6 +155,11 @@ class _FloatingActionButtonTransitionState extends State<_FloatingActionButtonTr
@override
void initState() {
super.initState();
// If we start out with a child, have the child appear fully visible instead
// of animating in.
if (config.child != null)
_currentController.value = 1.0;
_previousAnimation = new CurvedAnimation(
parent: _previousController,
curve: Curves.easeIn
@ -165,7 +170,6 @@ class _FloatingActionButtonTransitionState extends State<_FloatingActionButtonTr
);
_previousController.addStatusListener(_handleAnimationStatusChanged);
_currentController.forward();
}
@override

36
packages/flutter/test/material/scaffold_test.dart
View File

@ -40,4 +40,40 @@ void main() {
bodyBox = tester.renderObject(find.byKey(bodyKey));
expect(bodyBox.size, equals(new Size(800.0, 544.0)));
});
testWidgets('Floating action animation', (WidgetTester tester) async {
await tester.pumpWidget(new Scaffold(
floatingActionButton: new FloatingActionButton(
key: new Key("one"),
onPressed: null,
child: new Text("1")
)
));
expect(tester.binding.transientCallbackCount, 0);
await tester.pumpWidget(new Scaffold(
floatingActionButton: new FloatingActionButton(
key: new Key("two"),
onPressed: null,
child: new Text("2")
)
));
expect(tester.binding.transientCallbackCount, greaterThan(0));
await tester.pumpWidget(new Container());
expect(tester.binding.transientCallbackCount, 0);
await tester.pumpWidget(new Scaffold());
expect(tester.binding.transientCallbackCount, 0);
await tester.pumpWidget(new Scaffold(
floatingActionButton: new FloatingActionButton(
key: new Key("one"),
onPressed: null,
child: new Text("1")
)
));
expect(tester.binding.transientCallbackCount, greaterThan(0));
});
}