Skip to content

Migrate Material curves to new names #4898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guidezpl merged 8 commits into from
Dec 6, 2023
Merged

Migrate Material curves to new names #4898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7104ef3
Migrate Material curves
guidezpl Sep 11, 2023
8387f6b
bump package and flutter versions
guidezpl Sep 11, 2023
64c3ef7
fix dart sdk lower bound
guidezpl Sep 11, 2023
d51986d
Update CHANGELOG.md
guidezpl Sep 11, 2023
63c3c24
Merge branch 'main' into m3-motion
guidezpl Dec 5, 2023
45d40f7
Update CHANGELOG.md
guidezpl Dec 5, 2023
7800765
bump SDK, update changelog title
guidezpl Dec 5, 2023
9ba1502
Merge branch 'main' into m3-motion
guidezpl Dec 6, 2023
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
7 changes: 4 additions & 3 deletions packages/animations/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## NEXT
## 2.0.9

* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
* Updates minimum supported SDK version to Flutter 3.13/Dart 3.1.
* Migrate motion curves to use `Easing` class.

## 2.0.8

Expand Down Expand Up @@ -28,7 +29,7 @@
* Updates for non-nullable bindings.

## 2.0.2
* Fixed documentation for `OpenContainer` class; replaced `openBuilder` with `closedBuilder`.
* Fixed documentation for `OpenContainer` class; replaced `openBuilder` with `closedBuilder`.

## 2.0.1
* Add links to the spec and codelab.
Expand Down
2 changes: 1 addition & 1 deletion packages/animations/lib/src/fade_scale_transition.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class FadeScaleTransition extends StatelessWidget {
static final Animatable<double> _scaleInTransition = Tween<double>(
begin: 0.80,
end: 1.00,
).chain(CurveTween(curve: decelerateEasing));
).chain(CurveTween(curve: Easing.legacyDecelerate));
static final Animatable<double> _fadeOutTransition = Tween<double>(
begin: 1.0,
end: 0.0,
Expand Down
20 changes: 10 additions & 10 deletions packages/animations/lib/src/shared_axis_transition.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,18 +303,18 @@ class _EnterTransition extends StatelessWidget {
final bool reverse;

static final Animatable<double> _fadeInTransition = CurveTween(
curve: decelerateEasing,
curve: Easing.legacyDecelerate,
).chain(CurveTween(curve: const Interval(0.3, 1.0)));

static final Animatable<double> _scaleDownTransition = Tween<double>(
begin: 1.10,
end: 1.00,
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

static final Animatable<double> _scaleUpTransition = Tween<double>(
begin: 0.80,
end: 1.00,
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

@override
Widget build(BuildContext context) {
Expand All @@ -323,7 +323,7 @@ class _EnterTransition extends StatelessWidget {
final Animatable<Offset> slideInTransition = Tween<Offset>(
begin: Offset(!reverse ? 30.0 : -30.0, 0.0),
end: Offset.zero,
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

return FadeTransition(
opacity: _fadeInTransition.animate(animation),
Expand All @@ -342,7 +342,7 @@ class _EnterTransition extends StatelessWidget {
final Animatable<Offset> slideInTransition = Tween<Offset>(
begin: Offset(0.0, !reverse ? 30.0 : -30.0),
end: Offset.zero,
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

return FadeTransition(
opacity: _fadeInTransition.animate(animation),
Expand Down Expand Up @@ -386,18 +386,18 @@ class _ExitTransition extends StatelessWidget {
final Widget? child;

static final Animatable<double> _fadeOutTransition = _FlippedCurveTween(
curve: accelerateEasing,
curve: Easing.legacyAccelerate,
).chain(CurveTween(curve: const Interval(0.0, 0.3)));

static final Animatable<double> _scaleUpTransition = Tween<double>(
begin: 1.00,
end: 1.10,
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

static final Animatable<double> _scaleDownTransition = Tween<double>(
begin: 1.00,
end: 0.80,
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

@override
Widget build(BuildContext context) {
Expand All @@ -406,7 +406,7 @@ class _ExitTransition extends StatelessWidget {
final Animatable<Offset> slideOutTransition = Tween<Offset>(
begin: Offset.zero,
end: Offset(!reverse ? -30.0 : 30.0, 0.0),
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

return FadeTransition(
opacity: _fadeOutTransition.animate(animation),
Expand All @@ -428,7 +428,7 @@ class _ExitTransition extends StatelessWidget {
final Animatable<Offset> slideOutTransition = Tween<Offset>(
begin: Offset.zero,
end: Offset(0.0, !reverse ? -30.0 : 30.0),
).chain(CurveTween(curve: standardEasing));
).chain(CurveTween(curve: Easing.legacy));

return FadeTransition(
opacity: _fadeOutTransition.animate(animation),
Expand Down
6 changes: 3 additions & 3 deletions packages/animations/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ 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.0.8
version: 2.0.9

environment:
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"
sdk: ">=3.1.0 <4.0.0"
flutter: ">=3.13.0"

dependencies:
flutter:
Expand Down