Migrated to Flutter 2 null safety (some assumptions were made about what was nullable)

Author: jblough

example/pubspec.lock

@@ -7,42 +7,63 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "2.1.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.0"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.15.0"
   contentful_rich_text:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.1.1"
+    version: "0.1.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.2"
+    version: "1.0.3"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -53,48 +74,53 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   html_unescape:
     dependency: transitive
     description:
       name: html_unescape
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1+2"
+    version: "2.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.3"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.5"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.7"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
-  quiver:
+    version: "1.8.0"
+  plugin_platform_interface:
     dependency: transitive
     description:
-      name: quiver
+      name: plugin_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -106,63 +132,98 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.5"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.3"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.19"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0"
   url_launcher:
     dependency: transitive
     description:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.2"
+    version: "6.0.3"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.2"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
 sdks:
-  dart: ">=2.2.2 <3.0.0"
-  flutter: ">=0.5.6 <2.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.22.0"

example/pubspec.yaml

@@ -12,6 +12,7 @@ description: A new Flutter project.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 version: 1.0.0+1
+publish_to: none
 
 environment:
   sdk: ">=2.1.0 <3.0.0"
@@ -25,7 +26,7 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.2
+  cupertino_icons: ^1.0.3
 
 dev_dependencies:
   flutter_test:

lib/contentful_rich_text.dart

@@ -81,8 +81,8 @@ class ContentfulRichText {
   static Widget defaultInline(INLINES type, Inline node) => Container();
 
   dynamic richTextJson;
-  Options options;
-  Document richTextDocument;
+  Options? options;
+  Document? richTextDocument;
 
   ContentfulRichText(this.richTextJson, {this.options});
 
@@ -99,28 +99,26 @@ class ContentfulRichText {
       singletonRenderers.renderNode = Map.from(
         defaultNodeRenderers.renderNodes,
       );
-      if (options?.renderNode?.renderNodes != null) {
-        singletonRenderers.renderNode.addAll(options.renderNode.renderNodes);
+      if (options?.renderNode.renderNodes != null) {
+        singletonRenderers.renderNode.addAll(options!.renderNode.renderNodes);
       }
       singletonRenderers.renderMark = MARKS.renderMarks(
-        options?.renderMark?.renderMarks,
+        options?.renderMark.renderMarks,
       );
 
       return Container(
-        child: nodeListToWidget(richTextDocument.content),
+        child: nodeListToWidget(richTextDocument?.content ?? []),
       );
     }
     return Container();
   }
 
   /// nodeListToWidget renders the Widget tree from the data nodes
-  Widget nodeListToWidget(List<dynamic> nodes) {
+  Widget nodeListToWidget(List<dynamic>? nodes) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.start,
       crossAxisAlignment: CrossAxisAlignment.start,
-      children: List<Widget>.from(
-        nodes?.map<Widget>((node) => nodeToWidget(node)) ?? [],
-      ),
+      children: nodes?.map<Widget>((node) => nodeToWidget(node)).toList() ?? [],
     );
   }
 
@@ -131,7 +129,7 @@ class ContentfulRichText {
       return Text.rich(TextSpan(text: _processInlineNode(node)));
     } else if (Helpers.isParagraph(node) || Helpers.isHeader(node)) {
       // TODO: Headers don't appear to set their size properly
-      return singletonRenderers.renderNode[node['nodeType']](
+      return singletonRenderers.renderNode[node['nodeType']]!(
         node,
         (nodes) => List<TextSpan>.from(
           nodes.map(
@@ -146,7 +144,7 @@ class ContentfulRichText {
         // TODO: Figure what to return when passed an unrecognized node.
         return Container();
       }
-      return singletonRenderers.renderNode[node['nodeType']](node, nextNode);
+      return singletonRenderers.renderNode[node['nodeType']]!(node, nextNode);
     }
   }
 
@@ -155,7 +153,7 @@ class ContentfulRichText {
   /// Hyperlink nodes
   dynamic _processInlineNode(
     node, {
-    String uri,
+    String? uri,
   }) {
     if (node['nodeType'] == 'hyperlink' || uri?.isNotEmpty == true) {
       // Note: Hyperlinks are nested in other blocs like Paragraphs/Headers
@@ -167,7 +165,7 @@ class ContentfulRichText {
         // pass uri for Hyperlink on text nodes for TapRecognizer
         node['data'] = {'uri': link};
       }
-      return singletonRenderers.renderNode[nodeType](
+      return singletonRenderers.renderNode[nodeType]!(
         node,
         (nodes) => nodes
             ?.map<TextSpan>(
@@ -182,7 +180,7 @@ class ContentfulRichText {
     // If not a hyperlink, process as text node
     TextNode textNode = TextNode(node);
     String nodeValue = HtmlUnescape().convert(textNode.value);
-    if (textNode.marks?.isNotEmpty == true) {
+    if (textNode.marks.isNotEmpty) {
       return TextSpan(
         text: nodeValue,
         style: MARKS.getMarksTextStyles(
@@ -194,7 +192,7 @@ class ContentfulRichText {
     return TextSpan(text: nodeValue);
   }
 
-  Document _parseRichTextJson() {
+  Document? _parseRichTextJson() {
     if (richTextJson == null || richTextJson['nodeType'] != 'document') {
       return null;
     }

lib/state/renderers.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
 class Renderers {
-  Map<dynamic, Function> renderNode;
-  Map<dynamic, TextStyle> renderMark;
+  late Map<dynamic, Function> renderNode;
+  late Map<dynamic, TextStyle> renderMark;
 }
 
 Renderers singletonRenderers = Renderers();