TickerProvider -> Singletickerprovider (#124)

* changes made to fade (#119) * changes made in rotate (#119) * changes made in scale (#119) * TickerProvider->SingleTickerProvider (fade)(#119)
aagarwal1012 · Oct 13, 2020 · 28ab296 · 28ab296
1 parent cb43a4d
commit 28ab296
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 82 deletions.
diff --git a/lib/src/fade.dart b/lib/src/fade.dart
@@ -99,7 +99,7 @@ class FadeAnimatedTextKit extends StatefulWidget {
 }
 
 class _FadeTextState extends State<FadeAnimatedTextKit>
-    with TickerProviderStateMixin {
+    with SingleTickerProviderStateMixin {
   Animation _fadeIn, _fadeOut;
 
   AnimationController _controller;
@@ -135,6 +135,7 @@ class _FadeTextState extends State<FadeAnimatedTextKit>
       _texts.add({'text': text, 'pause': _pause});
     });
 
+    _initAnimation();
     _nextAnimation();
   }
 
@@ -171,6 +172,22 @@ class _FadeTextState extends State<FadeAnimatedTextKit>
     );
   }
 
+  void _initAnimation() {
+    _controller = AnimationController(
+      duration: _duration,
+      vsync: this,
+    );
+
+    _fadeIn = Tween<double>(begin: 0.0, end: 1.0).animate(CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(0.0, 0.5, curve: Curves.linear)));
+
+    _fadeOut = Tween<double>(begin: 1.0, end: 0.0).animate(CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(0.8, 1.0, curve: Curves.linear)))
+      ..addStatusListener(_animationEndCallback);
+  }
+
   void _nextAnimation() {
     final bool isLast = _index == widget.text.length - 1;
 
@@ -199,21 +216,7 @@ class _FadeTextState extends State<FadeAnimatedTextKit>
 
     if (mounted) setState(() {});
 
-    _controller = AnimationController(
-      duration: _duration,
-      vsync: this,
-    );
-
-    _fadeIn = Tween<double>(begin: 0.0, end: 1.0).animate(CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.0, 0.5, curve: Curves.linear)));
-
-    _fadeOut = Tween<double>(begin: 1.0, end: 0.0).animate(CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.8, 1.0, curve: Curves.linear)))
-      ..addStatusListener(_animationEndCallback);
-
-    _controller.forward();
+    _controller.forward(from: 0.0);
   }
 
   void _setPause() {

diff --git a/lib/src/rotate.dart b/lib/src/rotate.dart
@@ -98,7 +98,7 @@ class RotateAnimatedTextKit extends StatefulWidget {
 }
 
 class _RotatingTextState extends State<RotateAnimatedTextKit>
-    with TickerProviderStateMixin {
+    with SingleTickerProviderStateMixin {
   AnimationController _controller;
 
   double _transitionHeight;
@@ -137,6 +137,7 @@ class _RotatingTextState extends State<RotateAnimatedTextKit>
       _texts.add({'text': text, 'pause': _pause});
     });
 
+    _initAnimation();
     _nextAnimation();
   }
 
@@ -179,40 +180,7 @@ class _RotatingTextState extends State<RotateAnimatedTextKit>
     );
   }
 
