implementing club

lib/src/rive_core/animation/keyed_object.dart

@@ -111,7 +111,7 @@ class KeyedObject extends KeyedObjectBase<RuntimeArtboard> {
   }
 
   /// STOKANAL-FORK-EDIT: iterate properties with a list rather than with a map
-  late final List<KeyedProperty> _properties = _keyedProperties.values.toList(growable: false);
+  late final List<KeyedProperty> properties = _keyedProperties.values.toList(growable: false);
 
   void apply(
     double time,
@@ -124,7 +124,7 @@ class KeyedObject extends KeyedObjectBase<RuntimeArtboard> {
     }
     // for (final keyedProperty in _keyedProperties.values) {
     /// STOKANAL-FORK-EDIT: iterate properties with a list rather than with a map
-    for (final keyedProperty in _properties) {
+    for (final keyedProperty in properties) {
       if (keyedProperty.isCallback) {
         continue;
       }

lib/src/rive_core/animation/linear_animation.dart

@@ -70,13 +70,16 @@ class LinearAnimation extends LinearAnimationBase {
       objects.any((element) => _keyedObjects.containsKey(element.id));
 
   bool isObjectKeyed(Core object) => _keyedObjects.containsKey(object.id);
+
   bool removeObjectKeys(Core object) {
     var value = _keyedObjects[object.id];
     if (value == null) {
       return false;
     }
     bool found = false;
-    for (final kp in value.keyedProperties) {
+    // for (final kp in value.keyedProperties) {
+    /// STOKANAL-FORK-EDIT: iterate properties with a list rather than with a map
+    for (final kp in value.properties) {
       for (final kf in kp.keyframes.toList()) {
         kf.remove();
         found = true;
@@ -101,6 +104,9 @@ class LinearAnimation extends LinearAnimationBase {
   /// Returns the start time of the animation in seconds, considering speed
   double get startTime => (speed >= 0) ? startSeconds : endSeconds;
 
+  /// STOKANAL-FORK-EDIT: iterate properties with a list rather than with a map
+  late final List<KeyedObject> _objects = _keyedObjects.values.toList(growable: false);
+
   void reportKeyedCallbacks(
     double secondsFrom,
     double secondsTo, {
@@ -116,7 +122,9 @@ class LinearAnimation extends LinearAnimationBase {
     // Do not report a callback twice if it comes from the "pong" part of a
     // "ping pong" loop
     if (!isAtStartFrame || !fromPong) {
-      for (final keyedObject in _keyedObjects.values) {
+      // for (final keyedObject in _keyedObjects.values) {
+      /// STOKANAL-FORK-EDIT: iterate properties with a list rather than with a map
+      for (final keyedObject in _objects) {
         keyedObject.reportKeyedCallbacks(
           secondsFrom,
           secondsTo,
@@ -138,7 +146,9 @@ class LinearAnimation extends LinearAnimationBase {
       // ignore: parameter_assignments
       time = (time * fps).floor() / fps;
     }
-    for (final keyedObject in _keyedObjects.values) {
+    // for (final keyedObject in _keyedObjects.values) {
+    /// STOKANAL-FORK-EDIT: iterate properties with a list rather than with a map
+    for (final keyedObject in _objects) {
       keyedObject.apply(time, mix, coreContext);
     }
   }

lib/src/rive_file.dart

@@ -355,9 +355,7 @@ class RiveFile {
     // TODO: in the next major version add an assert here to make this a
     // requirement
     if (!_initializedText) {
-      debugPrint('''Rive: RiveFile.import called before RiveFile.initialize()
-
-Consider calling `await RiveFile.initialize()` before using `RiveFile.import`''');
+      debugPrint('''Rive: RiveFile.import called before RiveFile.initialize(). Consider calling `await RiveFile.initialize()` before using `RiveFile.import`''');
     }
 
     var reader = BinaryReader(bytes);