Fix web version (#135)

And allow to use an imageProviderFactory with a zip file.

.github/workflows/analyze-and-test.yaml

@@ -33,3 +33,17 @@ jobs:
                    "and check in all changes" \
               && exit 1)
         shell: bash
+  build_web_version:
+    name: Check that the web version compile
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: subosito/flutter-action@v1
+        with:
+          channel: 'beta'
+      - run: flutter config --enable-web
+      - run: flutter precache web
+      - run: flutter pub get
+        working-directory: example
+      - run: flutter build web
+        working-directory: example

example/pubspec.lock

@@ -7,63 +7,63 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.0"
+    version: "3.0.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.3"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.5"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.5"
+    version: "1.15.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.0"
+    version: "3.0.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   ffi:
     dependency: transitive
     description:
@@ -136,28 +136,28 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.8.0-nullsafety.2"
+    version: "0.8.0-nullsafety.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.3"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.6"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.3"
+    version: "1.8.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -232,56 +232,56 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.4"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.6"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.6"
+    version: "0.2.19"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.5"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.5"
+    version: "2.1.0"
   win32:
     dependency: transitive
     description:

example/test/dynamic_image_test.dart

@@ -0,0 +1,74 @@
+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,6 +9,7 @@ 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,8 +241,7 @@ abstract class BaseStrokeContent
     var bounds = _path.getBounds();
 
     var width = _widthAnimation.value;
-    bounds = Rect.fromLTRB(bounds.left - width / 2.0, bounds.top - width / 2.0,
-        bounds.right + width / 2.0, bounds.bottom + width / 2.0);
+    bounds = bounds.inflate(width / 2.0);
     // Add padding to account for rounding errors.
     bounds = bounds.inflate(1);
     L.endSection('StrokeContent#getBounds');

lib/src/composition.dart

@@ -34,12 +34,14 @@ class CompositionParameters {
 }
 
 class LottieComposition {
-  static Future<LottieComposition> fromByteData(ByteData data, {String? name}) {
-    return fromBytes(data.buffer.asUint8List(), name: name);
+  static Future<LottieComposition> fromByteData(ByteData data,
+      {String? name, LottieImageProviderFactory? imageProviderFactory}) {
+    return fromBytes(data.buffer.asUint8List(),
+        name: name, imageProviderFactory: imageProviderFactory);
   }
 
   static Future<LottieComposition> fromBytes(Uint8List bytes,
-      {String? name}) async {
+      {String? name, LottieImageProviderFactory? imageProviderFactory}) async {
     Archive? archive;
     if (bytes[0] == 0x50 && bytes[1] == 0x4B) {
       archive = ZipDecoder().decodeBytes(bytes);
@@ -55,8 +57,18 @@ 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_delegates.dart

@@ -1,4 +1,6 @@
+import 'dart:ui' as ui;
 import 'package:flutter/widgets.dart';
+import '../lottie.dart';
 import 'lottie_drawable.dart';
 import 'value_delegate.dart';
 
@@ -43,12 +45,31 @@ class LottieDelegates {
   /// ```
   final List<ValueDelegate>? values;
 
-  //TODO(xha): imageDelegate to change the image to display?
+  /// A callback to dynamically change an image of the animation.
+  ///
+  /// 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,7 +79,13 @@ class LottieDrawable {
   ui.Image? getImageAsset(String? ref) {
     var imageAsset = composition.images[ref];
     if (imageAsset != null) {
-      return imageAsset.loadedImage;
+      var imageDelegate = delegates?.image;
+      ui.Image? image;
+      if (imageDelegate != null) {
+        image = imageDelegate(composition, imageAsset);
+      }
+
+      return image ?? imageAsset.loadedImage;
     } else {
       return null;
     }

lib/src/model/layer/base_layer.dart

@@ -261,10 +261,7 @@ 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(
-        Rect.fromLTRB(bounds.left - 1, bounds.top - 1, bounds.right + 1,
-            bounds.bottom + 1),
-        _clearPaint);
+    canvas.drawRect(bounds.inflate(1), _clearPaint);
     L.endSection('Layer#clearLayer');
   }
 

lib/src/parser/lottie_composition_parser.dart

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

lib/src/providers/asset_provider.dart

@@ -33,7 +33,8 @@ 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,7 +18,8 @@ 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,7 +18,8 @@ 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,7 +24,8 @@ 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);

lib/src/providers/provider_web.dart

@@ -30,6 +30,6 @@ String filePath(Object file) {
   return (file as File).relativePath ?? '';
 }
 
-ImageProvider? loadImageForFile(Object file, LottieImageAsset lottieImage) {
-  return null;
+ImageProvider loadImageForFile(Object file, LottieImageAsset lottieImage) {
+  throw UnimplementedError();
 }

pubspec.lock

@@ -7,112 +7,112 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "14.0.0"
+    version: "16.0.0"
   analyzer:
     dependency: "direct dev"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.41.2"
+    version: "1.0.0"
   archive:
     dependency: "direct main"
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.0"
+    version: "3.0.0"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.0"
+    version: "2.0.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.3"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.3"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.5"
+    version: "0.4.6"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.8"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.3"
+    version: "1.5.4"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.5"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.7"
+    version: "6.1.10"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2"
+    version: "5.0.0"
   built_value:
     dependency: transitive
     description:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.1.0"
+    version: "8.0.0"
   characters:
     dependency: "direct main"
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.5"
+    version: "1.1.0"
   charcode:
     dependency: "direct main"
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -126,14 +126,14 @@ packages:
       name: cli_util
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
@@ -147,49 +147,49 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.5"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "3.0.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.0"
+    version: "3.0.0"
   dart_style:
     dependency: "direct dev"
     description:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.11"
+    version: "1.3.13"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   file:
     dependency: transitive
     description:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.1"
+    version: "6.1.0"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.11"
+    version: "1.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -206,7 +206,7 @@ packages:
       name: glob
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.0"
   graphs:
     dependency: transitive
     description:
@@ -227,14 +227,7 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.4"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.16.1"
+    version: "4.0.0"
   io:
     dependency: transitive
     description:
@@ -255,7 +248,7 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.1"
+    version: "4.0.0"
   logging:
     dependency: "direct main"
     description:
@@ -269,14 +262,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.3"
+    version: "0.12.10"
   meta:
     dependency: "direct main"
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.6"
+    version: "1.3.0"
   mime:
     dependency: transitive
     description:
@@ -287,38 +280,26 @@ packages:
   mockito:
     dependency: "direct dev"
     description:
-      name: mockito
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.0-nullsafety.7"
-  node_interop:
-    dependency: transitive
-    description:
-      name: node_interop
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.1"
-  node_io:
-    dependency: transitive
-    description:
-      name: node_io
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
+      path: "."
+      ref: HEAD
+      resolved-ref: c9fa2276b6b352331105e5b000d60f996d8ec452
+      url: "https://github.com/dart-lang/mockito.git"
+    source: git
+    version: "5.0.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "2.0.0"
   path:
     dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.3"
+    version: "1.8.0"
   pedantic:
     dependency: transitive
     description:
@@ -332,42 +313,35 @@ packages:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   pub_semver:
-    dependency: transitive
+    dependency: "direct dev"
     description:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.4"
+    version: "2.0.0"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.7"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.5"
+    version: "0.1.8"
   shelf:
     dependency: transitive
     description:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.9"
+    version: "1.0.0"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.4"
+    version: "0.2.4+1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -379,56 +353,56 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.10+1"
+    version: "0.9.10+3"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.4"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.6"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.6"
+    version: "0.2.19"
   timing:
     dependency: transitive
     description:
@@ -442,21 +416,21 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.5"
+    version: "1.3.0"
   vector_math:
     dependency: "direct main"
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.5"
+    version: "2.1.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+15"
+    version: "1.0.0"
   web_socket_channel:
     dependency: transitive
     description:
@@ -470,6 +444,6 @@ packages:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.0"
+    version: "3.0.0"
 sdks:
   dart: ">=2.12.0-0.0 <3.0.0"

pubspec.yaml

@@ -1,28 +1,32 @@
 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.2
+version: 0.8.0-nullsafety.4
 homepage: https://github.com/xvrh/lottie-flutter
 
 environment:
   sdk: '>=2.12.0-0 <3.0.0'
 
 dependencies:
-  archive: ^3.0.0-nullsafety.0
-  characters: ^1.1.0-nullsafety.5
-  charcode: ^1.2.0-nullsafety.3
-  collection: ^1.15.0-nullsafety.5
+  archive: ^3.0.0
+  characters: ^1.1.0
+  charcode: ^1.2.0
+  collection: ^1.15.0
   flutter:
     sdk: flutter
   logging: ^1.0.0
-  meta: ^1.3.0-nullsafety.6
-  path: ^1.8.0-nullsafety.3
-  vector_math: ^2.1.0-nullsafety.5
+  meta: ^1.3.0
+  path: ^1.8.0
+  vector_math: ^2.1.0
 
 dev_dependencies:
-  analyzer:
+  analyzer: ^1.0.0
   build_runner:
   dart_style:
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.0-nullsafety.7
-  yaml: ^3.0.0-nullsafety.0
+  mockito:
+    git:
+      url: https://github.com/dart-lang/mockito.git
+      ref: c9fa227
+  pub_semver:
+  yaml: ^3.0.0