update version 1.2.0

Author: nslogx

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.2.0] - 2020.09.16
+
+* add textStyle option [#34](https://github.com/huangjianke/flutter_easyloading/issues/34)
+* fixed bugs
+
 ## [1.1.4] - 2020.03.23
 
 * add lineWidth option [#9](https://github.com/huangjianke/flutter_easyloading/issues/9)

README-zh_CN.md

@@ -12,7 +12,7 @@
 
 ```yaml
 dependencies:
-  flutter_easyloading: ^1.1.3
+  flutter_easyloading: ^1.2.0
 ```
 
 ## 导入
@@ -78,6 +78,9 @@ EasyLoadingMaskType maskType;
 /// 文本的对齐方式 , 默认[TextAlign.center].
 TextAlign textAlign;
 
+/// 文本的样式 , 默认 null.
+TextStyle textStyle;
+
 /// loading内容区域的内边距.
 EdgeInsets contentPadding;
 

README.md

@@ -12,7 +12,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yaml
 dependencies:
-  flutter_easyloading: ^1.1.3
+  flutter_easyloading: ^1.2.0
 ```
 
 ## Import
@@ -78,6 +78,9 @@ EasyLoadingMaskType maskType;
 /// textAlign of status, default [TextAlign.center].
 TextAlign textAlign;
 
+/// textStyle of status, default null.
+TextStyle textStyle;
+
 /// content padding of loading.
 EdgeInsets contentPadding;
 

example/pubspec.lock

@@ -5,63 +5,63 @@ packages:
     dependency: transitive
     description:
       name: archive
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.11"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.4.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.5"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.14.11"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.3"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.3"
   flutter:
@@ -75,14 +75,14 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.1.1"
+    version: "1.2.0"
   flutter_spinkit:
     dependency: transitive
     description:
       name: flutter_spinkit
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.1.2"
+    version: "4.1.2+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -92,49 +92,49 @@ packages:
     dependency: transitive
     description:
       name: image
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.6"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.8"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.4.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   sky_engine:
@@ -146,63 +146,63 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.5.5"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.5"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.11"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.5.0"
 sdks:

lib/src/easy_loading.dart

@@ -1,10 +1,10 @@
-import 'package:flutter/material.dart';
 import 'dart:async';
+import 'package:flutter/material.dart';
 
 import './widgets/container.dart';
 import './widgets/progress.dart';
 import './widgets/indicator.dart';
-import 'theme.dart';
+import './theme.dart';
 
 /// loading style
 enum EasyLoadingStyle {
@@ -65,6 +65,9 @@ class EasyLoading {
   /// textAlign of status, default [TextAlign.center].
   TextAlign textAlign;
 
+  /// textStyle of status, default null.
+  TextStyle textStyle;
+
   /// content padding of loading.
   EdgeInsets contentPadding;
 

lib/src/theme.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-
-import 'easy_loading.dart';
+import './easy_loading.dart';
 
 class EasyLoadingTheme {
   /// color of indicator
@@ -71,6 +70,9 @@ class EasyLoadingTheme {
   /// textAlign of status
   static TextAlign get textAlign => EasyLoading.instance.textAlign;
 
+  /// textStyle of status
+  static TextStyle get textStyle => EasyLoading.instance.textStyle;
+
   /// radius of loading
   static double get radius => EasyLoading.instance.radius;
 

lib/src/widgets/container.dart

@@ -1,5 +1,5 @@
-import 'package:flutter/material.dart';
 import 'dart:async';
+import 'package:flutter/material.dart';
 
 import '../theme.dart';
 
@@ -95,10 +95,11 @@ class LoadingContainerState extends State<LoadingContainer> {
             _status?.isNotEmpty == true
                 ? Text(
                     _status,
-                    style: TextStyle(
-                      color: EasyLoadingTheme.textColor,
-                      fontSize: EasyLoadingTheme.fontSize,
-                    ),
+                    style: EasyLoadingTheme.textStyle ??
+                        TextStyle(
+                          color: EasyLoadingTheme.textColor,
+                          fontSize: EasyLoadingTheme.fontSize,
+                        ),
                     textAlign: EasyLoadingTheme.textAlign,
                   )
                 : null,

lib/src/widgets/loading.dart

@@ -31,18 +31,20 @@ class _FlutterEasyLoadingState extends State<FlutterEasyLoading> {
 
   @override
   Widget build(BuildContext context) {
-    return Directionality(
-      child: Overlay(
-        initialEntries: [
-          OverlayEntry(
-            builder: (BuildContext _context) {
-              EasyLoading.instance.context = _context;
-              return widget.child;
-            },
-          ),
-        ],
+    return Material(
+      child: Directionality(
+        child: Overlay(
+          initialEntries: [
+            OverlayEntry(
+              builder: (BuildContext _context) {
+                EasyLoading.instance.context = _context;
+                return widget.child;
+              },
+            ),
+          ],
+        ),
+        textDirection: widget.textDirection,
       ),
-      textDirection: widget.textDirection,
     );
   }
 }

lib/src/widgets/progress.dart

@@ -1,6 +1,5 @@
-import 'package:flutter/material.dart';
 import 'dart:math' as math;
-
+import 'package:flutter/material.dart';
 import '../theme.dart';
 
 class Progress extends StatefulWidget {