update version 2.0.0

Author: nslogx

example/lib/main.dart

@@ -110,21 +110,13 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                   FlatButton(
                     textColor: Colors.blue,
-                    child: Text('showProgress'),
+                    child: Text('showToast'),
                     onPressed: () {
-                      _progress = 0;
                       _timer?.cancel();
-                      _timer = Timer.periodic(const Duration(milliseconds: 100),
-                          (Timer timer) {
-                        EasyLoading.showProgress(_progress,
-                            status: '${(_progress * 100).toStringAsFixed(0)}%');
-                        _progress += 0.03;
-
-                        if (_progress >= 1) {
-                          _timer?.cancel();
-                          EasyLoading.dismiss();
-                        }
-                      });
+                      EasyLoading.showToast(
+                        'Toast',
+                        toastPosition: EasyLoadingToastPosition.top,
+                      );
                     },
                   ),
                   FlatButton(
@@ -153,10 +145,21 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
                   FlatButton(
                     textColor: Colors.blue,
-                    child: Text('showToast'),
+                    child: Text('showProgress'),
                     onPressed: () {
+                      _progress = 0;
                       _timer?.cancel();
-                      EasyLoading.showToast('Toast');
+                      _timer = Timer.periodic(const Duration(milliseconds: 100),
+                          (Timer timer) {
+                        EasyLoading.showProgress(_progress,
+                            status: '${(_progress * 100).toStringAsFixed(0)}%');
+                        _progress += 0.03;
+
+                        if (_progress >= 1) {
+                          _timer?.cancel();
+                          EasyLoading.dismiss();
+                        }
+                      });
                     },
                   ),
                 ],
@@ -228,7 +231,10 @@ class _MyHomePageState extends State<MyHomePage> {
                 ),
               ),
               Padding(
-                padding: EdgeInsets.only(top: 20.0),
+                padding: EdgeInsets.only(
+                  top: 20.0,
+                  bottom: 50.0,
+                ),
                 child: Column(
                   children: <Widget>[
                     Text('IndicatorType(total: 23)'),

lib/src/animations/animation_builder.dart

@@ -0,0 +1,24 @@
+import 'package:flutter/widgets.dart';
+
+typedef Widget OKToastAnimationBuilder(
+  BuildContext context,
+  Widget child,
+  AnimationController controller,
+  double percent,
+);
+
+abstract class BaseAnimationBuilder {
+  BaseAnimationBuilder();
+
+  Widget call(
+    BuildContext context,
+    Widget child,
+    AnimationController controller,
+    double percent,
+  ) {
+    return buildWidget(context, child, controller, percent);
+  }
+
+  Widget buildWidget(BuildContext context, Widget child,
+      AnimationController controller, double percent);
+}

lib/src/easy_loading.dart

@@ -14,6 +14,25 @@ enum EasyLoadingStyle {
   custom,
 }
 
+/// toast position
+enum EasyLoadingToastPosition {
+  top,
+  center,
+  bottom,
+}
+
+/// loading mask type
+/// [none] default mask type, allow user interactions while loading is displayed
+/// [clear] don't allow user interactions while loading is displayed
+/// [black] don't allow user interactions while loading is displayed
+/// [custom] while mask type is custom, maskColor should not be null
+enum EasyLoadingMaskType {
+  none,
+  clear,
+  black,
+  custom,
+}
+
 /// loading indicator type. see [https://github.com/jogboms/flutter_spinkit#-showcase]
 enum EasyLoadingIndicatorType {
   fadingCircle,
@@ -41,18 +60,6 @@ enum EasyLoadingIndicatorType {
   squareCircle,
 }
 
-/// loading mask type
-/// [none] default mask type, allow user interactions while loading is displayed
-/// [clear] don't allow user interactions while loading is displayed
-/// [black] don't allow user interactions while loading is displayed
-/// [custom] while mask type is custom, maskColor should not be null
-enum EasyLoadingMaskType {
-  none,
-  clear,
-  black,
-  custom,
-}
-
 class EasyLoading {
   /// loading style, default [EasyLoadingStyle.dark].
   EasyLoadingStyle loadingStyle;
@@ -63,6 +70,9 @@ class EasyLoading {
   /// loading mask type, default [EasyLoadingMaskType.none].
   EasyLoadingMaskType maskType;
 
+  /// toast position, default [EasyLoadingToastPosition.center].
+  EasyLoadingToastPosition toastPosition;
+
   /// textAlign of status, default [TextAlign.center].
   TextAlign textAlign;
 
@@ -126,13 +136,13 @@ class EasyLoading {
   OverlayEntry overlayEntry;
   Widget _w;
 
-  GlobalKey<LoadingContainerState> _key;
-  GlobalKey<ProgressState> _progressKey;
+  GlobalKey<EasyLoadingContainerState> _key;
+  GlobalKey<EasyLoadingProgressState> _progressKey;
   Timer _timer;
 
   Widget get w => _w;
-  GlobalKey<LoadingContainerState> get key => _key;
-  GlobalKey<ProgressState> get progressKey => _progressKey;
+  GlobalKey<EasyLoadingContainerState> get key => _key;
+  GlobalKey<EasyLoadingProgressState> get progressKey => _progressKey;
   Timer get timer => _timer;
 
   factory EasyLoading() => _getInstance();
@@ -189,8 +199,9 @@ class EasyLoading {
       'progress value should be 0.0 ~ 1.0',
     );
     if (_getInstance()._progressKey == null || _getInstance().w == null) {
-      GlobalKey<ProgressState> _progressKey = GlobalKey<ProgressState>();
-      Widget w = Progress(
+      GlobalKey<EasyLoadingProgressState> _progressKey =
+          GlobalKey<EasyLoadingProgressState>();
+      Widget w = EasyLoadingProgress(
         key: _progressKey,
         value: value,
       );
@@ -265,10 +276,12 @@ class EasyLoading {
   static void showToast(
     String status, {
     Duration duration,
+    EasyLoadingToastPosition toastPosition,
   }) {
     _getInstance()._show(
       status: status,
       duration: duration ?? EasyLoadingTheme.displayDuration,
+      toastPosition: toastPosition ?? EasyLoadingTheme.toastPosition,
     );
   }
 
@@ -293,12 +306,18 @@ class EasyLoading {
     Widget w,
     String status,
     Duration duration,
+    EasyLoadingToastPosition toastPosition = EasyLoadingToastPosition.center,
   }) {
     assert(
       _getInstance().overlayEntry != null,
       'overlayEntry should not be null',
     );
 
+    assert(
+      toastPosition != null,
+      'toastPosition should not be null',
+    );
+
     if (_getInstance().loadingStyle == EasyLoadingStyle.custom) {
       assert(
         _getInstance().backgroundColor != null,
@@ -328,12 +347,14 @@ class EasyLoading {
     _cancelTimer();
     _getInstance()._progressKey = null;
 
-    GlobalKey<LoadingContainerState> _key = GlobalKey<LoadingContainerState>();
-    _getInstance()._w = LoadingContainer(
+    GlobalKey<EasyLoadingContainerState> _key =
+        GlobalKey<EasyLoadingContainerState>();
+    _getInstance()._w = EasyLoadingContainer(
       key: _key,
       status: status,
       indicator: w,
       animation: _getInstance()._w == null,
+      toastPosition: toastPosition,
     );
     _markNeedsBuild();
     _getInstance()._key = _key;
@@ -346,11 +367,11 @@ class EasyLoading {
 
   void _dismiss(bool animation) {
     if (animation) {
-      LoadingContainerState loadingContainerState =
+      EasyLoadingContainerState easyLoadingContainerState =
           _getInstance().key?.currentState;
-      if (loadingContainerState != null) {
+      if (easyLoadingContainerState != null) {
         final Completer<void> completer = Completer<void>();
-        loadingContainerState.dismiss(completer);
+        easyLoadingContainerState.dismiss(completer);
         completer.future.then((value) {
           _reset();
         });

lib/src/theme.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import './easy_loading.dart';
 
 class EasyLoadingTheme {
@@ -58,6 +59,18 @@ class EasyLoadingTheme {
   static EasyLoadingIndicatorType get indicatorType =>
       EasyLoading.instance.indicatorType;
 
+  /// toast position
+  static EasyLoadingToastPosition get toastPosition =>
+      EasyLoading.instance.toastPosition;
+
+  /// toast position
+  static AlignmentGeometry alignment(EasyLoadingToastPosition position) =>
+      position == EasyLoadingToastPosition.bottom
+          ? AlignmentDirectional.bottomCenter
+          : (position == EasyLoadingToastPosition.top
+              ? AlignmentDirectional.topCenter
+              : AlignmentDirectional.center);
+
   /// display duration
   static Duration get displayDuration => EasyLoading.instance.displayDuration;