Merge pull request #43 from OpenFlutter/Default-duration

Add duration param to OKToast.

Author: CaiJingLong

README.md

@@ -98,6 +98,7 @@ oktoast have default style, and you also can custom style or other behavior.
 |   animationBuilder   | OKToastAnimationBuilder | optional |              Add animation to show / hide toast.              |
 |  animationDuration   |        Duration         | optional |                  The duration of animation.                   |
 |    animationCurve    |          Curve          | optional |                      Curve of animation.                      |
+|       duration       |        Duration         | optional |                  Default duration of toast.                   |
 
 ### Method `showToast`
 

example/lib/main.dart

@@ -23,6 +23,7 @@ class MyApp extends StatelessWidget {
       animationCurve: Curves.easeIn,
       animationBuilder: Miui10AnimBuilder(),
       animationDuration: Duration(milliseconds: 200),
+      duration: Duration(seconds: 2, milliseconds: 500),
     );
   }
 }
@@ -47,7 +48,6 @@ class _MyHomePageState extends State<MyHomePage> {
     // 3.1 use showToast method
     showToast(
       "$_counter",
-      duration: Duration(seconds: 2),
       position: ToastPosition.bottom,
       backgroundColor: Colors.black.withOpacity(0.8),
       radius: 13.0,

lib/src/core/toast.dart

@@ -27,7 +27,7 @@ const _defaultDuration = Duration(
 ToastFuture showToast(
   String msg, {
   BuildContext context,
-  Duration duration = _defaultDuration,
+  Duration duration,
   ToastPosition position,
   TextStyle textStyle,
   EdgeInsetsGeometry textPadding,
@@ -43,17 +43,14 @@ ToastFuture showToast(
 }) {
   context ??= _contextMap.values.first;
 
-  textStyle ??= _ToastTheme.of(context).textStyle ?? TextStyle(fontSize: 15.0);
-
-  textAlign ??= _ToastTheme.of(context).textAlign;
-
-  textPadding ??= _ToastTheme.of(context).textPadding;
-
-  position ??= _ToastTheme.of(context).position;
-  backgroundColor ??= _ToastTheme.of(context).backgroundColor;
-  radius ??= _ToastTheme.of(context).radius;
-
-  textDirection ??= _ToastTheme.of(context).textDirection ?? TextDirection.ltr;
+  final theme = _ToastTheme.of(context);
+  textStyle ??= theme.textStyle ?? TextStyle(fontSize: 15.0);
+  textAlign ??= theme.textAlign;
+  textPadding ??= theme.textPadding;
+  position ??= theme.position;
+  backgroundColor ??= theme.backgroundColor;
+  radius ??= theme.radius;
+  textDirection ??= theme.textDirection ?? TextDirection.ltr;
 
   Widget widget = Container(
     margin: const EdgeInsets.all(50.0),
@@ -88,7 +85,7 @@ ToastFuture showToast(
 ToastFuture showToastWidget(
   Widget widget, {
   BuildContext context,
-  Duration duration = _defaultDuration,
+  Duration duration,
   ToastPosition position,
   VoidCallback onDismiss,
   bool dismissOtherToast,
@@ -109,6 +106,7 @@ ToastFuture showToastWidget(
   animationDuration ??=
       theme.animationDuration ?? const Duration(milliseconds: 250);
   animationCurve ??= theme.animationCurve ?? Curves.easeIn;
+  duration ??= theme.duration ?? _defaultDuration;
 
   final movingOnWindowChange = theme?.movingOnWindowChange ?? false;
 

lib/src/widget/oktoast.dart

@@ -34,6 +34,8 @@ class OKToast extends StatefulWidget {
   /// Whether toast can respond to click events.
   final bool handleTouth;
 
+  final Duration duration;
+
   /// The animation builder of show/hide toast.
   final OKToastAnimationBuilder animationBuilder;
 
@@ -59,6 +61,7 @@ class OKToast extends StatefulWidget {
     this.animationBuilder,
     this.animationDuration = const Duration(milliseconds: 250),
     this.animationCurve,
+    this.duration,
   })  : this.backgroundColor = backgroundColor ?? const Color(0xDD000000),
         super(key: key);
 
@@ -130,6 +133,7 @@ class _OKToastState extends State<OKToast> {
       animationBuilder: widget.animationBuilder,
       animationDuration: widget.animationDuration,
       animationCurve: widget.animationCurve,
+      duration: widget.duration,
     );
   }
 }

lib/src/widget/theme.dart

@@ -27,6 +27,8 @@ class _ToastTheme extends InheritedWidget {
 
   final Curve animationCurve;
 
+  final Duration duration;
+
   @override
   bool updateShouldNotify(InheritedWidget oldWidget) => true;
 
@@ -45,6 +47,7 @@ class _ToastTheme extends InheritedWidget {
     this.animationBuilder,
     this.animationDuration,
     this.animationCurve,
+    this.duration,
   })  : textDirection = textDirection ?? TextDirection.ltr,
         super(child: child);