force resolution 1.0

.github/workflows/analyze.yaml

@@ -6,12 +6,12 @@ on:
       - master
 
 jobs:
-  analyze:
+  analyze_and_test:
     name: Flutter analyze
     strategy:
       matrix:
-        flutter: ['stable', 'beta']
-    runs-on: macos-latest
+        flutter: ['stable']
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v1
@@ -30,26 +30,3 @@ jobs:
                    "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

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

@@ -10,11 +10,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v1
         with:
-          channel: 'beta'
+          channel: 'stable'
       - run: flutter pub get
       - run: flutter pub run tool/publish/comment_dependency_overrides.dart
       - run: flutter pub get
-      - run: flutter pub run tool/publish/check_version.dart ${GITHUB_REF}
+      - run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF}
+      - run: flutter pub run tool/publish/check_version.dart ${{ env.RELEASE_VERSION }}
       - name: Setup credentials
         run: |
           mkdir -p $FLUTTER_HOME/.pub-cache

.github/workflows/test.yaml

@@ -0,0 +1,17 @@
+name: Lottie Flutter
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Run all tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run tests
+        uses: docker://cirrusci/flutter:1.22.1
+        with:
+          args: sh run_tests.sh

CHANGELOG.md

@@ -1,15 +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.
-
 ## [0.7.0+1]
 - Fix Flutter Web compilation error
 

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.
 
@@ -64,7 +64,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
-  late final AnimationController _controller;
+  AnimationController _controller;
 
   @override
   void initState() {
@@ -137,7 +137,7 @@ class MyWidget extends StatefulWidget {
 }
 
 class _MyWidgetState extends State<MyWidget> {
-  late final Future<LottieComposition> _composition;
+  Future<LottieComposition> _composition;
 
   @override
   void initState() {
@@ -176,7 +176,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, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -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/alert_dialog.dart

@@ -23,7 +23,7 @@ class __PageState extends State<_Page> {
   void initState() {
     super.initState();
 
-    SchedulerBinding.instance!.addPostFrameCallback((_) => _showLoader());
+    SchedulerBinding.instance.addPostFrameCallback((_) => _showLoader());
   }
 
   void _showLoader() {

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({Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/animation_controller.dart

@@ -9,7 +9,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
-  late final AnimationController _controller;
+  AnimationController _controller;
 
   @override
   void initState() {

example/lib/examples/animation_full_control.dart

@@ -17,7 +17,7 @@ class MyApp extends StatefulWidget {
 }
 
 class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
-  late final AnimationController _controller;
+  AnimationController _controller;
 
   @override
   void initState() {
@@ -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
 
@@ -96,10 +97,9 @@ class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
                   min: start,
                   max: stop,
                   reverse: true,
-                  period: _controller.duration! * (stop - start),
+                  period: _controller.duration * (stop - start),
                 );
               },
-              child: Text('Loop between frames'),
             ),
           ],
         ),

example/lib/examples/custom_draw.dart

@@ -22,7 +22,7 @@ class MyWidget extends StatefulWidget {
 }
 
 class _MyWidgetState extends State<MyWidget> {
-  late final Future<LottieComposition> _composition;
+  Future<LottieComposition> _composition;
 
   @override
   void initState() {
@@ -57,7 +57,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, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

example/lib/examples/custom_load.dart

@@ -23,7 +23,7 @@ class MyWidget extends StatefulWidget {
 }
 
 class _MyWidgetState extends State<MyWidget> {
-  late final Future<LottieComposition> _composition;
+  Future<LottieComposition> _composition;
 
   @override
   void initState() {

example/lib/examples/dynamic_properties.dart

@@ -8,7 +8,7 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({Key key}) : super(key: key);
 
   @override
   _AppState createState() => _AppState();
@@ -50,7 +50,7 @@ class _AppState extends State<App> with TickerProviderStateMixin {
               value: _useDelegates,
               onChanged: (newValue) {
                 setState(() {
-                  _useDelegates = newValue!;
+                  _useDelegates = newValue;
                 });
               },
             ),

example/lib/examples/dynamic_text.dart

@@ -7,14 +7,14 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({Key key}) : super(key: key);
 
   @override
   _AppState createState() => _AppState();
 }
 
 class _AppState extends State<App> with TickerProviderStateMixin {
-  late final TextEditingController _textController;
+  TextEditingController _textController;
 
   @override
   void initState() {

example/lib/examples/hide_after_complete.dart

@@ -6,14 +6,14 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({Key key}) : super(key: key);
 
   @override
   _AppState createState() => _AppState();
 }
 
 class _AppState extends State<App> with TickerProviderStateMixin {
-  late final AnimationController _animationController;
+  AnimationController _animationController;
   bool _showAnimation = true;
 
   @override

example/lib/examples/markers.dart

@@ -9,14 +9,14 @@ void main() async {
 }
 
 class App extends StatefulWidget {
-  const App({Key? key}) : super(key: key);
+  const App({Key key}) : super(key: key);
 
   @override
   _AppState createState() => _AppState();
 }
 
 class _AppState extends State<App> with TickerProviderStateMixin {
-  late final Future<LottieComposition> _composition;
+  Future<LottieComposition> _composition;
 
   @override
   void initState() {
@@ -35,9 +35,9 @@ class _AppState extends State<App> with TickerProviderStateMixin {
         body: FutureBuilder<LottieComposition>(
           future: _composition,
           builder: (context, snapshot) {
-            if (snapshot.hasError) return ErrorWidget(snapshot.error!);
+            if (snapshot.hasError) return ErrorWidget(snapshot.error);
             if (!snapshot.hasData) return CircularProgressIndicator();
-            return _LottieDetails(snapshot.data!);
+            return _LottieDetails(snapshot.data);
           },
         ),
       ),
@@ -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, {Key key}) : super(key: key);
 
   @override
   _LottieDetailsState createState() => _LottieDetailsState();
@@ -56,7 +56,7 @@ class _LottieDetails extends StatefulWidget {
 
 class _LottieDetailsState extends State<_LottieDetails>
     with TickerProviderStateMixin {
-  late final AnimationController _controller;
+  AnimationController _controller;
 
   @override
   void initState() {
@@ -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(
@@ -112,8 +112,8 @@ class _LottieDetailsState extends State<_LottieDetails>
   }
 
   void _playBetween(String marker1, String marker2) {
-    var start = widget.composition.getMarker(marker1)!.start;
-    var end = widget.composition.getMarker(marker2)!.start;
+    var start = widget.composition.getMarker(marker1).start;
+    var end = widget.composition.getMarker(marker2).start;
 
     _controller.value = start;
     _controller.animateTo(end,

example/lib/examples/repeat.dart

@@ -1,63 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:lottie/lottie.dart';
-
-void main() => runApp(MyApp());
-
-class MyApp extends StatefulWidget {
-  @override
-  _MyAppState createState() => _MyAppState();
-}
-
-class _MyAppState extends State<MyApp> with TickerProviderStateMixin {
-  late final AnimationController _controller;
-  int _repeatIndex = 0;
-
-  @override
-  void initState() {
-    super.initState();
-
-    _controller = AnimationController(vsync: this)
-      ..addStatusListener((status) {
-        if (status == AnimationStatus.completed) {
-          setState(() {
-            _repeatIndex++;
-          });
-          if (_repeatIndex < 5) {
-            _controller.reset();
-            _controller.forward();
-          }
-        }
-      });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      home: Scaffold(
-        body: ListView(
-          children: [
-            Lottie.asset(
-              'assets/AndroidWave.json',
-              controller: _controller,
-              width: 150,
-              height: 150,
-              onLoaded: (composition) {
-                // Configure the AnimationController with the duration of the
-                // Lottie file and start the animation.
-                _controller.duration = composition.duration;
-                _controller.forward();
-              },
-            ),
-            Center(child: Text('Repeat: $_repeatIndex')),
-          ],
-        ),
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-}

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({Key key}) : super(key: key);
 
   @override
   _AppState createState() => _AppState();
@@ -20,7 +20,7 @@ class App extends StatefulWidget {
 
 class _AppState extends State<App> with TickerProviderStateMixin {
   int _index = 0;
-  late final AnimationController _animationController;
+  AnimationController _animationController;
 
   @override
   void initState() {

example/lib/examples/save_frames.dart

@@ -1,5 +1,3 @@
-//@dart=2.10
-
 import 'dart:io';
 import 'dart:ui';
 import 'package:flutter/material.dart';
@@ -28,9 +26,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,38 +21,34 @@ class App extends StatelessWidget {
         appBar: AppBar(
           title: Text('Lottie Flutter'),
         ),
-        body: Scrollbar(
-          child: GridView.builder(
+        body: 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(
+                      child: child,
                       opacity: composition == null ? 0 : 1,
                       duration: const Duration(seconds: 1),
                       curve: Curves.easeOut,
-                        child: child,
                     );
                   },
                 ),
               ),
+              onTap: () {
+                Navigator.of(context).push(MaterialPageRoute<void>(
+                    builder: (context) => Detail(assetName)));
+              },
             );
           },
         ),
       ),
-      ),
     );
   }
 }
@@ -60,7 +56,7 @@ class App extends StatelessWidget {
 class _Item extends StatelessWidget {
   final Widget child;
 
-  const _Item({Key? key, required this.child}) : super(key: key);
+  const _Item({Key key, this.child}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -85,18 +81,26 @@ class _Item extends StatelessWidget {
 class Detail extends StatefulWidget {
   final String assetName;
 
-  const Detail(this.assetName, {Key? key}) : super(key: key);
+  const Detail(this.assetName, {Key key}) : super(key: key);
 
   @override
   _DetailState createState() => _DetailState();
 }
 
 class _DetailState extends State<Detail> with TickerProviderStateMixin {
-  late final _controller = AnimationController(vsync: this);
+  AnimationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _controller = AnimationController(vsync: this);
+  }
 
   @override
   void dispose() {
     _controller.dispose();
+
     super.dispose();
   }
 

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({Key key, this.composition}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -97,13 +97,13 @@ class App extends StatelessWidget {
 
 class _Lottie extends StatefulWidget {
   final LottieComposition composition;
-  final double? width;
-  final double? height;
-  final BoxFit? fit;
-  final AlignmentGeometry? alignment;
+  final double width;
+  final double height;
+  final BoxFit fit;
+  final AlignmentGeometry alignment;
 
   const _Lottie(this.composition,
-      {Key? key, this.width, this.height, this.fit, this.alignment})
+      {Key key, this.width, this.height, this.fit, this.alignment})
       : super(key: key);
 
   @override
@@ -111,7 +111,7 @@ class _Lottie extends StatefulWidget {
 }
 
 class __LottieState extends State<_Lottie> with TickerProviderStateMixin {
-  late AnimationController _controller;
+  AnimationController _controller;
 
   @override
   void initState() {

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/lib/tests/airbnb.dart

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

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.9.1

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;
@@ -318,10 +330,10 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
+			outputFileListPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

example/pubspec.lock

@@ -7,77 +7,91 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.2"
+    version: "2.0.11"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.5.0-nullsafety.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.1"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.1"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.15.0-nullsafety.3"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "2.1.3"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.1"
   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 +103,138 @@ packages:
       name: flutter_colorpicker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0"
+    version: "0.3.4"
   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.6.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: "0.11.4"
   lottie:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1"
+    version: "0.7.0+1"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.10-nullsafety.1"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.3"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.0-nullsafety.1"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "1.6.21"
   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+4"
   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.3"
   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+1"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.0"
+    version: "1.8.0+1"
   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 +246,70 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0-nullsafety.2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.0-nullsafety.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.0-nullsafety.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.2.19-nullsafety.2"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.0-nullsafety.3"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.0-nullsafety.3"
   win32:
     dependency: transitive
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "1.7.3"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.20.0"
+  dart: ">=2.10.0-110 <2.11.0"
+  flutter: ">=1.12.13+hotfix.5 <2.0.0"

example/pubspec.yaml

@@ -1,9 +1,9 @@
 name: lottie_example
 description: A sample app for the Lottie player
-publish_to: none
+version: 0.0.1
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -17,6 +17,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  golden_toolkit:
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -30,7 +31,6 @@ flutter:
     - assets/lottiefiles/
     - assets/Mobilo/
     - assets/Tests/
-    - assets/Tests/images/
     - assets/Logo/
     - assets/Images/
     - assets/Images/WeAccept/
@@ -59,4 +59,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

@@ -7,15 +7,15 @@ import 'package:lottie/lottie.dart';
 import 'utils.dart';
 
 void main() {
-  late LottieComposition composition;
+  LottieComposition composition;
 
   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,
-      {double? progress}) async {
+      {double progress}) async {
     var screenshotName = description
         .toLowerCase()
         .replaceAll(RegExp('[^a-z0-9 ]'), '')
@@ -291,8 +291,8 @@ void main() {
     testGolden(
         'Opacity interpolation ($progress)',
         ValueDelegate.transformOpacity(['Shape Layer 1', 'Rectangle'],
-            callback: (frameInfo) => lerpDouble(10, 100,
-                    Curves.linear.transform(frameInfo.overallProgress))!
+            callback: (frameInfo) => lerpDouble(
+                    10, 100, Curves.linear.transform(frameInfo.overallProgress))
                 .round()),
         progress: progress);
   }

example/test/dynamic_text_test.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lottie/lottie.dart';
@@ -9,7 +10,7 @@ void main() {
     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> main(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>()
@@ -16,8 +16,7 @@ void main() {
       var size = Size(500, 400);
       tester.binding.window.physicalSizeTestValue = size;
       tester.binding.window.devicePixelRatioTestValue = 1.0;
-      var composition =
-          (await tester.runAsync(() => FileLottie(asset).load()))!;
+      var composition = await tester.runAsync(() => FileLottie(asset).load());
 
       await tester.pumpWidget(FilmStrip(composition, size: size));