update v2.1.3 (fixed: #64)

Author: nslogx

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [2.1.3] - 2020.11.13
+
+* fixed [#64](https://github.com/huangjianke/flutter_easyloading/issues/64)
+
 ## [2.1.2] - 2020.11.12
 
 * fixed [#63](https://github.com/huangjianke/flutter_easyloading/issues/63)

README-zh_CN.md

@@ -16,7 +16,7 @@
 
 ```yaml
 dependencies:
-  flutter_easyloading: ^2.1.2
+  flutter_easyloading: ^2.1.3
 ```
 
 ## 导入

README.md

@@ -16,7 +16,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yaml
 dependencies:
-  flutter_easyloading: ^2.1.2
+  flutter_easyloading: ^2.1.3
 ```
 
 ## Import

example/ios/Flutter/.last_build_id

@@ -1 +1 @@
-967974c66177fcaca35ee5d47917254d
+01bf2686737ec64d54f08c343d12afd2

example/lib/test.dart

@@ -29,12 +29,12 @@ class _TestPageState extends State<TestPage> {
 
   void loadData() async {
     try {
-      EasyLoading.show();
+      await EasyLoading.show();
       Response response = await Dio().get('https://github.com');
       print(response);
-      EasyLoading.dismiss();
+      await EasyLoading.dismiss();
     } catch (e) {
-      EasyLoading.showError(e.toString());
+      await EasyLoading.showError(e.toString());
       print(e);
     }
   }

lib/src/easy_loading.dart

@@ -468,9 +468,7 @@ class EasyLoading {
       completer: completer,
     );
     completer.future.whenComplete(() {
-      for (final EasyLoadingStatusCallback callback in _statusCallbacks) {
-        if (callback != null) callback(EasyLoadingStatus.show);
-      }
+      _callback(EasyLoadingStatus.show);
       if (duration != null) {
         _cancelTimer();
         _timer = Timer.periodic(duration, (timer) async {
@@ -483,11 +481,13 @@ class EasyLoading {
     return completer.future;
   }
 
-  Future<void> _dismiss(bool animation) {
+  Future<void> _dismiss(bool animation) async {
+    if (key != null && key.currentState == null) {
+      _reset();
+      return;
+    }
+
     return key?.currentState?.dismiss(animation)?.whenComplete(() {
-      for (final EasyLoadingStatusCallback callback in _statusCallbacks) {
-        if (callback != null) callback(EasyLoadingStatus.dismiss);
-      }
       _reset();
     });
   }
@@ -498,6 +498,13 @@ class EasyLoading {
     _progressKey = null;
     _cancelTimer();
     _markNeedsBuild();
+    _callback(EasyLoadingStatus.dismiss);
+  }
+
+  void _callback(EasyLoadingStatus status) {
+    for (final EasyLoadingStatusCallback callback in _statusCallbacks) {
+      if (callback != null) callback(status);
+    }
   }
 
   void _markNeedsBuild() {