Pending Fixes and Improvements #101

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 A collection of loading indicators animated with flutter. Heavily inspired by @tobiasahlin's SpinKit.
 
+## 5.1.0
+
+- Renamed `SpinKitPouringHourglass` -> `SpinKitPouringHourGlass` for correctness
+- Fix `SpinKitFoldingCube` animation 
+- Fix disposing of non-local animation controllers
+- Introduced `strokeWidth` to pouring glass animation
+- Introduced `SpinKitPouringHourGlassRefined`
+- Introduced `SpinKitSpinningLines`
+- Introduced `SpinKitPianoWave`
+- Introduced `SpinKitDancingSquare`
+- Introduced `SpinKitThreeInOut`
+
 ## 5.0.0
 
 - Migrate to null safety

README.md

@@ -8,7 +8,7 @@ A collection of loading indicators animated with flutter. Heavily inspired by [@
 
 ```yaml
 dependencies:
-  flutter_spinkit: ^5.0.0
+  flutter_spinkit: ^5.1.0
 ```
 
 ### ⚡️ Import

example/lib/showcase.dart

@@ -35,7 +35,7 @@ class ShowCase extends StatelessWidget {
     const SpinKitSpinningCircle(color: Colors.white, shape: BoxShape.rectangle),
     const SpinKitFadingCircle(color: Colors.white),
     const SpinKitHourGlass(color: Colors.white),
-    const SpinKitPouringHourglass(color: Colors.white),
+    const SpinKitPouringHourGlass(color: Colors.white),
     const SpinKitPouringHourGlassRefined(color: Colors.white),
     const SpinKitRipple(color: Colors.white),
     const SpinKitDancingSquare(color: Colors.white),

example/pubspec.lock

@@ -61,7 +61,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "5.0.0"
+    version: "5.1.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter

lib/src/circle.dart

@@ -36,7 +36,9 @@ class _SpinKitCircleState extends State<SpinKitCircle> with SingleTickerProvider
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/cube_grid.dart

@@ -50,7 +50,9 @@ class _SpinKitCubeGridState extends State<SpinKitCubeGrid> with SingleTickerProv
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/dancing_square.dart

@@ -37,7 +37,9 @@ class _SpinKitDancingSquareState extends State<SpinKitDancingSquare> with Single
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/double_bounce.dart

@@ -38,7 +38,9 @@ class _SpinKitDoubleBounceState extends State<SpinKitDoubleBounce> with SingleTi
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/dual_ring.dart

@@ -39,7 +39,9 @@ class _SpinKitDualRingState extends State<SpinKitDualRing> with SingleTickerProv
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/fading_circle.dart

@@ -36,7 +36,9 @@ class _SpinKitFadingCircleState extends State<SpinKitFadingCircle> with SingleTi
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/fading_cube.dart

@@ -35,7 +35,9 @@ class _SpinKitFadingCubeState extends State<SpinKitFadingCube> with SingleTicker
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/fading_four.dart

@@ -38,7 +38,9 @@ class _SpinKitFadingFourState extends State<SpinKitFadingFour> with SingleTicker
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/fading_grid.dart

@@ -37,7 +37,9 @@ class _SpinKitFadingGridState extends State<SpinKitFadingGrid> with SingleTicker
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/folding_cube.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:flutter/widgets.dart';
 
 class SpinKitFoldingCube extends StatefulWidget {
@@ -99,10 +100,12 @@ class _SpinKitFoldingCubeState extends State<SpinKitFoldingCube> with TickerProv
     _timer2.cancel();
     _timer3.cancel();
     _timer4.cancel();
-    _controller1.dispose();
-    _controller2.dispose();
-    _controller3.dispose();
-    _controller4.dispose();
+    if (widget.controller == null) {
+      _controller1.dispose();
+      _controller2.dispose();
+      _controller3.dispose();
+      _controller4.dispose();
+    }
 
     super.dispose();
   }

lib/src/hour_glass.dart

@@ -37,7 +37,9 @@ class _SpinKitHourGlassState extends State<SpinKitHourGlass> with SingleTickerPr
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/piano_wave.dart

@@ -43,7 +43,9 @@ class _SpinKitPianoWaveState extends State<SpinKitPianoWave> with SingleTickerPr
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/pouring_hour_glass.dart

@@ -3,25 +3,27 @@ import 'dart:ui';
 
 import 'package:flutter/widgets.dart';
 
-class SpinKitPouringHourglass extends StatefulWidget {
-  const SpinKitPouringHourglass({
+class SpinKitPouringHourGlass extends StatefulWidget {
+  const SpinKitPouringHourGlass({
     Key? key,
     required this.color,
     this.size = 50.0,
     this.duration = const Duration(milliseconds: 2400),
+    this.strokeWidth,
     this.controller,
   }) : super(key: key);
 
   final double size;
   final Color color;
   final Duration duration;
+  final double? strokeWidth;
   final AnimationController? controller;
 
   @override
-  _SpinKitPouringHourglassState createState() => _SpinKitPouringHourglassState();
+  _SpinKitPouringHourGlassState createState() => _SpinKitPouringHourGlassState();
 }
 
-class _SpinKitPouringHourglassState extends State<SpinKitPouringHourglass> with SingleTickerProviderStateMixin {
+class _SpinKitPouringHourGlassState extends State<SpinKitPouringHourGlass> with SingleTickerProviderStateMixin {
   late AnimationController _controller;
   late Animation<double> _pouringAnimation;
   late Animation<double> _rotationAnimation;
@@ -41,7 +43,9 @@ class _SpinKitPouringHourglassState extends State<SpinKitPouringHourglass> with
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 
@@ -56,6 +60,7 @@ class _SpinKitPouringHourglassState extends State<SpinKitPouringHourglass> with
             painter: _HourGlassPaint(
               poured: _pouringAnimation.value,
               color: widget.color,
+              strokeWidth: widget.strokeWidth,
             ),
           ),
         ),
@@ -65,14 +70,15 @@ class _SpinKitPouringHourglassState extends State<SpinKitPouringHourglass> with
 }
 
 class _HourGlassPaint extends CustomPainter {
-  _HourGlassPaint({this.poured, required Color color})
+  _HourGlassPaint({this.strokeWidth, this.poured, required Color color})
       : _paint = Paint()
           ..style = PaintingStyle.stroke
           ..color = color,
         _powderPaint = Paint()
           ..style = PaintingStyle.fill
           ..color = color;
 
+  final double? strokeWidth;
   final double? poured;
   final Paint _paint;
   final Paint _powderPaint;
@@ -86,7 +92,7 @@ class _HourGlassPaint extends CustomPainter {
     final yPadding = gapWidth / 2;
     final top = yPadding;
     final bottom = size.height - yPadding;
-    _paint.strokeWidth = gapWidth;
+    _paint.strokeWidth = strokeWidth ?? gapWidth;
 
     final hourglassPath = Path()
       ..moveTo(centerX - hourglassWidth, top)

lib/src/pouring_hour_glass_refined.dart

@@ -9,12 +9,14 @@ class SpinKitPouringHourGlassRefined extends StatefulWidget {
     required this.color,
     this.size = 50.0,
     this.duration = const Duration(milliseconds: 2400),
+    this.strokeWidth,
     this.controller,
   }) : super(key: key);
 
   final double size;
   final Color color;
   final Duration duration;
+  final double? strokeWidth;
   final AnimationController? controller;
 
   @override
@@ -42,7 +44,9 @@ class _SpinKitPouringHourGlassRefinedState extends State<SpinKitPouringHourGlass
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 
@@ -57,6 +61,7 @@ class _SpinKitPouringHourGlassRefinedState extends State<SpinKitPouringHourGlass
             painter: _HourGlassPaint(
               poured: _pouringAnimation.value,
               color: widget.color,
+              strokeWidth: widget.strokeWidth,
             ),
           ),
         ),
@@ -66,14 +71,15 @@ class _SpinKitPouringHourGlassRefinedState extends State<SpinKitPouringHourGlass
 }
 
 class _HourGlassPaint extends CustomPainter {
-  _HourGlassPaint({this.poured, required Color color})
+  _HourGlassPaint({this.strokeWidth, this.poured, required Color color})
       : _paint = Paint()
           ..style = PaintingStyle.stroke
           ..color = color,
         _powderPaint = Paint()
           ..style = PaintingStyle.fill
           ..color = color;
 
+  final double? strokeWidth;
   final double? poured;
   final Paint _paint;
   final Paint _powderPaint;
@@ -87,7 +93,7 @@ class _HourGlassPaint extends CustomPainter {
     final yPadding = gapWidth / 2;
     final top = yPadding;
     final bottom = size.height - yPadding;
-    _paint.strokeWidth = gapWidth;
+    _paint.strokeWidth = strokeWidth ?? gapWidth;
 
     final hourglassPath = Path()
       ..moveTo(centerX - hourglassWidth + 2, top)

lib/src/pulse.dart

@@ -38,7 +38,9 @@ class _SpinKitPulseState extends State<SpinKitPulse> with SingleTickerProviderSt
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/pumping_heart.dart

@@ -40,7 +40,9 @@ class _SpinKitPumpingHeartState extends State<SpinKitPumpingHeart> with SingleTi
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/ring.dart

@@ -45,7 +45,9 @@ class _SpinKitRingState extends State<SpinKitRing> with SingleTickerProviderStat
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/ripple.dart

@@ -44,7 +44,9 @@ class _SpinKitRippleState extends State<SpinKitRipple> with SingleTickerProvider
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/rotating_circle.dart

@@ -42,7 +42,9 @@ class _SpinKitRotatingCircleState extends State<SpinKitRotatingCircle> with Sing
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }
 

lib/src/rotating_plain.dart

@@ -42,7 +42,9 @@ class _SpinKitRotatingPlainState extends State<SpinKitRotatingPlain> with Single
 
   @override
   void dispose() {
-    _controller.dispose();
+    if (widget.controller == null) {
+      _controller.dispose();
+    }
     super.dispose();
   }