From 446c92f53c49ebdf068879c5979eea4a69872726 Mon Sep 17 00:00:00 2001 From: Luigi Rosso Date: Thu, 5 Dec 2019 18:27:48 -0500 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit f0b24f48568c390226005a3e9cd28d6f14318db9 Author: Luigi Rosso Date: Thu Dec 5 18:24:59 2019 -0500 Minor fixes for analyze. commit 333249f4f4d3709018153c4f44dd1ca70e8523f9 Author: Luigi Rosso Date: Thu Dec 5 17:36:58 2019 -0500 Preparing for publish. commit 0aa32c5bb685dd16a0b62e137635792923f863d3 Author: Luigi Rosso Date: Wed Dec 4 15:19:37 2019 -0800 Adding Guss. commit 6ba1f70ddcf77fa361297770b3ecdc3d4b8b35b0 Author: Luigi Rosso Date: Wed Dec 4 09:12:26 2019 -0800 Fixing type error in jelly component. commit a522dff8569160dcd9ce0afbb361609a22fd4bce Author: Luigi Rosso Date: Sun Dec 1 17:31:28 2019 -0800 Fixing effect on self. commit 2375f0c253a7f146d33cc790fbc8b2c1fbabc149 Author: Luigi Rosso Date: Wed Nov 27 18:03:08 2019 -0800 Adding animation for effects. commit dee0d83270badb8b44b07cb51bbb3a1a5092a7aa Author: Luigi Rosso Date: Tue Nov 26 16:40:01 2019 -0800 Getting drop shadow, blur, and inner shadows working. commit 31aa64181e6bbb2c7212321d5529ca90111dc0da Author: Luigi Rosso Date: Mon Nov 25 19:57:39 2019 -0800 Major groundwork for effects & masking. commit 9ff2b94022b8192d71c7fdde337e0d151fd13e7d Author: Luigi Rosso Date: Wed Nov 20 16:38:28 2019 -0800 Fixing gradient transformations for shapes with transformAffectsStroke set to true. commit 1e88ddf5ca23b7d4952853a9b90db31441c5cc3a Merge: c7758eb 17f73ec Author: Luigi Rosso Date: Mon Nov 18 16:32:28 2019 -0800 Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter commit c7758eb0b069de813b36e487e340ab511ab62a25 Author: Luigi Rosso Date: Mon Nov 18 16:32:23 2019 -0800 Fixing FlareControls. commit 17f73ec8a23a9129d029d3ed1f78072475909435 Author: Umberto Sonnino Date: Fri Nov 15 11:09:51 2019 +0000 Update README with latest version commit c9f434180a766600121f493f62c485963d171231 Author: Luigi Rosso Date: Thu Nov 7 15:05:04 2019 -0800 Backing out changeImageFromNetwork. Issue #183 commit e9712a4244eefe96e8b4644be1a6e8eb0d3feae1 Author: Luigi Rosso Date: Thu Nov 7 12:32:17 2019 -0800 Bumping versions. commit 366cdc03cef7110f9247b4de332a12f40d987f32 Author: Luigi Rosso Date: Thu Nov 7 12:27:53 2019 -0800 Adding support for runtime image swapping, requires marking image nodes as isDynamic in Flare. Issue #183. commit 53a7c659b772f5b9442f569be0a389512a77ff29 Author: Luigi Rosso Date: Wed Nov 6 17:30:42 2019 -0800 Updating flare_flutter version. commit b391dd4343b710fa575b45c47d11aca8b3cb4b52 Merge: 1e9b22e 9ec074b Author: Luigi Rosso Date: Wed Nov 6 17:28:34 2019 -0800 Merge branch 'warmth_fix' commit 9ec074be6328914ebcd82e5285c9aef9e408e1d5 Author: Luigi Rosso Date: Wed Nov 6 15:43:31 2019 -0800 Call setState if mounted. commit c66ac647efac650ef38b425fa7488343e36a075f Author: Luigi Rosso Date: Wed Nov 6 15:38:06 2019 -0800 Addressing an issue found in #177 with FlareCacheBuilder setting state when widget is no longer mounted. commit 1e9b22e0aa12e27c362fcaf28d914aa482198db9 Author: Umberto Sonnino Date: Wed Nov 6 19:02:25 2019 +0100 Init mat before inverting commit bc07b8752c05bd1a05cfcded0c2193e23602a1e0 Author: Umberto Sonnino Date: Wed Nov 6 19:00:13 2019 +0100 Remove local flare_dart from examples pubspec #184 commit e1cca7cdc97bdfb1fd19d2ee365ce901c1e8339a Author: Luigi Rosso Date: Tue Oct 29 12:50:30 2019 -0700 Bumping versions, merging optimal_load branch, and persisting settings in checkbox example. commit 55cae393bb92dcd7157a5b12c55074e3bafa6d6d Author: Luigi Rosso Date: Tue Oct 29 12:41:43 2019 -0700 Copy transform affects stroke properly when instancing shapes. commit 43716dd3449266fe9f6f42c5bf05701d0bb06b88 Author: Luigi Rosso Date: Mon Oct 28 12:52:09 2019 -0700 Prevent coldLoad (async) from happening when widget isn’t ready to load. commit 506837e0bafff3060318bc65d03296ebb599f284 Author: Luigi Rosso Date: Fri Oct 25 13:00:56 2019 -0700 Improving loading. commit 9ee95b964dde6ee3fb17b9e969ab00b3d0992c9f Author: Luigi Rosso Date: Fri Oct 25 10:42:42 2019 -0700 Make sure overrideColor is set even when drawableNodes is null. commit 7d59de1e77c040acc271bc3981a70517856a31b1 Author: Umberto Sonnino Date: Fri Oct 25 13:15:34 2019 +0100 Move null check commit 528af53a2bc9ac68d00fc30aadb2f78509fff922 Author: Umberto Sonnino Date: Fri Oct 25 13:10:17 2019 +0100 Insert null checks for artboards with no drawables #178 commit 33f23a7d29b5adf04f5b6536ddaf74f1aa590165 Author: Umberto Sonnino Date: Fri Oct 25 12:16:16 2019 +0100 Remove GradientColor override of ActorPaint opacity getter #179 commit 59ba2f08174b43c7a7f8a7ff97cd04d533da1eea Author: Umberto Sonnino Date: Thu Oct 24 09:31:41 2019 +0100 Document the `actor_animatino.apply()` function commit d77438f87f7aae2d850a8295ae4d9a5b33505694 Author: Umberto Sonnino Date: Thu Oct 24 09:31:10 2019 +0100 Fix division by 0 on transform constraint commit f0cf988bc3ef928b8b96ae217133ecadca02b418 Author: Luigi Rosso Date: Fri Oct 11 12:59:13 2019 -0700 Fix reading of JSON clip values. Issue #172 commit a7796e0d6e9b5ea6957eafc9f784ba4c36320967 Author: Luigi Rosso Date: Fri Oct 11 12:39:48 2019 -0700 Mitigating issue #172. commit 373c14a4f3b2360c4252a8ac834c23bb28068f6e Author: Luigi Rosso Date: Wed Oct 9 14:21:47 2019 -0700 Fixing issue with image clipping. commit ae1c901441306953f09549b4c3bdd4612cc86af4 Author: Luigi Rosso Date: Wed Oct 9 11:19:16 2019 -0700 Fix merge bugs. commit d8cb780a543fe9fd35d60bcfcb198b70622c524f Author: Luigi Rosso Date: Wed Oct 9 11:09:42 2019 -0700 Adding support for difference clipping. commit bf99a765746f321937315e7ecd96aaa190a3d20b Author: Luigi Rosso Date: Tue Oct 8 19:07:26 2019 -0700 Matching stable version commit 9becc744d0d50f10533e3ad1f7c0b4daee6604c2 Author: Luigi Rosso Date: Tue Oct 8 13:58:11 2019 -0700 Bumping flare_dart to 2.0 due to breaking changes. commit 0a292cc67ea8d261057b9f9e5c32028e3436436c Author: Luigi Rosso Date: Tue Oct 8 13:39:57 2019 -0700 Bumping versions and changelogs. commit 431a98e4804efe6d073a9b55a9ce1a5f23c7ca4d Author: Luigi Rosso Date: Tue Oct 8 13:35:26 2019 -0700 Fixing up analysis issues for #169 commit 72fb6fc743ed3a241c7c51e5a8ebc90836f734ba Merge: 4d00202 dc68dea Author: Luigi Rosso Date: Tue Oct 8 13:02:17 2019 -0700 Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter commit 4d00202a4f24b2c3d581b28cb15b953ec91c9f3c Author: Luigi Rosso Date: Tue Oct 8 13:02:11 2019 -0700 Cleaning up analysis issues. commit dc68dea6d57cb504d1a867c7e4c5b6768ec5dfe2 Merge: 5ca8d49 f1d9749 Author: Luigi Rosso Date: Tue Oct 8 11:06:53 2019 -0700 Merge pull request #168 from mehmetf/master Escalate the severity of unused imports in analyzer commit f1d97496a2679f470202f17298cd76a0411d7a8c Author: Mehmet Fidanboylu Date: Tue Oct 8 10:20:58 2019 -0700 Do the same changes to flare_dart commit 64f395edf7c6f8419a7a461e46664ff3723cfa78 Author: Mehmet Fidanboylu Date: Tue Oct 8 10:17:51 2019 -0700 Escalate the severity of unused imports in analyzer commit 5ca8d49c09406d1ac62ffffd4d0c5082744be7a3 Author: Luigi Rosso Date: Mon Oct 7 11:22:38 2019 -0700 Bumping versions and changelog. commit 874ce8e0b77a8ffc3eea9027cb31e2b75437da01 Author: Luigi Rosso Date: Mon Oct 7 11:20:28 2019 -0700 Adding support for nodes inside of shapes. commit 4d06431f341b426dd5cc41529a49c115e6354c51 Author: Luigi Rosso Date: Fri Oct 4 18:06:09 2019 -0700 Introducing FlareTesting.setup(); commit 2c5f4200535d679fd3092d1b6aa15ff71d85b869 Author: Luigi Rosso Date: Fri Oct 4 13:44:25 2019 -0700 Clamping trim start/end. commit daba34d11233391e7277b157bc117b8bbb626982 Author: Luigi Rosso Date: Mon Sep 30 21:21:55 2019 +0200 Cherry picking critical lints from #1 63 and updating for pub. --- example/checkbox/pubspec.lock | 209 ------------------ example/slider/pubspec.lock | 96 ++++++-- flare_dart/lib/actor_bone.dart | 1 - flare_dart/lib/actor_ik_constraint.dart | 2 +- .../lib/actor_layer_effect_renderer.dart | 1 - flare_flutter/android/local.properties | 4 +- .../ios/Runner/GeneratedPluginRegistrant.h | 3 + 7 files changed, 83 insertions(+), 233 deletions(-) delete mode 100644 example/checkbox/pubspec.lock diff --git a/example/checkbox/pubspec.lock b/example/checkbox/pubspec.lock deleted file mode 100644 index 2f6e59c..0000000 --- a/example/checkbox/pubspec.lock +++ /dev/null @@ -1,209 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.10" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.3.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.5" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.2" - collection: - dependency: transitive - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.14.11" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.3" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.2" - flare_dart: - dependency: transitive - description: - path: "../../flare_dart" - relative: true - source: path - version: "2.2.2" - flare_flutter: - dependency: "direct main" - description: - path: "../../flare_flutter" - relative: true - source: path - version: "1.6.3" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.5" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.7" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.5" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.9.3" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.5" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.5" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.6" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" -sdks: - dart: ">=2.4.0 <3.0.0" diff --git a/example/slider/pubspec.lock b/example/slider/pubspec.lock index 51a53c3..7f515ba 100644 --- a/example/slider/pubspec.lock +++ b/example/slider/pubspec.lock @@ -1,20 +1,34 @@ # Generated by pub -# See https://www.dartlang.org/tools/pub/glossary#lockfile +# See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.11" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.4.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" charcode: dependency: transitive description: @@ -29,6 +43,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.14.11" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" cupertino_icons: dependency: "direct main" description: @@ -37,19 +65,21 @@ packages: source: hosted version: "0.1.2" flare_dart: - dependency: "direct main" + dependency: transitive description: - path: "../../flare_dart" - relative: true - source: path - version: "1.1.0" + path: flare_dart + ref: dev + resolved-ref: "393c22461e127714a3a25c986bb59a666cba72ac" + url: "git://github.com/2d-inc/Flare-Flutter.git" + source: git + version: "2.3.0" flare_flutter: dependency: "direct main" description: path: "../../flare_flutter" relative: true source: path - version: "1.1.0" + version: "1.8.0" flutter: dependency: "direct main" description: flutter @@ -60,34 +90,55 @@ packages: description: flutter source: sdk version: "0.0.0" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.3+1" + version: "0.12.6" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.1.8" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.2" + version: "1.6.4" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0+1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.0" quiver: dependency: transitive description: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.5" sky_engine: dependency: transitive description: flutter @@ -99,7 +150,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.4.1" + version: "1.5.5" stack_trace: dependency: transitive description: @@ -113,28 +164,28 @@ packages: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "1.6.8" + version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.1" + version: "0.2.11" typed_data: dependency: transitive description: @@ -149,5 +200,12 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "3.5.0" sdks: - dart: ">=2.1.0 <3.0.0" + dart: ">=2.4.0 <3.0.0" diff --git a/flare_dart/lib/actor_bone.dart b/flare_dart/lib/actor_bone.dart index ab4a1d5..3992fe5 100644 --- a/flare_dart/lib/actor_bone.dart +++ b/flare_dart/lib/actor_bone.dart @@ -1,7 +1,6 @@ import "actor_artboard.dart"; import "actor_bone_base.dart"; import "actor_component.dart"; -import "actor_node.dart"; import "jelly_component.dart"; import "stream_reader.dart"; diff --git a/flare_dart/lib/actor_ik_constraint.dart b/flare_dart/lib/actor_ik_constraint.dart index f740ef1..b3cf6f5 100644 --- a/flare_dart/lib/actor_ik_constraint.dart +++ b/flare_dart/lib/actor_ik_constraint.dart @@ -121,7 +121,7 @@ class ActorIKConstraint extends ActorTargetedConstraint { } ActorBone bone = fk.bone; - for (final ActorNode node in bone.children) { + for (final node in bone.children) { BoneChain item = _fkChain.firstWhere( (chainItem) => chainItem.bone == node, orElse: () => null); diff --git a/flare_dart/lib/actor_layer_effect_renderer.dart b/flare_dart/lib/actor_layer_effect_renderer.dart index 9286721..e7e0bf3 100644 --- a/flare_dart/lib/actor_layer_effect_renderer.dart +++ b/flare_dart/lib/actor_layer_effect_renderer.dart @@ -4,7 +4,6 @@ import 'package:flare_dart/math/aabb.dart'; import 'actor_artboard.dart'; import 'actor_blur.dart'; -import 'actor_component.dart'; import 'actor_drawable.dart'; import 'actor_inner_shadow.dart'; import 'actor_mask.dart'; diff --git a/flare_flutter/android/local.properties b/flare_flutter/android/local.properties index 5cc61ea..82133b4 100644 --- a/flare_flutter/android/local.properties +++ b/flare_flutter/android/local.properties @@ -1,2 +1,2 @@ -sdk.dir=/usr/local/share/android-sdk -flutter.sdk=/Users/luigirosso/Projects/flutter \ No newline at end of file +sdk.dir=/Users/luigi/Library/Android/sdk +flutter.sdk=/Users/luigi/Projects/flutter/flutter \ No newline at end of file diff --git a/flare_flutter/ios/Runner/GeneratedPluginRegistrant.h b/flare_flutter/ios/Runner/GeneratedPluginRegistrant.h index 3b700eb..ed9a5c6 100644 --- a/flare_flutter/ios/Runner/GeneratedPluginRegistrant.h +++ b/flare_flutter/ios/Runner/GeneratedPluginRegistrant.h @@ -7,8 +7,11 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface GeneratedPluginRegistrant : NSObject + (void)registerWithRegistry:(NSObject*)registry; @end +NS_ASSUME_NONNULL_END #endif /* GeneratedPluginRegistrant_h */