...

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

@@ -6,11 +6,11 @@ on:
       - master
 
 jobs:
-  analyze:
+  analyze_and_test:
     name: Flutter analyze
     strategy:
       matrix:
-        flutter: ['stable', 'beta']
+        flutter: ['beta']
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
@@ -22,6 +22,9 @@ jobs:
       - run: flutter pub get
         working-directory: example
       - run: flutter analyze
+      - run: flutter test test # https://github.com/flutter/flutter/issues/20907
+      - run: flutter test test
+        working-directory: example
       - run: flutter pub run tool/prepare_submit.dart
       - name: "check for uncommitted changes"
         run: |
@@ -29,27 +32,4 @@ jobs:
           || (echo "##[error] found changed files after build. please run 'dart tool/prepare_submit.dart'" \
                    "and check in all changes" \
               && exit 1)
-        shell: bash
-  test:
-    name: Run all tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run tests
-        uses: docker://cirrusci/flutter:2.0.6
-        with:
-          args: sh run_tests.sh
-  build_web_version:
-    name: Check that the web version compile
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
-        with:
-          channel: 'beta'
-      - run: flutter config --enable-web
-      - run: flutter precache web
-      - run: flutter pub get
-        working-directory: example
-      - run: flutter build web
-        working-directory: example
+        shell: bash

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

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

CHANGELOG.md

@@ -1,12 +1,3 @@
-## [1.0.1]
-- Implement `RenderBox.computeDryLayout`
-
-## [1.0.0]
-- Migrate to null safety
-- Fix some rendering bugs
-- Add an image delegate to dynamically change images
-- Allow to use an imageProviderFactory with a zip file
-
 ## [0.7.1]
 - Fix a crash for some lottie file with empty paths.
 

CONTRIBUTING.md

@@ -1,7 +0,0 @@
-
-## Run the Golden tests
-Run and update the golden tests requires Docker installed.
-
-```shell script
-sh update_goldens.sh
-```

README.md

