Skip to content
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

refactor(custom_route): update route duration type from int to Duration #2110

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(custom_route): update route duration type from int to Duration #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,7 @@ CustomRoute(
page: LoginRoute.page,
// TransitionsBuilders class contains a preset of common transitions builders.
transitionsBuilder: TransitionsBuilders.slideBottom,
durationInMilliseconds: 400,
duration: Duration(milliseconds: 400),
)
```

Expand Down
8 changes: 4 additions & 4 deletions auto_route/lib/src/route/auto_route_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ class CustomRoute<R> extends AutoRoute {
super.allowSnapshotting = true,
RouteTransitionsBuilder? transitionsBuilder,
CustomRouteBuilder? customRouteBuilder,
int? durationInMilliseconds,
int? reverseDurationInMilliseconds,
Duration? duration,
Duration? reverseDuration,
bool opaque = true,
bool barrierDismissible = true,
String? barrierLabel,
Expand All @@ -401,8 +401,8 @@ class CustomRoute<R> extends AutoRoute {
type: RouteType.custom(
transitionsBuilder: transitionsBuilder,
customRouteBuilder: customRouteBuilder,
durationInMilliseconds: durationInMilliseconds,
reverseDurationInMilliseconds: reverseDurationInMilliseconds,
duration: duration,
reverseDuration: reverseDuration,
opaque: opaque,
barrierDismissible: barrierDismissible,
barrierLabel: barrierLabel,
Expand Down
25 changes: 12 additions & 13 deletions auto_route/lib/src/route/route_type.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ abstract class RouteType {
const factory RouteType.custom({
RouteTransitionsBuilder? transitionsBuilder,
CustomRouteBuilder? customRouteBuilder,
int? durationInMilliseconds,
int? reverseDurationInMilliseconds,
Duration? duration,
Duration? reverseDuration,
bool opaque,
bool barrierDismissible,
String? barrierLabel,
Expand Down Expand Up @@ -110,15 +110,15 @@ class CustomRouteType extends RouteType {
/// },
final CustomRouteBuilder? customRouteBuilder;

/// route transition duration in milliseconds
/// route transition duration
/// is passed to [PageRouteBuilder]
/// this property is ignored unless a [transitionBuilder] is provided
final int? durationInMilliseconds;
final Duration? duration;

/// route reverse transition duration in milliseconds
/// route reverse transition duration
/// is passed to [PageRouteBuilder]
/// this property is ignored unless a [transitionBuilder] is provided
final int? reverseDurationInMilliseconds;
final Duration? reverseDuration;

/// passed to the barrierDismissible property in [PageRouteBuilder]
///
Expand All @@ -141,8 +141,8 @@ class CustomRouteType extends RouteType {
this.barrierLabel,
this.barrierColor,
this.transitionsBuilder,
this.durationInMilliseconds,
this.reverseDurationInMilliseconds,
this.duration,
this.reverseDuration,
super.opaque,
this.barrierDismissible = false,
}) : super._();
Expand All @@ -155,9 +155,8 @@ class CustomRouteType extends RouteType {
runtimeType == other.runtimeType &&
transitionsBuilder == other.transitionsBuilder &&
customRouteBuilder == other.customRouteBuilder &&
durationInMilliseconds == other.durationInMilliseconds &&
reverseDurationInMilliseconds ==
other.reverseDurationInMilliseconds &&
duration == other.duration &&
reverseDuration == other.reverseDuration &&
barrierDismissible == other.barrierDismissible &&
barrierLabel == other.barrierLabel &&
barrierColor == other.barrierColor;
Expand All @@ -167,8 +166,8 @@ class CustomRouteType extends RouteType {
super.hashCode ^
transitionsBuilder.hashCode ^
customRouteBuilder.hashCode ^
durationInMilliseconds.hashCode ^
reverseDurationInMilliseconds.hashCode ^
duration.hashCode ^
reverseDuration.hashCode ^
barrierDismissible.hashCode ^
barrierLabel.hashCode ^
barrierColor.hashCode;
Expand Down
10 changes: 4 additions & 6 deletions auto_route/lib/src/router/auto_route_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,12 @@ mixin _CustomPageRouteTransitionMixin<T> on PageRoute<T> {
Widget buildContent(BuildContext context);

@override
Duration get transitionDuration => Duration(
milliseconds: routeType.durationInMilliseconds ?? 300,
);
Duration get transitionDuration =>
routeType.duration ?? const Duration(milliseconds: 300);

@override
Duration get reverseTransitionDuration => Duration(
milliseconds: routeType.reverseDurationInMilliseconds ?? 300,
);
Duration get reverseTransitionDuration =>
routeType.reverseDuration ?? const Duration(milliseconds: 300);

@override
bool get barrierDismissible => routeType.barrierDismissible;
Expand Down