Visitar URL original
[animations] Handle DualTransitionBuilder name conflict with flutter/flutter by shihaohong · Pull Request #173 · flutter/packages · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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'.
  • Loading branch information
shihaohong committed Jun 17, 2020
commit 11afba80e43a197cf59b3e09a62c4d1d891d2fce
3 changes: 3 additions & 0 deletions packages/animations/lib/src/dual_transition_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// TODO(shihaohong): Remove DualTransitionBuilder once flutter/flutter's `stable`
// branch contains DualTransitionBuilder.

import 'package:flutter/widgets.dart';

/// Builder callback used by [DualTransitionBuilder].
Expand Down
6 changes: 4 additions & 2 deletions packages/animations/lib/src/fade_scale_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

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 'utils/curves.dart';

Expand Down Expand Up @@ -151,7 +153,7 @@ class FadeScaleTransition extends StatelessWidget {

@override
Widget build(BuildContext context) {
return DualTransitionBuilder(
return dual_transition_builder.DualTransitionBuilder(
animation: animation,
forwardBuilder: (
BuildContext context,
Expand Down
6 changes: 4 additions & 2 deletions packages/animations/lib/src/fade_through_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

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
/// in which the outgoing page fades out, then the incoming page fades in and
Expand Down Expand Up @@ -223,7 +225,7 @@ class _ZoomedFadeInFadeOut extends StatelessWidget {

@override
Widget build(BuildContext context) {
return DualTransitionBuilder(
return dual_transition_builder.DualTransitionBuilder(
animation: animation,
forwardBuilder: (
BuildContext context,
Expand Down
8 changes: 5 additions & 3 deletions packages/animations/lib/src/shared_axis_transition.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.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';

/// Determines which type of shared axis transition is used.
Expand Down Expand Up @@ -238,7 +240,7 @@ class SharedAxisTransition extends StatelessWidget {
@override
Widget build(BuildContext context) {
final Color color = fillColor ?? Theme.of(context).canvasColor;
return DualTransitionBuilder(
return dual_transition_builder.DualTransitionBuilder(
animation: animation,
forwardBuilder: (
BuildContext context,
Expand All @@ -264,7 +266,7 @@ class SharedAxisTransition extends StatelessWidget {
child: child,
);
},
child: DualTransitionBuilder(
child: dual_transition_builder.DualTransitionBuilder(
animation: ReverseAnimation(secondaryAnimation),
forwardBuilder: (
BuildContext context,
Expand Down
12 changes: 7 additions & 5 deletions packages/animations/test/dual_transition_builder_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// 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_test/flutter_test.dart';
import 'package:flutter/widgets.dart';
Expand All @@ -15,7 +17,7 @@ void main() {
);

await tester.pumpWidget(Center(
child: DualTransitionBuilder(
child: dual_transition_builder.DualTransitionBuilder(
animation: controller,
forwardBuilder: (
BuildContext context,
Expand Down Expand Up @@ -85,7 +87,7 @@ void main() {
await tester.pumpWidget(Directionality(
textDirection: TextDirection.ltr,
child: Center(
child: DualTransitionBuilder(
child: dual_transition_builder.DualTransitionBuilder(
animation: controller,
forwardBuilder: (
BuildContext context,
Expand Down Expand Up @@ -147,7 +149,7 @@ void main() {
duration: const Duration(milliseconds: 300),
);
await tester.pumpWidget(Center(
child: DualTransitionBuilder(
child: dual_transition_builder.DualTransitionBuilder(
animation: controller,
forwardBuilder: (
BuildContext context,
Expand Down Expand Up @@ -213,7 +215,7 @@ void main() {
duration: const Duration(milliseconds: 300),
);
await tester.pumpWidget(Center(
child: DualTransitionBuilder(
child: dual_transition_builder.DualTransitionBuilder(
animation: controller,
forwardBuilder: (
BuildContext context,
Expand Down