v1.0.20

Author: xuyingjun

CHANGELOG.md

@@ -77,4 +77,8 @@
 
 ## 1.0.19
 
-* fix a padding bug
+* fix a padding bug
+
+## 1.0.20
+
+* add a useRootNavigator property

README.md

@@ -17,7 +17,7 @@ Global dialog function encapsulation, with a semantic way to fill the content in
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.19
+  flutter_custom_dialog: ^1.0.20
 ```
 
 **2、import**
@@ -278,6 +278,7 @@ animatedFunc|Animation of dialog|Emerge from the middle
 showCallBack|dialog show callbacks|not
 dismissCallBack|dialog dismiss callbacks|not
 barrierDismissible|Whether to click to pop up the external disappear|true
+useRootNavigator|Whether to use root navigation|true
 
 * After setting gravity, set gravityAnimationEnable = true if animation is needed
 * If the decoration property is set, the backgroundColor and borderRadius are not in effect; they are mutually exclusive

README_CN.md

@@ -15,7 +15,7 @@
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.19
+  flutter_custom_dialog: ^1.0.20
 ```
 
 **2、import**
@@ -276,6 +276,7 @@ animatedFunc|弹窗出现的动画|从中间出现
 showCallBack|弹窗展示的回调|无
 dismissCallBack|弹窗消失的回调|无
 barrierDismissible|是否点击弹出外部消失|true
+useRootNavigator|是否使用根导航|true
 
 * 设置完gravity后，若需要动画则设置gravityAnimationEnable = true
 * 若设置decoration属性，则backgroundColor和borderRadius不生效，他们是互斥关系

example/pubspec.lock

@@ -47,7 +47,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.20"
+    version: "1.0.19"
   flutter_test:
     dependency: "direct dev"
     description: flutter

lib/flutter_custom_dialog.dart

@@ -19,9 +19,13 @@ class YYDialog {
   BoxConstraints constraints; //弹窗约束
   Function(Widget child, Animation<double> animation) animatedFunc; //弹窗出现的动画
   bool barrierDismissible = true; //是否点击弹出外部消失
-  bool useRootNavigator = true; // see also Navigator.of()
   EdgeInsets margin = EdgeInsets.all(0.0); //弹窗布局的外边距
 
+  /// 用于有多个navigator嵌套的情况，默认为true
+  /// @params useRootNavigator=false，push是用的是当前布局的context
+  /// @params useRootNavigator=true，push是用的嵌套根布局的context
+  bool useRootNavigator = true;
+
   Decoration decoration; //弹窗内的装饰，与backgroundColor和borderRadius互斥
   Color backgroundColor = Colors.white; //弹窗内的背景色
   double borderRadius = 0.0; //弹窗圆角
@@ -268,7 +272,6 @@ class YYDialog {
       barrierColor: barrierColor,
       animatedFunc: animatedFunc,
       barrierDismissible: barrierDismissible,
-      useRootNavigator: useRootNavigator,
       duration: duration,
       child: Padding(
         padding: margin,
@@ -427,7 +430,6 @@ class CustomDialog {
   Color _barrierColor;
   RouteTransitionsBuilder _transitionsBuilder;
   bool _barrierDismissible;
-  bool _useRootNavigator;
   Gravity _gravity;
   bool _gravityAnimationEnable;
   Function _animatedFunc;
@@ -442,7 +444,6 @@ class CustomDialog {
     bool gravityAnimationEnable,
     Function animatedFunc,
     bool barrierDismissible,
-    bool useRootNavigator,
   })  : _child = child,
         _context = context,
         _gravity = gravity,
@@ -451,9 +452,8 @@ class CustomDialog {
         _barrierColor = barrierColor,
         _animatedFunc = animatedFunc,
         _transitionsBuilder = transitionsBuilder,
-        _barrierDismissible = barrierDismissible,
-        _useRootNavigator = useRootNavigator {
-      this.show();
+        _barrierDismissible = barrierDismissible {
+    this.show();
   }
 
   show() {
@@ -466,7 +466,6 @@ class CustomDialog {
       context: _context,
       barrierColor: _barrierColor ?? Colors.black.withOpacity(.3),
       barrierDismissible: _barrierDismissible ?? true,
-      useRootNavigator: _useRootNavigator ?? true,
       barrierLabel: "",
       transitionDuration: _duration ?? Duration(milliseconds: 250),
       transitionBuilder: _transitionsBuilder ?? _buildMaterialDialogTransitions,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_custom_dialog
 description: Semantic dialog | Made In YY.inc | Welcome to contribute
-version: 1.0.19
+version: 1.0.20
 author: AndroidHensen <[email protected]>
 homepage: https://github.com/YYFlutter/flutter-custom-dialog.git