diff --git a/packages/animations/CHANGELOG.md b/packages/animations/CHANGELOG.md index cfb4ff33284c..4d8b66709c6e 100644 --- a/packages/animations/CHANGELOG.md +++ b/packages/animations/CHANGELOG.md @@ -1,6 +1,7 @@ -## NEXT +## 3.0.0 -* Updates minimum supported SDK version to Flutter 3.38/Dart 3.10. +* Migrates to material_ui. +* Updates minimum supported SDK version to Flutter 3.44/Dart 3.12. ## 2.2.0 diff --git a/packages/animations/example/lib/container_transition.dart b/packages/animations/example/lib/container_transition.dart index 3838544cbe2c..5bf6c9aa4409 100644 --- a/packages/animations/example/lib/container_transition.dart +++ b/packages/animations/example/lib/container_transition.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:animations/animations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; const String _loremIpsumParagraph = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod ' diff --git a/packages/animations/example/lib/fade_scale_transition.dart b/packages/animations/example/lib/fade_scale_transition.dart index 494bf2a72b1b..6f652073eca7 100644 --- a/packages/animations/example/lib/fade_scale_transition.dart +++ b/packages/animations/example/lib/fade_scale_transition.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:animations/animations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The demo page for [FadeScaleTransition]. class FadeScaleTransitionDemo extends StatefulWidget { diff --git a/packages/animations/example/lib/fade_through_transition.dart b/packages/animations/example/lib/fade_through_transition.dart index 1cb03d6f9ab6..b924863a38d5 100644 --- a/packages/animations/example/lib/fade_through_transition.dart +++ b/packages/animations/example/lib/fade_through_transition.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:animations/animations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The demo page for [FadeThroughTransition]. class FadeThroughTransitionDemo extends StatefulWidget { diff --git a/packages/animations/example/lib/main.dart b/packages/animations/example/lib/main.dart index 66e830601e5b..20bb4db1427e 100644 --- a/packages/animations/example/lib/main.dart +++ b/packages/animations/example/lib/main.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; +import 'package:material_ui/material_ui.dart'; import 'container_transition.dart'; import 'fade_scale_transition.dart'; diff --git a/packages/animations/example/lib/shared_axis_transition.dart b/packages/animations/example/lib/shared_axis_transition.dart index c12548b500bd..42c4a1a9a31b 100644 --- a/packages/animations/example/lib/shared_axis_transition.dart +++ b/packages/animations/example/lib/shared_axis_transition.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:animations/animations.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// The demo page for [SharedAxisPageTransitionsBuilder]. class SharedAxisTransitionDemo extends StatefulWidget { diff --git a/packages/animations/example/pubspec.yaml b/packages/animations/example/pubspec.yaml index 89b6dffa0522..d85eda864a8a 100644 --- a/packages/animations/example/pubspec.yaml +++ b/packages/animations/example/pubspec.yaml @@ -6,8 +6,8 @@ publish_to: none version: 0.0.1 environment: - sdk: ^3.10.0 - flutter: ">=3.38.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: animations: @@ -15,6 +15,7 @@ dependencies: cupertino_icons: ^1.0.2 flutter: sdk: flutter + material_ui: ^1.0.0 dev_dependencies: flutter_test: diff --git a/packages/animations/lib/src/fade_scale_transition.dart b/packages/animations/lib/src/fade_scale_transition.dart index 4ccb66fc25a1..1771e97c4da0 100644 --- a/packages/animations/lib/src/fade_scale_transition.dart +++ b/packages/animations/lib/src/fade_scale_transition.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'modal.dart'; diff --git a/packages/animations/lib/src/fade_through_transition.dart b/packages/animations/lib/src/fade_through_transition.dart index e308bda3e14c..dd7e20a451e2 100644 --- a/packages/animations/lib/src/fade_through_transition.dart +++ b/packages/animations/lib/src/fade_through_transition.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Used by [PageTransitionsTheme] to define a page route transition animation /// in which the outgoing page fades out, then the incoming page fades in and diff --git a/packages/animations/lib/src/modal.dart b/packages/animations/lib/src/modal.dart index 8e9598d578bd..a9bbf9a73faf 100644 --- a/packages/animations/lib/src/modal.dart +++ b/packages/animations/lib/src/modal.dart @@ -4,7 +4,7 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'fade_scale_transition.dart'; @@ -96,12 +96,11 @@ class _ModalRoute extends PopupRoute { this.barrierLabel, required this.transitionDuration, required this.reverseTransitionDuration, - required _ModalTransitionBuilder transitionBuilder, + required this._transitionBuilder, required this.builder, RouteSettings? routeSettings, super.filter, }) : assert(!barrierDismissible || barrierLabel != null), - _transitionBuilder = transitionBuilder, super(settings: routeSettings); @override diff --git a/packages/animations/lib/src/open_container.dart b/packages/animations/lib/src/open_container.dart index 0eb6267acd82..e63fa2dbc1ae 100644 --- a/packages/animations/lib/src/open_container.dart +++ b/packages/animations/lib/src/open_container.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; +import 'package:material_ui/material_ui.dart'; /// Signature for `action` callback function provided to [OpenContainer.openBuilder]. /// diff --git a/packages/animations/lib/src/shared_axis_transition.dart b/packages/animations/lib/src/shared_axis_transition.dart index 617a28d6945d..60caf2d14e17 100644 --- a/packages/animations/lib/src/shared_axis_transition.dart +++ b/packages/animations/lib/src/shared_axis_transition.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Determines which type of shared axis transition is used. enum SharedAxisTransitionType { diff --git a/packages/animations/pubspec.yaml b/packages/animations/pubspec.yaml index b7a7be7ee25d..5ef410abed64 100644 --- a/packages/animations/pubspec.yaml +++ b/packages/animations/pubspec.yaml @@ -2,15 +2,16 @@ name: animations description: Fancy pre-built animations that can easily be integrated into any Flutter application. repository: https://github.com/flutter/packages/tree/main/packages/animations issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+animations%22 -version: 2.2.0 +version: 3.0.0 environment: - sdk: ^3.10.0 - flutter: ">=3.38.0" + sdk: ^3.12.0 + flutter: ">=3.44.0" dependencies: flutter: sdk: flutter + material_ui: ^1.0.0 dev_dependencies: flutter_test: diff --git a/packages/animations/test/dual_transition_builder_test.dart b/packages/animations/test/dual_transition_builder_test.dart index a0fa77f7d384..5ff43fab303c 100644 --- a/packages/animations/test/dual_transition_builder_test.dart +++ b/packages/animations/test/dual_transition_builder_test.dart @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { testWidgets('runs animations', (WidgetTester tester) async { diff --git a/packages/animations/test/fade_scale_transition_test.dart b/packages/animations/test/fade_scale_transition_test.dart index 83e6b5bb0050..9111898066c5 100644 --- a/packages/animations/test/fade_scale_transition_test.dart +++ b/packages/animations/test/fade_scale_transition_test.dart @@ -4,8 +4,8 @@ import 'package:animations/src/fade_scale_transition.dart'; import 'package:animations/src/modal.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { testWidgets('FadeScaleTransitionConfiguration builds a new route', (WidgetTester tester) async { diff --git a/packages/animations/test/fade_through_transition_test.dart b/packages/animations/test/fade_through_transition_test.dart index 32d8d5969e4d..93e2c4e1eccb 100644 --- a/packages/animations/test/fade_through_transition_test.dart +++ b/packages/animations/test/fade_through_transition_test.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:animations/src/fade_through_transition.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { testWidgets('FadeThroughPageTransitionsBuilder builds a FadeThroughTransition', ( diff --git a/packages/animations/test/modal_test.dart b/packages/animations/test/modal_test.dart index 87089f715b4c..2ec8ee7d6572 100644 --- a/packages/animations/test/modal_test.dart +++ b/packages/animations/test/modal_test.dart @@ -5,8 +5,8 @@ import 'dart:ui' as ui; import 'package:animations/src/modal.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { testWidgets('showModal builds a new route with specified barrier properties', ( diff --git a/packages/animations/test/open_container_test.dart b/packages/animations/test/open_container_test.dart index 7f5d64ffa5bb..88f5c790cfb1 100644 --- a/packages/animations/test/open_container_test.dart +++ b/packages/animations/test/open_container_test.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:animations/src/open_container.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; void main() { testWidgets('Can be opened via GlobalKey', (WidgetTester tester) async { diff --git a/packages/animations/test/shared_axis_transition_test.dart b/packages/animations/test/shared_axis_transition_test.dart index b3548628e381..e9a3208c6eed 100644 --- a/packages/animations/test/shared_axis_transition_test.dart +++ b/packages/animations/test/shared_axis_transition_test.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:animations/src/shared_axis_transition.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:vector_math/vector_math_64.dart' hide Colors; void main() {