Hypothetical fix for #243

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

@@ -34,7 +34,7 @@ jobs:
               && exit 1)
         shell: bash
   build_web_version:
-    name: Check that the web version compile
+    name: Check that the web version can compile
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [2.0.0]
+- **Breaking change**: the lottie widget will be smaller if it relies on the intrinsic size of the composition. 
+
+Previously the lottie parser was automatically multiplying the size of the composition by `window.devicePixelRatio`.
+This was incorrect as it results in a widget of a different size depending on the pixel ratio of the monitor. 
+Furthermore, it created some bugs when the property `window.devicePixelRatio` was not available immediately at the start
+of the app (on Android release builds). 
+
+The code can be adapted to specify explicitly the size of the animation with `width`, `height` and `fit` properties.
+
+```dart
+Scaffold(
+  body: Center(
+    child: Lottie.asset(
+      'assets/LottieLogo1.json',
+      height: 800,
+      fit: BoxFit.contain,
+    ),
+  ),
+);
+```
+
 ## [1.4.3]
 - Fixed some lints with Flutter 3.3. 
 

README.md

@@ -23,7 +23,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -61,7 +61,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();
@@ -136,7 +136,7 @@ This example shows how to load and parse a Lottie composition from a json file.
 
 ```dart
 class MyWidget extends StatefulWidget {
-  const MyWidget({Key? key}) : super(key: key);
+  const MyWidget({super.key});
 
   @override
   State<MyWidget> createState() => _MyWidgetState();
@@ -182,7 +182,7 @@ a specific position and size.
 class CustomDrawer extends StatelessWidget {
   final LottieComposition composition;
 
-  const CustomDrawer(this.composition, {Key? key}) : super(key: key);
+  const CustomDrawer(this.composition, {super.key});
 
   @override
   Widget build(BuildContext context) {

analysis_options.yaml

@@ -10,14 +10,16 @@ linter:
     always_declare_return_types: true
     avoid_dynamic_calls: true
     avoid_escaping_inner_quotes: true
+    avoid_returning_null_for_future: true
     avoid_setters_without_getters: true
+    cancel_subscriptions: true
     cast_nullable_to_non_nullable: true
     close_sinks: true
     no_adjacent_strings_in_list: true
     no_default_cases: true
     omit_local_variable_types: true
     only_throw_errors: true
-    prefer_interpolation_to_compose_strings: true
+    prefer_relative_imports: true
     prefer_single_quotes: true
     sort_child_properties_last: true
     sort_pub_dependencies: true
@@ -27,3 +29,4 @@ linter:
     unnecessary_statements: true
     unsafe_html: true
     use_raw_strings: true
+    use_super_parameters: true

example/README.md

@@ -9,7 +9,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/alert_dialog.dart

@@ -5,7 +5,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const App());
 
 class App extends StatelessWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/animate_no_repeat.dart

@@ -6,7 +6,7 @@ void main() async {
 }
 
 class App extends StatelessWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/animation_controller.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();

example/lib/examples/animation_full_control.dart

@@ -12,7 +12,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();

example/lib/examples/blur.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/custom_draw.dart

@@ -5,7 +5,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -18,7 +18,7 @@ class MyApp extends StatelessWidget {
 }
 
 class MyWidget extends StatefulWidget {
-  const MyWidget({Key? key}) : super(key: key);
+  const MyWidget({super.key});
 
   @override
   State<MyWidget> createState() => _MyWidgetState();
@@ -60,7 +60,7 @@ class _MyWidgetState extends State<MyWidget> {
 class CustomDrawer extends StatelessWidget {
   final LottieComposition composition;
 
-  const CustomDrawer(this.composition, {Key? key}) : super(key: key);
+  const CustomDrawer(this.composition, {super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/custom_load.dart

@@ -5,7 +5,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -19,7 +19,7 @@ class MyApp extends StatelessWidget {
 
 //--- example
 class MyWidget extends StatefulWidget {
-  const MyWidget({Key? key}) : super(key: key);
+  const MyWidget({super.key});
 
   @override
   State<MyWidget> createState() => _MyWidgetState();

example/lib/examples/drop_shadow.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/dynamic_properties.dart

@@ -7,7 +7,7 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   State<App> createState() => _AppState();

example/lib/examples/dynamic_text.dart

@@ -7,7 +7,7 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   State<App> createState() => _AppState();

example/lib/examples/error_builder.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/examples.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/hide_after_complete.dart

@@ -6,7 +6,7 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   State<App> createState() => _AppState();

example/lib/examples/markers.dart

@@ -9,7 +9,7 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   State<App> createState() => _AppState();
@@ -48,7 +48,7 @@ class _AppState extends State<App> with TickerProviderStateMixin {
 class _LottieDetails extends StatefulWidget {
   final LottieComposition composition;
 
-  const _LottieDetails(this.composition, {Key? key}) : super(key: key);
+  const _LottieDetails(this.composition);
 
   @override
   _LottieDetailsState createState() => _LottieDetailsState();

example/lib/examples/repeat.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();

example/lib/examples/run_once.dart

@@ -12,7 +12,7 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   State<App> createState() => _AppState();

example/lib/examples/save_frames.dart

@@ -10,7 +10,7 @@ import 'package:path_provider/path_provider.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   State<MyApp> createState() => _MyAppState();

example/lib/examples/simple_dynamic_properties.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/main.dart

@@ -4,7 +4,7 @@ import 'package:lottie/lottie.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/main_app.dart

@@ -14,7 +14,7 @@ void main() {
 }
 
 class App extends StatelessWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -24,8 +24,8 @@ class App extends StatelessWidget {
         appBar: AppBar(
           title: const Text('Lottie Flutter'),
         ),
-        body: Scrollbar(
+        body: GridView.builder(
-          child: GridView.builder(
+          primary: true,
           itemCount: files.length,
           gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
               crossAxisCount: 4),
@@ -41,6 +41,7 @@ class App extends StatelessWidget {
               child: _Item(
                 child: Lottie.asset(
                   assetName,
+                  fit: BoxFit.contain,
                   onWarning: (w) => _logger.info('$assetName - $w'),
                   frameBuilder: (context, child, composition) {
                     return AnimatedOpacity(
@@ -56,7 +57,6 @@ class App extends StatelessWidget {
           },
         ),
       ),
-      ),
     );
   }
 }
@@ -64,7 +64,7 @@ class App extends StatelessWidget {
 class _Item extends StatelessWidget {
   final Widget child;
 
-  const _Item({Key? key, required this.child}) : super(key: key);
+  const _Item({required this.child});
 
   @override
   Widget build(BuildContext context) {
@@ -89,7 +89,7 @@ class _Item extends StatelessWidget {
 class Detail extends StatefulWidget {
   final String assetName;
 
-  const Detail(this.assetName, {Key? key}) : super(key: key);
+  const Detail(this.assetName, {super.key});
 
   @override
   State<Detail> createState() => _DetailState();

example/lib/sizing_example.dart

@@ -13,7 +13,7 @@ void main() async {
 class App extends StatelessWidget {
   final LottieComposition composition;
 
-  const App({Key? key, required this.composition}) : super(key: key);
+  const App({super.key, required this.composition});
 
   @override
   Widget build(BuildContext context) {
@@ -103,8 +103,7 @@ class _Lottie extends StatefulWidget {
   final AlignmentGeometry? alignment;
 
   const _Lottie(this.composition,
-      {Key? key, this.width, this.height, this.fit, this.alignment})
+      {this.width, this.height, this.fit, this.alignment});
-      : super(key: key);
 
   @override
   __LottieState createState() => __LottieState();

example/lib/tests/airbnb.dart

@@ -6,7 +6,7 @@ void main() async {
 }
 
 class App extends StatelessWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   Widget build(BuildContext context) {

example/lib/tests/we_accept.dart

@@ -6,7 +6,7 @@ void main() async {
 }
 
 class App extends StatelessWidget {
-  const App({Key? key}) : super(key: key);
+  const App({super.key});
 
   @override
   Widget build(BuildContext context) {

example/linux/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,11 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+}

example/linux/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

example/linux/flutter/generated_plugins.cmake

@@ -0,0 +1,23 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

example/macos/Podfile.lock

@@ -14,8 +14,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
 
 SPEC CHECKSUMS:
-  FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
+  FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
-  path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f
+  path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
 
 PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
 

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.1"
+    version: "3.3.2"
   async:
     dependency: transitive
     description:
@@ -115,28 +115,28 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   lints:
     dependency: transitive
     description:
       name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   logging:
     dependency: "direct main"
     description:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   lottie:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.4.3"
+    version: "2.0.0"
   matcher:
     dependency: transitive
     description:
@@ -178,7 +178,7 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.20"
+    version: "2.0.21"
   path_provider_ios:
     dependency: transitive
     description:
@@ -206,7 +206,7 @@ packages:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   path_provider_windows:
     dependency: transitive
     description:
@@ -227,7 +227,7 @@ packages:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   process:
     dependency: transitive
     description:
@@ -302,7 +302,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.1"
   xdg_directories:
     dependency: transitive
     description:

example/pubspec.yaml

@@ -3,7 +3,7 @@ description: A sample app for the Lottie player
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   flutter:

lib/src/animation/keyframe/color_keyframe_animation.dart

@@ -4,7 +4,7 @@ import '../../value/keyframe.dart';
 import 'keyframe_animation.dart';
 
 class ColorKeyframeAnimation extends KeyframeAnimation<Color> {
-  ColorKeyframeAnimation(List<Keyframe<Color>> keyframes) : super(keyframes);
+  ColorKeyframeAnimation(super.keyframes);
 
   @override
   Color getValue(Keyframe<Color> keyframe, double keyframeProgress) {

lib/src/animation/keyframe/double_keyframe_animation.dart

@@ -3,7 +3,7 @@ import '../../value/keyframe.dart';
 import 'keyframe_animation.dart';
 
 class DoubleKeyframeAnimation extends KeyframeAnimation<double> {
-  DoubleKeyframeAnimation(List<Keyframe<double>> keyframes) : super(keyframes);
+  DoubleKeyframeAnimation(super.keyframes);
 
   @override
   double getValue(Keyframe<double> keyframe, double keyframeProgress) {

lib/src/animation/keyframe/integer_keyframe_animation.dart

@@ -3,7 +3,7 @@ import '../../value/keyframe.dart';
 import 'keyframe_animation.dart';
 
 class IntegerKeyframeAnimation extends KeyframeAnimation<int> {
-  IntegerKeyframeAnimation(List<Keyframe<int>> keyframes) : super(keyframes);
+  IntegerKeyframeAnimation(super.keyframes);
 
   @override
   int getValue(Keyframe<int> keyframe, double keyframeProgress) {

lib/src/animation/keyframe/keyframe_animation.dart

@@ -1,7 +1,6 @@
-import '../../value/keyframe.dart';
 import 'base_keyframe_animation.dart';
 
 abstract class KeyframeAnimation<T extends Object>
     extends BaseKeyframeAnimation<T, T> {
-  KeyframeAnimation(List<Keyframe<T>> keyframes) : super(keyframes);
+  KeyframeAnimation(super.keyframes);
 }

lib/src/animation/keyframe/path_keyframe.dart

@@ -7,9 +7,9 @@ class PathKeyframe extends Keyframe<Offset> {
   Path? _path;
   final Keyframe<Offset> _pointKeyFrame;
 
-  PathKeyframe(LottieComposition composition, Keyframe<Offset> keyframe)
+  PathKeyframe(LottieComposition super.composition, Keyframe<Offset> keyframe)
       : _pointKeyFrame = keyframe,
-        super(composition,
+        super(
             startValue: keyframe.startValue,
             endValue: keyframe.endValue,
             interpolator: keyframe.interpolator,

lib/src/animation/keyframe/path_keyframe_animation.dart

@@ -7,7 +7,7 @@ class PathKeyframeAnimation extends KeyframeAnimation<Offset> {
   PathKeyframe? _pathMeasureKeyframe;
   late PathMetric _pathMeasure;
 
-  PathKeyframeAnimation(List<Keyframe<Offset>> keyframes) : super(keyframes);
+  PathKeyframeAnimation(super.keyframes);
 
   @override
   Offset getValue(Keyframe<Offset> keyframe, double keyframeProgress) {

lib/src/animation/keyframe/point_keyframe_animation.dart

@@ -3,7 +3,7 @@ import '../../value/keyframe.dart';
 import 'keyframe_animation.dart';
 
 class PointKeyframeAnimation extends KeyframeAnimation<Offset> {
-  PointKeyframeAnimation(List<Keyframe<Offset>> keyframes) : super(keyframes);
+  PointKeyframeAnimation(super.keyframes);
 
   @override
   Offset getValue(Keyframe<Offset> keyframe, double keyframeProgress) {

lib/src/animation/keyframe/shape_keyframe_animation.dart

@@ -11,8 +11,7 @@ class ShapeKeyframeAnimation extends BaseKeyframeAnimation<ShapeData, Path> {
   final Path _tempPath = PathFactory.create();
   List<ShapeModifierContent>? _shapeModifiers;
 
-  ShapeKeyframeAnimation(List<Keyframe<ShapeData>> keyframes)
+  ShapeKeyframeAnimation(super.keyframes);
-      : super(keyframes);
 
   @override
   Path getValue(Keyframe<ShapeData> keyframe, double keyframeProgress) {

lib/src/animation/keyframe/text_keyframe_animation.dart

@@ -5,8 +5,7 @@ import '../../value/lottie_value_callback.dart';
 import 'keyframe_animation.dart';
 
 class TextKeyframeAnimation extends KeyframeAnimation<DocumentData> {
-  TextKeyframeAnimation(List<Keyframe<DocumentData>> keyframes)
+  TextKeyframeAnimation(super.keyframes);
-      : super(keyframes);
 
   @override
   DocumentData getValue(

lib/src/lottie.dart

@@ -12,7 +12,7 @@ import 'lottie_builder.dart';
 /// [repeat] and [reverse].
 class Lottie extends StatefulWidget {
   const Lottie({
-    Key? key,
+    super.key,
     required this.composition,
     this.controller,
     this.width,
@@ -30,8 +30,7 @@ class Lottie extends StatefulWidget {
   })  : animate = animate ?? true,
         reverse = reverse ?? false,
         repeat = repeat ?? true,
-        addRepaintBoundary = addRepaintBoundary ?? true,
+        addRepaintBoundary = addRepaintBoundary ?? true;
-        super(key: key);
 
   /// Creates a widget that displays an [LottieComposition] obtained from an [AssetBundle].
   static LottieBuilder asset(

lib/src/lottie_builder.dart

@@ -41,7 +41,7 @@ typedef LottieErrorWidgetBuilder = Widget Function(
 ///
 class LottieBuilder extends StatefulWidget {
   const LottieBuilder({
-    Key? key,
+    super.key,
     required this.lottie,
     this.controller,
     this.frameRate,
@@ -60,7 +60,7 @@ class LottieBuilder extends StatefulWidget {
     this.addRepaintBoundary,
     this.filterQuality,
     this.onWarning,
-  }) : super(key: key);
+  });
 
   /// Creates a widget that displays an [LottieComposition] obtained from the network.
   LottieBuilder.network(
@@ -75,7 +75,7 @@ class LottieBuilder extends StatefulWidget {
     this.options,
     LottieImageProviderFactory? imageProviderFactory,
     this.onLoaded,
-    Key? key,
+    super.key,
     this.frameBuilder,
     this.errorBuilder,
     this.width,
@@ -86,8 +86,7 @@ class LottieBuilder extends StatefulWidget {
     this.filterQuality,
     this.onWarning,
   }) : lottie = NetworkLottie(src,
-            headers: headers, imageProviderFactory: imageProviderFactory),
+            headers: headers, imageProviderFactory: imageProviderFactory);
-        super(key: key);
 
   /// Creates a widget that displays an [LottieComposition] obtained from a [File].
   ///
@@ -110,7 +109,7 @@ class LottieBuilder extends StatefulWidget {
     this.options,
     LottieImageProviderFactory? imageProviderFactory,
     this.onLoaded,
-    Key? key,
+    super.key,
     this.frameBuilder,
     this.errorBuilder,
     this.width,
@@ -120,8 +119,7 @@ class LottieBuilder extends StatefulWidget {
     this.addRepaintBoundary,
     this.filterQuality,
     this.onWarning,
-  })  : lottie = FileLottie(file, imageProviderFactory: imageProviderFactory),
+  }) : lottie = FileLottie(file, imageProviderFactory: imageProviderFactory);
-        super(key: key);
 
   /// Creates a widget that displays an [LottieComposition] obtained from an [AssetBundle].
   LottieBuilder.asset(
@@ -135,7 +133,7 @@ class LottieBuilder extends StatefulWidget {
     this.options,
     LottieImageProviderFactory? imageProviderFactory,
     this.onLoaded,
-    Key? key,
+    super.key,
     AssetBundle? bundle,
     this.frameBuilder,
     this.errorBuilder,
@@ -150,8 +148,7 @@ class LottieBuilder extends StatefulWidget {
   }) : lottie = AssetLottie(name,
             bundle: bundle,
             package: package,
-            imageProviderFactory: imageProviderFactory),
+            imageProviderFactory: imageProviderFactory);
-        super(key: key);
 
   /// Creates a widget that displays an [LottieComposition] obtained from a [Uint8List].
   LottieBuilder.memory(
@@ -166,7 +163,7 @@ class LottieBuilder extends StatefulWidget {
     LottieImageProviderFactory? imageProviderFactory,
     this.onLoaded,
     this.errorBuilder,
-    Key? key,
+    super.key,
     this.frameBuilder,
     this.width,
     this.height,
@@ -175,9 +172,7 @@ class LottieBuilder extends StatefulWidget {
     this.addRepaintBoundary,
     this.filterQuality,
     this.onWarning,
-  })  : lottie =
+  }) : lottie = MemoryLottie(bytes, imageProviderFactory: imageProviderFactory);
-            MemoryLottie(bytes, imageProviderFactory: imageProviderFactory),
-        super(key: key);
 
   /// The lottie animation to load.
   /// Example of providers: [AssetLottie], [NetworkLottie], [FileLottie], [MemoryLottie]

lib/src/model/animatable/animatable_color_value.dart

@@ -1,11 +1,9 @@
 import 'dart:ui';
 import '../../animation/keyframe/color_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import 'base_animatable_value.dart';
 
 class AnimatableColorValue extends BaseAnimatableValue<Color, Color> {
-  AnimatableColorValue.fromKeyframes(List<Keyframe<Color>> keyframes)
+  AnimatableColorValue.fromKeyframes(super.keyframes) : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   ColorKeyframeAnimation createAnimation() {

lib/src/model/animatable/animatable_double_value.dart

@@ -1,12 +1,10 @@
 import '../../animation/keyframe/double_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import 'base_animatable_value.dart';
 
 class AnimatableDoubleValue extends BaseAnimatableValue<double, double> {
   AnimatableDoubleValue() : super.fromValue(0.0);
 
-  AnimatableDoubleValue.fromKeyframes(List<Keyframe<double>> keyframes)
+  AnimatableDoubleValue.fromKeyframes(super.keyframes) : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   DoubleKeyframeAnimation createAnimation() {

lib/src/model/animatable/animatable_gradient_color_value.dart

@@ -1,13 +1,11 @@
 import '../../animation/keyframe/gradient_color_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import '../content/gradient_color.dart';
 import 'base_animatable_value.dart';
 
 class AnimatableGradientColorValue
     extends BaseAnimatableValue<GradientColor, GradientColor> {
-  AnimatableGradientColorValue.fromKeyframes(
+  AnimatableGradientColorValue.fromKeyframes(super.keyframes)
-      List<Keyframe<GradientColor>> keyframes)
+      : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   GradientColorKeyframeAnimation createAnimation() {

lib/src/model/animatable/animatable_integer_value.dart

@@ -1,13 +1,11 @@
 import '../../animation/keyframe/base_keyframe_animation.dart';
 import '../../animation/keyframe/integer_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import 'base_animatable_value.dart';
 
 class AnimatableIntegerValue extends BaseAnimatableValue<int, int> {
   AnimatableIntegerValue() : super.fromValue(100);
 
-  AnimatableIntegerValue.fromKeyframes(List<Keyframe<int>> keyframes)
+  AnimatableIntegerValue.fromKeyframes(super.keyframes) : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   BaseKeyframeAnimation<int, int> createAnimation() {

lib/src/model/animatable/animatable_point_value.dart

@@ -1,11 +1,9 @@
 import 'dart:ui';
 import '../../animation/keyframe/point_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import 'base_animatable_value.dart';
 
 class AnimatablePointValue extends BaseAnimatableValue<Offset, Offset> {
-  AnimatablePointValue.fromKeyframes(List<Keyframe<Offset>> keyframes)
+  AnimatablePointValue.fromKeyframes(super.keyframes) : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   PointKeyframeAnimation createAnimation() {

lib/src/model/animatable/animatable_scale_value.dart

@@ -1,16 +1,14 @@
 import 'dart:ui';
 import '../../animation/keyframe/base_keyframe_animation.dart';
 import '../../animation/keyframe/point_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import 'base_animatable_value.dart';
 
 class AnimatableScaleValue extends BaseAnimatableValue<Offset, Offset> {
   AnimatableScaleValue.one() : this(const Offset(1, 1));
 
-  AnimatableScaleValue(Offset value) : super.fromValue(value);
+  AnimatableScaleValue(super.value) : super.fromValue();
 
-  AnimatableScaleValue.fromKeyframes(List<Keyframe<Offset>> keyframes)
+  AnimatableScaleValue.fromKeyframes(super.keyframes) : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   BaseKeyframeAnimation<Offset, Offset> createAnimation() {

lib/src/model/animatable/animatable_shape_value.dart

@@ -1,12 +1,10 @@
 import 'dart:ui';
 import '../../animation/keyframe/shape_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import '../content/shape_data.dart';
 import 'base_animatable_value.dart';
 
 class AnimatableShapeValue extends BaseAnimatableValue<ShapeData, Path> {
-  AnimatableShapeValue.fromKeyframes(List<Keyframe<ShapeData>> keyframes)
+  AnimatableShapeValue.fromKeyframes(super.keyframes) : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   ShapeKeyframeAnimation createAnimation() {

lib/src/model/animatable/animatable_text_frame.dart

@@ -1,12 +1,10 @@
 import '../../animation/keyframe/text_keyframe_animation.dart';
-import '../../value/keyframe.dart';
 import '../document_data.dart';
 import 'base_animatable_value.dart';
 
 class AnimatableTextFrame
     extends BaseAnimatableValue<DocumentData, DocumentData> {
-  AnimatableTextFrame.fromKeyframes(List<Keyframe<DocumentData>> keyframes)
+  AnimatableTextFrame.fromKeyframes(super.keyframes) : super.fromKeyframes();
-      : super.fromKeyframes(keyframes);
 
   @override
   TextKeyframeAnimation createAnimation() {

lib/src/model/layer/image_layer.dart

@@ -2,19 +2,16 @@ import 'dart:ui';
 import 'package:vector_math/vector_math_64.dart';
 import '../../animation/keyframe/base_keyframe_animation.dart';
 import '../../animation/keyframe/value_callback_keyframe_animation.dart';
-import '../../lottie_drawable.dart';
 import '../../lottie_property.dart';
 import '../../utils.dart';
 import '../../value/lottie_value_callback.dart';
 import 'base_layer.dart';
-import 'layer.dart';
 
 class ImageLayer extends BaseLayer {
   final Paint paint = Paint();
   BaseKeyframeAnimation<ColorFilter, ColorFilter?>? _colorFilterAnimation;
 
-  ImageLayer(LottieDrawable lottieDrawable, Layer layerModel)
+  ImageLayer(super.lottieDrawable, super.layerModel);
-      : super(lottieDrawable, layerModel);
 
   @override
   void drawLayer(Canvas canvas, Size size, Matrix4 parentMatrix,
@@ -23,7 +20,6 @@ class ImageLayer extends BaseLayer {
     if (bitmap == null) {
       return;
     }
-    var density = window.devicePixelRatio;
 
     paint.filterQuality = lottieDrawable.filterQuality ?? FilterQuality.low;
     paint.setAlpha(parentAlpha);
@@ -34,8 +30,8 @@ class ImageLayer extends BaseLayer {
     canvas.transform(parentMatrix.storage);
     var src =
         Rect.fromLTWH(0, 0, bitmap.width.toDouble(), bitmap.height.toDouble());
-    var dst = Rect.fromLTWH(
+    var dst =
-        0, 0, bitmap.width * density, bitmap.height.toDouble() * density);
+        Rect.fromLTWH(0, 0, bitmap.width.toDouble(), bitmap.height.toDouble());
     canvas.drawImageRect(bitmap, src, dst, paint);
     canvas.restore();
   }
@@ -45,8 +41,8 @@ class ImageLayer extends BaseLayer {
     var superBounds = super.getBounds(parentMatrix, applyParents: applyParents);
     var bitmap = getBitmap();
     if (bitmap != null) {
-      var bounds = Rect.fromLTWH(0, 0, bitmap.width * window.devicePixelRatio,
+      var bounds = Rect.fromLTWH(
-          bitmap.height * window.devicePixelRatio);
+          0, 0, bitmap.width.toDouble(), bitmap.height.toDouble());
       return boundsMatrix.mapRect(bounds);
     }
     return superBounds;

lib/src/model/layer/null_layer.dart

@@ -1,12 +1,9 @@
 import 'dart:ui';
 import 'package:vector_math/vector_math_64.dart';
-import '../../lottie_drawable.dart';
 import 'base_layer.dart';
-import 'layer.dart';
 
 class NullLayer extends BaseLayer {
-  NullLayer(LottieDrawable lottieDrawable, Layer layerModel)
+  NullLayer(super.lottieDrawable, super.layerModel);
-      : super(lottieDrawable, layerModel);
 
   @override
   void drawLayer(Canvas canvas, Size size, Matrix4 parentMatrix,

lib/src/model/layer/text_layer.dart

@@ -1,4 +1,3 @@
-import 'dart:ui';
 import 'package:flutter/widgets.dart';
 import '../../animation/content/content_group.dart';
 import '../../animation/keyframe/base_keyframe_animation.dart';
@@ -132,8 +131,7 @@ class TextLayer extends BaseLayer {
       _strokePaint.strokeWidth = _strokeWidthAnimation!.value;
     } else {
       var parentScale = parentMatrix.getScale();
-      _strokePaint.strokeWidth =
+      _strokePaint.strokeWidth = documentData.strokeWidth * parentScale;
-          documentData.strokeWidth * window.devicePixelRatio * parentScale;
     }
 
     if (lottieDrawable.useTextGlyphs) {
@@ -159,9 +157,10 @@ class TextLayer extends BaseLayer {
     var parentScale = parentMatrix.getScale();
 
     var text = documentData.text;
+    canvas.transform(parentMatrix.storage);
 
     // Line height
-    var lineHeight = documentData.lineHeight * window.devicePixelRatio;
+    var lineHeight = documentData.lineHeight;
 
     // Split full text in multiple lines
     var textLines = _getTextLines(text);
@@ -182,12 +181,14 @@ class TextLayer extends BaseLayer {
       canvas.translate(0, translateY);
 
       // Draw each line
-      _drawGlyphTextLine(textLine, documentData, parentMatrix, font, canvas,
+      _drawGlyphTextLine(textLine, documentData, Matrix4.identity(), font, canvas,
           parentScale, fontScale);
 
       // Reset canvas
       canvas.restore();
     }
+
+    canvas.restore();
   }
 
   void _drawGlyphTextLine(
@@ -208,8 +209,7 @@ class TextLayer extends BaseLayer {
       }
       _drawCharacterAsGlyph(
           character, parentMatrix, fontScale, documentData, canvas);
-      var tx =
+      var tx = character.width * fontScale * parentScale;
-          character.width * fontScale * window.devicePixelRatio * parentScale;
       // Add tracking
       var tracking = documentData.tracking / 10.0;
       if (_trackingCallbackAnimation != null) {
@@ -238,11 +238,10 @@ class TextLayer extends BaseLayer {
     } else {
       textSize = documentData.size;
     }
-    textStyle =
+    textStyle = textStyle.copyWith(fontSize: textSize);
-        textStyle.copyWith(fontSize: textSize * window.devicePixelRatio);
 
     // Line height
-    var lineHeight = documentData.lineHeight * window.devicePixelRatio;
+    var lineHeight = documentData.lineHeight;
 
     // Calculate tracking
     var tracking = documentData.tracking / 10;
@@ -251,7 +250,7 @@ class TextLayer extends BaseLayer {
     } else if (_trackingAnimation != null) {
       tracking += _trackingAnimation!.value;
     }
-    tracking = tracking * window.devicePixelRatio * textSize / 100.0;
+    tracking = tracking * textSize / 100.0;
 
     // Split full text in multiple lines
     var textLines = _getTextLines(text);
@@ -316,8 +315,7 @@ class TextLayer extends BaseLayer {
       if (character == null) {
         continue;
       }
-      textLineWidth +=
+      textLineWidth += character.width * fontScale * parentScale;
-          character.width * fontScale * window.devicePixelRatio * parentScale;
     }
     return textLineWidth;
   }
@@ -344,8 +342,7 @@ class TextLayer extends BaseLayer {
       var path = contentGroups[j].getPath();
       path.getBounds();
       _matrix.set(parentMatrix);
-      _matrix.translate(
+      _matrix.translate(0.0, -documentData.baselineShift);
-          0.0, -documentData.baselineShift * window.devicePixelRatio);
       _matrix.scale(fontScale, fontScale);
       path = path.transform(_matrix.storage);
       if (documentData.strokeOverFill) {

lib/src/parser/animatable_path_value_parser.dart

@@ -27,8 +27,8 @@ class AnimatablePathValueParser {
       reader.endArray();
       KeyframesParser.setEndFrames(keyframes);
     } else {
-      keyframes.add(Keyframe<Offset>.nonAnimated(
+      keyframes
-          JsonUtils.jsonToPoint(reader, window.devicePixelRatio)));
+          .add(Keyframe<Offset>.nonAnimated(JsonUtils.jsonToPoint(reader)));
     }
     return AnimatablePathValue.fromKeyframes(keyframes);
   }

lib/src/parser/animatable_transform_parser.dart

@@ -74,8 +74,7 @@ class AnimatableTransformParser {
           //           ]
           //         },
           // which doesn't parse to a real keyframe.
-          rotation = AnimatableValueParser.parseFloat(reader, composition,
+          rotation = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           if (rotation.keyframes.isEmpty) {
             rotation.keyframes.add(Keyframe(composition,
                 startValue: 0.0,
@@ -96,20 +95,16 @@ class AnimatableTransformParser {
           opacity = AnimatableValueParser.parseInteger(reader, composition);
           break;
         case 6:
-          startOpacity = AnimatableValueParser.parseFloat(reader, composition,
+          startOpacity = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 7:
-          endOpacity = AnimatableValueParser.parseFloat(reader, composition,
+          endOpacity = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 8:
-          skew = AnimatableValueParser.parseFloat(reader, composition,
+          skew = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 9:
-          skewAngle = AnimatableValueParser.parseFloat(reader, composition,
+          skewAngle = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         default:
           reader.skipName();

lib/src/parser/animatable_value_parser.dart

@@ -1,4 +1,3 @@
-import 'dart:ui';
 import '../composition.dart';
 import '../model/animatable/animatable_color_value.dart';
 import '../model/animatable/animatable_double_value.dart';
@@ -25,12 +24,9 @@ class AnimatableValueParser {
   AnimatableValueParser._();
 
   static AnimatableDoubleValue parseFloat(
-      JsonReader reader, LottieComposition composition,
+      JsonReader reader, LottieComposition composition) {
-      {bool? isDp}) {
+    return AnimatableDoubleValue.fromKeyframes(
-    isDp ??= true;
+        parse(reader, composition, floatParser));
-    return AnimatableDoubleValue.fromKeyframes(parse(
-        reader, composition, floatParser,
-        scale: isDp ? window.devicePixelRatio : 1.0));
   }
 
   static AnimatableIntegerValue parseInteger(
@@ -42,7 +38,7 @@ class AnimatableValueParser {
   static AnimatablePointValue parsePoint(
       JsonReader reader, LottieComposition composition) {
     return AnimatablePointValue.fromKeyframes(KeyframesParser.parse(
-        reader, composition, window.devicePixelRatio, offsetParser,
+        reader, composition, offsetParser,
         multiDimensional: true));
   }
 
@@ -54,9 +50,8 @@ class AnimatableValueParser {
 
   static AnimatableShapeValue parseShapeData(
       JsonReader reader, LottieComposition composition) {
-    return AnimatableShapeValue.fromKeyframes(parse(
+    return AnimatableShapeValue.fromKeyframes(
-        reader, composition, shapeDataParser,
+        parse(reader, composition, shapeDataParser));
-        scale: window.devicePixelRatio));
   }
 
   static AnimatableTextFrame parseDocumentData(
@@ -81,6 +76,6 @@ class AnimatableValueParser {
       LottieComposition composition, ValueParser<T> valueParser,
       {double? scale}) {
     scale ??= 1.0;
-    return KeyframesParser.parse(reader, composition, scale, valueParser);
+    return KeyframesParser.parse(reader, composition, valueParser);
   }
 }

lib/src/parser/color_parser.dart

@@ -1,7 +1,7 @@
 import 'dart:ui';
 import 'moshi/json_reader.dart';
 
-Color colorParser(JsonReader reader, {required double scale}) {
+Color colorParser(JsonReader reader) {
   var isArray = reader.peek() == Token.beginArray;
   if (isArray) {
     reader.beginArray();

lib/src/parser/document_data_parser.dart

@@ -17,7 +17,7 @@ final JsonReaderOptions _names = JsonReaderOptions.of([
   'of', // 10
 ]);
 
-DocumentData documentDataParser(JsonReader reader, {required double scale}) {
+DocumentData documentDataParser(JsonReader reader) {
   String? text;
   String? fontName;
   var size = 0.0;

lib/src/parser/drop_shadow_effect_parser.dart

@@ -69,12 +69,11 @@ class DropShadowEffectParser {
               _color = AnimatableValueParser.parseColor(reader, composition);
               break;
             case 'Opacity':
-              _opacity = AnimatableValueParser.parseFloat(reader, composition,
+              _opacity = AnimatableValueParser.parseFloat(reader, composition);
-                  isDp: false);
               break;
             case 'Direction':
-              _direction = AnimatableValueParser.parseFloat(reader, composition,
+              _direction =
-                  isDp: false);
+                  AnimatableValueParser.parseFloat(reader, composition);
               break;
             case 'Distance':
               _distance = AnimatableValueParser.parseFloat(reader, composition);

lib/src/parser/float_parser.dart

@@ -1,6 +1,6 @@
 import 'json_utils.dart';
 import 'moshi/json_reader.dart';
 
-double floatParser(JsonReader reader, {required double scale}) {
+double floatParser(JsonReader reader) {
-  return JsonUtils.valueFromObject(reader) * scale;
+  return JsonUtils.valueFromObject(reader);
 }

lib/src/parser/gradient_color_parser.dart

@@ -26,7 +26,7 @@ class GradientColorParser {
   /// opacity,
   /// ...
   /// ]
-  GradientColor parse(JsonReader reader, {required double scale}) {
+  GradientColor parse(JsonReader reader) {
     var array = <double>[];
     // The array was started by Keyframe because it thought that this may be an array of keyframes
     // but peek returned a number so it considered it a static array of numbers.

lib/src/parser/integer_parser.dart

@@ -1,6 +1,6 @@
 import 'json_utils.dart';
 import 'moshi/json_reader.dart';
 
-int integerParser(JsonReader reader, {required double scale}) {
+int integerParser(JsonReader reader) {
-  return (JsonUtils.valueFromObject(reader) * scale).round();
+  return JsonUtils.valueFromObject(reader).round();
 }

lib/src/parser/json_utils.dart

@@ -14,43 +14,43 @@ class JsonUtils {
     return Color.fromARGB(255, r, g, b);
   }
 
-  static List<Offset> jsonToPoints(JsonReader reader, double scale) {
+  static List<Offset> jsonToPoints(JsonReader reader) {
     var points = <Offset>[];
 
     reader.beginArray();
     while (reader.peek() == Token.beginArray) {
       reader.beginArray();
-      points.add(jsonToPoint(reader, scale));
+      points.add(jsonToPoint(reader));
       reader.endArray();
     }
     reader.endArray();
     return points;
   }
 
-  static Offset jsonToPoint(JsonReader reader, double scale) {
+  static Offset jsonToPoint(JsonReader reader) {
     switch (reader.peek()) {
       case Token.number:
-        return _jsonNumbersToPoint(reader, scale);
+        return _jsonNumbersToPoint(reader);
       case Token.beginArray:
-        return _jsonArrayToPoint(reader, scale);
+        return _jsonArrayToPoint(reader);
       case Token.beginObject:
-        return _jsonObjectToPoint(reader, scale: scale);
+        return _jsonObjectToPoint(reader);
       // ignore: no_default_cases
       default:
         throw Exception('Unknown point starts with ${reader.peek()}');
     }
   }
 
-  static Offset _jsonNumbersToPoint(JsonReader reader, double scale) {
+  static Offset _jsonNumbersToPoint(JsonReader reader) {
     var x = reader.nextDouble();
     var y = reader.nextDouble();
     while (reader.hasNext()) {
       reader.skipValue();
     }
-    return Offset(x * scale, y * scale);
+    return Offset(x, y);
   }
 
-  static Offset _jsonArrayToPoint(JsonReader reader, double scale) {
+  static Offset _jsonArrayToPoint(JsonReader reader) {
     double x;
     double y;
     reader.beginArray();
@@ -60,12 +60,12 @@ class JsonUtils {
       reader.skipValue();
     }
     reader.endArray();
-    return Offset(x * scale, y * scale);
+    return Offset(x, y);
   }
 
   static final JsonReaderOptions _pointNames = JsonReaderOptions.of(['x', 'y']);
 
-  static Offset _jsonObjectToPoint(JsonReader reader, {required double scale}) {
+  static Offset _jsonObjectToPoint(JsonReader reader) {
     var x = 0.0;
     var y = 0.0;
     reader.beginObject();
@@ -83,7 +83,7 @@ class JsonUtils {
       }
     }
     reader.endObject();
-    return Offset(x * scale, y * scale);
+    return Offset(x, y);
   }
 
   static double valueFromObject(JsonReader reader) {

lib/src/parser/keyframe_parser.dart

@@ -26,22 +26,21 @@ class KeyframeParser {
 
   /// @param multiDimensional When true, the keyframe interpolators can be independent for the X and Y axis.
   static Keyframe<T> parse<T>(JsonReader reader, LottieComposition composition,
-      double scale, ValueParser<T> valueParser,
+      ValueParser<T> valueParser,
       {required bool animated, bool multiDimensional = false}) {
     if (animated && multiDimensional) {
-      return _parseMultiDimensionalKeyframe(
+      return _parseMultiDimensionalKeyframe(composition, reader, valueParser);
-          composition, reader, scale, valueParser);
     } else if (animated) {
-      return _parseKeyframe(composition, reader, scale, valueParser);
+      return _parseKeyframe(composition, reader, valueParser);
     } else {
-      return _parseStaticValue(reader, scale, valueParser);
+      return _parseStaticValue(reader, valueParser);
     }
   }
 
   /// beginObject will already be called on the keyframe so it can be differentiated with
   /// a non animated value.
   static Keyframe<T> _parseKeyframe<T>(LottieComposition composition,
-      JsonReader reader, double scale, ValueParser<T> valueParser) {
+      JsonReader reader, ValueParser<T> valueParser) {
     Offset? cp1;
     Offset? cp2;
     var startFrame = 0.0;
@@ -61,25 +60,25 @@ class KeyframeParser {
           startFrame = reader.nextDouble();
           break;
         case 1:
-          startValue = valueParser(reader, scale: scale);
+          startValue = valueParser(reader);
           break;
         case 2:
-          endValue = valueParser(reader, scale: scale);
+          endValue = valueParser(reader);
           break;
         case 3:
-          cp1 = JsonUtils.jsonToPoint(reader, 1);
+          cp1 = JsonUtils.jsonToPoint(reader);
           break;
         case 4:
-          cp2 = JsonUtils.jsonToPoint(reader, 1);
+          cp2 = JsonUtils.jsonToPoint(reader);
           break;
         case 5:
           hold = reader.nextInt() == 1;
           break;
         case 6:
-          pathCp1 = JsonUtils.jsonToPoint(reader, scale);
+          pathCp1 = JsonUtils.jsonToPoint(reader);
           break;
         case 7:
-          pathCp2 = JsonUtils.jsonToPoint(reader, scale);
+          pathCp2 = JsonUtils.jsonToPoint(reader);
           break;
         default:
           reader.skipValue();
@@ -111,7 +110,6 @@ class KeyframeParser {
   static Keyframe<T> _parseMultiDimensionalKeyframe<T>(
       LottieComposition composition,
       JsonReader reader,
-      double scale,
       ValueParser<T> valueParser) {
     Offset? cp1;
     Offset? cp2;
@@ -140,10 +138,10 @@ class KeyframeParser {
           startFrame = reader.nextDouble();
           break;
         case 1: // s
-          startValue = valueParser(reader, scale: scale);
+          startValue = valueParser(reader);
           break;
         case 2: // e
-          endValue = valueParser(reader, scale: scale);
+          endValue = valueParser(reader);
           break;
         case 3: // o
           if (reader.peek() == Token.beginObject) {
@@ -192,7 +190,7 @@ class KeyframeParser {
             yCp1 = Offset(yCp1x, yCp1y);
             reader.endObject();
           } else {
-            cp1 = JsonUtils.jsonToPoint(reader, scale);
+            cp1 = JsonUtils.jsonToPoint(reader);
           }
           break;
         case 4: // i
@@ -242,17 +240,17 @@ class KeyframeParser {
             yCp2 = Offset(yCp2x, yCp2y);
             reader.endObject();
           } else {
-            cp2 = JsonUtils.jsonToPoint(reader, scale);
+            cp2 = JsonUtils.jsonToPoint(reader);
           }
           break;
         case 5: // h
           hold = reader.nextInt() == 1;
           break;
         case 6: // to
-          pathCp1 = JsonUtils.jsonToPoint(reader, scale);
+          pathCp1 = JsonUtils.jsonToPoint(reader);
           break;
         case 7: // ti
-          pathCp2 = JsonUtils.jsonToPoint(reader, scale);
+          pathCp2 = JsonUtils.jsonToPoint(reader);
           break;
         default:
           reader.skipValue();
@@ -322,8 +320,8 @@ class KeyframeParser {
   }
 
   static Keyframe<T> _parseStaticValue<T>(
-      JsonReader reader, double scale, ValueParser<T> valueParser) {
+      JsonReader reader, ValueParser<T> valueParser) {
-    var value = valueParser(reader, scale: scale);
+    var value = valueParser(reader);
     return Keyframe<T>.nonAnimated(value);
   }
 }

lib/src/parser/keyframes_parser.dart

@@ -11,7 +11,7 @@ class KeyframesParser {
   KeyframesParser._();
 
   static List<Keyframe<T>> parse<T>(JsonReader reader,
-      LottieComposition composition, double scale, ValueParser<T> valueParser,
+      LottieComposition composition, ValueParser<T> valueParser,
       {bool multiDimensional = false}) {
     var keyframes = <Keyframe<T>>[];
 
@@ -30,19 +30,18 @@ class KeyframesParser {
             if (reader.peek() == Token.number) {
               // For properties in which the static value is an array of numbers.
               keyframes.add(KeyframeParser.parse(
-                  reader, composition, scale, valueParser,
+                  reader, composition, valueParser,
                   animated: false, multiDimensional: multiDimensional));
             } else {
               while (reader.hasNext()) {
                 keyframes.add(KeyframeParser.parse(
-                    reader, composition, scale, valueParser,
+                    reader, composition, valueParser,
                     animated: true, multiDimensional: multiDimensional));
               }
             }
             reader.endArray();
           } else {
-            keyframes.add(KeyframeParser.parse(
+            keyframes.add(KeyframeParser.parse(reader, composition, valueParser,
-                reader, composition, scale, valueParser,
                 animated: false, multiDimensional: multiDimensional));
           }
           break;

lib/src/parser/layer_parser.dart

@@ -136,10 +136,10 @@ class LayerParser {
           parentId = reader.nextInt();
           break;
         case 5:
-          solidWidth = (reader.nextInt() * window.devicePixelRatio).round();
+          solidWidth = reader.nextInt();
           break;
         case 6:
-          solidHeight = (reader.nextInt() * window.devicePixelRatio).round();
+          solidHeight = reader.nextInt();
           break;
         case 7:
           solidColor = MiscUtils.parseColor(reader.nextString(),
@@ -246,10 +246,10 @@ class LayerParser {
           startFrame = reader.nextDouble();
           break;
         case 16:
-          preCompWidth = (reader.nextInt() * window.devicePixelRatio).round();
+          preCompWidth = reader.nextInt();
           break;
         case 17:
-          preCompHeight = (reader.nextInt() * window.devicePixelRatio).round();
+          preCompHeight = reader.nextInt();
           break;
         case 18:
           inFrame = reader.nextDouble();
@@ -258,8 +258,7 @@ class LayerParser {
           outFrame = reader.nextDouble();
           break;
         case 20:
-          timeRemapping = AnimatableValueParser.parseFloat(reader, composition,
+          timeRemapping = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 21:
           cl = reader.nextString();

lib/src/parser/lottie_composition_parser.dart

@@ -1,4 +1,3 @@
-import 'dart:ui';
 import '../composition.dart';
 import '../lottie_image_asset.dart';
 import '../model/font.dart';
@@ -29,16 +28,15 @@ class LottieCompositionParser {
   static LottieComposition parse(
       LottieComposition composition, JsonReader reader) {
     var parameters = CompositionParameters.forComposition(composition);
-    var scale = window.devicePixelRatio;
 
     reader.beginObject();
     while (reader.hasNext()) {
       switch (reader.selectName(_names)) {
         case 0:
-          parameters.bounds.width = (reader.nextInt() * scale).round();
+          parameters.bounds.width = (reader.nextInt()).round();
           break;
         case 1:
-          parameters.bounds.height = (reader.nextInt() * scale).round();
+          parameters.bounds.height = (reader.nextInt()).round();
           break;
         case 2:
           parameters.startFrame = reader.nextDouble();

lib/src/parser/offset_parser.dart

@@ -2,18 +2,17 @@ import 'dart:ui';
 import 'json_utils.dart';
 import 'moshi/json_reader.dart';
 
-Offset offsetParser(JsonReader reader, {required double scale}) {
+Offset offsetParser(JsonReader reader) {
   var token = reader.peek();
   if (token == Token.beginArray) {
-    return JsonUtils.jsonToPoint(reader, scale);
+    return JsonUtils.jsonToPoint(reader);
   } else if (token == Token.beginObject) {
-    return JsonUtils.jsonToPoint(reader, scale);
+    return JsonUtils.jsonToPoint(reader);
   } else if (token == Token.number) {
     // This is the case where the static value for a property is an array of numbers.
     // We begin the array to see if we have an array of keyframes but it's just an array
     // of static numbers instead.
-    var point =
+    var point = Offset(reader.nextDouble(), reader.nextDouble());
-        Offset(reader.nextDouble() * scale, reader.nextDouble() * scale);
     while (reader.hasNext()) {
       reader.skipValue();
     }

lib/src/parser/path_keyframe_parser.dart

@@ -10,8 +10,7 @@ class PathKeyframeParser {
 
   static PathKeyframe parse(JsonReader reader, LottieComposition composition) {
     var animated = reader.peek() == Token.beginObject;
-    var keyframe = KeyframeParser.parse<Offset>(
+    var keyframe = KeyframeParser.parse<Offset>(reader, composition, pathParser,
-        reader, composition, window.devicePixelRatio, pathParser,
         animated: animated);
 
     return PathKeyframe(composition, keyframe);

lib/src/parser/path_parser.dart

@@ -2,6 +2,6 @@ import 'dart:ui';
 import 'json_utils.dart';
 import 'moshi/json_reader.dart';
 
-Offset pathParser(JsonReader reader, {required double scale}) {
+Offset pathParser(JsonReader reader) {
-  return JsonUtils.jsonToPoint(reader, scale);
+  return JsonUtils.jsonToPoint(reader);
 }

lib/src/parser/polysar_shape_parser.dart

@@ -36,32 +36,28 @@ class PolystarShapeParser {
           type = PolystarShapeType.forValue(reader.nextInt());
           break;
         case 2:
-          points = AnimatableValueParser.parseFloat(reader, composition,
+          points = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 3:
           position =
               AnimatablePathValueParser.parseSplitPath(reader, composition);
           break;
         case 4:
-          rotation = AnimatableValueParser.parseFloat(reader, composition,
+          rotation = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 5:
           outerRadius = AnimatableValueParser.parseFloat(reader, composition);
           break;
         case 6:
-          outerRoundedness = AnimatableValueParser.parseFloat(
+          outerRoundedness =
-              reader, composition,
+              AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 7:
           innerRadius = AnimatableValueParser.parseFloat(reader, composition);
           break;
         case 8:
-          innerRoundedness = AnimatableValueParser.parseFloat(
+          innerRoundedness =
-              reader, composition,
+              AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 9:
           hidden = reader.nextBoolean();

lib/src/parser/repeat_parser.dart

@@ -25,12 +25,10 @@ class RepeaterParser {
           name = reader.nextString();
           break;
         case 1:
-          copies = AnimatableValueParser.parseFloat(reader, composition,
+          copies = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 2:
-          offset = AnimatableValueParser.parseFloat(reader, composition,
+          offset = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 3:
           transform = AnimatableTransformParser.parse(reader, composition);

lib/src/parser/rounded_corners_parser.dart

@@ -23,8 +23,7 @@ class RoundedCornersParser {
           name = reader.nextString();
           break;
         case 1: // r
-          cornerRadius =
+          cornerRadius = AnimatableValueParser.parseFloat(reader, composition);
-              AnimatableValueParser.parseFloat(reader, composition, isDp: true);
           break;
         case 2: // hd
           hidden = reader.nextBoolean();

lib/src/parser/scale_xy_parser.dart

@@ -1,7 +1,7 @@
 import 'dart:ui';
 import 'moshi/json_reader.dart';
 
-Offset scaleXYParser(JsonReader reader, {required double scale}) {
+Offset scaleXYParser(JsonReader reader) {
   var isArray = reader.peek() == Token.beginArray;
   if (isArray) {
     reader.beginArray();
@@ -14,5 +14,5 @@ Offset scaleXYParser(JsonReader reader, {required double scale}) {
   if (isArray) {
     reader.endArray();
   }
-  return Offset(sx / 100.0 * scale, sy / 100.0 * scale);
+  return Offset(sx / 100.0, sy / 100.0);
 }

lib/src/parser/shape_data_parser.dart

@@ -6,7 +6,7 @@ import 'moshi/json_reader.dart';
 
 final JsonReaderOptions _names = JsonReaderOptions.of(['c', 'v', 'i', 'o']);
 
-ShapeData shapeDataParser(JsonReader reader, {required double scale}) {
+ShapeData shapeDataParser(JsonReader reader) {
   // Sometimes the points data is in a array of length 1. Sometimes the data is at the top
   // level.
   if (reader.peek() == Token.beginArray) {
@@ -25,13 +25,13 @@ ShapeData shapeDataParser(JsonReader reader, {required double scale}) {
         closed = reader.nextBoolean();
         break;
       case 1:
-        pointsArray = JsonUtils.jsonToPoints(reader, scale);
+        pointsArray = JsonUtils.jsonToPoints(reader);
         break;
       case 2:
-        inTangents = JsonUtils.jsonToPoints(reader, scale);
+        inTangents = JsonUtils.jsonToPoints(reader);
         break;
       case 3:
-        outTangents = JsonUtils.jsonToPoints(reader, scale);
+        outTangents = JsonUtils.jsonToPoints(reader);
         break;
       default:
         reader.skipName();

lib/src/parser/shape_trim_path_parser.dart

@@ -19,16 +19,13 @@ class ShapeTrimPathParser {
     while (reader.hasNext()) {
       switch (reader.selectName(_names)) {
         case 0:
-          start = AnimatableValueParser.parseFloat(reader, composition,
+          start = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 1:
-          end = AnimatableValueParser.parseFloat(reader, composition,
+          end = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 2:
-          offset = AnimatableValueParser.parseFloat(reader, composition,
+          offset = AnimatableValueParser.parseFloat(reader, composition);
-              isDp: false);
           break;
         case 3:
           name = reader.nextString();

lib/src/parser/value_parser.dart

@@ -1,3 +1,3 @@
 import 'moshi/json_reader.dart';
 
-typedef ValueParser<V> = V Function(JsonReader reader, {required double scale});
+typedef ValueParser<V> = V Function(JsonReader reader);

lib/src/providers/asset_provider.dart

@@ -13,8 +13,8 @@ class AssetLottie extends LottieProvider {
     this.assetName, {
     this.bundle,
     this.package,
-    LottieImageProviderFactory? imageProviderFactory,
+    super.imageProviderFactory,
-  }) : super(imageProviderFactory: imageProviderFactory);
+  });
 
   final String assetName;
   String get keyName =>

lib/src/providers/file_provider.dart

@@ -7,8 +7,7 @@ import 'lottie_provider.dart';
 import 'provider_io.dart' if (dart.library.html) 'provider_web.dart' as io;
 
 class FileLottie extends LottieProvider {
-  FileLottie(this.file, {LottieImageProviderFactory? imageProviderFactory})
+  FileLottie(this.file, {super.imageProviderFactory});
-      : super(imageProviderFactory: imageProviderFactory);
 
   final Object /*io.File|html.File*/ file;
 

lib/src/providers/memory_provider.dart

@@ -8,8 +8,7 @@ import 'load_image.dart';
 import 'lottie_provider.dart';
 
 class MemoryLottie extends LottieProvider {
-  MemoryLottie(this.bytes, {LottieImageProviderFactory? imageProviderFactory})
+  MemoryLottie(this.bytes, {super.imageProviderFactory});
-      : super(imageProviderFactory: imageProviderFactory);
 
   final Uint8List bytes;
 

lib/src/providers/network_provider.dart

@@ -9,9 +9,7 @@ import 'lottie_provider.dart';
 import 'provider_io.dart' if (dart.library.html) 'provider_web.dart' as network;
 
 class NetworkLottie extends LottieProvider {
-  NetworkLottie(this.url,
+  NetworkLottie(this.url, {this.headers, super.imageProviderFactory});
-      {this.headers, LottieImageProviderFactory? imageProviderFactory})
-      : super(imageProviderFactory: imageProviderFactory);
 
   final String url;
   final Map<String, String>? headers;

lib/src/raw_lottie.dart

@@ -13,7 +13,7 @@ import 'render_lottie.dart';
 class RawLottie extends LeafRenderObjectWidget {
   /// Creates a widget that displays a Lottie composition.
   const RawLottie({
-    Key? key,
+    super.key,
     this.composition,
     this.delegates,
     this.options,
@@ -25,8 +25,7 @@ class RawLottie extends LeafRenderObjectWidget {
     AlignmentGeometry? alignment,
     this.filterQuality,
   })  : progress = progress ?? 0.0,
-        alignment = alignment ?? Alignment.center,
+        alignment = alignment ?? Alignment.center;
-        super(key: key);
 
   /// The Lottie composition to display.
   final LottieComposition? composition;

pubspec.lock

@@ -7,21 +7,21 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "48.0.0"
+    version: "50.0.0"
   analyzer:
     dependency: "direct dev"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.0"
+    version: "5.2.0"
   archive:
     dependency: "direct main"
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.1"
+    version: "3.3.2"
   args:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
@@ -70,21 +70,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.1.0"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.2"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.2.4"
+    version: "7.2.7"
   built_collection:
     dependency: transitive
     description:
@@ -98,7 +98,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.4.1"
+    version: "8.4.2"
   characters:
     dependency: transitive
     description:
@@ -126,7 +126,7 @@ packages:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.0"
+    version: "4.3.0"
   collection:
     dependency: transitive
     description:
@@ -140,7 +140,7 @@ packages:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.1"
   crypto:
     dependency: transitive
     description:
@@ -199,21 +199,21 @@ packages:
       name: frontend_server_client
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3"
+    version: "3.1.0"
   glob:
     dependency: transitive
     description:
       name: glob
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -227,7 +227,7 @@ packages:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   io:
     dependency: transitive
     description:
@@ -241,28 +241,28 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.6.0"
+    version: "4.7.0"
   lints:
     dependency: transitive
     description:
       name: lints
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   matcher:
     dependency: transitive
     description:
@@ -318,7 +318,7 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   pubspec_parse:
     dependency: transitive
     description:
@@ -332,14 +332,14 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -372,7 +372,7 @@ packages:
       name: stream_transform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
@@ -421,7 +421,7 @@ packages:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   web_socket_channel:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lottie
 description: Render After Effects animations natively on Flutter. This package is a pure Dart implementation of a Lottie player.
-version: 1.4.3
+version: 2.0.0
-homepage: https://github.com/xvrh/lottie-flutter
+repository: https://github.com/xvrh/lottie-flutter
 
 environment:
   sdk: '>=2.18.0 <3.0.0'

test/dynamic_properties_test.dart

@@ -291,7 +291,7 @@ void main() {
     'Blur',
     ValueDelegate.blurRadius(
       ['**'],
-      value: 22,
+      value: 10,
     ),
   );