-  void _nextAnimation() {
-    final bool isLast = _index == widget.text.length - 1;
-
-    _isCurrentlyPausing = false;
-
-    // Handling onNext callback
-    if (_index > -1) {
-      widget.onNext?.call(_index, isLast);
-    }
-
-    if (isLast) {
-      if (widget.isRepeatingAnimation &&
-          (widget.repeatForever ||
-              _currentRepeatCount != (widget.totalRepeatCount - 1))) {
-        _index = 0;
-        if (!widget.repeatForever) {
-          _currentRepeatCount++;
-        }
-      } else {
-        widget.onFinished?.call();
-        return;
-      }
-    } else {
-      _index++;
-    }
-
-    if (mounted) setState(() {});
-
-    if (widget.transitionHeight == null) {
-      _transitionHeight = widget.textStyle.fontSize * 10 / 3;
-    } else {
-      _transitionHeight = widget.transitionHeight;
-    }
-
+  void _initAnimation() {
     _controller = AnimationController(
       duration: _duration,
       vsync: this,
@@ -253,8 +221,43 @@ class _RotatingTextState extends State<RotateAnimatedTextKit>
         parent: _controller,
         curve: const Interval(0.7, 1.0, curve: Curves.easeIn)))
       ..addStatusListener(_animationEndCallback);
+  }
+
+  void _nextAnimation() {
+    final bool isLast = _index == widget.text.length - 1;
+
+    _isCurrentlyPausing = false;
+
+    // Handling onNext callback
+    if (_index > -1) {
+      widget.onNext?.call(_index, isLast);
+    }
+
+    if (isLast) {
+      if (widget.isRepeatingAnimation &&
+          (widget.repeatForever ||
+              _currentRepeatCount != (widget.totalRepeatCount - 1))) {
+        _index = 0;
+        if (!widget.repeatForever) {
+          _currentRepeatCount++;
+        }
+      } else {
+        widget.onFinished?.call();
+        return;
+      }
+    } else {
+      _index++;
+    }
+
+    if (mounted) setState(() {});
+
+    if (widget.transitionHeight == null) {
+      _transitionHeight = widget.textStyle.fontSize * 10 / 3;
+    } else {
+      _transitionHeight = widget.transitionHeight;
+    }
 
-    _controller.forward();
+    _controller.forward(from: 0.0);
   }
 
   void _setPause() {

diff --git a/lib/src/scale.dart b/lib/src/scale.dart
@@ -105,7 +105,7 @@ class ScaleAnimatedTextKit extends StatefulWidget {
 }
 
 class _ScaleTextState extends State<ScaleAnimatedTextKit>
-    with TickerProviderStateMixin {
+    with SingleTickerProviderStateMixin {
   AnimationController _controller;
 
   Animation _fadeIn, _fadeOut, _scaleIn, _scaleOut;
@@ -141,6 +141,8 @@ class _ScaleTextState extends State<ScaleAnimatedTextKit>
       _texts.add({'text': text, 'pause': _pause});
     });
 
+    // init controller and animations
+    _initAnimation();
     // Start animation
     _nextAnimation();
   }
@@ -181,34 +183,7 @@ class _ScaleTextState extends State<ScaleAnimatedTextKit>
     );
   }
 
-  void _nextAnimation() {
-    final bool isLast = _index == widget.text.length - 1;
-
-    _isCurrentlyPausing = false;
-
-    // Handling onNext callback
-    if (_index > -1) {
-      widget.onNext?.call(_index, isLast);
-    }
-
-    if (isLast) {
-      if (widget.isRepeatingAnimation &&
-          (widget.repeatForever ||
-              _currentRepeatCount != (widget.totalRepeatCount - 1))) {
-        _index = 0;
-        if (!widget.repeatForever) {
-          _currentRepeatCount++;
-        }
-      } else {
-        widget.onFinished?.call();
-        return;
-      }
-    } else {
-      _index++;
-    }
-
-    setState(() {});
-
+  void _initAnimation() {
     _controller = AnimationController(
       duration: _duration,
       vsync: this,
@@ -239,8 +214,37 @@ class _ScaleTextState extends State<ScaleAnimatedTextKit>
               curve: Curves.easeIn,
             )))
           ..addStatusListener(_animationEndCallback);
+  }
+
+  void _nextAnimation() {
+    final bool isLast = _index == widget.text.length - 1;
+
+    _isCurrentlyPausing = false;
+
+    // Handling onNext callback
+    if (_index > -1) {
+      widget.onNext?.call(_index, isLast);
+    }
+
+    if (isLast) {
+      if (widget.isRepeatingAnimation &&
+          (widget.repeatForever ||
+              _currentRepeatCount != (widget.totalRepeatCount - 1))) {
+        _index = 0;
+        if (!widget.repeatForever) {
+          _currentRepeatCount++;
+        }
+      } else {
+        widget.onFinished?.call();
+        return;
+      }
+    } else {
+      _index++;
+    }
+
+    setState(() {});
 
-    _controller.forward();
+    _controller.forward(from: 0.0);
   }
 
   void _setPause() {