Merge pull request #52 from funwithflutter/develop

chore: update version

Author: funwithflutter

.ci_templates/flutter_netlify_build.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Setup flutter
+FLUTTER=`which flutter`
+if [ $? -eq 0 ]
+then
+  # Flutter is installed
+  FLUTTER=`which flutter`
+else
+  # Get flutter
+  git clone https://github.com/flutter/flutter.git
+  FLUTTER=flutter/bin/flutter
+fi
+
+# Setup FVM
+FVM=`which fvm`
+if [ $? -eq 0 ]
+then
+  # FVM is installed
+  FVM=`which fvm`
+else
+  # Get FVC
+  echo "Getting fvm"
+  $FLUTTER pub global activate fvm
+  export PATH="$PATH":"$HOME/.pub-cache/bin"
+fi
+
+
+fvm install
+
+fvm flutter pub get
+
+cd example
+
+fvm flutter build web
+
+echo "OK"

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.6.0]
+🔄  Changed
+- Removed the random_color package and replaced with custom logic. Random colors may now be slightly different.
+- Updated dependencies
+
+🐞 Fixed
+- Unmounted exception (https://github.com/funwithflutter/flutter_confetti/issues/36). Thanks Iiropel.
+- Moved `.super` call to the top of `initState`.
+
 ## [0.6.0-nullsafety]
 Now with null safety :) - Thanks Ali1Ammar!
 

example/lib/main.dart

@@ -33,6 +33,7 @@ class _MyAppState extends State<MyApp> {
 
   @override
   void initState() {
+    super.initState();
     _controllerCenter =
         ConfettiController(duration: const Duration(seconds: 10));
     _controllerCenterRight =
@@ -43,7 +44,6 @@ class _MyAppState extends State<MyApp> {
         ConfettiController(duration: const Duration(seconds: 10));
     _controllerBottomCenter =
         ConfettiController(duration: const Duration(seconds: 10));
-    super.initState();
   }
 
   @override

example/pubspec.lock

@@ -49,7 +49,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.6.0-nullsafety"
+    version: "0.6.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -95,13 +95,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
-  random_color:
-    dependency: transitive
-    description:
-      name: random_color
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.6-nullsafety"
   sky_engine:
     dependency: transitive
     description: flutter

lib/src/confetti.dart

@@ -144,6 +144,7 @@ class _ConfettiWidgetState extends State<ConfettiWidget>
 
   @override
   void initState() {
+    super.initState();
     widget.confettiController.addListener(_handleChange);
 
     _particleSystem = ParticleSystem(
@@ -163,7 +164,6 @@ class _ConfettiWidgetState extends State<ConfettiWidget>
     _particleSystem.addListener(_particleSystemListener);
 
     _initAnimation();
-    super.initState();
   }
 
   void _initAnimation() {

lib/src/helper.dart

@@ -1,8 +1,16 @@
-import 'dart:math';
-import 'dart:ui' as ui;
+import 'dart:math' show Random;
+import 'dart:ui' show lerpDouble;
+
+import 'package:flutter/material.dart';
 
 final _rand = Random();
 
-double randomize(double min, double max) {
-  return ui.lerpDouble(min, max, _rand.nextDouble())!;
+class Helper {
+  static double randomize(double min, double max) {
+    return lerpDouble(min, max, _rand.nextDouble())!;
+  }
+
+  static Color randomColor() {
+    return Colors.primaries[Random().nextInt(Colors.primaries.length)];
+  }
 }

lib/src/particle.dart

@@ -2,7 +2,6 @@ import 'dart:math';
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
-import 'package:random_color/random_color.dart';
 import 'package:vector_math/vector_math.dart' as vmath;
 
 import 'package:confetti/src/helper.dart';
@@ -179,7 +178,7 @@ class ParticleSystem extends ChangeNotifier {
     if (_blastDirectionality == BlastDirectionality.explosive) {
       blastDirection = _randomBlastDirection;
     }
-    final blastRadius = randomize(_minBlastForce, _maxBlastForce);
+    final blastRadius = Helper.randomize(_minBlastForce, _maxBlastForce);
     final y = blastRadius * sin(blastDirection);
     final x = blastRadius * cos(blastDirection);
     return vmath.Vector2(x, y);
@@ -193,13 +192,13 @@ class ParticleSystem extends ChangeNotifier {
       final index = _rand.nextInt(_colors!.length);
       return _colors![index];
     }
-    return RandomColor().randomColor();
+    return Helper.randomColor();
   }
 
   Size _randomSize() {
     return Size(
-      randomize(_minimumSize.width, _maximumSize.width),
-      randomize(_minimumSize.height, _maximumSize.height),
+      Helper.randomize(_minimumSize.width, _maximumSize.width),
+      Helper.randomize(_minimumSize.height, _maximumSize.height),
     );
   }
 }
@@ -209,18 +208,19 @@ class Particle {
       double particleDrag, Path Function(Size size)? createParticlePath)
       : _startUpForce = startUpForce,
         _color = color,
-        _mass = randomize(1, 11),
+        _mass = Helper.randomize(1, 11),
         _particleDrag = particleDrag,
         _location = vmath.Vector2.zero(),
         _acceleration = vmath.Vector2.zero(),
-        _velocity = vmath.Vector2(randomize(-3, 3), randomize(-3, 3)),
+        _velocity =
+            vmath.Vector2(Helper.randomize(-3, 3), Helper.randomize(-3, 3)),
         // _size = size,
         _pathShape = createParticlePath != null
             ? createParticlePath(size)
             : createPath(size),
-        _aVelocityX = randomize(-0.1, 0.1),
-        _aVelocityY = randomize(-0.1, 0.1),
-        _aVelocityZ = randomize(-0.1, 0.1),
+        _aVelocityX = Helper.randomize(-0.1, 0.1),
+        _aVelocityY = Helper.randomize(-0.1, 0.1),
+        _aVelocityZ = Helper.randomize(-0.1, 0.1),
         _gravity = lerpDouble(0.1, 5, gravity);
 
   final vmath.Vector2 _startUpForce;

melos.yaml

@@ -15,13 +15,7 @@ scripts:
     description: |
       Run `dart analyze` in all packages.
        - Note: you can also rely on your IDEs Dart Analysis / Issues window.
-  firebase:emulator:
-    run: |
-      cd .github/workflows/scripts && ./start-firebase-emulator.sh
-    description: |
-      Start the Firebase emulator suite. Used by Functions, Firestore, Auth and Storage
-      integration testing.
-       - Requires Node.js and NPM installed.
+
   format:
     run: dart pub global run flutter_plugin_tools format
     description: |

pubspec.lock

@@ -95,13 +95,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
-  random_color:
-    dependency: "direct main"
-    description:
-      name: random_color
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.6-nullsafety"
   sky_engine:
     dependency: transitive
     description: flutter

pubspec.yaml

@@ -2,7 +2,7 @@ name: confetti
 description: Blast colorful confetti all over the screen. Celebrate in app
   achievements with style. Control the velocity, angle, gravity and amount of
   confetti.
-version: 0.6.0-nullsafety
+version: 0.6.0
 homepage: https://github.com/funwithflutter/flutter_confetti
 
 environment:
@@ -11,8 +11,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  random_color: ^1.0.6-nullsafety
-  vector_math: ^2.1.0-nullsafety.3
+  vector_math: ^2.1.0
 
 dev_dependencies:
   flutter_test: