Merge pull request #92 from MMMzq/dev

Dev

Author: MMMzq

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.0.5]
+* fix: cancel the use of `nullOk` attribute  
+
+* feat: optimize `toast` display sequence logic 
+
+* feat: add options for users to style titles
+
 ## [3.0.4]
 * fix:  The bug that `ProxyDispose.disposeCallback` callback cannot be triggered
 

README.md

@@ -51,7 +51,7 @@ Loading|Text|CustomWidget
 #### 1. add dependencies into you project pubspec.yaml file
 ``` dart
 dependencies:
-     bot_toast: ^3.0.4
+     bot_toast: ^3.0.5
 ```
 
 #### 2. import BotToast lib

README_zh.md

@@ -55,7 +55,7 @@ Loading|Text|CustomWidget
 #### 1. pubspec.yaml文件里添加依赖
 ``` dart
 dependencies:
-     bot_toast: ^3.0.4
+     bot_toast: ^3.0.5
 ```
 
 #### 2. 导入BotToast库

lib/src/bot_toast_manager.dart

@@ -18,14 +18,31 @@ class BotToastManager extends StatefulWidget {
   BotToastManagerState createState() => BotToastManagerState();
 }
 
+class _IndexWidget extends StatelessWidget {
+  final Widget child;
+
+  final int index;
+
+  const _IndexWidget({Key key, this.child, this.index}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return child;
+  }
+}
+
 class BotToastManagerState extends State<BotToastManager> {
-  final Map<String, Map<UniqueKey, Widget>> _map = {};
+  final Map<String, Map<UniqueKey, _IndexWidget>> _map = {};
 
   final Set<UniqueKey> _pending = Set<UniqueKey>();
 
-  List<Widget> get _children => _map.values.fold([], (value, items) {
+  int _nextAddIndex = 0;
+
+  List<_IndexWidget> get _children =>
+      _map.values.fold<List<_IndexWidget>>(<_IndexWidget>[], (value, items) {
         return value..addAll(items.values);
-      });
+      })
+        ..sort((a, b) => a.index.compareTo(b.index));
 
   void insert(String groupKey, UniqueKey key, Widget widget) {
     safeRun(() {
@@ -40,13 +57,16 @@ class BotToastManagerState extends State<BotToastManager> {
       );
 
       widget = ProxyDispose(
-        key: uniqueKey,
         child: widget,
         disposeCallback: () {
           _map[groupKey]?.remove(key);
         },
       );
-      _map[groupKey][key] = widget;
+      _map[groupKey][key] = _IndexWidget(
+        key: uniqueKey,
+        index: ++_nextAddIndex,
+        child: widget,
+      );
       _pending.add(key);
       _update();
     });

lib/src/keyboard_safe_area.dart

@@ -13,10 +13,9 @@ class KeyboardSafeArea extends StatelessWidget {
     if (!enable) {
       return child;
     }
-    MediaQueryData data = MediaQuery.of(context, nullOk: true);
+    MediaQueryData data = MediaQuery.of(context);
     return Padding(
-      padding: EdgeInsets.only(
-          bottom: (data != null ? data.viewInsets.bottom : 0.0)),
+      padding: EdgeInsets.only(bottom: data.viewInsets.bottom),
       child: child,
     );
   }

lib/src/toast.dart

@@ -114,7 +114,7 @@ class BotToast {
         title: (_) => Text(title, style: titleStyle),
         subtitle: subTitle == null
             ? null
-            : (_) => Text(subTitle, style: subTitleStyle ?? titleStyle),
+            : (_) => Text(subTitle, style: subTitleStyle),
         trailing: hideCloseButton
             ? null
             : (cancel) => IconButton(

lib/src/toast_widget/animation.dart

@@ -16,15 +16,15 @@ Widget textAnimation(
       child: child,
     );
 
-Widget loadingAnimation(AnimationController controller, CancelFunc cancelFunc,
-    Widget child) =>
+Widget loadingAnimation(
+        AnimationController controller, CancelFunc cancelFunc, Widget child) =>
     FadeAnimation(
       controller: controller,
       child: child,
     );
 
-Widget attachedAnimation(AnimationController controller, CancelFunc cancelFunc,
-    Widget child) =>
+Widget attachedAnimation(
+        AnimationController controller, CancelFunc cancelFunc, Widget child) =>
     FadeAnimation(
       controller: controller,
       child: child,

lib/src/toast_widget/attached.dart

@@ -117,15 +117,19 @@ Offset positionToastBox(
       case "Left":
         direction += canPlaceRight(extraSpace: targetRect.width)
             ? "Left"
-            : canPlaceLeft(extraSpace: targetRect.width) ? "Right" : "Center";
+            : canPlaceLeft(extraSpace: targetRect.width)
+                ? "Right"
+                : "Center";
         break;
       case "Center":
         direction += "Center";
         break;
       case "Right":
         direction += canPlaceLeft(extraSpace: targetRect.width)
             ? "Right"
-            : canPlaceRight(extraSpace: targetRect.width) ? "Left" : "Center";
+            : canPlaceRight(extraSpace: targetRect.width)
+                ? "Left"
+                : "Center";
         break;
     }
   } else {
@@ -135,15 +139,19 @@ Offset positionToastBox(
       case "Top":
         direction += canPlaceBottom(extraSpace: targetRect.height)
             ? "Top"
-            : canPlaceTop(extraSpace: targetRect.height) ? "Bottom" : "Center";
+            : canPlaceTop(extraSpace: targetRect.height)
+                ? "Bottom"
+                : "Center";
         break;
       case "Center":
         direction += "Center";
         break;
       case "Bottom":
         direction += canPlaceTop(extraSpace: targetRect.height)
             ? "Bottom"
-            : canPlaceBottom(extraSpace: targetRect.height) ? "Top" : "Center";
+            : canPlaceBottom(extraSpace: targetRect.height)
+                ? "Top"
+                : "Center";
         break;
     }
   }

pubspec.yaml

@@ -3,7 +3,7 @@ description: A really easy to use flutter toast library.Easy to use and feature
 homepage: https://github.com/MMMzq/bot_toast
 email: vivask770@163.com
 
-version: 3.0.4
+version: 3.0.5
 
 environment:
   sdk: ">=2.1.0 <3.0.0"