Skip to content

Commit

Permalink
add opaque property (#257)
Browse files Browse the repository at this point in the history
* 添加opaque参数,支持透明路由

* 添加opaque参数,支持透明路由

* PageRoute的opaque默认值改为true

* analyzer fixes

Co-authored-by: jiangzhou <976912502@qq.com>
  • Loading branch information
lukepighetti and alen256 committed Jan 12, 2022
1 parent d326c32 commit 00e05fe
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
1 change: 0 additions & 1 deletion example/lib/components/home/home_component.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import 'dart:async';

import 'package:fluro/fluro.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

Expand Down
1 change: 0 additions & 1 deletion example/lib/config/route_handlers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import '../helpers/color_helpers.dart';
import '../components/demo/demo_simple_component.dart';
import '../components/home/home_component.dart';
import 'package:flutter/painting.dart';
import 'package:fluro/fluro.dart';
import 'package:flutter/material.dart';

Expand Down
2 changes: 2 additions & 0 deletions lib/src/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@ class AppRoute {
this.transitionType,
this.transitionDuration,
this.transitionBuilder,
this.opaque,
});

String route;
dynamic handler;
TransitionType? transitionType;
Duration? transitionDuration;
RouteTransitionsBuilder? transitionBuilder;
bool? opaque;
}

/// The type of transition to use when pushing/popping a route.
Expand Down
21 changes: 12 additions & 9 deletions lib/src/fluro_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import 'dart:async';

import 'package:fluro/fluro.dart';
import 'package:fluro/src/common.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -38,18 +37,18 @@ class FluroRouter {
static const defaultTransitionDuration = Duration(milliseconds: 250);

/// Creates a [PageRoute] definition for the passed [RouteHandler]. You can optionally provide a default transition type.
void define(
String routePath, {
required Handler? handler,
TransitionType? transitionType,
Duration transitionDuration = defaultTransitionDuration,
RouteTransitionsBuilder? transitionBuilder,
}) {
void define(String routePath,
{required Handler? handler,
TransitionType? transitionType,
Duration transitionDuration = defaultTransitionDuration,
RouteTransitionsBuilder? transitionBuilder,
bool? opaque}) {
_routeTree.addRoute(
AppRoute(routePath, handler,
transitionType: transitionType,
transitionDuration: transitionDuration,
transitionBuilder: transitionBuilder),
transitionBuilder: transitionBuilder,
opaque: opaque),
);
}

Expand All @@ -75,6 +74,7 @@ class FluroRouter {
Duration? transitionDuration,
RouteTransitionsBuilder? transitionBuilder,
RouteSettings? routeSettings,
bool? opaque,
}) {
RouteMatch routeMatch = matchRoute(
context,
Expand All @@ -84,6 +84,7 @@ class FluroRouter {
transitionDuration: transitionDuration,
maintainState: maintainState,
routeSettings: routeSettings,
opaque: opaque,
);

Route<dynamic>? route = routeMatch.route;
Expand Down Expand Up @@ -148,6 +149,7 @@ class FluroRouter {
Duration? transitionDuration,
RouteTransitionsBuilder? transitionsBuilder,
bool maintainState = true,
bool? opaque,
}) {
RouteSettings settingsToUse = routeSettings ?? RouteSettings(name: path);

Expand Down Expand Up @@ -235,6 +237,7 @@ class FluroRouter {
}

return PageRouteBuilder<dynamic>(
opaque: opaque ?? route?.opaque ?? true,
settings: routeSettings,
maintainState: maintainState,
pageBuilder: (BuildContext context, Animation<double> animation,
Expand Down

0 comments on commit 00e05fe

Please sign in to comment.