v5.2.0 (#116)

jogboms · May 1, 2023 · 4211f37 · 4211f37
2 parents bd5827f + 9397db0
commit 4211f37
Show file tree

Hide file tree

Showing 38 changed files with 151 additions and 142 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,9 +20,11 @@ jobs:
       - uses: actions/setup-java@v1
         with:
           java-version: "12.x"
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          channel: "dev"
+          cache: true
+          channel: 'stable'
+      - run: flutter doctor
       - run: flutter pub get
       - run: flutter format --set-exit-if-changed -l 120 lib -l 120 example
       - run: flutter analyze lib example
@@ -31,4 +33,4 @@ jobs:
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v1
         with:
-          fail_ci_if_error: true
+          fail_ci_if_error: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 A collection of loading indicators animated with flutter. Heavily inspired by @tobiasahlin's SpinKit.
 
+## 5.2.0
+
+- Fix `SpinKitCircle`, `SpinKitFadingCircle`, `SpinKitDancingSquare` animation 
+- Fix calling `setState` on unmounted states
+- Introduced [SpinKitWaveSpinner] 
+- Introduced [SpinKitPulsingGrid]
+
 ## 5.1.0
 
 - Renamed `SpinKitPouringHourglass` -> `SpinKitPouringHourGlass` for correctness

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ A collection of loading indicators animated with flutter. Heavily inspired by [@
 
 ```yaml
 dependencies:
-  flutter_spinkit: ^5.1.0
+  flutter_spinkit: ^5.2.0
 ```
 
 ### ⚡️ Import

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,9 +1,6 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
   errors:
     missing_required_param: error
     missing_return: error
@@ -40,4 +37,5 @@ linter:
     - unnecessary_statements
     - use_late_for_private_fields_and_variables
     - use_named_constants
-    - use_raw_strings
+    - use_raw_strings
+    - use_super_parameters
diff --git a/lib/src/chasing_dots.dart b/lib/src/chasing_dots.dart
@@ -17,7 +17,7 @@ class SpinKitChasingDots extends StatefulWidget {
   final Duration duration;
 
   @override
-  _SpinKitChasingDotsState createState() => _SpinKitChasingDotsState();
+  State<SpinKitChasingDots> createState() => _SpinKitChasingDotsState();
 }
 
 class _SpinKitChasingDotsState extends State<SpinKitChasingDots> with TickerProviderStateMixin {

diff --git a/lib/src/circle.dart b/lib/src/circle.dart
@@ -20,11 +20,12 @@ class SpinKitCircle extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitCircleState createState() => _SpinKitCircleState();
+  State<SpinKitCircle> createState() => _SpinKitCircleState();
 }
 
 class _SpinKitCircleState extends State<SpinKitCircle> with SingleTickerProviderStateMixin {
-  final List<double> delays = [.0, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1];
+  static const _itemCount = 12;
+
   late AnimationController _controller;
 
   @override
@@ -48,17 +49,17 @@ class _SpinKitCircleState extends State<SpinKitCircle> with SingleTickerProvider
       child: SizedBox.fromSize(
         size: Size.square(widget.size),
         child: Stack(
-          children: List.generate(delays.length, (index) {
-            final _position = widget.size * .5;
+          children: List.generate(_itemCount, (index) {
+            final position = widget.size * .5;
             return Positioned.fill(
-              left: _position,
-              top: _position,
+              left: position,
+              top: position,
               child: Transform(
                 transform: Matrix4.rotationZ(30.0 * index * 0.0174533),
                 child: Align(
                   alignment: Alignment.center,
                   child: ScaleTransition(
-                    scale: DelayTween(begin: 0.0, end: 1.0, delay: delays[index]).animate(_controller),
+                    scale: DelayTween(begin: 0.0, end: 1.0, delay: index / _itemCount).animate(_controller),
                     child: SizedBox.fromSize(size: Size.square(widget.size * 0.15), child: _itemBuilder(index)),
                   ),
                 ),

diff --git a/lib/src/cube_grid.dart b/lib/src/cube_grid.dart
@@ -19,7 +19,7 @@ class SpinKitCubeGrid extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitCubeGridState createState() => _SpinKitCubeGridState();
+  State<SpinKitCubeGrid> createState() => _SpinKitCubeGridState();
 }
 
 class _SpinKitCubeGridState extends State<SpinKitCubeGrid> with SingleTickerProviderStateMixin {

diff --git a/lib/src/dancing_square.dart b/lib/src/dancing_square.dart
@@ -21,11 +21,12 @@ class SpinKitDancingSquare extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitDancingSquareState createState() => _SpinKitDancingSquareState();
+  State<SpinKitDancingSquare> createState() => _SpinKitDancingSquareState();
 }
 
 class _SpinKitDancingSquareState extends State<SpinKitDancingSquare> with SingleTickerProviderStateMixin {
-  final List<double> delays = [.0, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1];
+  static const _itemCount = 12;
+
   late AnimationController _controller;
 
   @override
@@ -49,19 +50,20 @@ class _SpinKitDancingSquareState extends State<SpinKitDancingSquare> with Single
       child: SizedBox.fromSize(
         size: Size.square(widget.size),
         child: Stack(
-          children: List.generate(delays.length, (index) {
-            final _position = widget.size * .5;
+          children: List.generate(_itemCount, (index) {
+            final position = widget.size * .5;
+            final delay = index / _itemCount;
             return Stack(
               children: [
                 Positioned.fill(
-                  left: _position,
-                  top: _position,
+                  left: position,
+                  top: position,
                   child: Transform(
                     transform: Matrix4.rotationX(30.0 * index * 0.0174533),
                     child: Align(
                       alignment: Alignment.center,
                       child: ScaleTransition(
-                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delays[index]).animate(_controller),
+                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delay).animate(_controller),
                         child: SizedBox.fromSize(
                           size: Size.square(widget.size * 0.15),
                           child: _itemBuilder(index),
@@ -71,14 +73,14 @@ class _SpinKitDancingSquareState extends State<SpinKitDancingSquare> with Single
                   ),
                 ),
                 Positioned.fill(
-                  left: _position,
-                  top: -1 * _position,
+                  left: position,
+                  top: -1 * position,
                   child: Transform(
                     transform: Matrix4.rotationY(30.0 * index * 0.0174533),
                     child: Align(
                       alignment: Alignment.center,
                       child: ScaleTransition(
-                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delays[index]).animate(_controller),
+                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delay).animate(_controller),
                         child: SizedBox.fromSize(
                           size: Size.square(widget.size * 0.15),
                           child: _itemBuilder(index),
@@ -88,14 +90,14 @@ class _SpinKitDancingSquareState extends State<SpinKitDancingSquare> with Single
                   ),
                 ),
                 Positioned.fill(
-                  left: -1 * _position,
-                  top: _position,
+                  left: -1 * position,
+                  top: position,
                   child: Transform(
                     transform: Matrix4.rotationX(30.0 * index * 0.0174533),
                     child: Align(
                       alignment: Alignment.center,
                       child: ScaleTransition(
-                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delays[index]).animate(_controller),
+                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delay).animate(_controller),
                         child: SizedBox.fromSize(
                           size: Size.square(widget.size * 0.15),
                           child: _itemBuilder(index),
@@ -105,14 +107,14 @@ class _SpinKitDancingSquareState extends State<SpinKitDancingSquare> with Single
                   ),
                 ),
                 Positioned.fill(
-                  left: _position,
-                  top: _position,
+                  left: position,
+                  top: position,
                   child: Transform(
                     transform: Matrix4.rotationY(30.0 * index * 0.0174533),
                     child: Align(
                       alignment: Alignment.center,
                       child: ScaleTransition(
-                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delays[index]).animate(_controller),
+                        scale: DelayTween(begin: 0.0, end: 1.0, delay: delay).animate(_controller),
                         child: SizedBox.fromSize(
                           size: Size.square(widget.size * 0.15),
                           child: _itemBuilder(index),

diff --git a/lib/src/double_bounce.dart b/lib/src/double_bounce.dart
@@ -19,7 +19,7 @@ class SpinKitDoubleBounce extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitDoubleBounceState createState() => _SpinKitDoubleBounceState();
+  State<SpinKitDoubleBounce> createState() => _SpinKitDoubleBounceState();
 }
 
 class _SpinKitDoubleBounceState extends State<SpinKitDoubleBounce> with SingleTickerProviderStateMixin {

diff --git a/lib/src/dual_ring.dart b/lib/src/dual_ring.dart
@@ -19,7 +19,7 @@ class SpinKitDualRing extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitDualRingState createState() => _SpinKitDualRingState();
+  State<SpinKitDualRing> createState() => _SpinKitDualRingState();
 }
 
 class _SpinKitDualRingState extends State<SpinKitDualRing> with SingleTickerProviderStateMixin {
@@ -56,8 +56,8 @@ class _SpinKitDualRingState extends State<SpinKitDualRing> with SingleTickerProv
         transform: Matrix4.identity()..rotateZ((_animation.value) * math.pi * 2),
         alignment: FractionalOffset.center,
         child: CustomPaint(
-          child: SizedBox.fromSize(size: Size.square(widget.size)),
           painter: _DualRingPainter(angle: 90, paintWidth: widget.lineWidth, color: widget.color),
+          child: SizedBox.fromSize(size: Size.square(widget.size)),
         ),
       ),
     );

diff --git a/lib/src/fading_circle.dart b/lib/src/fading_circle.dart
@@ -20,10 +20,12 @@ class SpinKitFadingCircle extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitFadingCircleState createState() => _SpinKitFadingCircleState();
+  State<SpinKitFadingCircle> createState() => _SpinKitFadingCircleState();
 }
 
 class _SpinKitFadingCircleState extends State<SpinKitFadingCircle> with SingleTickerProviderStateMixin {
+  static const _itemCount = 12;
+
   late AnimationController _controller;
 
   @override
@@ -47,17 +49,17 @@ class _SpinKitFadingCircleState extends State<SpinKitFadingCircle> with SingleTi
       child: SizedBox.fromSize(
         size: Size.square(widget.size),
         child: Stack(
-          children: List.generate(12, (i) {
-            final _position = widget.size * .5;
+          children: List.generate(_itemCount, (i) {
+            final position = widget.size * .5;
             return Positioned.fill(
-              left: _position,
-              top: _position,
+              left: position,
+              top: position,
               child: Transform(
                 transform: Matrix4.rotationZ(30.0 * i * 0.0174533),
                 child: Align(
                   alignment: Alignment.center,
                   child: FadeTransition(
-                    opacity: DelayTween(begin: 0.0, end: 1.0, delay: i / 12).animate(_controller),
+                    opacity: DelayTween(begin: 0.0, end: 1.0, delay: i / _itemCount).animate(_controller),
                     child: SizedBox.fromSize(size: Size.square(widget.size * 0.15), child: _itemBuilder(i)),
                   ),
                 ),

diff --git a/lib/src/fading_cube.dart b/lib/src/fading_cube.dart
@@ -20,7 +20,7 @@ class SpinKitFadingCube extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitFadingCubeState createState() => _SpinKitFadingCubeState();
+  State<SpinKitFadingCube> createState() => _SpinKitFadingCubeState();
 }
 
 class _SpinKitFadingCubeState extends State<SpinKitFadingCube> with SingleTickerProviderStateMixin {
@@ -51,20 +51,20 @@ class _SpinKitFadingCubeState extends State<SpinKitFadingCube> with SingleTicker
             angle: -45.0 * 0.0174533,
             child: Stack(
               children: List.generate(4, (i) {
-                final _size = widget.size * 0.5, _position = widget.size * .5;
+                final size = widget.size * 0.5, position = widget.size * .5;
                 return Positioned.fill(
-                  top: _position,
-                  left: _position,
+                  top: position,
+                  left: position,
                   child: Transform.scale(
                     scale: 1.1,
-                    origin: Offset(-_size * .5, -_size * .5),
+                    origin: Offset(-size * .5, -size * .5),
                     child: Transform(
                       transform: Matrix4.rotationZ(90.0 * i * 0.0174533),
                       child: Align(
                         alignment: Alignment.center,
                         child: FadeTransition(
                           opacity: DelayTween(begin: 0.0, end: 1.0, delay: 0.3 * i).animate(_controller),
-                          child: SizedBox.fromSize(size: Size.square(_size), child: _itemBuilder(i)),
+                          child: SizedBox.fromSize(size: Size.square(size), child: _itemBuilder(i)),
                         ),
                       ),
                     ),

diff --git a/lib/src/fading_four.dart b/lib/src/fading_four.dart
@@ -22,11 +22,11 @@ class SpinKitFadingFour extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitFadingFourState createState() => _SpinKitFadingFourState();
+  State<SpinKitFadingFour> createState() => _SpinKitFadingFourState();
 }
 
 class _SpinKitFadingFourState extends State<SpinKitFadingFour> with SingleTickerProviderStateMixin {
-  final List<double> delays = [.0, -0.9, -0.6, -0.3];
+  static const List<double> _delays = [.0, -0.9, -0.6, -0.3];
   late AnimationController _controller;
 
   @override
@@ -51,16 +51,16 @@ class _SpinKitFadingFourState extends State<SpinKitFadingFour> with SingleTicker
         size: Size.square(widget.size),
         child: Stack(
           children: List.generate(4, (i) {
-            final _position = widget.size * .5;
+            final position = widget.size * .5;
             return Positioned.fill(
-              left: _position,
-              top: _position,
+              left: position,
+              top: position,
               child: Transform(
                 transform: Matrix4.rotationZ(30.0 * (i * 3) * 0.0174533),
                 child: Align(
                   alignment: Alignment.center,
                   child: FadeTransition(
-                    opacity: DelayTween(begin: 0.0, end: 1.0, delay: delays[i]).animate(_controller),
+                    opacity: DelayTween(begin: 0.0, end: 1.0, delay: _delays[i]).animate(_controller),
                     child: SizedBox.fromSize(size: Size.square(widget.size * 0.25), child: _itemBuilder(i)),
                   ),
                 ),

diff --git a/lib/src/fading_grid.dart b/lib/src/fading_grid.dart
@@ -22,7 +22,7 @@ class SpinKitFadingGrid extends StatefulWidget {
   final AnimationController? controller;
 
   @override
-  _SpinKitFadingGridState createState() => _SpinKitFadingGridState();
+  State<SpinKitFadingGrid> createState() => _SpinKitFadingGridState();
 }
 
 class _SpinKitFadingGridState extends State<SpinKitFadingGrid> with SingleTickerProviderStateMixin {