add opaque property (lukepighetti#257)

* 添加opaque参数，支持透明路由 * 添加opaque参数，支持透明路由 * PageRoute的opaque默认值改为true * analyzer fixes Co-authored-by: jiangzhou <[email protected]>
Focus-on-the-Family · Jan 12, 2022 · 00e05fe · 00e05fe
1 parent d326c32
commit 00e05fe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/example/lib/components/home/home_component.dart b/example/lib/components/home/home_component.dart
@@ -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';
 

diff --git a/example/lib/config/route_handlers.dart b/example/lib/config/route_handlers.dart
@@ -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';
 

diff --git a/lib/src/common.dart b/lib/src/common.dart
@@ -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.

diff --git a/lib/src/fluro_router.dart b/lib/src/fluro_router.dart
@@ -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';
 
@@ -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),
     );
   }
 
@@ -75,6 +74,7 @@ class FluroRouter {
     Duration? transitionDuration,
     RouteTransitionsBuilder? transitionBuilder,
     RouteSettings? routeSettings,
+    bool? opaque,
   }) {
     RouteMatch routeMatch = matchRoute(
       context,
@@ -84,6 +84,7 @@ class FluroRouter {
       transitionDuration: transitionDuration,
       maintainState: maintainState,
       routeSettings: routeSettings,
+      opaque: opaque,
     );
 
     Route<dynamic>? route = routeMatch.route;
@@ -148,6 +149,7 @@ class FluroRouter {
     Duration? transitionDuration,
     RouteTransitionsBuilder? transitionsBuilder,
     bool maintainState = true,
+    bool? opaque,
   }) {
     RouteSettings settingsToUse = routeSettings ?? RouteSettings(name: path);
 
@@ -235,6 +237,7 @@ class FluroRouter {
         }
 
         return PageRouteBuilder<dynamic>(
+          opaque: opaque ?? route?.opaque ?? true,
           settings: routeSettings,
           maintainState: maintainState,
           pageBuilder: (BuildContext context, Animation<double> animation,