Fix some warnings with Flutter 3.3 (#235)

Thanks for the contribution

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

@@ -8,9 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
-          channel: 'beta'
+          channel: 'stable'
       - run: flutter pub get
       - run: flutter pub run tool/publish/comment_dependency_overrides.dart
       - run: flutter pub get

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.4.3]
+- Fixed some lints with Flutter 3.3. 
+
+## [1.4.2]
+- Use `FilterQuality.low` as default to draw image layers.
+
+## [1.4.1]
+- Allow `AlignmentGeometry` for `alignment`.
+
 ## [1.4.0]
 - Added `filterQuality` property to control the performance vs quality trade-off to use when drawing images
 

example/pubspec.lock

@@ -14,7 +14,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,21 +28,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
@@ -63,7 +56,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
@@ -77,7 +70,7 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -115,7 +108,7 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.4"
+    version: "0.13.5"
   http_parser:
     dependency: transitive
     description:
@@ -143,35 +136,35 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.4.0"
+    version: "1.4.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   path:
     dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   path_provider:
     dependency: "direct main"
     description:
@@ -185,14 +178,14 @@ packages:
       name: path_provider_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.16"
+    version: "2.0.20"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.0.11"
   path_provider_linux:
     dependency: transitive
     description:
@@ -220,7 +213,7 @@ packages:
       name: path_provider_windows
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.3"
   platform:
     dependency: transitive
     description:
@@ -253,7 +246,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
@@ -274,21 +267,21 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   typed_data:
     dependency: transitive
     description:
@@ -309,14 +302,14 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.7.0"
+    version: "3.0.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0+1"
+    version: "0.2.0+2"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
+  dart: ">=2.18.0 <3.0.0"
-  flutter: ">=3.0.0"
+  flutter: ">=3.3.0"

lib/src/lottie.dart

