Merge pull request Sub6Resources#31 from Edward608/master

Sub6Resources · web-flow · commit 3c3230c6e820 · 2018-10-19T12:00:44.000-06:00
Add typedef for onLinkTap lambda
diff --git a/lib/flutter_html.dart b/lib/flutter_html.dart
@@ -19,7 +19,7 @@ class Html extends StatelessWidget {
   final EdgeInsetsGeometry padding;
   final Color backgroundColor;
   final TextStyle defaultTextStyle;
-  final Function onLinkTap;
+  final OnLinkTap onLinkTap;
   final bool renderNewlines;
 
   /// Either return a custom widget for specific node types or return null to
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -3,6 +3,7 @@ import 'package:html/parser.dart' as parser;
 import 'package:html/dom.dart' as dom;
 
 typedef CustomRender = Widget Function(dom.Node node, List<Widget> children);
+typedef OnLinkTap = void Function(String url);
 
 class HtmlParser {
   HtmlParser({
@@ -13,7 +14,7 @@ class HtmlParser {
   });
 
   final double width;
-  final Function onLinkTap;
+  final OnLinkTap onLinkTap;
   final bool renderNewlines;
   final CustomRender customRender;
 
@@ -98,12 +99,12 @@ class HtmlParser {
 
     if (renderNewlines) {
       assert(() {
-        print("Before: $data");
+        debugPrint("Before: $data");
         return true;
       }());
       data = data.replaceAll("\n", "<br />");
       assert(() {
-        print("After: $data");
+        debugPrint("After: $data");
       }());
     }
     dom.Document document = parser.parse(data);
@@ -122,7 +123,7 @@ class HtmlParser {
 
     if (node is dom.Element) {
       assert(() {
-        print("Found ${node.localName}");
+        debugPrint("Found ${node.localName}");
         return true;
       }());
 
@@ -757,7 +758,7 @@ class HtmlParser {
         node.text = " ";
       }
 
-      print("Plain Text Node: '${trimStringHtml(node.text)}'");
+      debugPrint("Plain Text Node: '${trimStringHtml(node.text)}'");
       String finalText = trimStringHtml(node.text);
       //Temp fix for https://github.com/flutter/flutter/issues/736
       if (finalText.endsWith(" ")) {
