finish showNotify #111

Author: xdd666t

example/lib/main.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 
@@ -35,6 +37,12 @@ class SmartDialogPage extends StatelessWidget {
             child: Text('showLoading'),
           ),
 
+          //notify
+          ElevatedButton(
+            onPressed: () => _showNotify(),
+            child: Text('showNotify'),
+          ),
+
           //dialog
           ElevatedButton(
             onPressed: () => _show(),
@@ -58,15 +66,10 @@ class SmartDialogPage extends StatelessWidget {
   }
 
   void _showToast() async {
-    for (var i = 0; i < 9; i++) {
-      SmartDialog.showToast(
-        'test toast ---- $i',
-        displayType: SmartToastType.normal,
-      );
-      await Future.delayed(Duration(milliseconds: 500));
-    }
-
-    SmartDialog.dismiss(status: SmartStatus.allToast);
+    SmartDialog.showToast(
+      'test toast ---- ${Random().nextInt(999)}',
+      displayType: SmartToastType.multi,
+    );
   }
 
   void _show() async {
@@ -159,4 +162,12 @@ class SmartDialogPage extends StatelessWidget {
     await Future.delayed(Duration(seconds: 2));
     SmartDialog.dismiss();
   }
+
+  void _showNotify() async {
+    SmartDialog.showNotify(
+      msg: '请求成功',
+      notifyType: NotifyType.failure,
+      backType: SmartBackType.block,
+    );
+  }
 }

lib/flutter_smart_dialog.dart

@@ -7,6 +7,8 @@ export 'src/config/smart_config_custom.dart';
 export 'src/config/smart_config_loading.dart';
 export 'src/config/smart_config_toast.dart';
 export 'src/data/animation_param.dart' show AnimationParam;
+export 'src/data/notify_style.dart';
+
 /// dialog
 export 'src/init_dialog.dart';
 export 'src/smart_dialog.dart';

lib/src/config/enum_config.dart

@@ -242,15 +242,36 @@ enum SmartInitType {
   toast,
 }
 
-enum SmartNotifyType {
+enum SmartBackType {
+  /// Interception returns the event, closes the dialog,
+  /// but does not close the page (if the dialog exists on the interface)
+  ///
+  /// 拦截返回事件, 关闭dialog, 但不会关闭页面 (如果dialog存在在界面上)
+  normal,
+
+  /// Interception returns the event without closing the dialog or closing the page
+  ///
+  /// 拦截返回事件, 不关闭dialog, 也不关闭页面
+  block,
+
+  /// Do not intercept the return event, the return event will not close the dialog
+  ///
+  /// 不拦截返回事件, 返回事件将不会关闭dialog
+  ignore,
+}
+
+/// Prompt dialog to distinguish different types of showNotify
+///
+/// 用以区别showNotify不同类型的提示弹窗
+enum NotifyType {
   /// success
   success,
 
   /// failure
   failure,
 
-  /// warn
-  warn,
+  /// warning
+  warning,
 
   /// error
   error,

lib/src/config/smart_config_notify.dart

@@ -21,6 +21,7 @@ class SmartConfigNotify {
     this.awaitOverType = SmartAwaitOverType.dialogDismiss,
     this.maskTriggerType = SmartMaskTriggerType.up,
     this.nonAnimationTypes = const [],
+    this.backType = SmartBackType.ignore,
     this.isExist = false,
   });
 
@@ -123,6 +124,12 @@ class SmartConfigNotify {
   /// 对于不同的场景, 可动态关闭弹窗动画, 具体请参照[SmartNonAnimationType]
   final List<SmartNonAnimationType> nonAnimationTypes;
 
+  /// For different processing types of return events,
+  /// please refer to the description of [SmartBackType] for details
+  ///
+  /// 对于返回事件不同的处理类型, 具体可参照[SmartBackType]说明
+  final SmartBackType backType;
+
   /// whether custom dialog(show()) exist on the screen
   ///
   /// 自定义dialog(show())，是否存在在界面上

lib/src/custom/custom_notify.dart

@@ -36,6 +36,7 @@ class CustomNotify extends BaseDialog {
     required Duration? displayTime,
     required String? tag,
     required bool keepSingle,
+    required SmartBackType backType,
   }) {
     if (DebounceUtils.instance.banContinue(DebounceType.notify, debounce)) {
       return Future.value(null);
@@ -46,6 +47,7 @@ class CustomNotify extends BaseDialog {
       keepSingle: keepSingle,
       debounce: debounce,
       displayTime: displayTime,
+      backType: backType,
     );
     return mainDialog.show<T>(
       widget: widget,
@@ -102,6 +104,7 @@ class CustomNotify extends BaseDialog {
     required bool keepSingle,
     required bool debounce,
     required Duration? displayTime,
+    required SmartBackType backType,
   }) {
     SmartDialog.config.notify.isExist = true;
 
@@ -112,6 +115,7 @@ class CustomNotify extends BaseDialog {
         singleNotifyInfo = NotifyInfo(
           dialog: this,
           tag: tag ?? SmartTag.keepSingle,
+          backType: backType,
         );
         _pushDialog(singleNotifyInfo);
       }
@@ -121,7 +125,7 @@ class CustomNotify extends BaseDialog {
       tag = tag ?? '${hashCode + Random().nextDouble()}';
 
       // handle dialog stack
-      notifyInfo = NotifyInfo(dialog: this, tag: tag);
+      notifyInfo = NotifyInfo(dialog: this, tag: tag, backType: backType);
       _pushDialog(notifyInfo);
     }
 
@@ -146,7 +150,7 @@ class CustomNotify extends BaseDialog {
   }
 
   static Future<void>? dismiss<T>({
-    DialogType type = DialogType.dialog,
+    DialogType type = DialogType.notify,
     String? tag,
     T? result,
     bool force = false,

lib/src/custom/toast/custom_toast.dart

@@ -110,7 +110,7 @@ class CustomToast extends BaseDialog {
 
     if (newToast) {
       toastQueue.addLast(ToastInfo(
-        type: SmartToastType.last,
+        type: SmartToastType.normal,
         mainDialog: mainDialog,
         time: time,
         onShowToast: onShowToast,

lib/src/data/notify_info.dart

@@ -3,18 +3,22 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/src/custom/custom_dialog.dart';
 
+import '../../flutter_smart_dialog.dart';
 import '../helper/dialog_proxy.dart';
 import 'base_dialog.dart';
 
 class NotifyInfo {
   NotifyInfo({
     required this.dialog,
     required this.tag,
+    required this.backType,
   });
 
   final BaseDialog dialog;
 
   String? tag;
 
+  SmartBackType backType;
+
   Timer? displayTimer;
 }

lib/src/data/notify_style.dart

@@ -4,14 +4,14 @@ class FlutterSmartNotifyStyle {
   const FlutterSmartNotifyStyle({
     this.successBuilder,
     this.failureBuilder,
-    this.warnBuilder,
+    this.warningBuilder,
     this.alertBuilder,
     this.errorBuilder,
   });
 
   final Widget Function(String msg)? successBuilder;
   final Widget Function(String msg)? failureBuilder;
-  final Widget Function(String msg)? warnBuilder;
+  final Widget Function(String msg)? warningBuilder;
   final Widget Function(String msg)? alertBuilder;
   final Widget Function(String msg)? errorBuilder;
 }

lib/src/helper/dialog_proxy.dart

@@ -166,6 +166,7 @@ class DialogProxy {
     required Duration? displayTime,
     required String? tag,
     required bool keepSingle,
+    required SmartBackType backType,
   }) {
     CustomNotify? dialog;
     var entry = SmartOverlayEntry(
@@ -190,6 +191,7 @@ class DialogProxy {
       displayTime: displayTime,
       tag: tag,
       keepSingle: keepSingle,
+      backType: backType,
     );
   }
 

lib/src/helper/pop_monitor/monitor_pop_route.dart

@@ -3,7 +3,9 @@ import 'package:flutter_smart_dialog/src/helper/dialog_proxy.dart';
 import 'package:flutter_smart_dialog/src/helper/route_record.dart';
 import 'package:flutter_smart_dialog/src/util/view_utils.dart';
 
+import '../../../flutter_smart_dialog.dart';
 import '../../config/enum_config.dart';
+import '../../data/smart_tag.dart';
 
 class MonitorPopRoute with WidgetsBindingObserver {
   factory MonitorPopRoute() => instance;
@@ -20,15 +22,74 @@ class MonitorPopRoute with WidgetsBindingObserver {
 
   @override
   Future<bool> didPopRoute() async {
+    //loading
+    if (SmartDialog.config.isExistLoading) {
+      DialogProxy.instance.dismiss(
+        status: SmartStatus.loading,
+        closeType: CloseType.back,
+      );
+      return true;
+    }
+
+    //notify
+    if (SmartDialog.config.notify.isExist) {
+      var notifyQueue = DialogProxy.instance.notifyQueue;
+      for (var i = notifyQueue.length - 1; i >= 0; i--) {
+        var item = notifyQueue.elementAt(i);
+        if (item.backType == SmartBackType.normal) {
+          DialogProxy.instance.dismiss(
+            status: SmartStatus.notify,
+            closeType: CloseType.back,
+            tag: item.tag,
+          );
+          return true;
+        } else if (item.backType == SmartBackType.block) {
+          return true;
+        }
+      }
+    }
+
     // handle contain system dialog and common condition
-    if (RouteRecord.instance.handleSmartDialog()) {
+    if (handleSmartDialog()) {
       DialogProxy.instance.dismiss(
-        status: SmartStatus.smart,
+        status: SmartStatus.dialog,
         closeType: CloseType.back,
       );
       return true;
     }
 
     return super.didPopRoute();
   }
+
+  bool handleSmartDialog() {
+    bool shouldHandle = true;
+    var routeQueue = RouteRecord.instance.routeQueue;
+    try {
+      //handle dialog
+      if (DialogProxy.instance.dialogQueue.isEmpty) {
+        if (routeQueue.isNotEmpty) routeQueue.clear();
+        shouldHandle = false;
+      } else {
+        var info = DialogProxy.instance.dialogQueue.last;
+
+        //deal with system dialog
+        if (info.useSystem && routeQueue.isNotEmpty) {
+          var route = routeQueue.last;
+          if (route.settings.name != SmartTag.systemDialog) {
+            shouldHandle = false;
+          }
+        } else {
+          // deal with bindPage and permanent dialog
+          if (!info.dialog.mainDialog.visible || info.permanent) {
+            shouldHandle = false;
+          }
+        }
+      }
+    } catch (e) {
+      shouldHandle = false;
+      print('SmartDialog back event error:${e.toString()}');
+    }
+
+    return shouldHandle;
+  }
 }

lib/src/helper/route_record.dart

@@ -32,42 +32,6 @@ class RouteRecord {
     routeQueue.remove(route);
   }
 
-  bool handleSmartDialog() {
-    bool shouldHandle = true;
-    try {
-      //handle loading
-      if (SmartDialog.config.isExistLoading) {
-        return true;
-      }
-
-      //handle dialog
-      if (DialogProxy.instance.dialogQueue.isEmpty) {
-        if (routeQueue.isNotEmpty) routeQueue.clear();
-        shouldHandle = false;
-      } else {
-        var info = DialogProxy.instance.dialogQueue.last;
-
-        //deal with system dialog
-        if (info.useSystem && routeQueue.isNotEmpty) {
-          var route = routeQueue.last;
-          if (route.settings.name != SmartTag.systemDialog) {
-            shouldHandle = false;
-          }
-        } else {
-          // deal with bindPage and permanent dialog
-          if (!info.dialog.mainDialog.visible || info.permanent) {
-            shouldHandle = false;
-          }
-        }
-      }
-    } catch (e) {
-      shouldHandle = false;
-      print('SmartDialog back event error:${e.toString()}');
-    }
-
-    return shouldHandle;
-  }
-
   void _hideDialog(Route<dynamic>? curRoute) {
     if (curRoute == null || DialogProxy.instance.dialogQueue.isEmpty) return;
     for (var item in DialogProxy.instance.dialogQueue) {