Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit ee997b7
Author: Luigi Rosso <[email protected]>
Date:   Wed Nov 6 17:32:55 2019 -0800

    Squashed commit of the following:

    commit 53a7c65
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Nov 6 17:30:42 2019 -0800

        Updating flare_flutter version.

    commit b391dd4
    Merge: 1e9b22e 9ec074b
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Nov 6 17:28:34 2019 -0800

        Merge branch 'warmth_fix'

    commit 9ec074b
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Nov 6 15:43:31 2019 -0800

        Call setState if mounted.

    commit c66ac64
    Author: Luigi Rosso <[email protected]>
    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 1e9b22e
    Author: Umberto Sonnino <[email protected]>
    Date:   Wed Nov 6 19:02:25 2019 +0100

        Init mat before inverting

    commit bc07b87
    Author: Umberto Sonnino <[email protected]>
    Date:   Wed Nov 6 19:00:13 2019 +0100

        Remove local flare_dart from examples pubspec #184

    commit e1cca7c
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 29 12:50:30 2019 -0700

        Bumping versions, merging optimal_load branch, and persisting settings in checkbox example.

    commit 55cae39
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 29 12:41:43 2019 -0700

        Copy transform affects stroke properly when instancing shapes.

    commit 43716dd
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 28 12:52:09 2019 -0700

        Prevent coldLoad (async) from happening when widget isn’t ready to load.

    commit 506837e
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 25 13:00:56 2019 -0700

        Improving loading.

    commit 9ee95b9
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 25 10:42:42 2019 -0700

        Make sure overrideColor is set even when drawableNodes is null.

    commit 7d59de1
    Author: Umberto Sonnino <[email protected]>
    Date:   Fri Oct 25 13:15:34 2019 +0100

        Move null check

    commit 528af53
    Author: Umberto Sonnino <[email protected]>
    Date:   Fri Oct 25 13:10:17 2019 +0100

        Insert null checks for artboards with no drawables #178

    commit 33f23a7
    Author: Umberto Sonnino <[email protected]>
    Date:   Fri Oct 25 12:16:16 2019 +0100

        Remove GradientColor override of ActorPaint opacity getter #179

    commit 59ba2f0
    Author: Umberto Sonnino <[email protected]>
    Date:   Thu Oct 24 09:31:41 2019 +0100

        Document the `actor_animatino.apply()` function

    commit d77438f
    Author: Umberto Sonnino <[email protected]>
    Date:   Thu Oct 24 09:31:10 2019 +0100

        Fix division by 0 on transform constraint

    commit f0cf988
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 11 12:59:13 2019 -0700

        Fix reading of JSON clip values. Issue #172

    commit a7796e0
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 11 12:39:48 2019 -0700

        Mitigating issue #172.

    commit 373c14a
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 14:21:47 2019 -0700

        Fixing issue with image clipping.

    commit ae1c901
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 11:19:16 2019 -0700

        Fix merge bugs.

    commit d8cb780
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 11:09:42 2019 -0700

        Adding support for difference clipping.

    commit bf99a76
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 19:07:26 2019 -0700

        Matching stable version

    commit 9becc74
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:58:11 2019 -0700

        Bumping flare_dart to 2.0 due to breaking changes.

    commit 0a292cc
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:39:57 2019 -0700

        Bumping versions and changelogs.

    commit 431a98e
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:35:26 2019 -0700

        Fixing up analysis issues for #169

    commit 72fb6fc
    Merge: 4d00202 dc68dea
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:02:17 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter

    commit 4d00202
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:02:11 2019 -0700

        Cleaning up analysis issues.

    commit dc68dea
    Merge: 5ca8d49 f1d9749
    Author: Luigi Rosso <[email protected]>
    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 f1d9749
    Author: Mehmet Fidanboylu <[email protected]>
    Date:   Tue Oct 8 10:20:58 2019 -0700

        Do the same changes to flare_dart

    commit 64f395e
    Author: Mehmet Fidanboylu <[email protected]>
    Date:   Tue Oct 8 10:17:51 2019 -0700

        Escalate the severity of unused imports in analyzer

    commit 5ca8d49
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 7 11:22:38 2019 -0700

        Bumping versions and changelog.

    commit 874ce8e
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 7 11:20:28 2019 -0700

        Adding support for nodes inside of shapes.

    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.

commit 9ec6c71
Author: Luigi Rosso <[email protected]>
Date:   Tue Oct 29 12:57:01 2019 -0700

    Squashed commit of the following:

    commit e1cca7c
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 29 12:50:30 2019 -0700

        Bumping versions, merging optimal_load branch, and persisting settings in checkbox example.

    commit 55cae39
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 29 12:41:43 2019 -0700

        Copy transform affects stroke properly when instancing shapes.

    commit 43716dd
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 28 12:52:09 2019 -0700

        Prevent coldLoad (async) from happening when widget isn’t ready to load.

    commit 506837e
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 25 13:00:56 2019 -0700

        Improving loading.

    commit 9ee95b9
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 25 10:42:42 2019 -0700

        Make sure overrideColor is set even when drawableNodes is null.

    commit 7d59de1
    Author: Umberto Sonnino <[email protected]>
    Date:   Fri Oct 25 13:15:34 2019 +0100

        Move null check

    commit 528af53
    Author: Umberto Sonnino <[email protected]>
    Date:   Fri Oct 25 13:10:17 2019 +0100

        Insert null checks for artboards with no drawables #178

    commit 33f23a7
    Author: Umberto Sonnino <[email protected]>
    Date:   Fri Oct 25 12:16:16 2019 +0100

        Remove GradientColor override of ActorPaint opacity getter #179

    commit 59ba2f0
    Author: Umberto Sonnino <[email protected]>
    Date:   Thu Oct 24 09:31:41 2019 +0100

        Document the `actor_animatino.apply()` function

    commit d77438f
    Author: Umberto Sonnino <[email protected]>
    Date:   Thu Oct 24 09:31:10 2019 +0100

        Fix division by 0 on transform constraint

    commit f0cf988
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 11 12:59:13 2019 -0700

        Fix reading of JSON clip values. Issue #172

    commit a7796e0
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 11 12:39:48 2019 -0700

        Mitigating issue #172.

    commit 373c14a
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 14:21:47 2019 -0700

        Fixing issue with image clipping.

    commit ae1c901
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 11:19:16 2019 -0700

        Fix merge bugs.

    commit d8cb780
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 11:09:42 2019 -0700

        Adding support for difference clipping.

    commit bf99a76
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 19:07:26 2019 -0700

        Matching stable version

    commit 9becc74
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:58:11 2019 -0700

        Bumping flare_dart to 2.0 due to breaking changes.

    commit 0a292cc
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:39:57 2019 -0700

        Bumping versions and changelogs.

    commit 431a98e
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:35:26 2019 -0700

        Fixing up analysis issues for #169

    commit 72fb6fc
    Merge: 4d00202 dc68dea
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:02:17 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter

    commit 4d00202
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:02:11 2019 -0700

        Cleaning up analysis issues.

    commit dc68dea
    Merge: 5ca8d49 f1d9749
    Author: Luigi Rosso <[email protected]>
    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 f1d9749
    Author: Mehmet Fidanboylu <[email protected]>
    Date:   Tue Oct 8 10:20:58 2019 -0700

        Do the same changes to flare_dart

    commit 64f395e
    Author: Mehmet Fidanboylu <[email protected]>
    Date:   Tue Oct 8 10:17:51 2019 -0700

        Escalate the severity of unused imports in analyzer

    commit 5ca8d49
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 7 11:22:38 2019 -0700

        Bumping versions and changelog.

    commit 874ce8e
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 7 11:20:28 2019 -0700

        Adding support for nodes inside of shapes.

    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.

commit c74bac6
Author: Luigi Rosso <[email protected]>
Date:   Fri Oct 11 13:00:27 2019 -0700

    Squashed commit of the following:

    commit f0cf988
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 11 12:59:13 2019 -0700

        Fix reading of JSON clip values. Issue #172

    commit a7796e0
    Author: Luigi Rosso <[email protected]>
    Date:   Fri Oct 11 12:39:48 2019 -0700

        Mitigating issue #172.

    commit 373c14a
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 14:21:47 2019 -0700

        Fixing issue with image clipping.

    commit ae1c901
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 11:19:16 2019 -0700

        Fix merge bugs.

    commit d8cb780
    Author: Luigi Rosso <[email protected]>
    Date:   Wed Oct 9 11:09:42 2019 -0700

        Adding support for difference clipping.

    commit bf99a76
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 19:07:26 2019 -0700

        Matching stable version

    commit 9becc74
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:58:11 2019 -0700

        Bumping flare_dart to 2.0 due to breaking changes.

    commit 0a292cc
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:39:57 2019 -0700

        Bumping versions and changelogs.

    commit 431a98e
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:35:26 2019 -0700

        Fixing up analysis issues for #169

    commit 72fb6fc
    Merge: 4d00202 dc68dea
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:02:17 2019 -0700

        Merge branch 'master' of https://github.com/2d-inc/Flare-Flutter

    commit 4d00202
    Author: Luigi Rosso <[email protected]>
    Date:   Tue Oct 8 13:02:11 2019 -0700

        Cleaning up analysis issues.

    commit dc68dea
    Merge: 5ca8d49 f1d9749
    Author: Luigi Rosso <[email protected]>
    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 f1d9749
    Author: Mehmet Fidanboylu <[email protected]>
    Date:   Tue Oct 8 10:20:58 2019 -0700

        Do the same changes to flare_dart

    commit 64f395e
    Author: Mehmet Fidanboylu <[email protected]>
    Date:   Tue Oct 8 10:17:51 2019 -0700

        Escalate the severity of unused imports in analyzer

    commit 5ca8d49
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 7 11:22:38 2019 -0700

        Bumping versions and changelog.

    commit 874ce8e
    Author: Luigi Rosso <[email protected]>
    Date:   Mon Oct 7 11:20:28 2019 -0700

        Adding support for nodes inside of shapes.

    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.
  • Loading branch information
@luigi-rosso
luigi-rosso committed Nov 7, 2019
1 parent eb99974 commit 9dedc74
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 19 deletions.
2 changes: 0 additions & 2 deletions example/favorite/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ dependencies:
sdk: flutter
flare_flutter:
path: ../../flare_flutter
flare_dart:
path: ../../flare_dart
cupertino_icons: ^0.1.2

dev_dependencies:
Expand Down
2 changes: 0 additions & 2 deletions example/penguin_dance/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ dependencies:
sdk: flutter
flare_flutter:
path: ../../flare_flutter
flare_dart:
path: ../../flare_dart

cupertino_icons: ^0.1.2

Expand Down
2 changes: 0 additions & 2 deletions example/slider/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ dependencies:
sdk: flutter
flare_flutter:
path: ../../flare_flutter
flare_dart:
path: ../../flare_dart
cupertino_icons: ^0.1.2

dev_dependencies:
Expand Down
2 changes: 0 additions & 2 deletions example/space_reload/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ dependencies:
sdk: flutter
flare_flutter:
path: ../../flare_flutter
# flare_dart:
# path: ../../flare_dart

# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
Expand Down
1 change: 1 addition & 0 deletions flare_dart/lib/actor_path.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ abstract class ActorBasePath {
localTransform = Mat2D();
Mat2D.invert(localTransform, parent.worldTransform);
} else if (!_isRootPath) {
localTransform = Mat2D();
// Path isn't root, so get transform in shape space.
if (Mat2D.invert(localTransform, shape.worldTransform)) {
Mat2D.multiply(localTransform, localTransform, worldTransform);
Expand Down
4 changes: 4 additions & 0 deletions flare_flutter/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [1.6.5] - 2019-11-06 17:29:43

- Fixed an issue with FlareCacheBuilder calling setState when the widget is no longer mounted.

## [1.6.4] - 2019-10-29 12:45:05

- Use latest flare_dart, fixing issue with transformAffectsStroke in instances.
Expand Down
29 changes: 19 additions & 10 deletions flare_flutter/lib/flare_cache_builder.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,19 @@ class FlareCacheBuilder extends StatefulWidget {
}

class _FlareCacheBuilderState extends State<FlareCacheBuilder> {
bool isWarm = false;
bool _isWarm = false;
bool get isWarm => _isWarm;
set isWarm(bool value) {
if (value == _isWarm) {
return;
}
if (mounted) {
setState(() {
_isWarm = value;
});
}
}

final Set<FlareCacheAsset> _assets = {};
@override
void initState() {
Expand Down Expand Up @@ -62,24 +74,21 @@ class _FlareCacheBuilderState extends State<FlareCacheBuilder> {
}

bool _updateWarmth() {
if (!mounted) {
return true;
}
var filenames = widget.filenames;
if (filenames == null) {
setState(() {
isWarm = true;
});
isWarm = true;
return true;
}
for (final filename in filenames) {
if (getWarmActor(bundle, filename) == null) {
setState(() {
isWarm = false;
});
isWarm = false;
return false;
}
}
setState(() {
isWarm = true;
});
isWarm = true;
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion flare_flutter/pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: flare_flutter
description: Vector design and runtime animation for Flutter.
version: 1.6.4
version: 1.6.5
author: "2Dimensions Team <[email protected]>"
homepage: https://github.com/2d-inc/Flare-Flutter
environment:
Expand Down

0 comments on commit 9dedc74

Please sign in to comment.