♻️ nnbd migrate

Author: AlexV525

analysis_options.yaml

@@ -29,6 +29,9 @@ analyzer:
     missing_return: warning
     # allow having TODOs in the code
     todo: ignore
+    # allow self-reference to deprecated members (we do this because otherwise we have
+    # to annotate every member in every test, assert, etc, when we deprecate something)
+    deprecated_member_use_from_same_package: ignore
     # Ignore analyzer hints for updating pubspecs when using Future or
     # Stream and not importing dart:async
     # Please see https://github.com/flutter/flutter/pull/24528 for details.
@@ -39,6 +42,7 @@ analyzer:
     # see https://github.com/dart-lang/sdk/issues/28463
     - "lib/i18n/messages_*.dart"
     - "lib/src/http/**"
+    - "test_fixes/**"
 
 linter:
   rules:
@@ -50,6 +54,7 @@ linter:
     # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
     - always_require_non_null_named_parameters
     - always_specify_types
+    # - always_use_package_imports # we do this commonly
     - annotate_overrides
     # - avoid_annotating_with_dynamic # conflicts with always_specify_types
     # - avoid_as # required for implicit-casts: true
@@ -60,6 +65,7 @@ linter:
     # - avoid_double_and_int_checks # only useful when targeting JS runtime
     - avoid_empty_else
     - avoid_equals_and_hash_code_on_mutable_classes
+    # - avoid_escaping_inner_quotes # not yet tested
     - avoid_field_initializers_in_const_classes
     - avoid_function_literals_in_foreach_calls
     # - avoid_implementing_value_types # not yet tested
@@ -78,9 +84,10 @@ linter:
     - avoid_returning_null_for_void
     # - avoid_returning_this # there are plenty of valid reasons to return this
     # - avoid_setters_without_getters # not yet tested
-    # - avoid_shadowing_type_parameters # not yet tested
+    - avoid_shadowing_type_parameters
     - avoid_single_cascade_in_expression_statements
     - avoid_slow_async_io
+    # - avoid_type_to_string # we do this commonly
     - avoid_types_as_parameter_names
     # - avoid_types_on_closure_parameters # conflicts with always_specify_types
     # - avoid_unnecessary_containers # not yet tested
@@ -92,53 +99,59 @@ linter:
     - camel_case_types
     - cancel_subscriptions
     # - cascade_invocations # not yet tested
+    - cast_nullable_to_non_nullable
     # - close_sinks # not reliable enough
     # - comment_references # blocked on https://github.com/flutter/flutter/issues/20765
     # - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
     - control_flow_in_finally
-    # - curly_braces_in_flow_control_structures # not yet tested
+    # - curly_braces_in_flow_control_structures # not required by flutter style
     # - diagnostic_describe_all_properties # not yet tested
     - directives_ordering
+    # - do_not_use_environment # we do this commonly
     - empty_catches
     - empty_constructor_bodies
     - empty_statements
+    - exhaustive_cases
     # - file_names # not yet tested
     - flutter_style_todos
     - hash_and_equals
     - implementation_imports
     # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
     - iterable_contains_unrelated_type
-    # - join_return_with_assignment # not yet tested
+    # - join_return_with_assignment # not required by flutter style
+    - leading_newlines_in_multiline_strings
     - library_names
     - library_prefixes
-    # - lines_longer_than_80_chars # not yet tested
+    # - lines_longer_than_80_chars # not required by flutter style
     - list_remove_unrelated_type
     # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
     # - missing_whitespace_between_adjacent_strings # not yet tested
     - no_adjacent_strings_in_list
+    # - no_default_cases # too many false positives
     - no_duplicate_case_values
-    # - no_logic_in_create_state # not yet tested
-    # - no_runtimeType_toString # not yet tested
+    - no_logic_in_create_state
+    # - no_runtimeType_toString # ok in tests; we enable this only in packages/
     - non_constant_identifier_names
-    # - null_closures  # not yet tested
+    - null_check_on_nullable_type_parameter
+    # - null_closures # not required by flutter style
     # - omit_local_variable_types # opposite of always_specify_types
     # - one_member_abstracts # too many false positives
     # - only_throw_errors # https://github.com/flutter/flutter/issues/5792
     - overridden_fields
     - package_api_docs
