Skip to content

Commit c9c8e8f

Browse files
author
Shi-Hao Hong
authored
[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
1 parent 9d90dd3 commit c9c8e8f

7 files changed

+28
-13
lines changed

packages/animations/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.1.1] - June 19, 2020
6+
7+
* Hide implementation of `DualTransitionBuilder` as the widget has been implemented in the Flutter framework.
58

69
## [1.1.0] - June 2, 2020
710

packages/animations/lib/src/dual_transition_builder.dart

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
// TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
6+
// branch contains DualTransitionBuilder.
7+
58
import 'package:flutter/widgets.dart';
69

710
/// Builder callback used by [DualTransitionBuilder].

packages/animations/lib/src/fade_scale_transition.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
import 'package:flutter/material.dart';
66

7-
import 'dual_transition_builder.dart';
7+
// TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
8+
// branch contains DualTransitionBuilder.
9+
import 'dual_transition_builder.dart' as dual_transition_builder;
810
import 'modal.dart';
911
import 'utils/curves.dart';
1012

@@ -151,7 +153,7 @@ class FadeScaleTransition extends StatelessWidget {
151153

152154
@override
153155
Widget build(BuildContext context) {
154-
return DualTransitionBuilder(
156+
return dual_transition_builder.DualTransitionBuilder(
155157
animation: animation,
156158
forwardBuilder: (
157159
BuildContext context,

packages/animations/lib/src/fade_through_transition.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
import 'package:flutter/material.dart';
66

7-
import 'dual_transition_builder.dart';
7+
// TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
8+
// branch contains DualTransitionBuilder.
9+
import 'dual_transition_builder.dart' as dual_transition_builder;
810

911
/// Used by [PageTransitionsTheme] to define a page route transition animation
1012
/// in which the outgoing page fades out, then the incoming page fades in and
@@ -223,7 +225,7 @@ class _ZoomedFadeInFadeOut extends StatelessWidget {
223225

224226
@override
225227
Widget build(BuildContext context) {
226-
return DualTransitionBuilder(
228+
return dual_transition_builder.DualTransitionBuilder(
227229
animation: animation,
228230
forwardBuilder: (
229231
BuildContext context,

packages/animations/lib/src/shared_axis_transition.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import 'package:flutter/foundation.dart';
77
import 'package:flutter/material.dart';
88
import 'package:flutter/widgets.dart';
99

10-
import 'dual_transition_builder.dart';
10+
// TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
11+
// branch contains DualTransitionBuilder.
12+
import 'dual_transition_builder.dart' as dual_transition_builder;
1113
import 'utils/curves.dart';
1214

1315
/// Determines which type of shared axis transition is used.
@@ -238,7 +240,7 @@ class SharedAxisTransition extends StatelessWidget {
238240
@override
239241
Widget build(BuildContext context) {
240242
final Color color = fillColor ?? Theme.of(context).canvasColor;
241-
return DualTransitionBuilder(
243+
return dual_transition_builder.DualTransitionBuilder(
242244
animation: animation,
243245
forwardBuilder: (
244246
BuildContext context,
@@ -264,7 +266,7 @@ class SharedAxisTransition extends StatelessWidget {
264266
child: child,
265267
);
266268
},
267-
child: DualTransitionBuilder(
269+
child: dual_transition_builder.DualTransitionBuilder(
268270
animation: ReverseAnimation(secondaryAnimation),
269271
forwardBuilder: (
270272
BuildContext context,

packages/animations/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: animations
22
description: Fancy pre-built animations that can easily be integrated into any Flutter application.
3-
version: 1.1.0
3+
version: 1.1.1
44
homepage: https://github.com/flutter/packages/tree/master/packages/animations
55

66
environment:

packages/animations/test/dual_transition_builder_test.dart

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:animations/src/dual_transition_builder.dart';
5+
// TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
6+
// branch contains DualTransitionBuilder.
7+
import 'package:animations/src/dual_transition_builder.dart'
8+
as dual_transition_builder;
69
import 'package:flutter/material.dart';
710
import 'package:flutter_test/flutter_test.dart';
811
import 'package:flutter/widgets.dart';
@@ -15,7 +18,7 @@ void main() {
1518
);
1619

1720
await tester.pumpWidget(Center(
18-
child: DualTransitionBuilder(
21+
child: dual_transition_builder.DualTransitionBuilder(
1922
animation: controller,
2023
forwardBuilder: (
2124
BuildContext context,
@@ -85,7 +88,7 @@ void main() {
8588
await tester.pumpWidget(Directionality(
8689
textDirection: TextDirection.ltr,
8790
child: Center(
88-
child: DualTransitionBuilder(
91+
child: dual_transition_builder.DualTransitionBuilder(
8992
animation: controller,
9093
forwardBuilder: (
9194
BuildContext context,
@@ -147,7 +150,7 @@ void main() {
147150
duration: const Duration(milliseconds: 300),
148151
);
149152
await tester.pumpWidget(Center(
150-
child: DualTransitionBuilder(
153+
child: dual_transition_builder.DualTransitionBuilder(
151154
animation: controller,
152155
forwardBuilder: (
153156
BuildContext context,
@@ -213,7 +216,7 @@ void main() {
213216
duration: const Duration(milliseconds: 300),
214217
);
215218
await tester.pumpWidget(Center(
216-
child: DualTransitionBuilder(
219+
child: dual_transition_builder.DualTransitionBuilder(
217220
animation: controller,
218221
forwardBuilder: (
219222
BuildContext context,

0 commit comments

Comments
 (0)