[animations] Handle DualTransitionBuilder name conflict with flutter/flutter (#173)

* Handle DualTransitionBuilder conflict with flutter/flutter

Require animations package to use internal version of DualTransitionBuilder to avoid conflicts with flutter/flutter\'s recently merged copy of DualTransitionBuilder'.

* Update changelog and pubspec.yaml
This commit is contained in:
Shi-Hao Hong
2020-06-18 09:45:38 +08:00
committed by GitHub
parent 9d90dd3688
commit c9c8e8f5f5
7 changed files with 28 additions and 13 deletions

View File

@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [1.1.1] - June 19, 2020
* Hide implementation of `DualTransitionBuilder` as the widget has been implemented in the Flutter framework.
## [1.1.0] - June 2, 2020 ## [1.1.0] - June 2, 2020

View File

@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
// branch contains DualTransitionBuilder.
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
/// Builder callback used by [DualTransitionBuilder]. /// Builder callback used by [DualTransitionBuilder].

View File

@ -4,7 +4,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'dual_transition_builder.dart'; // TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
// branch contains DualTransitionBuilder.
import 'dual_transition_builder.dart' as dual_transition_builder;
import 'modal.dart'; import 'modal.dart';
import 'utils/curves.dart'; import 'utils/curves.dart';
@ -151,7 +153,7 @@ class FadeScaleTransition extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return DualTransitionBuilder( return dual_transition_builder.DualTransitionBuilder(
animation: animation, animation: animation,
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,

View File

@ -4,7 +4,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'dual_transition_builder.dart'; // TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
// branch contains DualTransitionBuilder.
import 'dual_transition_builder.dart' as dual_transition_builder;
/// Used by [PageTransitionsTheme] to define a page route transition animation /// Used by [PageTransitionsTheme] to define a page route transition animation
/// in which the outgoing page fades out, then the incoming page fades in and /// in which the outgoing page fades out, then the incoming page fades in and
@ -223,7 +225,7 @@ class _ZoomedFadeInFadeOut extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return DualTransitionBuilder( return dual_transition_builder.DualTransitionBuilder(
animation: animation, animation: animation,
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,

View File

@ -7,7 +7,9 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'dual_transition_builder.dart'; // TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
// branch contains DualTransitionBuilder.
import 'dual_transition_builder.dart' as dual_transition_builder;
import 'utils/curves.dart'; import 'utils/curves.dart';
/// Determines which type of shared axis transition is used. /// Determines which type of shared axis transition is used.
@ -238,7 +240,7 @@ class SharedAxisTransition extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final Color color = fillColor ?? Theme.of(context).canvasColor; final Color color = fillColor ?? Theme.of(context).canvasColor;
return DualTransitionBuilder( return dual_transition_builder.DualTransitionBuilder(
animation: animation, animation: animation,
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,
@ -264,7 +266,7 @@ class SharedAxisTransition extends StatelessWidget {
child: child, child: child,
); );
}, },
child: DualTransitionBuilder( child: dual_transition_builder.DualTransitionBuilder(
animation: ReverseAnimation(secondaryAnimation), animation: ReverseAnimation(secondaryAnimation),
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,

View File

@ -1,6 +1,6 @@
name: animations name: animations
description: Fancy pre-built animations that can easily be integrated into any Flutter application. description: Fancy pre-built animations that can easily be integrated into any Flutter application.
version: 1.1.0 version: 1.1.1
homepage: https://github.com/flutter/packages/tree/master/packages/animations homepage: https://github.com/flutter/packages/tree/master/packages/animations
environment: environment:

View File

@ -2,7 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'package:animations/src/dual_transition_builder.dart'; // TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
// branch contains DualTransitionBuilder.
import 'package:animations/src/dual_transition_builder.dart'
as dual_transition_builder;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
@ -15,7 +18,7 @@ void main() {
); );
await tester.pumpWidget(Center( await tester.pumpWidget(Center(
child: DualTransitionBuilder( child: dual_transition_builder.DualTransitionBuilder(
animation: controller, animation: controller,
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,
@ -85,7 +88,7 @@ void main() {
await tester.pumpWidget(Directionality( await tester.pumpWidget(Directionality(
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
child: Center( child: Center(
child: DualTransitionBuilder( child: dual_transition_builder.DualTransitionBuilder(
animation: controller, animation: controller,
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,
@ -147,7 +150,7 @@ void main() {
duration: const Duration(milliseconds: 300), duration: const Duration(milliseconds: 300),
); );
await tester.pumpWidget(Center( await tester.pumpWidget(Center(
child: DualTransitionBuilder( child: dual_transition_builder.DualTransitionBuilder(
animation: controller, animation: controller,
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,
@ -213,7 +216,7 @@ void main() {
duration: const Duration(milliseconds: 300), duration: const Duration(milliseconds: 300),
); );
await tester.pumpWidget(Center( await tester.pumpWidget(Center(
child: DualTransitionBuilder( child: dual_transition_builder.DualTransitionBuilder(
animation: controller, animation: controller,
forwardBuilder: ( forwardBuilder: (
BuildContext context, BuildContext context,