-    - package_names
+    # - package_names # non conforming packages in sdk
     - package_prefixed_library_names
     # - parameter_assignments # we do this commonly
     - prefer_adjacent_string_concatenation
     - prefer_asserts_in_initializer_lists
-    # - prefer_asserts_with_message # not yet tested
+    # - prefer_asserts_with_message # not required by flutter style
     - prefer_collection_literals
     - prefer_conditional_assignment
     - prefer_const_constructors
     - prefer_const_constructors_in_immutables
     - prefer_const_declarations
     - prefer_const_literals_to_create_immutables
-    # - prefer_constructors_over_static_methods # not yet tested
+    # - prefer_constructors_over_static_methods # far too many false positives
     - prefer_contains
     # - prefer_double_quotes # opposite of prefer_single_quotes
     - prefer_equal_for_default_values
@@ -170,13 +183,15 @@ linter:
     # - provide_deprecation_message # not yet tested
     # - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml
     - recursive_getters
+    # - sized_box_for_whitespace # not yet tested
     - slash_for_doc_comments
     # - sort_child_properties_last # not yet tested
     - sort_constructors_first
-    - sort_pub_dependencies
+    # - sort_pub_dependencies # prevents separating pinned transitive dependencies
     - sort_unnamed_constructors_first
     - test_types_in_equals
     - throw_in_finally
+    - tighten_type_of_initializing_formals
     # - type_annotate_public_apis # subset of always_specify_types
     - type_init_formals
     # - unawaited_futures # too many false positives
@@ -188,17 +203,24 @@ linter:
     # - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498
     - unnecessary_new
     - unnecessary_null_aware_assignments
+    # - unnecessary_null_checks # not yet tested
     - unnecessary_null_in_if_null_operators
+    - unnecessary_nullable_for_final_variable_declarations
     - unnecessary_overrides
     - unnecessary_parenthesis
+    # - unnecessary_raw_strings # not yet tested
     - unnecessary_statements
+    - unnecessary_string_escapes
     - unnecessary_string_interpolations
     - unnecessary_this
     - unrelated_type_equality_checks
     # - unsafe_html # not yet tested
     - use_full_hex_values_for_flutter_colors
     # - use_function_type_syntax_for_parameters # not yet tested
+    - use_is_even_rather_than_modulo
     # - use_key_in_widget_constructors # not yet tested
+    - use_late_for_private_fields_and_variables
+    - use_raw_strings
     - use_rethrow_when_possible
     # - use_setters_to_change_properties # not yet tested
     # - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182

example/lib/main.dart

@@ -23,26 +23,26 @@ class MyApp extends StatelessWidget {
         primarySwatch: Colors.blue,
         visualDensity: VisualDensity.adaptivePlatformDensity,
       ),
