fix #34 #41

Author: xdd666t

CHANGELOG.md

@@ -3,8 +3,9 @@
 - 'showToast' add 'consumeEvent' param: [#27](https://github.com/fluttercandies/flutter_smart_dialog/issues/27)
 - 'dismiss' can close dialogs with duplicate tags
 - Fix [#28](https://github.com/fluttercandies/flutter_smart_dialog/issues/28)
-- Fix [#34](https://github.com/fluttercandies/flutter_smart_dialog/issues/34)
 - Fix [#42](https://github.com/fluttercandies/flutter_smart_dialog/issues/42)
+- Fix [#34](https://github.com/fluttercandies/flutter_smart_dialog/issues/41) [#41](https://github.com/fluttercandies/flutter_smart_dialog/issues/34)
+- Add SmartStatus.allToast
 
 # [3.3.x]
 

lib/src/custom/custom_toast.dart

@@ -84,6 +84,8 @@ class CustomToast extends BaseDialog {
     handleMultiTypeToast(curType: type, fun: multiTypeToast);
   }
 
+  ///--------------------------multi type toast--------------------------
+
   Future<void> _normalToast({
     required Duration time,
     required Function() onShowToast,
@@ -114,7 +116,7 @@ class CustomToast extends BaseDialog {
     await _toastDelay(time);
     await _realDismiss();
 
-    _toastQueue.removeLast();
+    if (_toastQueue.isNotEmpty) _toastQueue.removeLast();
   }
 
   Future<void> _lastToast({
@@ -126,7 +128,7 @@ class CustomToast extends BaseDialog {
     await _toastDelay(time);
     if (_toastQueue.length == 1) await _realDismiss();
 
-    _toastQueue.removeLast();
+    if (_toastQueue.isNotEmpty) _toastQueue.removeLast();
   }
 
   Future<void> _firstAndLastToast({
@@ -148,10 +150,11 @@ class CustomToast extends BaseDialog {
     });
 
     if (_toastQueue.length == 1) await _toastQueue.first();
-
     if (_toastQueue.length > 2) _toastQueue.remove(_toastQueue.elementAt(1));
   }
 
+  ///--------------------------multi type toast--------------------------
+
   void handleMultiTypeToast({
     required SmartToastType curType,
     required Function() fun,
@@ -200,10 +203,12 @@ class CustomToast extends BaseDialog {
     config.isExistToast = false;
   }
 
-  Future<void> dismiss() async {
+  Future<void> dismiss({bool closeAll = false}) async {
+    if (closeAll) _toastQueue.clear();
     _curTime?.cancel();
     if (!(_curCompleter?.isCompleted ?? true)) _curCompleter?.complete();
-    await Future.delayed(Duration(milliseconds: 1));
+    await Future.delayed(SmartDialog.config.animationDuration);
+    await Future.delayed(const Duration(milliseconds: 50));
   }
 }
 

lib/src/helper/dialog_proxy.dart

@@ -209,6 +209,8 @@ class DialogProxy {
       if (loading) await _loading.dismiss(back: back);
     } else if (status == SmartStatus.toast) {
       await _toast.dismiss();
+    } else if (status == SmartStatus.allToast) {
+      await _toast.dismiss(closeAll: true);
     } else if (status == SmartStatus.loading) {
       await _loading.dismiss(back: back);
     } else if (status == SmartStatus.dialog) {

lib/src/smart_dialog.dart

@@ -17,6 +17,11 @@ enum SmartStatus {
   /// 关闭toast（showToast）
   toast,
 
+  /// close all toasts（showToast）
+  ///
+  /// 关闭所有toast（showToast）
+  allToast,
+
   /// close loading（showLoading）
   ///
   /// 关闭loading（showLoading）

lib/src/widget/attach_dialog_widget.dart

@@ -295,8 +295,9 @@ class _AttachDialogWidgetState extends State<AttachDialogWidget>
 
   ///等待动画结束,关闭动画资源
   Future<void> dismiss() async {
+    if (_ctrlBg == null) return;
     //over animation
-    _ctrlBg?.reverse();
+    _ctrlBg!.reverse();
     _ctrlBody.reverse();
 
     if (widget.isUseAnimation) {
@@ -307,6 +308,7 @@ class _AttachDialogWidgetState extends State<AttachDialogWidget>
   @override
   void dispose() {
     _ctrlBg?.dispose();
+    _ctrlBg = null;
     _ctrlBody.dispose();
     super.dispose();
   }
@@ -321,7 +323,6 @@ class AttachDialogController extends BaseController {
 
   @override
   Future<void> dismiss() async {
-    await Future.delayed(Duration(milliseconds: 1));
     try {
       await _state?.dismiss();
     } catch (e) {

lib/src/widget/smart_dialog_widget.dart

@@ -178,8 +178,9 @@ class _SmartDialogWidgetState extends State<SmartDialogWidget>
 
   ///等待动画结束,关闭动画资源
   Future<void> dismiss() async {
+    if (_ctrlBg == null) return;
     //结束动画
-    _ctrlBg?.reverse();
+    _ctrlBg!.reverse();
     _ctrlBody.reverse();
 
     if (widget.isUseAnimation) {
@@ -190,7 +191,9 @@ class _SmartDialogWidgetState extends State<SmartDialogWidget>
   @override
   void dispose() {
     _ctrlBg?.dispose();
+    _ctrlBg = null;
     _ctrlBody.dispose();
+
     super.dispose();
   }
 }
@@ -204,7 +207,6 @@ class SmartDialogController extends BaseController {
 
   @override
   Future<void> dismiss() async {
-    await Future.delayed(Duration(milliseconds: 1));
     try {
       await _state?.dismiss();
     } catch (e) {

pubspec.yaml

@@ -3,7 +3,7 @@ description:
   An elegant Flutter Dialog solution,
   Easily implement Toast, Loading and custom Dialog,
   Make the use of the dialog easier!
-version: 3.4.2+1
+version: 3.4.2+2
 homepage: https://github.com/fluttercandies/flutter_smart_dialog
 #flutter pub publish --server=https://pub.dartlang.org