Migrate to NNBD (#23)

fzyzcjy · Jan 28, 2021 · c76661b · c76661b
1 parent 0cccc25
commit c76661b
Show file tree

Hide file tree

Showing 15 changed files with 242 additions and 571 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         channel:
           - dev
-          - stable
+          # - stable
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,5 @@ lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+pubspec.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.4.0-nullsafety.0
+
+Migrated to null-safety (thanks to @Jjagg!)
+
 # 0.3.0
 
 - Improved the dart-doc of Portal and PortalEntry

diff --git a/example/lib/contextual_menu.dart b/example/lib/contextual_menu.dart
@@ -6,7 +6,7 @@ import 'package:flutter_portal/flutter_portal.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key key}) : super(key: key);
+  const MyApp({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +28,7 @@ class MyApp extends StatelessWidget {
 }
 
 class ContextualMenuExample extends StatefulWidget {
-  const ContextualMenuExample({Key key}) : super(key: key);
+  const ContextualMenuExample({Key? key}) : super(key: key);
 
   @override
   _ContextualMenuExampleState createState() => _ContextualMenuExampleState();
@@ -57,7 +57,7 @@ class _ContextualMenuExampleState extends State<ContextualMenuExample> {
             ),
           ],
         ),
-        child: RaisedButton(
+        child: ElevatedButton(
           onPressed: () => setState(() => _showMenu = true),
           child: const Text('show menu'),
         ),
@@ -68,8 +68,8 @@ class _ContextualMenuExampleState extends State<ContextualMenuExample> {
 
 class Menu extends StatelessWidget {
   const Menu({
-    Key key,
-    @required this.children,
+    Key? key,
+    required this.children,
   }) : super(key: key);
 
   final List<Widget> children;
@@ -93,13 +93,13 @@ class Menu extends StatelessWidget {
 
 class ModalEntry extends StatelessWidget {
   const ModalEntry({
-    Key key,
-    this.onClose,
-    this.menu,
-    this.visible,
-    this.menuAnchor,
-    this.childAnchor,
-    this.child,
+    Key? key,
+    required this.onClose,
+    required this.menu,
+    required this.visible,
+    required this.menuAnchor,
+    required this.childAnchor,
+    required this.child,
   }) : super(key: key);
 
   final VoidCallback onClose;

diff --git a/example/lib/date_picker.dart b/example/lib/date_picker.dart
@@ -7,11 +7,11 @@ void main() => runApp(const MyApp());
 
 class DeclarativeDatePicker extends StatelessWidget {
   const DeclarativeDatePicker({
-    Key key,
-    this.visible,
-    this.onDismissed,
-    this.onClose,
-    this.child,
+    Key? key,
+    required this.visible,
+    required this.onDismissed,
+    required this.onClose,
+    required this.child,
   }) : super(key: key);
 
   final bool visible;
@@ -36,7 +36,7 @@ class DeclarativeDatePicker extends StatelessWidget {
             child: Center(
               child: Card(
                 elevation: 16,
-                child: RaisedButton(
+                child: ElevatedButton(
                   onPressed: () => onClose(DateTime.now()),
                   child: const Text('today'),
                 ),
@@ -51,7 +51,7 @@ class DeclarativeDatePicker extends StatelessWidget {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key key}) : super(key: key);
+  const MyApp({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -73,14 +73,14 @@ class MyApp extends StatelessWidget {
 }
 
 class DatePickerUsageExample extends StatefulWidget {
-  const DatePickerUsageExample({Key key}) : super(key: key);
+  const DatePickerUsageExample({Key? key}) : super(key: key);
 
   @override
   _DatePickerUsageExampleState createState() => _DatePickerUsageExampleState();
 }
 
 class _DatePickerUsageExampleState extends State<DatePickerUsageExample> {
-  DateTime pickedDate;
+  DateTime? pickedDate;
   bool showDatePicker = false;
 
   @override
@@ -94,7 +94,7 @@ class _DatePickerUsageExampleState extends State<DatePickerUsageExample> {
         }),
         onDismissed: () => setState(() => showDatePicker = false),
         child: pickedDate == null
-            ? RaisedButton(
+            ? ElevatedButton(
                 onPressed: () => setState(() => showDatePicker = true),
                 child: const Text('pick a date'),
               )

diff --git a/example/lib/discovery.dart b/example/lib/discovery.dart
@@ -6,7 +6,7 @@ void main() {
 }
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key key}) : super(key: key);
+  const MyApp({Key? key}) : super(key: key);
 
   @override
   _MyAppState createState() => _MyAppState();
@@ -28,7 +28,7 @@ class _MyAppState extends State<MyApp> {
               children: [
                 const Text('You have clicked the button this many times:'),
                 Text('$count', style: Theme.of(context).textTheme.headline4),
-                RaisedButton(
+                ElevatedButton(
                   onPressed: () => setState(() => showDiscovery = true),
                   child: const Text('Show discovery'),
                 )
@@ -59,11 +59,11 @@ class _MyAppState extends State<MyApp> {
 
 class Discovery extends StatelessWidget {
   const Discovery({
-    Key key,
-    @required this.visible,
-    @required this.onClose,
-    @required this.description,
-    @required this.child,
+    Key? key,
+    required this.visible,
+    required this.onClose,
+    required this.description,
+    required this.child,
   }) : super(key: key);
 
   final Widget child;
@@ -102,7 +102,7 @@ class Discovery extends StatelessWidget {
               left: 50,
               width: 200,
               child: DefaultTextStyle(
-                style: Theme.of(context).textTheme.headline5,
+                style: Theme.of(context).textTheme.headline5!,
                 child: TweenAnimationBuilder<double>(
                   duration: kThemeAnimationDuration,
                   curve: Curves.easeOut,
@@ -157,10 +157,10 @@ class HolePainter extends CustomPainter {
 
 class Barrier extends StatelessWidget {
   const Barrier({
-    Key key,
-    @required this.onClose,
-    @required this.visible,
-    @required this.child,
+    Key? key,
+    required this.onClose,
+    required this.visible,
+    required this.child,
   }) : super(key: key);
 
   final Widget child;
@@ -190,3 +190,12 @@ class Barrier extends StatelessWidget {
     );
   }
 }
+
+/// Non-nullable version of ColorTween.
+class ColorTween extends Tween<Color> {
+  ColorTween({required Color begin, required Color end})
+      : super(begin: begin, end: end);
+
+  @override
+  Color lerp(double t) => Color.lerp(begin, end, t)!;
+}
diff --git a/example/lib/medium_clap.dart b/example/lib/medium_clap.dart
@@ -8,7 +8,7 @@ import 'package:flutter_portal/flutter_portal.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key key}) : super(key: key);
+  const MyApp({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -26,7 +26,7 @@ class MyApp extends StatelessWidget {
 }
 
 class ClapButton extends StatefulWidget {
-  const ClapButton({Key key}) : super(key: key);
+  const ClapButton({Key? key}) : super(key: key);
 
   @override
   _ClapButtonState createState() => _ClapButtonState();
@@ -35,7 +35,7 @@ class ClapButton extends StatefulWidget {
 class _ClapButtonState extends State<ClapButton> {
   int clapCount = 0;
   bool hasClappedRecently = false;
-  Timer resetHasClappedRecentlyTimer;
+  Timer? resetHasClappedRecentlyTimer;
 
   @override
   Widget build(BuildContext context) {
@@ -64,7 +64,7 @@ class _ClapButtonState extends State<ClapButton> {
           child: Text('$clapCount'),
         ),
       ),
-      child: RaisedButton(
+      child: ElevatedButton(
         onPressed: _clap,
         child: const Icon(Icons.plus_one),
       ),

diff --git a/example/lib/modal.dart b/example/lib/modal.dart
@@ -6,7 +6,7 @@ void main() {
 }
 
 class MyApp extends StatefulWidget {
-  const MyApp({Key key}) : super(key: key);
+  const MyApp({Key? key}) : super(key: key);
 
   @override
   _MyAppState createState() => _MyAppState();
@@ -28,7 +28,7 @@ class _MyAppState extends State<MyApp> {
                 child: Text('Hello world'),
               ),
               onClose: () => setState(() => showModal = false),
-              child: RaisedButton(
+              child: ElevatedButton(
                 onPressed: () => setState(() => showModal = true),
                 child: const Text('Show modal'),
               ),
@@ -42,11 +42,11 @@ class _MyAppState extends State<MyApp> {
 
 class Modal extends StatelessWidget {
   const Modal({
-    Key key,
-    @required this.visible,
-    @required this.onClose,
-    @required this.modal,
-    @required this.child,
+    Key? key,
+    required this.visible,
+    required this.onClose,
+    required this.modal,
+    required this.child,
   }) : super(key: key);
 
   final Widget child;
@@ -85,10 +85,10 @@ class Modal extends StatelessWidget {
 
 class Barrier extends StatelessWidget {
   const Barrier({
-    Key key,
-    @required this.onClose,
-    @required this.visible,
-    @required this.child,
+    Key? key,
+    required this.onClose,
+    required this.visible,
+    required this.child,
   }) : super(key: key);
 
   final Widget child;
@@ -118,3 +118,12 @@ class Barrier extends StatelessWidget {
     );
   }
 }
+
+/// Non-nullable version of ColorTween.
+class ColorTween extends Tween<Color> {
+  ColorTween({required Color begin, required Color end})
+      : super(begin: begin, end: end);
+
+  @override
+  Color lerp(double t) => Color.lerp(begin, end, t)!;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ jobs: @@
           matrix:
             channel:
               - dev
-              - stable
+              # - stable
         steps:
           - uses: actions/checkout@v2
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,3 +39,5 @@ lib/generated_plugin_registrant.dart

		# Exceptions to above rules.
		!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

		pubspec.lock