Squashed commit of the following:

commit 4d06431 Author: Luigi Rosso <[email protected]> Date: Fri Oct 4 18:06:09 2019 -0700 Introducing FlareTesting.setup(); commit 2c5f420 Author: Luigi Rosso <[email protected]> Date: Fri Oct 4 13:44:25 2019 -0700 Clamping trim start/end. commit daba34d Author: Luigi Rosso <[email protected]> Date: Mon Sep 30 21:21:55 2019 +0200 Cherry picking critical lints from #1 63 and updating for pub.
2d-inc · Oct 5, 2019 · e3d2414 · e3d2414
1 parent b1ae611
commit e3d2414
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 10 deletions.
diff --git a/flare_flutter/CHANGELOG.md b/flare_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.5.12] - 2019-10-04 17:56:54
+
+- Introduce FlareTesting.setup(); call this prior to running any tests using Flare content.
+
 ## [1.5.11] - 2019-10-04 13:44:04
 
 - Clamping trim start/end values to 0-1.

diff --git a/flare_flutter/lib/flare_cache_asset.dart b/flare_flutter/lib/flare_cache_asset.dart
@@ -11,21 +11,34 @@ class FlareCacheAsset extends CacheAsset {
   FlutterActor _actor;
   FlutterActor get actor => _actor;
 
+  static bool useCompute = true;
+
+  void loadedActor(FlutterActor actor, String filename) {
+    actor.loadImages().then((_) {
+      if (actor != null) {
+        _actor = actor;
+        completeLoad();
+      } else {
+        print("Failed to load flare file from $filename.");
+      }
+    });
+  }
+
   @override
   void load(Cache cache, String filename) {
     super.load(cache, filename);
     if (cache is AssetBundleCache) {
       cache.bundle.load(filename).then((ByteData data) {
-        compute(FlutterActor.loadFromByteData, data).then((FlutterActor actor) {
-          actor.loadImages().then((_) {
-            if (actor != null) {
-              _actor = actor;
-              completeLoad();
-            } else {
-              print("Failed to load flare file from $filename.");
-            }
+        if (useCompute) {
+          compute(FlutterActor.loadFromByteData, data)
+              .then((FlutterActor actor) {
+            loadedActor(actor, filename);
+          });
+        } else {
+          FlutterActor.loadFromByteData(data).then((FlutterActor actor) {
+            loadedActor(actor, filename);
           });
-        });
+        }
       });
     }
   }

diff --git a/flare_flutter/lib/flare_testing.dart b/flare_flutter/lib/flare_testing.dart
@@ -0,0 +1,9 @@
+import 'flare_cache.dart';
+import 'flare_cache_asset.dart';
+
+class FlareTesting {
+  static void setup() {
+    FlareCache.doesPrune = false;
+    FlareCacheAsset.useCompute = false;
+  }
+}
diff --git a/flare_flutter/pubspec.yaml b/flare_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flare_flutter
 description: Vector design and runtime animation for Flutter.
-version: 1.5.11
+version: 1.5.12
 author: "2Dimensions Team <[email protected]>"
 homepage: https://github.com/2d-inc/Flare-Flutter
 environment: