fix dismiss bug v1.0.1

Author: xuyingjun

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 1.0.0
 
 * first release
-* welcome to submit bug
+* welcome to submit bug
+
+## 1.0.1
+
+* fix dismiss Bug

README.md

@@ -16,7 +16,7 @@ Global dialog function encapsulation, with a semantic way to fill the content in
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.0
+  flutter_custom_dialog: ^1.0.1
 ```
 
 **2、import**
@@ -182,6 +182,14 @@ constraints|Dialog constraints|Minimum width and height not less than 10%
 animatedFunc|Animation of dialog|Emerge from the middle
 barrierDismissible|Whether to click to pop up the external disappear|true
 
+Supported method
+
+method|description
+--|--|--|
+show|show dialog
+dismiss|dismiss dialog
+isShowing|Is the dialog showing
+
 ## ⚡ Semantic Widget
 
 The contents of the components inside the dialog are encapsulated by semantic functions in advance to quickly build the dialog, as shown in the following table

README_CN.md

@@ -14,7 +14,7 @@
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.0
+  flutter_custom_dialog: ^1.0.1
 ```
 
 **2、import**
@@ -180,6 +180,14 @@ constraints|弹窗约束|最小宽高不低于10%
 animatedFunc|弹窗出现的动画|从中间出现
 barrierDismissible|是否点击弹出外部消失|true
 
+支持的方法
+
+method|description
+--|--|--|
+show|显示弹窗
+dismiss|隐藏弹窗
+isShowing|弹窗是否在展示
+
 ## ⚡ Semantic Widget
 
 弹窗内部的组件内容提前通过语义化的函数封装好常用的组件，以便快速构建出弹窗，具体见下表

example/lib/main.dart

@@ -1,6 +1,7 @@
 library flutter_custom_dialog;
 
 import 'package:flutter/material.dart';
+import 'package:flutter_custom_dialog/flutter_custom_dialog.dart';
 import 'package:flutter_custom_dialog/components/example/alert_dialog.dart';
 import 'package:flutter_custom_dialog/components/bean/dialog_gravity.dart';
 import 'package:flutter_custom_dialog/components/example/listview_dialog.dart';
@@ -29,6 +30,7 @@ class AppHome extends StatelessWidget {
             showAlertDialog(context),
             showListViewDialog(context),
             showProgressDialog(context),
+            showDevelopDialog(context),
           ],
         ),
       ),
@@ -206,6 +208,43 @@ showProgressDialog(BuildContext context) {
   );
 }
 
+showDevelopDialog(BuildContext context) {
+  YYDialog yyDialog;
+
+  return Padding(
+    padding: EdgeInsets.all(8.0),
+    child: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Text("YYDevelopDialog", style: titleTextStyle),
+        Text("1、Debug"),
+        Row(
+          children: <Widget>[
+            makeTextButton("fix dismiss\nbug in v1.0.1", () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => Scaffold(
+                          body: Column(
+                            children: <Widget>[
+                              makeTextButton("show", () {
+                                yyDialog = YYAlertDialogBody(context);
+                              }),
+                              makeTextButton("dismiss", () {
+                                yyDialog?.dismiss();
+                              }),
+                            ],
+                          ),
+                        )),
+              );
+            }),
+          ],
+        ),
+      ],
+    ),
+  );
+}
+
 Widget makeTextButton(title, Function() function) {
   return SizedBox(
     width: 70.0,

example/pubspec.lock

@@ -1,13 +1,13 @@
 # Generated by pub
-# See https://www.dartlang.org/tools/pub/glossary#lockfile
+# See https://dart.dev/tools/pub/glossary#lockfile
 packages:
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -80,14 +80,14 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.7.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -134,7 +134,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.5"
   typed_data:
     dependency: transitive
     description:
@@ -150,4 +150,4 @@ packages:
     source: hosted
     version: "2.0.8"
 sdks:
-  dart: ">=2.2.0 <3.0.0"
+  dart: ">=2.2.2 <3.0.0"

lib/flutter_custom_dialog.dart

@@ -19,6 +19,10 @@ class YYDialog {
   BoxConstraints constraints; //弹窗约束
   Function(Widget child, Animation<double> animation) animatedFunc; //弹窗出现的动画
   bool barrierDismissible = true; //是否点击弹出外部消失
+
+  get isShowing => _isShowing; //当前弹窗是否可见
+  bool _isShowing = false;
+
   //============================================================================
 
   YYDialog build(context) {
@@ -168,7 +172,6 @@ class YYDialog {
     Color activeColor,
     Function(int) onClickItemListener,
   }) {
-    print("YYDialog ==> listViewOfRadioButton()");
     Size size = MediaQuery.of(context).size;
     return this.widget(
       Container(
@@ -239,8 +242,11 @@ class YYDialog {
                     minHeight: size.height * .1,
                     minWidth: size.width * .1,
                   ),
-              child: Column(
-                children: widgetList,
+              child: CustomDialogChildren(
+                widgetList: widgetList,
+                isShowingChange: (bool isShowingChange) {
+                  _isShowing = isShowingChange;
+                },
               ),
             ),
           )
@@ -250,7 +256,9 @@ class YYDialog {
   }
 
   void dismiss() {
-    Navigator.of(context).pop();
+    if (_isShowing) {
+      Navigator.of(context, rootNavigator: true).pop();
+    }
   }
 
   getColumnMainAxisAlignment(gravity) {
@@ -317,6 +325,34 @@ class YYDialog {
   }
 }
 
+///弹窗的内容作为可变组件
+class CustomDialogChildren extends StatefulWidget {
+  List<Widget> widgetList = []; //弹窗内部所有组件
+  Function(bool) isShowingChange;
+
+  CustomDialogChildren({this.widgetList, this.isShowingChange});
+
+  @override
+  CustomDialogChildState createState() => CustomDialogChildState();
+}
+
+class CustomDialogChildState extends State<CustomDialogChildren> {
+  @override
+  Widget build(BuildContext context) {
+    widget.isShowingChange(true);
+    return Column(
+      children: widget.widgetList,
+    );
+  }
+
+  @override
+  void dispose() {
+    widget.isShowingChange(false);
+    super.dispose();
+  }
+}
+
+///弹窗API的封装
 class CustomDialog {
   BuildContext _context;
   Widget _child;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_custom_dialog
 description: Semantic dialog
-version: 1.0.0
+version: 1.0.1
 author: AndroidHensen <[email protected]>
 homepage: https://github.com/YYFlutter/flutter-custom-dialog.git