update v2.1.2 (#63)

Author: nslogx

CHANGELOG.md

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

README-zh_CN.md

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

README.md

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

example/pubspec.lock

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

lib/src/theme.dart

@@ -141,13 +141,12 @@ class EasyLoadingTheme {
   /// radius of loading
   static double get radius => EasyLoading.instance.radius;
 
-  static bool ignoring(bool dismissOnTap) {
-    bool dismiss = dismissOnTap ?? (EasyLoading.instance.dismissOnTap ?? false);
-    return dismiss
-        ? false
-        : (EasyLoading.instance.userInteractions ??
-            (EasyLoading.instance.maskType == EasyLoadingMaskType.none
-                ? true
-                : false));
+  /// should dismiss on user tap
+  static bool get dismissOnTap => EasyLoading.instance.dismissOnTap;
+
+  static bool ignoring(EasyLoadingMaskType maskType) {
+    EasyLoadingMaskType type = maskType ?? EasyLoading.instance.maskType;
+    return EasyLoading.instance.userInteractions ??
+        (type == EasyLoadingMaskType.none ? true : false);
   }
 }

lib/src/widgets/container.dart

@@ -55,7 +55,11 @@ class EasyLoadingContainer extends StatefulWidget {
 class EasyLoadingContainerState extends State<EasyLoadingContainer>
     with SingleTickerProviderStateMixin {
   String _status;
+  AlignmentGeometry _alignment;
+  bool _dismissOnTap, _ignoring;
+  Color _maskColor;
   AnimationController _animationController;
+
   bool get isPersistentCallbacks =>
       SchedulerBinding.instance.schedulerPhase ==
       SchedulerPhase.persistentCallbacks;
@@ -65,6 +69,14 @@ class EasyLoadingContainerState extends State<EasyLoadingContainer>
     super.initState();
     if (!mounted) return;
     _status = widget.status;
+    _alignment = (widget.indicator == null && widget.status?.isNotEmpty == true)
+        ? EasyLoadingTheme.alignment(widget.toastPosition)
+        : AlignmentDirectional.center;
+    _dismissOnTap =
+        widget.dismissOnTap ?? (EasyLoadingTheme.dismissOnTap ?? false);
+    _ignoring =
+        _dismissOnTap ? false : EasyLoadingTheme.ignoring(widget.maskType);
+    _maskColor = EasyLoadingTheme.maskColor(widget.maskType);
     _animationController = AnimationController(
       vsync: this,
       duration: EasyLoadingTheme.animationDuration,
@@ -113,12 +125,12 @@ class EasyLoadingContainerState extends State<EasyLoadingContainer>
     });
   }
 
+  void _onTap() async {
+    if (_dismissOnTap) await EasyLoading.dismiss();
+  }
+
   @override
   Widget build(BuildContext context) {
-    AlignmentGeometry _alignment =
-        (widget.indicator == null && widget.status?.isNotEmpty == true)
-            ? EasyLoadingTheme.alignment(widget.toastPosition)
-            : AlignmentDirectional.center;
     return Stack(
       alignment: _alignment,
       children: <Widget>[
@@ -128,16 +140,22 @@ class EasyLoadingContainerState extends State<EasyLoadingContainer>
             return Opacity(
               opacity: _animationController?.value ?? 0,
               child: IgnorePointer(
-                ignoring: EasyLoadingTheme.ignoring(widget.dismissOnTap),
-                child: GestureDetector(
-                  onTap: () async => await EasyLoading.dismiss(),
-                  behavior: HitTestBehavior.opaque,
-                  child: Container(
-                    width: double.infinity,
-                    height: double.infinity,
-                    color: EasyLoadingTheme.maskColor(widget.maskType),
-                  ),
-                ),
+                ignoring: _ignoring,
+                child: _dismissOnTap
+                    ? GestureDetector(
+                        onTap: _onTap,
+                        behavior: HitTestBehavior.translucent,
+                        child: Container(
+                          width: double.infinity,
+                          height: double.infinity,
+                          color: _maskColor,
+                        ),
+                      )
+                    : Container(
+                        width: double.infinity,
+                        height: double.infinity,
+                        color: _maskColor,
+                      ),
               ),
             );
           },

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_easyloading
 description: ✨A clean and lightweight loading/toast widget for Flutter, easy to use without context, support iOS、Android and Web
-version: 2.1.1
+version: 2.1.2
 homepage: https://github.com/huangjianke/flutter_easyloading
 
 environment: