Set version 3.1.0

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

@@ -8,15 +8,12 @@ on:
 jobs:
   analyze_and_test:
     name: Flutter analyze
-    strategy:
-      matrix:
-        flutter: ['stable']
     runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
-          channel: ${{ matrix.flutter }}
+          channel: 'stable'
       - run: flutter doctor
       - run: flutter --version
       - run: flutter pub get

.github/workflows/coverage.yaml

@@ -0,0 +1,22 @@
+name: Coverage
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  coverage:
+    name: Coverage
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+      - run: flutter test --coverage
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4.0.1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.0
+- Use `package:http` for `Lottie.network`. This allows to drop dependency on `dart:html` and be compatible with `wasm`.
+- Fix new lints
+
 ## 3.0.0
 - Add `renderCache` parameter.
 

analysis_options.yaml

@@ -18,7 +18,6 @@ linter:
     avoid_js_rounded_ints: true
     avoid_positional_boolean_parameters: true
     avoid_redundant_argument_values: true
-    avoid_returning_null_for_future: true
     avoid_setters_without_getters: true
     avoid_type_to_string: true
     avoid_unused_constructor_parameters: true

example/pubspec.lock

@@ -77,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -107,22 +107,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  golden_toolkit:
-    dependency: "direct dev"
-    description:
-      name: golden_toolkit
-      sha256: "8f74adab33154fe7b731395782797021f97d2edc52f7bfb85ff4f1b5c4a215f0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.0"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -135,10 +127,34 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.7.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -161,39 +177,47 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.0.0"
+    version: "3.1.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
   path:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -214,10 +238,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -262,10 +286,26 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.3"
+    version: "3.7.4"
+  shelf:
+    dependency: "direct dev"
+    description:
+      name: shelf
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  shelf_static:
+    dependency: "direct dev"
+    description:
+      name: shelf_static
+      sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -335,14 +375,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.0"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.0"
   win32:
     dependency: transitive
     description:
@@ -360,5 +408,5 @@ packages:
     source: hosted
     version: "1.0.4"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
+  dart: ">=3.3.0 <4.0.0"
   flutter: ">=3.16.0"

example/pubspec.yaml

@@ -23,7 +23,8 @@ dev_dependencies:
   flutter_lints:
   flutter_test:
     sdk: flutter
-  golden_toolkit:
+  shelf:
+  shelf_static:
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

example/tool/web_server.dart

@@ -0,0 +1,9 @@
+import 'dart:io';
+import 'package:shelf/shelf_io.dart';
+import 'package:shelf_static/shelf_static.dart';
+
+void main() async {
+  var server = await serve(
+      createStaticHandler('build/web'), InternetAddress.loopbackIPv4, 0);
+  print('Listen on http://${server.address.host}:${server.port}/index.html');
+}

lib/src/lottie.dart

@@ -1,5 +1,7 @@
+import 'dart:io' as io;
 import 'dart:typed_data';
 import 'package:flutter/widgets.dart';
+import 'package:http/http.dart' as http;
 import '../lottie.dart';
 import 'composition.dart';
 import 'l.dart';
@@ -95,7 +97,7 @@ class Lottie extends StatefulWidget {
 
   /// Creates a widget that displays an [LottieComposition] obtained from a [File].
   static LottieBuilder file(
-    Object /*io.File|html.File*/ file, {
+    io.File file, {
     Animation<double>? controller,
     FrameRate? frameRate,
     bool? animate,
@@ -200,6 +202,8 @@ class Lottie extends StatefulWidget {
   /// Creates a widget that displays an [LottieComposition] obtained from the network.
   static LottieBuilder network(
     String url, {
+    http.Client? client,
+    Map<String, String>? headers,
     Animation<double>? controller,
     FrameRate? frameRate,
     bool? animate,
@@ -225,6 +229,8 @@ class Lottie extends StatefulWidget {
   }) =>
       LottieBuilder.network(
         url,
+        client: client,
+        headers: headers,
         controller: controller,
         frameRate: frameRate,
         animate: animate,

lib/src/lottie_builder.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
+import 'dart:io' as io;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
+import 'package:http/http.dart' as http;
 import 'composition.dart';
 import 'frame_rate.dart';
 import 'lottie.dart';
@@ -67,6 +69,7 @@ class LottieBuilder extends StatefulWidget {
   /// Creates a widget that displays an [LottieComposition] obtained from the network.
   LottieBuilder.network(
     String src, {
+    http.Client? client,
     Map<String, String>? headers,
     this.controller,
     this.frameRate,
@@ -91,6 +94,7 @@ class LottieBuilder extends StatefulWidget {
     this.renderCache,
     bool? backgroundLoading,
   }) : lottie = NetworkLottie(src,
+            client: client,
             headers: headers,
             imageProviderFactory: imageProviderFactory,
             decoder: decoder,
@@ -107,7 +111,7 @@ class LottieBuilder extends StatefulWidget {
   /// `android.permission.READ_EXTERNAL_STORAGE` permission.
   ///
   LottieBuilder.file(
-    Object /*io.File|html.File*/ file, {
+    io.File file, {
     this.controller,
     this.frameRate,
     this.animate,

lib/src/lottie_property.dart

@@ -2,54 +2,54 @@ import 'dart:ui';
 import 'value/drop_shadow.dart';
 
 /// Property values are the same type as the generic type of their corresponding
-/// {@link LottieValueCallback}. With this, we can use generics to maintain type safety
+/// [LottieValueCallback]. With this, we can use generics to maintain type safety
 /// of the callbacks.
 ///
 /// Supported properties:
 /// Transform:
-///    {@link #TRANSFORM_ANCHOR_POINT}
-///    {@link #TRANSFORM_POSITION}
-///    {@link #TRANSFORM_OPACITY}
-///    {@link #TRANSFORM_SCALE}
-///    {@link #TRANSFORM_ROTATION}
-///    {@link #TRANSFORM_SKEW}
-///    {@link #TRANSFORM_SKEW_ANGLE}
+///    {TRANSFORM_ANCHOR_POINT}
+///    {TRANSFORM_POSITION}
+///    {TRANSFORM_OPACITY}
+///    {TRANSFORM_SCALE}
+///    {TRANSFORM_ROTATION}
+///    {TRANSFORM_SKEW}
+///    {TRANSFORM_SKEW_ANGLE}
 ///
 /// Fill:
-///    {@link #COLOR} (non-gradient)
-///    {@link #OPACITY}
-///    {@link #COLOR_FILTER}
+///    {#COLOR} (non-gradient)
+///    {#OPACITY}
+///    {#COLOR_FILTER}
 ///
 /// Stroke:
-///    {@link #COLOR} (non-gradient)
-///    {@link #STROKE_WIDTH}
-///    {@link #OPACITY}
-///    {@link #COLOR_FILTER}
+///    {#COLOR} (non-gradient)
+///    {#STROKE_WIDTH}
+///    {#OPACITY}
+///    {#COLOR_FILTER}
 ///
 /// Ellipse:
-///    {@link #POSITION}
-///    {@link #ELLIPSE_SIZE}
+///    {#POSITION}
+///    {#ELLIPSE_SIZE}
 ///
 /// Polystar:
-///    {@link #POLYSTAR_POINTS}
-///    {@link #POLYSTAR_ROTATION}
-///    {@link #POSITION}
-///    {@link #POLYSTAR_INNER_RADIUS} (star)
-///    {@link #POLYSTAR_OUTER_RADIUS}
-///    {@link #POLYSTAR_INNER_ROUNDEDNESS} (star)
-///    {@link #POLYSTAR_OUTER_ROUNDEDNESS}
+///    {#POLYSTAR_POINTS}
+///    {#POLYSTAR_ROTATION}
+///    {#POSITION}
+///    {#POLYSTAR_INNER_RADIUS} (star)
+///    {#POLYSTAR_OUTER_RADIUS}
+///    {#POLYSTAR_INNER_ROUNDEDNESS} (star)
+///    {#POLYSTAR_OUTER_ROUNDEDNESS}
 ///
 /// Repeater:
 ///    All transform properties
-///    {@link #REPEATER_COPIES}
-///    {@link #REPEATER_OFFSET}
-///    {@link #TRANSFORM_ROTATION}
-///    {@link #TRANSFORM_START_OPACITY}
-///    {@link #TRANSFORM_END_OPACITY}
+///    {#REPEATER_COPIES}
+///    {#REPEATER_OFFSET}
+///    {#TRANSFORM_ROTATION}
+///    {#TRANSFORM_START_OPACITY}
+///    {#TRANSFORM_END_OPACITY}
 ///
 /// Layers:
 ///    All transform properties
-///    {@link #TIME_REMAP} (composition layers only)
+///    {#TIME_REMAP} (composition layers only)
 abstract class LottieProperty {
   /// ColorInt **/
   static const Color color = Color(0x00000001);

lib/src/parser/moshi/buffer.dart

@@ -66,7 +66,7 @@ class Buffer {
   }
 
   /// Reads and discards {@code byteCount} bytes from this source. Throws an
-  /// {@link java.io.EOFException} if the source is exhausted before the
+  /// [Exception] if the source is exhausted before the
   /// requested bytes can be skipped.
   void skip(int byteCount) {
     _start += byteCount;

lib/src/parser/moshi/json_utf8_reader.dart

@@ -857,7 +857,7 @@ class JsonUtf8Reader extends JsonReader {
 
   /// Returns the next character in the stream that is neither whitespace nor a
   /// part of a comment. When this returns, the returned character is always at
-  /// {@code buffer.getByte(0)}.
+  /// {buffer.getByte(0)}.
   int _nextNonWhitespace(bool throwOnEof) {
     // This code uses ugly local variables 'p' and 'l' representing the 'pos'
     // and 'limit' fields respectively. Using locals rather than fields saves

lib/src/providers/asset_provider.dart

@@ -74,7 +74,7 @@ class AssetLottie extends LottieProvider {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) return false;
     return other is AssetLottie &&
         other.keyName == keyName &&

lib/src/providers/file_provider.dart

@@ -1,12 +1,13 @@
+import 'dart:io' as io;
 import 'dart:ui' as ui;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
+import 'package:path/path.dart' as p;
 import '../composition.dart';
 import '../lottie_image_asset.dart';
 import 'load_fonts.dart';
 import 'load_image.dart';
 import 'lottie_provider.dart';
-import 'provider_io.dart' if (dart.library.html) 'provider_web.dart' as io;
 
 @immutable
 class FileLottie extends LottieProvider {
@@ -15,9 +16,13 @@ class FileLottie extends LottieProvider {
     super.imageProviderFactory,
     super.decoder,
     super.backgroundLoading,
-  });
+  }) : assert(
+          !kIsWeb,
+          'Lottie.file is not supported on Flutter Web. '
+          'Consider using either Lottie.asset or Lottie.network instead.',
+        );
 
-  final Object /*io.File|html.File*/ file;
+  final io.File file;
 
   @override
   Future<LottieComposition> load({BuildContext? context}) {
@@ -25,9 +30,9 @@ class FileLottie extends LottieProvider {
       LottieComposition composition;
       var args = (file, decoder);
       if (backgroundLoading) {
-        composition = await compute(loadFileAndParse, args);
+        composition = await compute(_loadFileAndParse, args);
       } else {
-        composition = await loadFileAndParse(args);
+        composition = await _loadFileAndParse(args);
       }
 
       for (var image in composition.images.values) {
@@ -44,26 +49,28 @@ class FileLottie extends LottieProvider {
       LottieComposition composition, LottieImageAsset lottieImage) {
     var imageProvider = getImageProvider(lottieImage);
 
-    imageProvider ??= io.loadImageForFile(file, lottieImage);
+    var imagePath = p.url
+        .join(p.dirname(file.path), lottieImage.dirName, lottieImage.fileName);
+    imageProvider ??= FileImage(io.File(imagePath));
 
     return loadImage(composition, lottieImage, imageProvider);
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) return false;
-    return other is FileLottie && io.areFilesEqual(file, other.file);
+    return other is FileLottie && file.path == other.file.path;
   }
 
   @override
   int get hashCode => file.hashCode;
 
   @override
-  String toString() => '$runtimeType(file: ${io.filePath(file)})';
+  String toString() => '$runtimeType(file: ${file.path})';
 }
 
-Future<LottieComposition> loadFileAndParse(
-    (Object, LottieDecoder?) args) async {
-  var bytes = await io.loadFile(args.$1);
+Future<LottieComposition> _loadFileAndParse(
+    (io.File, LottieDecoder?) args) async {
+  var bytes = await args.$1.readAsBytes();
   return await LottieComposition.fromBytes(bytes, decoder: args.$2);
 }

lib/src/providers/memory_provider.dart

@@ -50,7 +50,7 @@ class MemoryLottie extends LottieProvider {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) return false;
 
     //TODO(xha): compare bytes content

lib/src/providers/network_provider.dart

@@ -2,24 +2,26 @@ import 'dart:async';
 import 'dart:ui' as ui;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
+import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as p;
 import '../composition.dart';
 import '../lottie_image_asset.dart';
 import 'load_fonts.dart';
 import 'load_image.dart';
 import 'lottie_provider.dart';
-import 'provider_io.dart' if (dart.library.html) 'provider_web.dart' as network;
 
 @immutable
 class NetworkLottie extends LottieProvider {
   NetworkLottie(
     this.url, {
+    this.client,
     this.headers,
     super.imageProviderFactory,
     super.decoder,
     super.backgroundLoading,
   });
 
+  final http.Client? client;
   final String url;
   final Map<String, String>? headers;
 
@@ -28,12 +30,16 @@ class NetworkLottie extends LottieProvider {
     return sharedLottieCache.putIfAbsent(this, () async {
       var resolved = Uri.base.resolve(url);
 
+      var client = this.client ?? http.Client();
+      try {
+        var bytes = await client.readBytes(resolved, headers: headers);
+
         LottieComposition composition;
-      var args = (resolved, headers, decoder);
         if (backgroundLoading) {
-        composition = await compute(downloadAndParse, args);
+          composition = await compute(parseJsonBytes, (bytes, decoder));
         } else {
-        composition = await downloadAndParse(args);
+          composition =
+              await LottieComposition.fromBytes(bytes, decoder: decoder);
         }
 
         for (var image in composition.images.values) {
@@ -43,6 +49,11 @@ class NetworkLottie extends LottieProvider {
         await ensureLoadedFonts(composition);
 
         return composition;
+      } finally {
+        if (this.client == null) {
+          client.close();
+        }
+      }
     });
   }
 
@@ -60,7 +71,7 @@ class NetworkLottie extends LottieProvider {
   }
 
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     if (other.runtimeType != runtimeType) return false;
     return other is NetworkLottie &&
         other.url == url &&
@@ -73,9 +84,3 @@ class NetworkLottie extends LottieProvider {
   @override
   String toString() => '$runtimeType(url: $url)';
 }
-
-Future<LottieComposition> downloadAndParse(
-    (Uri, Map<String, String>?, LottieDecoder?) args) async {
-  var bytes = await network.loadHttp(args.$1, headers: args.$2);
-  return await LottieComposition.fromBytes(bytes, decoder: args.$3);
-}

lib/src/providers/provider_io.dart

@@ -1,44 +0,0 @@
-import 'dart:io';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
-import 'package:path/path.dart' as p;
-import '../lottie_image_asset.dart';
-
-final HttpClient _sharedHttpClient = HttpClient()..autoUncompress = false;
-
-Future<Uint8List> loadHttp(Uri uri, {Map<String, String>? headers}) async {
-  var request = await _sharedHttpClient.getUrl(uri);
-  headers?.forEach((String name, String value) {
-    request.headers.add(name, value);
-  });
-  final response = await request.close();
-  if (response.statusCode != HttpStatus.ok) {
-    throw Exception('Http error. Status code: ${response.statusCode} for $uri');
-  }
-
-  final bytes = await consolidateHttpClientResponseBytes(response);
-  if (bytes.lengthInBytes == 0) {
-    throw Exception('NetworkImage is an empty file: $uri');
-  }
-
-  return bytes;
-}
-
-Future<Uint8List> loadFile(Object file) {
-  return (file as File).readAsBytes();
-}
-
-bool areFilesEqual(Object f1, Object f2) =>
-    (f1 as File).path == (f2 as File).path;
-
-String filePath(Object file) {
-  return (file as File).path;
-}
-
-ImageProvider loadImageForFile(Object file, LottieImageAsset lottieImage) {
-  var fileIo = file as File;
-
-  var imagePath = p.url
-      .join(p.dirname(fileIo.path), lottieImage.dirName, lottieImage.fileName);
-  return FileImage(File(imagePath));
-}

lib/src/providers/provider_web.dart

@@ -1,39 +0,0 @@
-import 'dart:html';
-import 'dart:typed_data';
-import 'package:flutter/rendering.dart';
-import '../lottie_image_asset.dart';
-
-// ignore_for_file: avoid_web_libraries_in_flutter
-
-Future<Uint8List> loadHttp(Uri uri, {Map<String, String>? headers}) async {
-  var request = await HttpRequest.request(uri.toString(),
-      requestHeaders: headers, responseType: 'blob');
-
-  return _loadBlob(request.response as Blob);
-}
-
-Future<Uint8List> loadFile(Object file) {
-  return _loadBlob(file as File);
-}
-
-Future<Uint8List> _loadBlob(Blob file) async {
-  var reader = FileReader();
-  reader.readAsArrayBuffer(file);
-
-  await reader.onLoadEnd.first;
-  if (reader.readyState != FileReader.DONE) {
-    throw Exception('Error while reading blob');
-  }
-
-  return reader.result! as Uint8List;
-}
-
-String filePath(Object file) {
-  return (file as File).relativePath ?? '';
-}
-
-bool areFilesEqual(Object f1, Object f2) => f1 == f2;
-
-ImageProvider loadImageForFile(Object file, LottieImageAsset lottieImage) {
-  throw UnimplementedError();
-}

lib/src/utils/misc.dart

@@ -96,7 +96,7 @@ class MiscUtils {
   /// it to the accumulator list.
   ///
   /// Any {@link KeyPathElementContent} should call through to this as its implementation of
-  /// {@link KeyPathElementContent#resolveKeyPath(KeyPath, int, List, KeyPath)}.
+  /// {KeyPathElementContent#resolveKeyPath(KeyPath, int, List, KeyPath)}.
   static void resolveKeyPath(
       KeyPath keyPath,
       int depth,

lib/src/value_delegate.dart

@@ -331,7 +331,7 @@ class ResolvedValueDelegate<T> {
   /// to multiple contents. In that case, the callbacks's value will apply to all of them.
   /// <p>
   /// Internally, this will check if the {@link KeyPath} has already been resolved with
-  /// {@link #resolveKeyPath(KeyPath)} and will resolve it if it hasn't.
+  /// {#resolveKeyPath(KeyPath)} and will resolve it if it hasn't.
   void addValueCallback(LottieDrawable drawable) {
     var invalidate = false;
     if (valueDelegate.keyPath.isEmpty) {

pubspec.lock

@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "64.0.0"
+    version: "67.0.0"
   analyzer:
     dependency: "direct dev"
     description:
       name: analyzer
-      sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "6.4.1"
   archive:
     dependency: "direct main"
     description:
@@ -139,14 +139,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  http:
+    dependency: "direct main"
+    description:
+      name: http
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    version: "0.7.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -159,26 +199,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   package_config:
     dependency: transitive
     description:
@@ -191,18 +231,18 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
       url: "https://pub.dev"
     source: hosted
-    version: "3.7.3"
+    version: "3.7.4"
   pub_semver:
     dependency: transitive
     description:
@@ -280,6 +320,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.0"
   watcher:
     dependency: transitive
     description:
@@ -292,10 +340,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.0"
   yaml:
     dependency: "direct dev"
     description:
@@ -305,5 +353,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
+  dart: ">=3.3.0 <4.0.0"
   flutter: ">=3.16.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: 3.0.0
+version: 3.1.0
 repository: https://github.com/xvrh/lottie-flutter
 
 funding:
@@ -14,6 +14,7 @@ dependencies:
   archive: ^3.0.0
   flutter:
     sdk: flutter
+  http: ^1.0.0
   path: ^1.8.0
   vector_math: ^2.1.0