fixed issue with non self closing br tag,

implemented better sizing or h1-h6 tags

Author: ali-thowfeek

CHANGELOG.md

@@ -1,4 +1,9 @@
-# [2.0.0+1] - May 10th, 2020
+# [2.0.0+2] - May 11th, 2020
+
+* Fixed an issue with non self closing `<br>` tag
+* Improved `<h1>-<h6>` sizing
+
+## [2.0.0+1] - May 10th, 2020
 
 * updated README
 

README.md

@@ -144,8 +144,9 @@ HTML.toTextSpan(
 Supports all tags which prints text normally like `p`, `div`, `span`, `body` etc.  
 And the following special tags which change the text appearance
 
-* `<h1> - <h5>`
+* `<h1> - <h6>`
 * `<b>` `<strong>`
+* `<br>` `<br />`
 * `<i>` `<em>`
 * `<u>`
 * `<strike>` `<del>` `<s>`

example/pubspec.lock

@@ -129,7 +129,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.0+1"
   sky_engine:
     dependency: transitive
     description: flutter

lib/src/html_stylist.dart

@@ -60,10 +60,14 @@ class HTML {
       {Function linksCallback,
       Map<String, TextStyle> overrideStyle,
       TextStyle defaultTextStyle}) {
-    //to fix a known issue with &nbsp; when appears after a ending tag
+    //to fix a known issue with &nbsp; when appearing after an ending tag
     htmlContent =
         htmlContent.replaceAll("&nbsp;", " ").replaceAll("&nbsp", " ");
 
+    //to fix a known issue with non self closing <br> tags
+    htmlContent =
+        htmlContent.replaceAll("<br>", "<br />");
+
     Parser p = Parser(context, HtmlUnescape().convert(htmlContent),
         linksCallback: linksCallback,
         overrideStyleMap: overrideStyle ?? Map<String, TextStyle>(),

lib/src/internals.dart

@@ -146,32 +146,70 @@ class Parser {
           var styles = "";
           var tagName = event.name.toLowerCase();
           var overrideStyles;
+          double defaultFontSize = defaultTextStyle?.fontSize;
+
           if (overrideStyleMap.containsKey(tagName))
             overrideStyles = overrideStyleMap[tagName];
 
           switch (tagName) {
             case "h1":
-              double h1 = Theme.of(_context).textTheme.headline5.fontSize;
+              double h1;
+              if (defaultFontSize == null) {
+                h1 = Theme.of(_context).textTheme.headline5.fontSize;
+              } else {
+                h1 = defaultFontSize * 2;
+              }
               styles = "font-size: ${h1}px;";
               break;
 
             case "h2":
-              double h2 = Theme.of(_context).textTheme.headline6.fontSize;
+              double h2;
+              if (defaultFontSize == null) {
+                h2 = Theme.of(_context).textTheme.headline6.fontSize;
+              } else {
+                h2 = defaultFontSize * 1.5;
+              }
               styles = "font-size: ${h2}px; font-weight: medium;";
               break;
 
             case "h3":
-              double h3 = Theme.of(_context).textTheme.subtitle1.fontSize;
+              double h3;
+              if (defaultFontSize == null) {
+                h3 = Theme.of(_context).textTheme.subtitle1.fontSize;
+              } else {
+                h3 = defaultFontSize * 1.17;
+              }
               styles = "font-size: ${h3}px;";
               break;
 
             case "h4":
-              double h4 = Theme.of(_context).textTheme.bodyText1.fontSize;
+              double h4;
+              if (defaultFontSize == null) {
+                h4 = Theme.of(_context).textTheme.bodyText1.fontSize;
+              } else {
+                h4 = defaultFontSize;
+              }
               styles = "font-size: ${h4}px; font-weight: medium;";
               break;
 
             case "h5":
-              styles = "font-weight: bold;";
+              double h5;
+              if (defaultFontSize == null) {
+                h5 = Theme.of(_context).textTheme.bodyText1.fontSize;
+              } else {
+                h5 = defaultFontSize * .83;
+              }
+              styles = "font-size: ${h5}px; font-weight: bold;";
+              break;
+
+            case "h6":
+              double h6;
+              if (defaultFontSize == null) {
+                h6 = Theme.of(_context).textTheme.bodyText2.fontSize;
+              } else {
+                h6 = defaultFontSize * .67;
+              }
+              styles = "font-size: ${h6}px; font-weight: bold;";
               break;
 
             case "b":

pubspec.yaml

@@ -1,6 +1,6 @@
 name: simple_html_css
 description: This package allows you to use simple HTML and inline CSS styles to style your text in flutter. A fork of css_text package.
-version: 2.0.0+1
+version: 2.0.0+2
 homepage: https://github.com/ali-thowfeek/simple_html_css_flutter
 repository: https://github.com/ali-thowfeek/simple_html_css_flutter
 environment: