Merge NNBD branch into master (#270)

Author: goderbauer

.cirrus.yml

@@ -7,6 +7,9 @@ task:
   upgrade_script:
     - flutter channel master
     - flutter upgrade
+    # TODO(goderbauer): Remove next two lines when https://github.com/flutter/flutter/issues/74772 is resolved.
+    - rm -rf /home/cirrus/sdks/flutter/bin/cache
+    - flutter doctor
     - git fetch origin master
   activate_script: pub global activate flutter_plugin_tools
   matrix:

packages/animations/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.0-nullsafety.0] - November 16, 2020
+
+* Migrates to null safety.
+
 ## [1.1.2] - July 28, 2020
 
 * Fixes for upcoming changes to the flutter framework.

packages/animations/example/lib/container_transition.dart

@@ -50,7 +50,7 @@ class _OpenContainerTransformDemoState
     extends State<OpenContainerTransformDemo> {
   ContainerTransitionType _transitionType = ContainerTransitionType.fade;
 
-  void _showMarkedAsDoneSnackbar(bool isMarkedAsDone) {
+  void _showMarkedAsDoneSnackbar(bool? isMarkedAsDone) {
     if (isMarkedAsDone ?? false)
       ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
         content: Text('Marked as done!'),
@@ -271,14 +271,14 @@ class _OpenContainerTransformDemoState
 
 class _OpenContainerWrapper extends StatelessWidget {
   const _OpenContainerWrapper({
-    this.closedBuilder,
-    this.transitionType,
-    this.onClosed,
+    required this.closedBuilder,
+    required this.transitionType,
+    required this.onClosed,
   });
 
-  final OpenContainerBuilder closedBuilder;
+  final CloseContainerBuilder closedBuilder;
   final ContainerTransitionType transitionType;
-  final ClosedCallback<bool> onClosed;
+  final ClosedCallback<bool?> onClosed;
 
   @override
   Widget build(BuildContext context) {
@@ -295,7 +295,7 @@ class _OpenContainerWrapper extends StatelessWidget {
 }
 
 class _ExampleCard extends StatelessWidget {
-  const _ExampleCard({this.openContainer});
+  const _ExampleCard({required this.openContainer});
 
   final VoidCallback openContainer;
 
@@ -333,7 +333,7 @@ class _ExampleCard extends StatelessWidget {
               'adipiscing elit, sed do eiusmod tempor.',
               style: Theme.of(context)
                   .textTheme
-                  .bodyText2
+                  .bodyText2!
                   .copyWith(color: Colors.black54),
             ),
           ),
@@ -345,8 +345,8 @@ class _ExampleCard extends StatelessWidget {
 
 class _SmallerCard extends StatelessWidget {
   const _SmallerCard({
-    this.openContainer,
-    this.subtitle,
+    required this.openContainer,
+    required this.subtitle,
   });
 
   final VoidCallback openContainer;
@@ -397,7 +397,7 @@ class _SmallerCard extends StatelessWidget {
 }
 
 class _ExampleSingleTile extends StatelessWidget {
-  const _ExampleSingleTile({this.openContainer});
+  const _ExampleSingleTile({required this.openContainer});
 
   final VoidCallback openContainer;
 
@@ -454,10 +454,10 @@ class _InkWellOverlay extends StatelessWidget {
     this.child,
   });
 
-  final VoidCallback openContainer;
-  final double width;
-  final double height;
-  final Widget child;
+  final VoidCallback? openContainer;
+  final double? width;
+  final double? height;
+  final Widget? child;
 
   @override
   Widget build(BuildContext context) {
@@ -510,15 +510,15 @@ class _DetailsPage extends StatelessWidget {
               children: <Widget>[
                 Text(
                   'Title',
-                  style: Theme.of(context).textTheme.headline5.copyWith(
+                  style: Theme.of(context).textTheme.headline5!.copyWith(
                         color: Colors.black54,
                         fontSize: 30.0,
                       ),
                 ),
                 const SizedBox(height: 10),
                 Text(
                   _loremIpsumParagraph,
-                  style: Theme.of(context).textTheme.bodyText2.copyWith(
+                  style: Theme.of(context).textTheme.bodyText2!.copyWith(
                         color: Colors.black54,
                         height: 1.5,
                         fontSize: 16.0,

packages/animations/example/lib/fade_scale_transition.dart

@@ -14,7 +14,7 @@ class FadeScaleTransitionDemo extends StatefulWidget {
 
 class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
     with SingleTickerProviderStateMixin {
-  AnimationController _controller;
+  late AnimationController _controller;
 
   @override
   void initState() {
@@ -48,8 +48,6 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
       case AnimationStatus.dismissed:
         return false;
     }
-    assert(false);
-    return null;
   }
 
   @override
@@ -58,7 +56,7 @@ class _FadeScaleTransitionDemoState extends State<FadeScaleTransitionDemo>
       appBar: AppBar(title: const Text('Fade')),
       floatingActionButton: AnimatedBuilder(
         animation: _controller,
-        builder: (BuildContext context, Widget child) {
+        builder: (BuildContext context, Widget? child) {
           return FadeScaleTransition(
             animation: _controller,
             child: child,

packages/animations/example/lib/main.dart

@@ -126,11 +126,11 @@ class _TransitionsHomePageState extends State<_TransitionsHomePage> {
 class _TransitionListTile extends StatelessWidget {
   const _TransitionListTile({
     this.onTap,
-    this.title,
-    this.subtitle,
+    required this.title,
+    required this.subtitle,
   });
 
-  final GestureTapCallback onTap;
+  final GestureTapCallback? onTap;
   final String title;
   final String subtitle;
 

packages/animations/example/lib/shared_axis_transition.dart

@@ -14,11 +14,11 @@ class SharedAxisTransitionDemo extends StatefulWidget {
 }
 
 class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
-  SharedAxisTransitionType _transitionType =
+  SharedAxisTransitionType? _transitionType =
       SharedAxisTransitionType.horizontal;
   bool _isLoggedIn = false;
 
-  void _updateTransitionType(SharedAxisTransitionType newType) {
+  void _updateTransitionType(SharedAxisTransitionType? newType) {
     setState(() {
       _transitionType = newType;
     });
@@ -51,7 +51,7 @@ class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
                     child: child,
                     animation: animation,
                     secondaryAnimation: secondaryAnimation,
-                    transitionType: _transitionType,
+                    transitionType: _transitionType!,
                   );
                 },
                 child: _isLoggedIn ? _CoursePage() : _SignInPage(),
@@ -80,23 +80,23 @@ class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
                 Radio<SharedAxisTransitionType>(
                   value: SharedAxisTransitionType.horizontal,
                   groupValue: _transitionType,
-                  onChanged: (SharedAxisTransitionType newValue) {
+                  onChanged: (SharedAxisTransitionType? newValue) {
                     _updateTransitionType(newValue);
                   },
                 ),
                 const Text('X'),
                 Radio<SharedAxisTransitionType>(
                   value: SharedAxisTransitionType.vertical,
                   groupValue: _transitionType,
-                  onChanged: (SharedAxisTransitionType newValue) {
+                  onChanged: (SharedAxisTransitionType? newValue) {
                     _updateTransitionType(newValue);
                   },
                 ),
                 const Text('Y'),
                 Radio<SharedAxisTransitionType>(
                   value: SharedAxisTransitionType.scaled,
                   groupValue: _transitionType,
-                  onChanged: (SharedAxisTransitionType newValue) {
+                  onChanged: (SharedAxisTransitionType? newValue) {
                     _updateTransitionType(newValue);
                   },
                 ),
@@ -146,7 +146,7 @@ class _CoursePage extends StatelessWidget {
 
 class _CourseSwitch extends StatefulWidget {
   const _CourseSwitch({
-    this.course,
+    required this.course,
   });
 
   final String course;

packages/animations/example/pubspec.yaml

@@ -6,7 +6,7 @@ publish_to: none
 version: 0.0.1
 
 environment:
-  sdk: ">=2.3.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
   animations: