...

.github/workflows/publish-on-pub.yaml

@@ -1,8 +1,8 @@
 name: Publish package to pub.dev
 on:
   push:
-    tags:
+#    tags:
-      - v*
+#      - v*
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -14,18 +14,19 @@ jobs:
       - run: flutter pub get
       - run: flutter pub run tool/publish/comment_dependency_overrides.dart
       - run: flutter pub get
+      - run: echo ${GITHUB_REF}
       - run: flutter pub run tool/publish/check_version.dart ${GITHUB_REF}
-      - name: Setup credentials
+#      - name: Setup credentials
-        run: |
+#        run: |
-          mkdir -p $FLUTTER_HOME/.pub-cache
+#          mkdir -p $FLUTTER_HOME/.pub-cache
-          cat <<EOF > $FLUTTER_HOME/.pub-cache/credentials.json
+#          cat <<EOF > $FLUTTER_HOME/.pub-cache/credentials.json
-          {
+#          {
-            "accessToken":"${{ secrets.OAUTH_ACCESS_TOKEN }}",
+#            "accessToken":"${{ secrets.OAUTH_ACCESS_TOKEN }}",
-            "refreshToken":"${{ secrets.OAUTH_REFRESH_TOKEN }}",
+#            "refreshToken":"${{ secrets.OAUTH_REFRESH_TOKEN }}",
-            "tokenEndpoint":"https://accounts.google.com/o/oauth2/token",
+#            "tokenEndpoint":"https://accounts.google.com/o/oauth2/token",
-            "scopes": [ "openid", "https://www.googleapis.com/auth/userinfo.email" ],
+#            "scopes": [ "openid", "https://www.googleapis.com/auth/userinfo.email" ],
-            "expiration": 1580681402856
+#            "expiration": 1580681402856
-          }
+#          }
-          EOF
+#          EOF
-      - name: Publish package
+#      - name: Publish package
-        run: flutter pub publish --force
+#        run: flutter pub publish --force

CHANGELOG.md

@@ -1,7 +1,3 @@
-## [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,3 +1,2 @@
-#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,3 +1,2 @@
-#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),
-            ElevatedButton(
+            RaisedButton(
               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)),
         ),
-        ElevatedButton(
+        RaisedButton(
           child: Text('touchDownEnd - touchUpCancel'),
           onPressed: () => _playBetween('touchDownEnd', 'touchUpCancel'),
         ),
-        ElevatedButton(
+        RaisedButton(
           child: Text('touchDownStart - touchDownEnd'),
           onPressed: () => _playBetween('touchDownStart', 'touchDownEnd'),
         ),
-        ElevatedButton(
+        RaisedButton(
           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: [
-              ElevatedButton(
+              RaisedButton(
                 child: Text('Export all frames'),
                 onPressed: _export,
               ),

example/lib/main_app.dart

@@ -21,36 +21,34 @@ class App extends StatelessWidget {
         appBar: AppBar(
           title: Text('Lottie Flutter'),
         ),
-        body: Scrollbar(
+        body: GridView.builder(
-          child: GridView.builder(
+          itemCount: files.length,
-            itemCount: files.length,
+          gridDelegate:
-            gridDelegate:
+              SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 4),
-                SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 4),
+          itemBuilder: (context, index) {
-            itemBuilder: (context, index) {
+            var assetName = files[index];
-              var assetName = files[index];
+            return GestureDetector(
-              return GestureDetector(
+              child: _Item(
-                child: _Item(
+                child: Lottie.asset(
-                  child: Lottie.asset(
+                  assetName,
-                    assetName,
+                  frameBuilder: (context, child, composition) {
-                    frameBuilder: (context, child, composition) {
+                    return AnimatedOpacity(
-                      return AnimatedOpacity(
+                      child: child,
-                        child: child,
+                      opacity: composition == null ? 0 : 1,
-                        opacity: composition == null ? 0 : 1,
+                      duration: const Duration(seconds: 1),
-                        duration: const Duration(seconds: 1),
+                      curve: Curves.easeOut,
-                        curve: Curves.easeOut,
+                    );
-                      );
+                  },
-                    },
-                  ),
                 ),
-                onTap: () {
+              ),
-                  Navigator.push(
+              onTap: () {
-                      context,
+                Navigator.push(
-                      MaterialPageRoute<void>(
+                    context,
-                          builder: (context) => Detail(assetName)));
+                    MaterialPageRoute<void>(
-                },
+                        builder: (context) => Detail(assetName)));
-              );
+              },
-            },
+            );
-          ),
+          },
         ),
       ),
     );

example/macos/Flutter/Flutter-Debug.xcconfig

@@ -1,3 +1,2 @@
-#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,3 +1,2 @@
-#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,28 +1,27 @@
 PODS:
-  - FlutterMacOS (1.22.4)
+  - FlutterMacOS (1.0.0)
   - 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: ac210ef71944b3f04789076d70d4c72c7ec0c619
+  FlutterMacOS: 15bea8a44d2fa024068daa0140371c020b4b6ff9
   path_provider: e0848572d1d38b9a7dd099e79cf83f5b7e2cde9f
   path_provider_macos: a0a3fd666cb7cd0448e936fb4abad4052961002b
 
 PODFILE CHECKSUM: d8ba9b3e9e93c62c74a660b46c6fcb09f03991a7
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.0

example/macos/Runner.xcodeproj/project.pbxproj

@@ -26,6 +26,10 @@
 		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 */
 
@@ -46,6 +50,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */,
+				33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */,
 			);
 			name = "Bundle Framework";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -67,12 +73,14 @@
 		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 */
@@ -80,6 +88,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D73912F022F37F9E000D13A0 /* App.framework in Frameworks */,
+				33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */,
 				F03CC91740A974D36C2A6384 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -135,6 +145,8 @@
 				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
 				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
 				33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */,
+				D73912EF22F37F9E000D13A0 /* App.framework */,
+				33D1A10322148B71006C7A3E /* FlutterMacOS.framework */,
 			);
 			path = Flutter;
 			sourceTree = "<group>";
@@ -269,7 +281,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
+			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename\n";
 		};
 		33CC111E2044C6BF0003C045 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;

example/pubspec.lock

@@ -129,14 +129,14 @@ packages:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.0-nullsafety.0"
   lottie:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.8.0-nullsafety.2"
+    version: "0.8.0-nullsafety.0"
   matcher:
     dependency: transitive
     description:
@@ -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"
+  flutter: ">=1.24.0-10.2.pre <2.0.0"

example/test/dynamic_image_test.dart

@@ -1,74 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:ui' as ui;
-import 'package:flutter/widgets.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:lottie/lottie.dart';
-import 'utils.dart';
-
-void main() {
-  testWidgets('Can specify ImageProvider with zip file ', (tester) async {
-    var size = Size(500, 400);
-    tester.binding.window.physicalSizeTestValue = size;
-    tester.binding.window.devicePixelRatioTestValue = 1.0;
-
-    var callCount = 0;
-    LottieImageProviderFactory imageProviderFactory = (image) {
-      ++callCount;
-      return FileImage(File('assets/Images/WeAccept/img_0.png'));
-    };
-
-    var composition = (await tester.runAsync(() => FileLottie(
-            File('assets/spinning_carrousel.zip'),
-            imageProviderFactory: imageProviderFactory)
-        .load()))!;
-
-    await tester.pumpWidget(FilmStrip(composition, size: size));
-
-    expect(callCount, 2);
-    await expectLater(find.byType(FilmStrip),
-        matchesGoldenFile('goldens/dynamic_image/zip_with_provider.png'));
-  });
-
-  testWidgets('Can specify image delegate', (tester) async {
-    var size = Size(500, 400);
-    tester.binding.window.physicalSizeTestValue = size;
-    tester.binding.window.devicePixelRatioTestValue = 1.0;
-
-    var image = await tester.runAsync(
-        () => loadImage(FileImage(File('assets/Images/WeAccept/img_0.png'))));
-
-    var composition = (await tester.runAsync(
-        () => FileLottie(File('assets/spinning_carrousel.zip')).load()))!;
-
-    var delegates = LottieDelegates(image: (composition, asset) {
-      return image;
-    });
-    await tester.pumpWidget(FilmStrip(
-      composition,
-      size: size,
-      delegates: delegates,
-    ));
-
-    await expectLater(find.byType(FilmStrip),
-        matchesGoldenFile('goldens/dynamic_image/delegate.png'));
-  });
-}
-
-Future<ui.Image?> loadImage(ImageProvider provider) {
-  var completer = Completer<ui.Image?>();
-  var imageStream = provider.resolve(ImageConfiguration.empty);
-  late ImageStreamListener listener;
-  listener = ImageStreamListener((image, synchronousLoaded) {
-    imageStream.removeListener(listener);
-
-    completer.complete(image.image);
-  }, onError: (dynamic e, __) {
-    imageStream.removeListener(listener);
-
-    completer.complete();
-  });
-  imageStream.addListener(listener);
-
-  return completer.future;
-}

lib/lottie.dart

@@ -9,7 +9,6 @@ export 'src/model/marker.dart' show Marker;
 export 'src/options.dart' show LottieOptions;
 export 'src/providers/asset_provider.dart' show AssetLottie;
 export 'src/providers/file_provider.dart' show FileLottie;
-export 'src/providers/load_image.dart' show LottieImageProviderFactory;
 export 'src/providers/lottie_provider.dart' show LottieProvider;
 export 'src/providers/memory_provider.dart' show MemoryLottie;
 export 'src/providers/network_provider.dart' show NetworkLottie;

lib/src/animation/content/base_stroke_content.dart

@@ -241,9 +241,11 @@ abstract class BaseStrokeContent
     var bounds = _path.getBounds();
 
     var width = _widthAnimation.value;
-    bounds = bounds.inflate(width / 2.0);
+    bounds = Rect.fromLTWH(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 = bounds.inflate(1);
+    bounds = Rect.fromLTWH(
+        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,7 +102,8 @@ class FillContent implements DrawingContent, KeyPathElementContent {
     }
     var outBounds = _path.getBounds();
     // Add padding to account for rounding errors.
-    outBounds = outBounds.inflate(1);
+    outBounds = Rect.fromLTWH(outBounds.left - 1, outBounds.top - 1,
+        outBounds.right + 1, outBounds.bottom + 1);
     return outBounds;
   }
 

lib/src/animation/content/gradient_fill_content.dart

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

lib/src/composition.dart

@@ -34,14 +34,12 @@ class CompositionParameters {
 }
 
 class LottieComposition {
-  static Future<LottieComposition> fromByteData(ByteData data,
+  static Future<LottieComposition> fromByteData(ByteData data, {String? name}) {
-      {String? name, LottieImageProviderFactory? imageProviderFactory}) {
+    return fromBytes(data.buffer.asUint8List(), name: name);
-    return fromBytes(data.buffer.asUint8List(),
-        name: name, imageProviderFactory: imageProviderFactory);
   }
 
   static Future<LottieComposition> fromBytes(Uint8List bytes,
-      {String? name, LottieImageProviderFactory? imageProviderFactory}) async {
+      {String? name}) async {
     Archive? archive;
     if (bytes[0] == 0x50 && bytes[1] == 0x4B) {
       archive = ZipDecoder().decodeBytes(bytes);
@@ -57,18 +55,8 @@ class LottieComposition {
         var imagePath = p.posix.join(image.dirName, image.fileName);
         var found = archive.files.firstWhereOrNull(
             (f) => f.name.toLowerCase() == imagePath.toLowerCase());
-
-        ImageProvider? provider;
-        if (imageProviderFactory != null) {
-          provider = imageProviderFactory(image);
-        }
-
-        if (provider != null) {
-          image.loadedImage = await loadImage(composition, image, provider);
-        }
-
         if (found != null) {
-          image.loadedImage ??= await loadImage(
+          image.loadedImage = await loadImage(
               composition, image, MemoryImage(found.content as Uint8List));
         }
       }

lib/src/lottie_builder.dart

@@ -381,11 +381,14 @@ class _LottieBuilderState extends State<LottieBuilder> {
   void _load() {
     var provider = widget.lottie;
     _loadingFuture = widget.lottie.load().then((composition) {
+      print('Loaded');
       if (mounted && widget.onLoaded != null && widget.lottie == provider) {
         widget.onLoaded!(composition);
       }
 
       return composition;
+    }, onError: (Object e, StackTrace t) {
+      print('Load error $e $t');
     });
   }
 

lib/src/lottie_delegates.dart

@@ -1,6 +1,4 @@
-import 'dart:ui' as ui;
 import 'package:flutter/widgets.dart';
-import '../lottie.dart';
 import 'lottie_drawable.dart';
 import 'value_delegate.dart';
 
@@ -45,31 +43,12 @@ class LottieDelegates {
   /// ```
   final List<ValueDelegate>? values;
 
-  /// A callback to dynamically change an image of the animation.
+  //TODO(xha): imageDelegate to change the image to display?
-  ///
-  /// Example:
-  /// ```dart
-  /// Lottie.asset(
-  //   'assets/data.json',
-  //   delegates: LottieDelegates(
-  //     image: (composition, image) {
-  //       if (image.id == 'img_0' && _isMouseOver) {
-  //         return myCustomImage;
-  //       }
-  //
-  //       // Use the default method: composition.images[image.id].loadedImage;
-  //       return null;
-  //     },
-  //   )
-  // )
-  /// ```
-  final ui.Image? Function(LottieComposition, LottieImageAsset)? image;
 
   LottieDelegates({
     this.text,
     TextStyle Function(LottieFontStyle)? textStyle,
     this.values,
-    this.image,
   }) : textStyle = textStyle;
 
   @override

lib/src/lottie_drawable.dart

@@ -79,13 +79,7 @@ class LottieDrawable {
   ui.Image? getImageAsset(String? ref) {
     var imageAsset = composition.images[ref];
     if (imageAsset != null) {
-      var imageDelegate = delegates?.image;
+      return imageAsset.loadedImage;
-      ui.Image? image;
-      if (imageDelegate != null) {
-        image = imageDelegate(composition, imageAsset);
-      }
-
-      return image ?? imageAsset.loadedImage;
     } else {
       return null;
     }

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.shape:
+      case LayerType.shap:
         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.
-    /*var paint = Paint()
+    /* Paint paint = new LPaint();
-      ..color = Color(0xFF00FF00)
+    paint.setColor(Color.RED);
-      ..style = PaintingStyle.stroke
+    paint.setStyle(Paint.Style.STROKE);
-      ..strokeWidth = 3;
+    paint.setStrokeWidth(3);
-    canvas.drawRect(bounds, paint);*/
+    canvas.drawRect(rect, paint); */
 
     bounds = _intersectBoundsWithMatte(bounds, parentMatrix);
 
@@ -261,7 +261,10 @@ abstract class BaseLayer implements DrawingContent, KeyPathElement {
   void _clearCanvas(Canvas canvas, Rect bounds) {
     L.beginSection('Layer#clearLayer');
     // If we don't pad the clear draw, some phones leave a 1px border of the graphics buffer.
-    canvas.drawRect(bounds.inflate(1), _clearPaint);
+    canvas.drawRect(
+        Rect.fromLTRB(bounds.left - 1, bounds.top - 1, bounds.right + 1,
+            bounds.bottom + 1),
+        _clearPaint);
     L.endSection('Layer#clearLayer');
   }
 

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, shape, text, unknown }
+enum LayerType { preComp, solid, image, nullLayer, shap, text, unknown }
 
 enum MatteType { none, add, invert, unknown }
 

lib/src/parser/lottie_composition_parser.dart

@@ -101,12 +101,13 @@ class LottieCompositionParser {
       }
       layers.add(layer);
       layerMap[layer.id] = layer;
-    }
+
-    if (imageCount > 4) {
+      if (imageCount > 4) {
-      composition.addWarning(
+        composition.addWarning(
-          'You have $imageCount images. Lottie should primarily be '
+            'You have $imageCount images. Lottie should primarily be '
-          'used with shapes. If you are using Adobe Illustrator, convert the Illustrator layers'
+            'used with shapes. If you are using Adobe Illustrator, convert the Illustrator layers'
-          ' to shape layers.');
+            ' to shape layers.');
+      }
     }
     reader.endArray();
   }

lib/src/providers/asset_provider.dart

@@ -33,8 +33,7 @@ class AssetLottie extends LottieProvider {
       var data = await chosenBundle.load(keyName);
 
       var composition = await LottieComposition.fromByteData(data,
-          name: p.url.basenameWithoutExtension(keyName),
+          name: p.url.basenameWithoutExtension(keyName));
-          imageProviderFactory: imageProviderFactory);
 
       for (var image in composition.images.values) {
         image.loadedImage ??= await _loadImage(composition, image);

lib/src/providers/file_provider.dart

@@ -18,8 +18,7 @@ class FileLottie extends LottieProvider {
     return sharedLottieCache.putIfAbsent(cacheKey, () async {
       var bytes = await io.loadFile(file);
       var composition = await LottieComposition.fromBytes(bytes,
-          name: p.basenameWithoutExtension(io.filePath(file)),
+          name: p.basenameWithoutExtension(io.filePath(file)));
-          imageProviderFactory: imageProviderFactory);
 
       for (var image in composition.images.values) {
         image.loadedImage ??= await _loadImage(composition, image);

lib/src/providers/load_image.dart

@@ -4,7 +4,7 @@ import 'package:flutter/widgets.dart';
 import '../composition.dart';
 import '../lottie_image_asset.dart';
 
-typedef LottieImageProviderFactory = ImageProvider? Function(LottieImageAsset);
+typedef LottieImageProviderFactory = ImageProvider Function(LottieImageAsset);
 
 Future<ui.Image?> loadImage(LottieComposition composition,
     LottieImageAsset lottieImage, ImageProvider provider) {

lib/src/providers/memory_provider.dart

@@ -18,8 +18,7 @@ class MemoryLottie extends LottieProvider {
     // TODO(xha): hash the list content
     var cacheKey = 'memory-${bytes.hashCode}-${bytes.lengthInBytes}';
     return sharedLottieCache.putIfAbsent(cacheKey, () async {
-      var composition = await LottieComposition.fromBytes(bytes,
+      var composition = await LottieComposition.fromBytes(bytes);
-          imageProviderFactory: imageProviderFactory);
       for (var image in composition.images.values) {
         image.loadedImage ??= await _loadImage(composition, image);
       }

lib/src/providers/network_provider.dart

@@ -24,8 +24,7 @@ class NetworkLottie extends LottieProvider {
       var bytes = await network.loadHttp(resolved, headers: headers);
 
       var composition = await LottieComposition.fromBytes(bytes,
-          name: p.url.basenameWithoutExtension(url),
+          name: p.url.basenameWithoutExtension(url));
-          imageProviderFactory: imageProviderFactory);
 
       for (var image in composition.images.values) {
         image.loadedImage ??= await _loadImage(resolved, composition, image);

pubspec.lock

@@ -49,7 +49,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.1"
   build_config:
     dependency: transitive
     description:
@@ -63,28 +63,28 @@ packages:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.6"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.3"
+    version: "1.5.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.7"
+    version: "6.1.6"
   built_collection:
     dependency: transitive
     description:
@@ -248,7 +248,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.2"
   json_annotation:
     dependency: transitive
     description:
@@ -262,7 +262,7 @@ packages:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.0-nullsafety.0"
   matcher:
     dependency: transitive
     description:
@@ -283,14 +283,14 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "0.9.7"
   mockito:
     dependency: "direct dev"
     description:
       name: mockito
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0-nullsafety.7"
+    version: "5.0.0-nullsafety.5"
   node_interop:
     dependency: transitive
     description:
@@ -325,7 +325,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.2"
   pool:
     dependency: transitive
     description:
@@ -367,7 +367,7 @@ packages:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -470,6 +470,6 @@ packages:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.0"
+    version: "2.2.1"
 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.3
+version: 0.8.0-nullsafety.0
 homepage: https://github.com/xvrh/lottie-flutter
 
 environment:
@@ -8,15 +8,15 @@ environment:
 
 dependencies:
   archive: ^3.0.0-nullsafety.0
-  characters: ^1.1.0-nullsafety.5
+  characters: ^1.0.0-nullsafety.0
-  charcode: ^1.2.0-nullsafety.3
+  charcode: ^1.2.0-nullsafety.0
-  collection: ^1.15.0-nullsafety.5
+  collection: ^1.15.0-nullsafety.0
   flutter:
     sdk: flutter
-  logging: ^1.0.0
+  logging: ^1.0.0-nullsafety.0
-  meta: ^1.3.0-nullsafety.6
+  meta: ^1.3.0-nullsafety.0
-  path: ^1.8.0-nullsafety.3
+  path: ^1.8.0-nullsafety.0
-  vector_math: ^2.1.0-nullsafety.5
+  vector_math: ^2.0.0-nullsafety.0
 
 dev_dependencies:
   analyzer:
@@ -24,5 +24,5 @@ dev_dependencies:
   dart_style:
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.0-nullsafety.7
+  mockito: ^5.0.0-nullsafety.1
-  yaml: ^3.0.0-nullsafety.0
+  yaml:

test/lottie_test.mocks.dart

@@ -1,13 +1,10 @@
-// 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 {}
@@ -22,23 +19,22 @@ class MockAssetBundle extends _i1.Mock implements _i3.AssetBundle {
 
   @override
   _i4.Future<_i2.ByteData> load(String? key) => (super.noSuchMethod(
-      Invocation.method(#load, [key]),
+          Invocation.method(#load, [key]), Future.value(_FakeByteData()))
-      returnValue: Future.value(_FakeByteData())) as _i4.Future<_i2.ByteData>);
+      as _i4.Future<_i2.ByteData>);
   @override
-  _i4.Future<String> loadString(String? key, {bool? cache = true}) => (super
+  _i4.Future<String> loadString(String? key, {bool? cache = true}) =>
-      .noSuchMethod(Invocation.method(#loadString, [key], {#cache: cache}),
+      (super.noSuchMethod(
-          returnValue: Future.value('')) as _i4.Future<String>);
+          Invocation.method(#loadString, [key], {#cache: cache}),
+          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]),
-          returnValue: Future.value(null)) as _i4.Future<T>);
+          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, []), returnValue: '')
+      (super.noSuchMethod(Invocation.method(#toString, []), '') as String);
-          as String);
 }