github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

add static method to create material hero controller (#61662)

Browse Source
This commit is contained in:
chunhtai 2020-07-17 14:26:03 -07:00 committed by GitHub
parent 14dcbb2d84
commit 09dfca6f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/flutter/lib/src/material/app.dart
View File

@ -536,6 +536,17 @@ class MaterialApp extends StatefulWidget {
@override @override
_MaterialAppState createState() => _MaterialAppState(); _MaterialAppState createState() => _MaterialAppState();
/// The [HeroController] used for Material page transitions.
///
/// Used by the [MaterialApp].
static HeroController createMaterialHeroController() {
return HeroController(
createRectTween: (Rect begin, Rect end) {
return MaterialRectArcTween(begin: begin, end: end);
},
);
}
} }
class _MaterialScrollBehavior extends ScrollBehavior { class _MaterialScrollBehavior extends ScrollBehavior {
@ -572,7 +583,7 @@ class _MaterialAppState extends State<MaterialApp> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_heroController = HeroController(createRectTween: _createRectTween); _heroController = MaterialApp.createMaterialHeroController();
} }
@override @override
@ -583,14 +594,10 @@ class _MaterialAppState extends State<MaterialApp> {
// old Navigator won't be disposed (and thus won't unregister with its // old Navigator won't be disposed (and thus won't unregister with its
// observers) until after the new one has been created (because the // observers) until after the new one has been created (because the
// Navigator has a GlobalKey). // Navigator has a GlobalKey).
_heroController = HeroController(createRectTween: _createRectTween); _heroController = MaterialApp.createMaterialHeroController();
} }
} }
RectTween _createRectTween(Rect begin, Rect end) {
return MaterialRectArcTween(begin: begin, end: end);
}
// Combine the Localizations for Material with the ones contributed // Combine the Localizations for Material with the ones contributed
// by the localizationsDelegates parameter, if any. Only the first delegate // by the localizationsDelegates parameter, if any. Only the first delegate
// of a particular LocalizationsDelegate.type is loaded so the // of a particular LocalizationsDelegate.type is loaded so the

9
packages/flutter/test/material/app_test.dart
View File

@ -834,6 +834,15 @@ void main() {
expect(find.text('regular page one'), findsNothing); expect(find.text('regular page one'), findsNothing);
expect(find.text('regular page two'), findsNothing); expect(find.text('regular page two'), findsNothing);
}); });
testWidgets('MaterialApp does create HeroController with the MaterialRectArcTween', (WidgetTester tester) async {
final HeroController controller = MaterialApp.createMaterialHeroController();
final Tween<Rect> tween = controller.createRectTween(
const Rect.fromLTRB(0.0, 0.0, 10.0, 10.0),
const Rect.fromLTRB(0.0, 0.0, 20.0, 20.0)
);
expect(tween, isA<MaterialRectArcTween>());
});
} }
class MockAccessibilityFeature implements AccessibilityFeatures { class MockAccessibilityFeature implements AccessibilityFeatures {