@@ -6,7 +6,7 @@
 Lottie is a mobile library for Android and iOS that parses [Adobe After Effects](https://www.adobe.com/products/aftereffects.html) 
 animations exported as json with [Bodymovin](https://github.com/airbnb/lottie-web) and renders them natively on mobile!
 
-This repository is an unofficial conversion of the [Lottie-android](https://github.com/airbnb/lottie-android) library in pure Dart. 
+This repository is a unofficial conversion of the [Lottie-android](https://github.com/airbnb/lottie-android) library in pure Dart. 
 
 It works on Android, iOS, macOS, linux, windows and web.
 
@@ -246,12 +246,13 @@ class _Animation extends StatelessWidget {
 ````
 
 ## Limitations
-This port supports the same [feature set as Lottie Android](https://airbnb.io/lottie/#/supported-features).
+Only the [supported features of Lottie Android](https://airbnb.io/lottie/#/supported-features)
+are supported in this port.
 
 ## Flutter Web
-Run the app with `flutter run -d chrome --web-renderer canvaskit`
+Run the app with `flutter run -d Chrome --dart-define=FLUTTER_WEB_USE_SKIA=true --release`
 
-See a preview here: https://xvrh.github.io/lottie-flutter-web/
+See a preview here: https://xvrh.github.io/lottie-flutter/index.html
 
 ## More examples
 See the `example` folder for more code samples of the various possibilities.

README.template.md

@@ -6,7 +6,7 @@
 Lottie is a mobile library for Android and iOS that parses [Adobe After Effects](https://www.adobe.com/products/aftereffects.html) 
 animations exported as json with [Bodymovin](https://github.com/airbnb/lottie-web) and renders them natively on mobile!
 
-This repository is an unofficial conversion of the [Lottie-android](https://github.com/airbnb/lottie-android) library in pure Dart. 
+This repository is a unofficial conversion of the [Lottie-android](https://github.com/airbnb/lottie-android) library in pure Dart. 
 
 It works on Android, iOS, macOS, linux, windows and web.
 
@@ -78,12 +78,13 @@ import 'example/lib/examples/simple_dynamic_properties.dart#example';
 ````
 
 ## Limitations
-This port supports the same [feature set as Lottie Android](https://airbnb.io/lottie/#/supported-features).
+Only the [supported features of Lottie Android](https://airbnb.io/lottie/#/supported-features)
+are supported in this port.
 
 ## Flutter Web
-Run the app with `flutter run -d chrome --web-renderer canvaskit`
+Run the app with `flutter run -d Chrome --dart-define=FLUTTER_WEB_USE_SKIA=true --release`
 
-See a preview here: https://xvrh.github.io/lottie-flutter-web/
+See a preview here: https://xvrh.github.io/lottie-flutter/index.html
 
 ## More examples
 See the `example` folder for more code samples of the various possibilities.

analysis_options.yaml

@@ -1,17 +1,16 @@
 include: package:pedantic/analysis_options.yaml
 analyzer:
+  errors:
   strong-mode:
     implicit-casts: false
     implicit-dynamic: false
 linter:
   rules:
-    avoid_dynamic_calls: true
     avoid_renaming_method_parameters: true
     avoid_returning_null_for_future: true
     avoid_returning_null_for_void: true
     avoid_returning_this: true
     avoid_setters_without_getters: true
-    avoid_web_libraries_in_flutter: true
     await_only_futures: true
     camel_case_types: true
     cancel_subscriptions: true
@@ -27,7 +26,6 @@ linter:
     overridden_fields: true
     prefer_inlined_adds: true
     prefer_interpolation_to_compose_strings: true
-    prefer_null_aware_method_calls: true
     prefer_null_aware_operators: true
     prefer_relative_imports: true
     prefer_typing_uninitialized_variables: true
@@ -35,9 +33,7 @@ linter:
     test_types_in_equals: true
     unnecessary_brace_in_string_interps: true
     unnecessary_getters_setters: true
-    unnecessary_null_checks: true
     unnecessary_parenthesis: true
     unnecessary_statements: true
     use_function_type_syntax_for_parameters: true
-    use_if_null_to_convert_nulls_to_bools: true
     void_checks: true

example/ios/Flutter/Debug.xcconfig

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

example/ios/Flutter/Release.xcconfig

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

example/lib/examples/animation_full_control.dart

@@ -86,7 +86,8 @@ class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
               ],
             ),
             const SizedBox(height: 30),
-            ElevatedButton(
+            RaisedButton(
+              child: Text('Loop between frames'),
               onPressed: () {
                 // Loop between 2 specifics frames
 
@@ -99,7 +100,6 @@ class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
                   period: _controller.duration! * (stop - start),
                 );
               },
-              child: Text('Loop between frames'),
             ),
           ],
         ),

example/lib/examples/markers.dart

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

example/lib/examples/save_frames.dart

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

example/lib/main_app.dart

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

example/lib/src/all_files.g.dart

@@ -108,17 +108,14 @@ final files = [
   'assets/Tests/hd.json',
   'assets/Tests/map.zip',
   'assets/TwitterHeartButton.json',
-  'assets/battery_optimizations.json',
+  'assets/_loading_indicator.json',
   'assets/bluetoothscanning.json',
-  'assets/camera_change.json',
-  'assets/envelope.json',
   'assets/example_with_images/data.json',
   'assets/lf20_w2Afea.json',
   'assets/lottiefiles/100_percent.json',
-  'assets/lottiefiles/28861-connection-style-2.json',
-  'assets/lottiefiles/45668-arrow-with-light-passing-through.json',
   'assets/lottiefiles/Plane.json',
   'assets/lottiefiles/StreetByMorning.json',
+  'assets/lottiefiles/___.json',
   'assets/lottiefiles/a_mountain.json',
   'assets/lottiefiles/accept_arrows.json',
   'assets/lottiefiles/airbnb.json',
@@ -349,9 +346,7 @@ final files = [
   'assets/lottiefiles/yoga_carpet.json',
   'assets/lottiefiles/youtube_icon_reveal.json',
   'assets/playing.json',
-  'assets/spinning_carrousel.zip',
-  'assets/sticker.json',
-  'assets/tent.json',
+  'assets/weather/_hurricane.json',
   'assets/weather/fog.json',
   'assets/weather/hurricane.json',
   'assets/weather/thunder-storm.json',

example/macos/Flutter/Flutter-Debug.xcconfig

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

example/macos/Flutter/Flutter-Release.xcconfig

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

example/macos/Podfile.lock

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

example/macos/Runner.xcodeproj/project.pbxproj

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

example/pubspec.lock

@@ -7,77 +7,77 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.2"
+    version: "3.0.0-nullsafety.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.0-nullsafety.3"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.3"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.5"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.3"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.3"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.15.0-nullsafety.5"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.0-nullsafety.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.3"
   ffi:
     dependency: transitive
     description:
       name: ffi
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "0.1.3"
   file:
     dependency: transitive
     description:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.0"
+    version: "5.2.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -89,124 +89,138 @@ packages:
       name: flutter_colorpicker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0"
+    version: "0.4.0-nullsafety.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
+  golden_toolkit:
+    dependency: "direct dev"
+    description:
+      name: golden_toolkit
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.0-nullsafety.0"
   http:
     dependency: "direct main"
     description:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.3"
+    version: "0.12.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
+    version: "3.1.4"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
   logging:
     dependency: transitive
     description:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.0-nullsafety.0"
   lottie:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1"
+    version: "0.8.0-nullsafety.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.10-nullsafety.3"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.6"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.0-nullsafety.3"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "1.6.27"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "0.0.1+2"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "0.0.4+8"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "1.0.4"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "0.0.4+3"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.0"
+    version: "1.9.2"
   platform:
     dependency: transitive
     description:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "2.2.1"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "1.0.3"
   process:
     dependency: transitive
     description:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.1"
+    version: "3.0.13"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -218,70 +232,70 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0-nullsafety.4"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.0-nullsafety.6"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.3"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.3"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.3"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.2.19-nullsafety.6"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.5"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.5"
   win32:
     dependency: transitive
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "1.7.4"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.1.2"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.20.0"
+  dart: ">=2.12.0-29.10.beta <3.0.0"
+  flutter: ">=1.24.0-10.2.pre <2.0.0"

example/pubspec.yaml

@@ -8,7 +8,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_colorpicker:
+  flutter_colorpicker: ^0.4.0-nullsafety.0
   http:
   lottie:
     path: ../
@@ -17,6 +17,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  golden_toolkit: ^0.9.0-nullsafety.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -59,4 +60,4 @@ flutter:
         - asset: assets/fonts/Roboto.ttf
     - family: Noto Emoji
       fonts:
-        - asset: assets/fonts/Noto-Emoji.ttf
+        - asset: assets/fonts/NotoEmoji-Regular.ttf

example/test/dynamic_properties_test.dart

@@ -11,7 +11,7 @@ void main() {
 
   setUpAll(() async {
     composition = await LottieComposition.fromBytes(
-        File('example/assets/Tests/Shapes.json').readAsBytesSync());
+        File('assets/Tests/Shapes.json').readAsBytesSync());
   });
 
   void testGolden(String description, ValueDelegate delegate,
@@ -22,9 +22,6 @@ void main() {
         .replaceAll(' ', '_');
 
     testWidgets(description, (tester) async {
-      tester.binding.window.physicalSizeTestValue = Size(500, 400);
-      tester.binding.window.devicePixelRatioTestValue = 1.0;
-
       var animation =
           AnimationController(vsync: tester, duration: composition.duration);
       if (progress != null) {

example/test/dynamic_text_test.dart

@@ -1,15 +1,13 @@
 import 'dart:io';
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lottie/lottie.dart';
 
 void main() {
   testWidgets('Dynamic test', (tester) async {
-    tester.binding.window.physicalSizeTestValue = Size(500, 400);
-    tester.binding.window.devicePixelRatioTestValue = 1.0;
-
     var composition = await LottieComposition.fromBytes(
-        File('example/assets/Tests/DynamicText.json').readAsBytesSync());
+        File('assets/Tests/DynamicText.json').readAsBytesSync());
 
     await tester.pumpWidget(
       MaterialApp(

example/test/fireworks_test.dart

@@ -13,7 +13,7 @@ void main() {
     tester.binding.window.devicePixelRatioTestValue = 1.0;
 
     var composition = await LottieComposition.fromBytes(
-        File('example/assets/17297-fireworks.json').readAsBytesSync());
+        File('assets/17297-fireworks.json').readAsBytesSync());
 
     await tester.pumpWidget(FilmStrip(composition, size: size));
 

example/test/flutter_test_config.dart

@@ -0,0 +1,7 @@
+import 'dart:async';
+import 'package:golden_toolkit/golden_toolkit.dart';
+
+Future<void> testExecutable(FutureOr<void> Function() testMain) async {
+  await loadAppFonts();
+  return testMain();
+}

example/test/golden_test.dart

@@ -7,7 +7,7 @@ import 'package:path/path.dart' as p;
 import 'utils.dart';
 
 void main() {
-  var root = 'example/assets';
+  var root = 'assets';
   for (var asset in Directory(root)
       .listSync(recursive: true)
       .whereType<File>()