update version 1.3.0

Author: nslogx

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.3.0] - 2020.09.24
+
+* fixed bugs
+
 ## [1.2.1] - 2020.09.22
 
 * add indicatorWidget option [#45](https://github.com/huangjianke/flutter_easyloading/issues/45)

README-zh_CN.md

@@ -12,7 +12,7 @@
 
 ```yaml
 dependencies:
-  flutter_easyloading: ^1.2.1
+  flutter_easyloading: ^1.3.0
 ```
 
 ## 导入
@@ -23,7 +23,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
 
 ## 如何使用
 
-首先, 使用 `FlutterEasyLoading` 组件包裹您的App组件:
+首先, 在`MaterialApp`/`CupertinoApp`中初始化`FlutterEasyLoading`:
 
 ```dart
 class MyApp extends StatelessWidget {
@@ -34,11 +34,10 @@ class MyApp extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
+      home: MyHomePage(title: 'Flutter EasyLoading'),
       builder: (BuildContext context, Widget child) {
         /// 确保 loading 组件能覆盖在其他组件之上.
-        return FlutterEasyLoading(
-          child: MyHomePage(title: 'Flutter EasyLoading'),
-        );
+        return FlutterEasyLoading(child: child);
       },
     );
   }
@@ -142,14 +141,6 @@ Widget infoWidget;
 
 - **`maskColor` 仅对 `EasyLoadingMaskType.custom`有效。**
 
-- **如果你想在 `initState` 方法里面使用 `EasyLoading`, 你应该这样做:**
-  ```dart
-  /// 帧绘制完成回调通知
-  WidgetsBinding.instance.addPostFrameCallback((_) {
-    EasyLoading.showSuccess('Great Success!');
-  });
-  ```
-
 因为 `EasyLoading` 是一个全局单例, 所以你可以在任意一个地方自定义它的样式:
 
 ```dart

README.md

@@ -12,7 +12,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yaml
 dependencies:
-  flutter_easyloading: ^1.2.1
+  flutter_easyloading: ^1.3.0
 ```
 
 ## Import
@@ -23,22 +23,22 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
 
 ## How to use
 
-First, warp your app widget with `FlutterEasyLoading`:
+First, initialize `FlutterEasyLoading` in `MaterialApp`/`CupertinoApp`:
 
 ```dart
 class MyApp extends StatelessWidget {
+  // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Flutter EasyLoading',
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
+      home: MyHomePage(title: 'Flutter EasyLoading'),
       builder: (BuildContext context, Widget child) {
         /// make sure that loading can be displayed in front of all other widgets
-        return FlutterEasyLoading(
-          child: MyHomePage(title: 'Flutter EasyLoading'),
-        );
+        return FlutterEasyLoading(child: child);
       },
     );
   }
@@ -142,13 +142,6 @@ Widget infoWidget;
 
 - **`maskColor` only used for `EasyLoadingMaskType.custom`.**
 
-- **if you want use `EasyLoading` in `initState` method, you should do like this:**
-  ```dart
-  /// Schedule a callback for the end of this frame
-  WidgetsBinding.instance.addPostFrameCallback((_) {
-    EasyLoading.showSuccess('Great Success!');
-  });
-  ```
 
 Because of `EasyLoading` is a singleton, so you can custom loading style any where like this:
 

example/ios/Runner.xcodeproj/project.pbxproj

@@ -9,10 +9,6 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
-		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
-		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
 		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -27,8 +23,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
-				9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -39,13 +33,11 @@
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -59,8 +51,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
-				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -70,9 +60,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
-				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
 				9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -204,7 +192,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;

example/lib/main.dart

@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 
+import './test.dart';
+
 void main() {
   runApp(MyApp());
   configLoading();
@@ -33,10 +35,10 @@ class MyApp extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
+      home: MyHomePage(title: 'Flutter EasyLoading'),
       builder: (BuildContext context, Widget child) {
-        return FlutterEasyLoading(
-          child: MyHomePage(title: 'Flutter EasyLoading'),
-        );
+        /// make sure that loading can be displayed in front of all other widgets
+        return FlutterEasyLoading(child: child);
       },
     );
   }
@@ -58,11 +60,7 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   void initState() {
     super.initState();
-
-    /// Schedule a callback for the end of this frame
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      EasyLoading.showSuccess('Use in initState!');
-    });
+    EasyLoading.showSuccess('Use in initState');
   }
 
   @override
@@ -78,9 +76,22 @@ class _MyHomePageState extends State<MyHomePage> {
             crossAxisAlignment: CrossAxisAlignment.center,
             mainAxisAlignment: MainAxisAlignment.start,
             children: <Widget>[
-              TextField(),
               Column(
                 children: <Widget>[
+                  TextField(),
+                  FlatButton(
+                    textColor: Colors.blue,
+                    child: Text('push test page'),
+                    onPressed: () {
+                      _timer?.cancel();
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (BuildContext context) => TestPage(),
+                        ),
+                      );
+                    },
+                  ),
                   FlatButton(
                     textColor: Colors.blue,
                     child: Text('dismiss'),

example/lib/test.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+
+class TestPage extends StatefulWidget {
+  @override
+  _TestPageState createState() => _TestPageState();
+}
+
+class _TestPageState extends State<TestPage> {
+  @override
+  void initState() {
+    super.initState();
+    EasyLoading.showSuccess('Use in initState');
+  }
+
+  @override
+  void deactivate() {
+    super.deactivate();
+    EasyLoading.dismiss();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Test Page'),
+      ),
+      body: Center(
+        child: FlatButton(
+          textColor: Colors.blue,
+          child: Text('async show'),
+          onPressed: () async {
+            await Future.delayed(Duration(seconds: 2));
+            EasyLoading.show(status: 'loading...');
+            await Future.delayed(Duration(seconds: 5));
+            EasyLoading.dismiss();
+          },
+        ),
+      ),
+    );
+  }
+}

example/pubspec.lock

@@ -75,7 +75,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.2.1"
+    version: "1.3.0"
   flutter_spinkit:
     dependency: transitive
     description: