Fix bounds calculation bug (#128)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.8.0]
+- Migrate to null safety
+- Fix some rendering bugs
+
 ## [0.7.1]
 - Fix a crash for some lottie file with empty paths.
 

example/ios/Flutter/Debug.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

example/ios/Flutter/Release.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

example/lib/examples/animation_full_control.dart

@@ -86,7 +86,7 @@ class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
               ],
             ),
             const SizedBox(height: 30),
-            RaisedButton(
+            ElevatedButton(
               child: Text('Loop between frames'),
               onPressed: () {
                 // Loop between 2 specifics frames

example/lib/examples/markers.dart

@@ -87,15 +87,15 @@ class _LottieDetailsState extends State<_LottieDetails>
           title: Text('Composition duration'),
           trailing: Text(widget.composition.durationFrames.toStringAsFixed(1)),
         ),
-        RaisedButton(
+        ElevatedButton(
           child: Text('touchDownEnd - touchUpCancel'),
           onPressed: () => _playBetween('touchDownEnd', 'touchUpCancel'),
         ),
-        RaisedButton(
+        ElevatedButton(
           child: Text('touchDownStart - touchDownEnd'),
           onPressed: () => _playBetween('touchDownStart', 'touchDownEnd'),
         ),
-        RaisedButton(
+        ElevatedButton(
           child: Text('touchDownEnd - touchUpEnd'),
           onPressed: () => _playBetween('touchDownEnd', 'touchUpEnd'),
         ),

example/lib/examples/save_frames.dart

@@ -28,7 +28,7 @@ class _MyAppState extends State<MyApp> {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
-              RaisedButton(
+              ElevatedButton(
                 child: Text('Export all frames'),
                 onPressed: _export,
               ),

example/macos/Flutter/Flutter-Debug.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

example/macos/Flutter/Flutter-Release.xcconfig

@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

example/macos/Podfile.lock

@@ -1,27 +1,28 @@
 PODS:
-  - FlutterMacOS (1.0.0)
+  - FlutterMacOS (1.22.4)
   - path_provider (0.0.1)
   - path_provider_macos (0.0.1):
     - FlutterMacOS
 
 DEPENDENCIES:
-  - FlutterMacOS (from `Flutter/ephemeral/.symlinks/flutter/darwin-x64-profile`)
   - path_provider (from `Flutter/ephemeral/.symlinks/plugins/path_provider/macos`)
   - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
 
+SPEC REPOS:
+  trunk:
+    - FlutterMacOS
+
 EXTERNAL SOURCES:
-  FlutterMacOS:
-    :path: Flutter/ephemeral/.symlinks/flutter/darwin-x64-profile
   path_provider:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider/macos
   path_provider_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
 
 SPEC CHECKSUMS:
-  FlutterMacOS: 15bea8a44d2fa024068daa0140371c020b4b6ff9
+  FlutterMacOS: ac210ef71944b3f04789076d70d4c72c7ec0c619
   path_provider: e0848572d1d38b9a7dd099e79cf83f5b7e2cde9f
   path_provider_macos: a0a3fd666cb7cd0448e936fb4abad4052961002b
 
 PODFILE CHECKSUM: d8ba9b3e9e93c62c74a660b46c6fcb09f03991a7
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1

example/macos/Runner.xcodeproj/project.pbxproj

@@ -26,10 +26,6 @@
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
-		33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; };
-		33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; };
-		D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F03CC91740A974D36C2A6384 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BC6FF5FCD90624533CC60DB /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
@@ -50,8 +46,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */,
-				33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */,
 			);
 			name = "Bundle Framework";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -73,14 +67,12 @@
 		33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = "<group>"; };
 		33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = "<group>"; };
 		33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = "<group>"; };
-		33D1A10322148B71006C7A3E /* FlutterMacOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FlutterMacOS.framework; path = Flutter/ephemeral/FlutterMacOS.framework; sourceTree = SOURCE_ROOT; };
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
 		5B4C0E87024EC2686CA05E23 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -88,8 +80,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D73912F022F37F9E000D13A0 /* App.framework in Frameworks */,
-				33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */,
 				F03CC91740A974D36C2A6384 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -145,8 +135,6 @@
 				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
 				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
 				33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */,
-				D73912EF22F37F9E000D13A0 /* App.framework */,
-				33D1A10322148B71006C7A3E /* FlutterMacOS.framework */,
 			);
 			path = Flutter;
 			sourceTree = "<group>";
@@ -281,7 +269,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename\n";
+			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
 		};
 		33CC111E2044C6BF0003C045 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;

example/pubspec.lock

@@ -298,4 +298,4 @@ packages:
     version: "0.1.2"
 sdks:
   dart: ">=2.12.0-29.10.beta <3.0.0"
-  flutter: ">=1.24.0-10.2.pre <2.0.0"
+  flutter: ">=1.24.0-10.2.pre"

lib/src/animation/content/base_stroke_content.dart

@@ -241,11 +241,10 @@ abstract class BaseStrokeContent
     var bounds = _path.getBounds();
 
     var width = _widthAnimation.value;
-    bounds = Rect.fromLTWH(bounds.left - width / 2.0, bounds.top - width / 2.0,
+    bounds = Rect.fromLTRB(bounds.left - width / 2.0, bounds.top - width / 2.0,
         bounds.right + width / 2.0, bounds.bottom + width / 2.0);
     // Add padding to account for rounding errors.
-    bounds = Rect.fromLTWH(
+    bounds = bounds.inflate(1);
-        bounds.left - 1, bounds.top - 1, bounds.right + 1, bounds.bottom + 1);
     L.endSection('StrokeContent#getBounds');
     return bounds;
   }

lib/src/animation/content/fill_content.dart

@@ -102,8 +102,7 @@ class FillContent implements DrawingContent, KeyPathElementContent {
     }
     var outBounds = _path.getBounds();
     // Add padding to account for rounding errors.
-    outBounds = Rect.fromLTWH(outBounds.left - 1, outBounds.top - 1,
+    outBounds = outBounds.inflate(1);
-        outBounds.right + 1, outBounds.bottom + 1);
     return outBounds;
   }
 

lib/src/animation/content/gradient_fill_content.dart

@@ -127,8 +127,7 @@ class GradientFillContent implements DrawingContent, KeyPathElementContent {
 
     var outBounds = _path.getBounds();
     // Add padding to account for rounding errors.
-    return Rect.fromLTWH(outBounds.left - 1, outBounds.top - 1,
+    return outBounds.inflate(1);
-        outBounds.right + 1, outBounds.bottom + 1);
   }
 
   Gradient _getLinearGradient() {

lib/src/model/layer/base_layer.dart

@@ -31,7 +31,7 @@ abstract class BaseLayer implements DrawingContent, KeyPathElement {
   static BaseLayer? forModel(Layer layerModel, LottieDrawable drawable,
       LottieComposition composition) {
     switch (layerModel.layerType) {
-      case LayerType.shap:
+      case LayerType.shape:
         return ShapeLayer(drawable, layerModel);
       case LayerType.preComp:
         return CompositionLayer(drawable, layerModel,
@@ -197,11 +197,11 @@ abstract class BaseLayer implements DrawingContent, KeyPathElement {
     var bounds = getBounds(_matrix, applyParents: false);
 
     // Uncomment this to draw matte outlines.
-    /* Paint paint = new LPaint();
+    /*var paint = Paint()
-    paint.setColor(Color.RED);
+      ..color = Color(0xFF00FF00)
-    paint.setStyle(Paint.Style.STROKE);
+      ..style = PaintingStyle.stroke
-    paint.setStrokeWidth(3);
+      ..strokeWidth = 3;
-    canvas.drawRect(rect, paint); */
+    canvas.drawRect(bounds, paint);*/
 
     bounds = _intersectBoundsWithMatte(bounds, parentMatrix);
 

lib/src/model/layer/layer.dart

@@ -8,7 +8,7 @@ import '../animatable/animatable_transform.dart';
 import '../content/content_model.dart';
 import '../content/mask.dart';
 
-enum LayerType { preComp, solid, image, nullLayer, shap, text, unknown }
+enum LayerType { preComp, solid, image, nullLayer, shape, text, unknown }
 
 enum MatteType { none, add, invert, unknown }
 

pubspec.lock

@@ -49,7 +49,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.1"
+    version: "1.6.2"
   build_config:
     dependency: transitive
     description:
@@ -63,28 +63,28 @@ packages:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.6"
+    version: "2.1.7"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.2"
+    version: "1.5.3"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.6"
+    version: "6.1.7"
   built_collection:
     dependency: transitive
     description:
@@ -248,7 +248,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.2"
+    version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
@@ -262,7 +262,7 @@ packages:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0-nullsafety.0"
+    version: "1.0.0"
   matcher:
     dependency: transitive
     description:
@@ -283,14 +283,14 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7"
+    version: "1.0.0"
   mockito:
     dependency: "direct dev"
     description:
       name: mockito
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0-nullsafety.5"
+    version: "5.0.0-nullsafety.7"
   node_interop:
     dependency: transitive
     description:
@@ -325,7 +325,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.2"
+    version: "1.10.0"
   pool:
     dependency: transitive
     description:
@@ -367,7 +367,7 @@ packages:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.3"
+    version: "0.2.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -470,6 +470,6 @@ packages:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.0-nullsafety.0"
 sdks:
   dart: ">=2.12.0-0.0 <3.0.0"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: lottie
 description: Render After Effects animations natively on Flutter. This package is a pure Dart implementation of a Lottie player.
-version: 0.8.0-nullsafety.0
+version: 0.8.0-nullsafety.1
 homepage: https://github.com/xvrh/lottie-flutter
 
 environment:
@@ -8,15 +8,15 @@ environment:
 
 dependencies:
   archive: ^3.0.0-nullsafety.0
-  characters: ^1.0.0-nullsafety.0
+  characters: ^1.1.0-nullsafety.5
-  charcode: ^1.2.0-nullsafety.0
+  charcode: ^1.2.0-nullsafety.3
-  collection: ^1.15.0-nullsafety.0
+  collection: ^1.15.0-nullsafety.5
   flutter:
     sdk: flutter
-  logging: ^1.0.0-nullsafety.0
+  logging: ^1.0.0
-  meta: ^1.3.0-nullsafety.0
+  meta: ^1.3.0-nullsafety.6
-  path: ^1.8.0-nullsafety.0
+  path: ^1.8.0-nullsafety.3
-  vector_math: ^2.0.0-nullsafety.0
+  vector_math: ^2.1.0-nullsafety.5
 
 dev_dependencies:
   analyzer:
@@ -24,5 +24,5 @@ dev_dependencies:
   dart_style:
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.0-nullsafety.1
+  mockito: ^5.0.0-nullsafety.7
-  yaml:
+  yaml: ^3.0.0-nullsafety.0

test/lottie_test.mocks.dart

@@ -1,10 +1,13 @@
+// Mocks generated by Mockito 5.0.0-nullsafety.7 from annotations
+// in lottie/test/lottie_test.dart.
+// Do not manually edit this file.
+
 import 'dart:async' as _i4;
 import 'dart:typed_data' as _i2;
 import 'package:flutter/src/services/asset_bundle.dart' as _i3;
 import 'package:mockito/mockito.dart' as _i1;
 
 // ignore_for_file: comment_references
-
 // ignore_for_file: unnecessary_parenthesis
 
 class _FakeByteData extends _i1.Fake implements _i2.ByteData {}
@@ -19,22 +22,23 @@ class MockAssetBundle extends _i1.Mock implements _i3.AssetBundle {
 
   @override
   _i4.Future<_i2.ByteData> load(String? key) => (super.noSuchMethod(
-          Invocation.method(#load, [key]), Future.value(_FakeByteData()))
+      Invocation.method(#load, [key]),
-      as _i4.Future<_i2.ByteData>);
+      returnValue: Future.value(_FakeByteData())) as _i4.Future<_i2.ByteData>);
   @override
-  _i4.Future<String> loadString(String? key, {bool? cache = true}) =>
+  _i4.Future<String> loadString(String? key, {bool? cache = true}) => (super
-      (super.noSuchMethod(
+      .noSuchMethod(Invocation.method(#loadString, [key], {#cache: cache}),
-          Invocation.method(#loadString, [key], {#cache: cache}),
+          returnValue: Future.value('')) as _i4.Future<String>);
-          Future.value('')) as _i4.Future<String>);
   @override
   _i4.Future<T> loadStructuredData<T>(
           String? key, _i4.Future<T> Function(String)? parser) =>
       (super.noSuchMethod(Invocation.method(#loadStructuredData, [key, parser]),
-          Future.value(null)) as _i4.Future<T>);
+          returnValue: Future.value(null)) as _i4.Future<T>);
   @override
   void evict(String? key) =>
-      super.noSuchMethod(Invocation.method(#evict, [key]));
+      super.noSuchMethod(Invocation.method(#evict, [key]),
+          returnValueForMissingStub: null);
   @override
   String toString() =>
-      (super.noSuchMethod(Invocation.method(#toString, []), '') as String);
+      (super.noSuchMethod(Invocation.method(#toString, []), returnValue: '')
+          as String);
 }