syncing with upstream

.gitignore

@@ -90,3 +90,19 @@ shared_lib/dependencies
 shared_lib/bin
 *.make
 Makefile
+
+# https://dart.dev/guides/libraries/private-files
+
+.dart_tool/
+build/
+
+doc/api/
+
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Mac
+.DS_Store

analysis_options.yaml

@@ -1,6 +1,7 @@
 analyzer:
   errors:
     unused_import: error
+    prefer_is_empty: ignore
   exclude:
     - ios
     - macos
@@ -51,7 +52,8 @@ linter:
     - join_return_with_assignment
     - library_names
     - library_prefixes
-    - lines_longer_than_80_chars
+    # STOKANAL-FORK-EDIT
+#    - lines_longer_than_80_chars
     # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
     - no_adjacent_strings_in_list
     - no_duplicate_case_values
@@ -76,7 +78,7 @@ linter:
     - prefer_contains
     - prefer_final_fields
     - prefer_final_in_for_each
-    - prefer_foreach
+#    - prefer_foreach
     - prefer_function_declarations_over_variables
     - prefer_initializing_formals
     - prefer_is_empty

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

example/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -0,0 +1,36 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+import audio_session
+import connectivity_plus
+import device_info_plus
+import flutter_udid
+import in_app_purchase_storekit
+import in_app_review
+import just_audio
+import package_info_plus
+import path_provider_foundation
+import rive_common
+import shared_preferences_foundation
+import url_launcher_macos
+import wakelock_plus
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
+  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
+  FlutterUdidPlugin.register(with: registry.registrar(forPlugin: "FlutterUdidPlugin"))
+  InAppPurchasePlugin.register(with: registry.registrar(forPlugin: "InAppPurchasePlugin"))
+  InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin"))
+  JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
+  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
+}

example/windows/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,23 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <flutter_udid/flutter_udid_plugin_c_api.h>
+#include <rive_common/rive_plugin.h>
+#include <url_launcher_windows/url_launcher_windows.h>
+
+void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+  FlutterUdidPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterUdidPluginCApi"));
+  RivePluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("RivePlugin"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
+}

example/windows/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter/plugin_registry.h>
+
+// Registers Flutter plugins.
+void RegisterPlugins(flutter::PluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

example/windows/flutter/generated_plugins.cmake

@@ -0,0 +1,27 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus
+  flutter_udid
+  rive_common
+  url_launcher_windows
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

lib/src/controllers/linear_animation_controller.dart

@@ -1,9 +1,11 @@
 import 'package:rive/src/core/core.dart';
+import 'package:rive/src/generated/rive_core_beans.dart';
 import 'package:rive/src/rive_core/animation/keyed_object.dart';
 import 'package:rive/src/rive_core/animation/linear_animation_instance.dart'
     as core;
 import 'package:rive/src/rive_core/event.dart';
 import 'package:rive/src/runtime_mounted_artboard.dart';
+
 export 'package:rive/src/runtime_mounted_artboard.dart';
 
 /// An AnimationController which controls a StateMachine and provides access to
@@ -27,19 +29,21 @@ class LinearAnimationInstance extends core.LinearAnimationInstance
 
   @override
   void reportEvent(Event event) {
-    _runtimeEventListeners.toList().forEach((callback) {
-      callback(event);
-    });
+    for (final t in _runtimeEventListeners) {
+      t(event);
+    }
+    // _runtimeEventListeners.toList().forEach((callback) {
+    //   callback(event);
+    // });
   }
 
   @override
   void reportKeyedCallback(
       int objectId, int propertyKey, double elapsedSeconds) {
     var coreObject = context?.resolve(objectId);
     if (coreObject != null) {
-      RiveCoreContext.setCallback(
+      PropertyBeans.get(propertyKey).setCallback(
         coreObject,
-        propertyKey,
         CallbackData(this, delay: elapsedSeconds),
       );
     }

lib/src/controllers/state_machine_controller.dart

@@ -7,6 +7,7 @@ import 'package:rive/src/rive_core/animation/state_machine_trigger.dart';
 import 'package:rive/src/rive_core/artboard.dart';
 import 'package:rive/src/rive_core/state_machine_controller.dart' as core;
 import 'package:rive/src/runtime_mounted_artboard.dart';
+
 export 'package:rive/src/runtime_mounted_artboard.dart';
 
 /// [StateMachine]s supports three input types. The StateMachine mostly
@@ -114,10 +115,13 @@ class SMITrigger extends SMIInput<bool> {
 /// the inputs of the StateMachine.
 class StateMachineController extends core.StateMachineController
     with RuntimeEventReporter {
-  final List<SMIInput> _inputs = <SMIInput>[];
 
   /// A list of inputs available in the StateMachine.
-  Iterable<SMIInput> get inputs => _inputs;
+  @nonVirtual
+  final List<SMIInput> inputs = <SMIInput>[];
+
+  // /// A list of inputs available in the StateMachine.
+  // Iterable<SMIInput> get inputs => _inputs;
 
   final _runtimeEventListeners = <OnRuntimeEvent>{};
 
@@ -130,13 +134,13 @@ class StateMachineController extends core.StateMachineController
     for (final input in stateMachine.inputs) {
       switch (input.coreType) {
         case StateMachineNumberBase.typeKey:
-          _inputs.add(SMINumber._(input as StateMachineNumber, this));
+          inputs.add(SMINumber._(input as StateMachineNumber, this));
           break;
         case StateMachineBoolBase.typeKey:
-          _inputs.add(SMIBool._(input as StateMachineBool, this));
+          inputs.add(SMIBool._(input as StateMachineBool, this));
           break;
         case StateMachineTriggerBase.typeKey:
-          _inputs.add(SMITrigger._(input as StateMachineTrigger, this));
+          inputs.add(SMITrigger._(input as StateMachineTrigger, this));
           break;
       }
     }
@@ -168,7 +172,7 @@ class StateMachineController extends core.StateMachineController
   /// For easier to use methods, see [getBoolInput], [getTriggerInput],
   /// [getNumberInput].
   SMIInput<T>? findInput<T>(String name) {
-    for (final input in _inputs) {
+    for (final input in inputs) {
       if (input._is<T>() && input.name == name) {
         return input as SMIInput<T>;
       }
@@ -181,7 +185,7 @@ class StateMachineController extends core.StateMachineController
   /// For easier to use methods, see [getBoolInput], [getTriggerInput],
   /// [getNumberInput].
   T? findSMI<T>(String name) {
-    for (final input in _inputs) {
+    for (final input in inputs) {
       if (input is T && input.name == name) {
         return input as T;
       }
@@ -209,8 +213,11 @@ class StateMachineController extends core.StateMachineController
 
   @override
   void advanceInputs() {
-    for (final input in _inputs) {
-      input.advance();
+    final t = inputs.length;
+    for (var i = 0; i < t; i++) {
+    // for (final input in _inputs) {
+      inputs[i].advance();
+      // input.advance();
     }
   }
 
@@ -224,8 +231,16 @@ class StateMachineController extends core.StateMachineController
 
   @override
   void applyEvents() {
-    var events = reportedEvents.toList(growable: false);
     super.applyEvents();
-    _runtimeEventListeners.toList().forEach(events.forEach);
+
+    for (final event in _runtimeEventListeners) {
+      // reportedEvents.forEach(event);
+
+      var list = reportedEvents;
+      var t = list.length;
+      for (var i = 0; i < t; i++) {
+        event(list[i]);
+      }
+    }
   }
 }