-      home: const MyHomePage(title: 'WeChat Camera Picker Demo'),
+      home: const MyHomePage(),
     );
   }
 }
 
 class MyHomePage extends StatefulWidget {
-  const MyHomePage({Key key, this.title}) : super(key: key);
-
-  final String title;
+  const MyHomePage({Key? key}) : super(key: key);
 
   @override
   _MyHomePageState createState() => _MyHomePageState();
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  AssetEntity entity;
-  Uint8List data;
+  AssetEntity? entity;
+  Uint8List? data;
 
   Future<void> pick(BuildContext context) async {
-    final AssetEntity _entity = await CameraPicker.pickFromCamera(
+    final Size size = MediaQuery.of(context).size;
+    final double scale = MediaQuery.of(context).devicePixelRatio;
+    final AssetEntity? _entity = await CameraPicker.pickFromCamera(
       context,
       enableRecording: true,
     );
@@ -51,7 +51,10 @@ class _MyHomePageState extends State<MyHomePage> {
       if (mounted) {
         setState(() {});
       }
-      data = await entity.thumbData;
+      data = await _entity.thumbDataWithSize(
+        (size.width * scale).toInt(),
+        (size.height * scale).toInt(),
+      );
       if (mounted) {
         setState(() {});
       }
@@ -61,21 +64,16 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: Text(widget.title),
-      ),
-      body: SizedBox.expand(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            if (entity != null && data != null)
-              Image.memory(data)
-            else if (entity != null && data == null)
-              const CircularProgressIndicator()
-            else
-              const Text('Click the button to start picking.'),
-          ],
-        ),
+      appBar: AppBar(title: const Text('WeChat Camera Picker Demo')),
+      body: Stack(
+        children: <Widget>[
+          if (entity != null && data != null)
+            Positioned.fill(child: Image.memory(data!, fit: BoxFit.contain))
+          else if (entity != null && data == null)
+            const Center(child: CircularProgressIndicator())
+          else
+            const Center(child: Text('Click the button to start picking.')),
+        ],
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: () => pick(context),

example/pubspec.yaml

@@ -5,8 +5,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.8.1 <3.0.0"
-  flutter: ">=1.17.0"
+  sdk: ">=2.12.0-0 <3.0.0"
+  flutter: ">=1.22.6"
 
 dependencies:
   flutter:

lib/src/delegates/camera_picker_text_delegate.dart

@@ -8,11 +8,15 @@
 abstract class CameraPickerTextDelegate {
   /// Confirm string for the confirm button.
   /// 确认按钮的字段
-  String confirm;
+  late String confirm;
 
   /// Tips string above the shooting button before shooting.
   /// 拍摄前确认按钮上方的提示文字
-  String shootingTips;
+  late String shootingTips;
+
+  /// Load failed string for item.
+  /// 资源加载失败时的字段
+  late final String loadFailed;
 }
 
 /// Default text delegate implements with Chinese.
@@ -30,6 +34,9 @@ class DefaultCameraPickerTextDelegate implements CameraPickerTextDelegate {
 
   @override
   String shootingTips = '轻触拍照';
+
+  @override
+  String loadFailed = '加载失败';
 }
 
 /// Default text delegate including recording implements with Chinese.
@@ -48,6 +55,9 @@ class DefaultCameraPickerTextDelegateWithRecording
 
   @override
   String shootingTips = '轻触拍照，长按摄像';
+
+  @override
+  String loadFailed = '加载失败';
 }
 
 /// Default text delegate implements with English.
@@ -65,6 +75,9 @@ class EnglishCameraPickerTextDelegate implements CameraPickerTextDelegate {
 
   @override
   String shootingTips = 'Tap to take photo.';
+
+  @override
+  String loadFailed = 'Load failed';
 }
 
 /// Default text delegate including recording implements with English.
@@ -83,4 +96,7 @@ class EnglishCameraPickerTextDelegateWithRecording
 
   @override
   String shootingTips = 'Tap to take photo. Long press to record video.';
+
+  @override
+  String loadFailed = 'Load failed';
 }

lib/src/widget/builder/slide_page_transition_builder.dart

@@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
 /// 为选择器构造一个上下进出的页面过渡动画
 class SlidePageTransitionBuilder<T> extends PageRoute<T> {
   SlidePageTransitionBuilder({
-    @required this.builder,
+    required this.builder,
     this.transitionCurve = Curves.easeIn,
     this.transitionDuration = const Duration(milliseconds: 500),
   });
@@ -30,10 +30,10 @@ class SlidePageTransitionBuilder<T> extends PageRoute<T> {
   final bool maintainState = true;
 
   @override
-  Color get barrierColor => null;
+  Color? get barrierColor => null;
 
   @override
-  String get barrierLabel => null;
+  String? get barrierLabel => null;
 
   @override
   Widget buildPage(
@@ -55,10 +55,9 @@ class SlidePageTransitionBuilder<T> extends PageRoute<T> {
       position: Tween<Offset>(
         begin: const Offset(0, 1),
         end: Offset.zero,
-      ).animate(CurvedAnimation(
-        curve: transitionCurve,
-        parent: animation,
-      )),
+      ).animate(
+        CurvedAnimation(curve: transitionCurve, parent: animation),
+      ),
       child: child,
     );
   }

lib/src/widget/builder/tween_animation_builder_2.dart

@@ -6,10 +6,10 @@ import 'package:flutter/material.dart';
 
 class TweenAnimationBuilder2<A, B> extends StatelessWidget {
   const TweenAnimationBuilder2({
-    Key key,
-    @required this.firstTween,
-    @required this.secondTween,
-    @required this.builder,
+    Key? key,
+    required this.firstTween,
+    required this.secondTween,
+    required this.builder,
     this.firstTweenDuration = kThemeAnimationDuration,
     this.secondTweenDuration = kThemeAnimationDuration,
     this.firstTweenCurve = Curves.linear,