Start moving from class-based styling to Style-based styling

Sub6Resources · Sub6Resources · commit f3929174e00d · 2019-06-18T09:00:21.000-06:00
diff --git a/PRE_CHANGELOG.md b/PRE_CHANGELOG.md
@@ -21,5 +21,6 @@ This changelog highlights changes as we work to implement version 1.0.0.
 * The default text style now matches the app's Material `TextTheme.body1` (Fixes [#18](https://github.com/Sub6Resources/flutter_html/issues/18)).
 * Fixed quite a few issues with `img`
 * Added a fancy new `style` attribute (this should be used in place of the deprecated styling parameters).
+* Added an even fancier new `css` attribute that takes a CSS string and applies those styles to your widgets.
  
 
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # flutter_html
 [![pub package](https://img.shields.io/pub/v/flutter_html.svg)](https://pub.dev/packages/flutter_html)
+[![codecov](https://codecov.io/gh/Sub6Resources/flutter_html/branch/master/graph/badge.svg)](https://codecov.io/gh/Sub6Resources/flutter_html)
 [![CircleCI](https://circleci.com/gh/Sub6Resources/flutter_html.svg?style=svg)](https://circleci.com/gh/Sub6Resources/flutter_html)
 
 A Flutter widget for rendering html and css as Flutter widgets.
diff --git a/lib/html_parser.dart b/lib/html_parser.dart
@@ -36,7 +36,7 @@ class HtmlParser extends StatelessWidget {
       cleanedTree,
     );
 
-    return Text.rich(parsedTree);
+    return RichText(text: parsedTree);
   }
 
   /// [parseHTML] converts a string to a DOM document using the dart `html` library.
@@ -91,8 +91,9 @@ class HtmlParser extends StatelessWidget {
 
   static StyledElement applyCSS(StyledElement tree, css.StyleSheet sheet) {
     sheet.topLevels.forEach((treeNode) {
-      if(treeNode is css.RuleSet) {
-        print(treeNode.selectorGroup.selectors.first.simpleSelectorSequences.first.simpleSelector.name);
+      if (treeNode is css.RuleSet) {
+        print(treeNode.selectorGroup.selectors.first.simpleSelectorSequences
+            .first.simpleSelector.name);
       }
     });
 
diff --git a/lib/style.dart b/lib/style.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_html/block_element.dart';
 
 class Style {
+  Display display;
   TextStyle textStyle;
   bool preserveWhitespace;
   int baselineOffset;
@@ -11,6 +12,7 @@ class Style {
   Block block;
 
   Style({
+    this.display,
     this.textStyle,
     this.preserveWhitespace,
     this.baselineOffset,
@@ -32,6 +34,7 @@ class Style {
     Block mergedBlock = block?.merge(other.block);
 
     return copyWith(
+      display: other.display,
       textStyle: mergedTextStyle,
       preserveWhitespace: other.preserveWhitespace,
       baselineOffset: other.baselineOffset,
@@ -43,6 +46,7 @@ class Style {
   }
 
   Style copyWith({
+    Display display,
     TextStyle textStyle,
     bool preserveWhitespace,
     int baselineOffset,
@@ -52,6 +56,7 @@ class Style {
     Block block,
   }) {
     return Style(
+      display: display ?? this.display,
       textStyle: textStyle ?? this.textStyle,
       preserveWhitespace: preserveWhitespace ?? this.preserveWhitespace,
       baselineOffset: baselineOffset ?? this.baselineOffset,
@@ -62,3 +67,9 @@ class Style {
     );
   }
 }
+
+enum Display {
+  BLOCK,
+  INLINE,
+  INLINE_BLOCK,
+}
diff --git a/test/html_parser_test.dart b/test/html_parser_test.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_html/html_elements.dart';
 import 'package:flutter_html/html_parser.dart';
+import 'package:flutter_html/style.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_html/flutter_html.dart';
 
@@ -90,4 +91,25 @@ void testNewParser() {
       expect(audioContentElement.src, hasLength(2), reason: "Not enough sources...");
     }
   });
+
+  test("Test style merging", () {
+    Style style1 = Style(
+      display: Display.BLOCK,
+      textStyle: TextStyle(fontWeight: FontWeight.bold),
+    );
+
+    Style style2 = Style(
+      before: "* ",
+      textDirection: TextDirection.rtl,
+      textStyle: TextStyle(fontStyle: FontStyle.italic),
+    );
+
+    Style finalStyle = style1.merge(style2);
+
+    expect(finalStyle.display, equals(Display.BLOCK));
+    expect(finalStyle.before, equals("* "));
+    expect(finalStyle.textDirection, equals(TextDirection.rtl));
+    expect(finalStyle.textStyle.fontStyle, equals(FontStyle.italic));
+    expect(finalStyle.textStyle.fontWeight, equals(FontWeight.bold));
+  });
 }