@@ -52,7 +52,7 @@ class Lottie extends StatefulWidget {
     double? width,
     double? height,
     BoxFit? fit,
-    Alignment? alignment,
+    AlignmentGeometry? alignment,
     String? package,
     bool? addRepaintBoundary,
     FilterQuality? filterQuality,
@@ -101,7 +101,7 @@ class Lottie extends StatefulWidget {
     double? width,
     double? height,
     BoxFit? fit,
-    Alignment? alignment,
+    AlignmentGeometry? alignment,
     bool? addRepaintBoundary,
     FilterQuality? filterQuality,
     WarningCallback? onWarning,
@@ -147,7 +147,7 @@ class Lottie extends StatefulWidget {
     double? width,
     double? height,
     BoxFit? fit,
-    Alignment? alignment,
+    AlignmentGeometry? alignment,
     bool? addRepaintBoundary,
     FilterQuality? filterQuality,
     WarningCallback? onWarning,
@@ -193,7 +193,7 @@ class Lottie extends StatefulWidget {
     double? width,
     double? height,
     BoxFit? fit,
-    Alignment? alignment,
+    AlignmentGeometry? alignment,
     bool? addRepaintBoundary,
     FilterQuality? filterQuality,
     WarningCallback? onWarning,
@@ -311,7 +311,7 @@ class Lottie extends StatefulWidget {
   /// The quality of the image layer. See [FilterQuality]
   /// [FilterQuality.high] is highest quality but slowest.
   ///
-  /// Defaults to [FilterQuality.none]
+  /// Defaults to [FilterQuality.low]
   final FilterQuality? filterQuality;
 
   static bool get traceEnabled => L.traceEnabled;

lib/src/lottie_builder.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:typed_data';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'composition.dart';
@@ -33,12 +32,12 @@ typedef LottieErrorWidgetBuilder = Widget Function(
 /// Several constructors are provided for the various ways that a Lottie file
 /// can be provided:
 ///
-///  * [new Lottie], for obtaining a composition from a [LottieProvider].
+///  * [Lottie], for obtaining a composition from a [LottieProvider].
-///  * [new Lottie.asset], for obtaining a Lottie file from an [AssetBundle]
+///  * [Lottie.asset], for obtaining a Lottie file from an [AssetBundle]
 ///    using a key.
-///  * [new Lottie.network], for obtaining a lottie file from a URL.
+///  * [Lottie.network], for obtaining a lottie file from a URL.
-///  * [new Lottie.file], for obtaining a lottie file from a [File].
+///  * [Lottie.file], for obtaining a lottie file from a [File].
-///  * [new Lottie.memory], for obtaining a lottie file from a [Uint8List].
+///  * [Lottie.memory], for obtaining a lottie file from a [Uint8List].
 ///
 class LottieBuilder extends StatefulWidget {
   const LottieBuilder({
@@ -369,7 +368,7 @@ class LottieBuilder extends StatefulWidget {
   /// The quality of the image layer. See [FilterQuality]
   /// [FilterQuality.high] is highest quality but slowest.
   ///
-  /// Defaults to [FilterQuality.none]
+  /// Defaults to [FilterQuality.low]
   final FilterQuality? filterQuality;
 
   /// A callback called when there is a warning during the loading or painting

lib/src/lottie_delegates.dart

@@ -82,5 +82,5 @@ class LottieDelegates {
           values == other.values;
 
   @override
-  int get hashCode => hashValues(text, textStyle, values);
+  int get hashCode => Object.hash(text, textStyle, values);
 }

lib/src/model/document_data.dart

@@ -31,7 +31,7 @@ class DocumentData {
 
   @override
   int get hashCode {
-    return hashValues(
+    return Object.hash(
         text,
         fontName,
         size,

lib/src/model/layer/image_layer.dart

@@ -25,7 +25,7 @@ class ImageLayer extends BaseLayer {
     }
     var density = window.devicePixelRatio;
 
-    paint.filterQuality = lottieDrawable.filterQuality ?? FilterQuality.none;
+    paint.filterQuality = lottieDrawable.filterQuality ?? FilterQuality.low;
     paint.setAlpha(parentAlpha);
     if (_colorFilterAnimation != null) {
       paint.colorFilter = _colorFilterAnimation!.value;

lib/src/providers/asset_provider.dart

@@ -67,7 +67,7 @@ class AssetLottie extends LottieProvider {
   }
 
   @override
-  int get hashCode => hashValues(keyName, bundle);
+  int get hashCode => Object.hash(keyName, bundle);
 
   @override
   String toString() => '$runtimeType(bundle: $bundle, name: "$keyName")';

lib/src/providers/provider_io.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:typed_data';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:path/path.dart' as p;

lib/src/utils/debug_path.dart

@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 import 'dart:ui';
 import 'package:flutter/foundation.dart';
 

lib/src/value/drop_shadow.dart

@@ -33,7 +33,7 @@ class DropShadow {
   }
 
   @override
-  int get hashCode => hashValues(color, direction, distance, radius);
+  int get hashCode => Object.hash(color, direction, distance, radius);
 
   @override
   String toString() => 'DropShadow(color: $color, direction: $direction, '

lib/src/value/keyframe.dart

@@ -1,4 +1,3 @@
-import 'dart:ui';
 import 'package:flutter/animation.dart';
 import '../composition.dart';
 

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "43.0.0"
+    version: "48.0.0"
   analyzer:
     dependency: "direct dev"
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.1"
+    version: "5.0.0"
   archive:
     dependency: "direct main"
     description:
@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -49,7 +49,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   build_config:
     dependency: transitive
     description:
@@ -70,21 +70,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "7.2.3"
+    version: "7.2.4"
   built_collection:
     dependency: transitive
     description:
@@ -98,21 +98,14 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.4.0"
+    version: "8.4.1"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -126,14 +119,14 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.0"
+    version: "4.2.0"
   collection:
     dependency: transitive
     description:
@@ -161,21 +154,21 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.4"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   file:
     dependency: transitive
     description:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   fixnum:
     dependency: transitive
     description:
@@ -276,21 +269,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:
@@ -311,7 +304,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   pool:
     dependency: transitive
     description:
@@ -332,14 +325,14 @@ packages:
       name: pubspec_parse
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   shelf:
     dependency: transitive
     description:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -358,7 +351,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
@@ -386,21 +379,21 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   timing:
     dependency: transitive
     description:
@@ -444,5 +437,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
+  dart: ">=2.18.0 <3.0.0"
-  flutter: ">=2.10.0"
+  flutter: ">=3.3.0"

pubspec.yaml

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

test/lottie_test.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:typed_data';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';

tool/code_style/fix_import_order.dart

@@ -98,7 +98,7 @@ String _reorderImports(String content, CompilationUnit unit) {
   var contentBefore = content.substring(0, minOffset);
   var reorderedContent = '';
 
-  String _writeBlock(List<UriBasedDirective> directives) {
+  String writeBlock(List<UriBasedDirective> directives) {
     var result = '';
     for (var directive in directives) {
       var wholeDirective = wholeDirectives.firstWhere(
@@ -115,9 +115,9 @@ String _reorderImports(String content, CompilationUnit unit) {
     return '$result$newLineChar$newLineChar';
   }
 
-  reorderedContent += _removeBlankLines(_writeBlock(imports));
+  reorderedContent += _removeBlankLines(writeBlock(imports));
-  reorderedContent += _removeBlankLines(_writeBlock(exports));
+  reorderedContent += _removeBlankLines(writeBlock(exports));
-  reorderedContent += _removeBlankLines(_writeBlock(parts));
+  reorderedContent += _removeBlankLines(writeBlock(parts));
 
   var contentAfter = content.substring(maxOffset);