diff --git a/CHANGELOG.md b/CHANGELOG.md index fa2b755..2d72a66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [0.6.0] + +- updated Dependencies: [#99](https://github.com/PonnamKarthik/FlutterHtmlView/pull/99). + - html: ^0.14.0+3 + - video_player: 0.10.7 + - cached_network_image: ^2.0.0 + - flutter_markdown: ^0.3.3 + - html2md: ^0.5.1 + ## [0.5.12] - add support to change style #93 diff --git a/README.md b/README.md index c691330..665d6c3 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Flutter has no default support to render html so this package helps you to rende ```yaml dependencies: - flutter_html_view: ^0.5.11 + flutter_html_view: ^0.6.0 ``` ```dart diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 32cb046..bd835a9 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,54 +1,16 @@ name: flutter_html_view_example -description: Demonstrates how to use the flutter_html_textview plugin. +description: Demonstrates how to use the flutter_html_view plugin. dependencies: flutter: sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 dev_dependencies: flutter_test: sdk: flutter - flutter_html_view: path: ../ -# For information on the generic Dart part of this file, see the -# following page: https://www.dartlang.org/tools/pub/pubspec - -# The following section is specific to Flutter. flutter: - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.io/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see - # https://flutter.io/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.io/custom-fonts/#from-packages diff --git a/lib/flutter_html_text.dart b/lib/flutter_html_text.dart index 6bb982e..a117265 100644 --- a/lib/flutter_html_text.dart +++ b/lib/flutter_html_text.dart @@ -12,7 +12,13 @@ class HtmlText extends StatelessWidget { BuildContext ctx; - HtmlText({this.data, this.style, this.onLaunchFail, this.overflow, this.maxLines}); + HtmlText({ + this.data, + this.style, + this.onLaunchFail, + this.overflow, + this.maxLines, + }); void _launchURL(String url) async { try { @@ -62,7 +68,6 @@ class HtmlText extends StatelessWidget { TextSpan span = this._stackToTextSpan(nodes, context); - RichText contents; if (overflow != null && maxLines != null) { contents = new RichText( @@ -520,8 +525,8 @@ class HtmlParser { break; case 'font-size': - fontSize = double.parse(value); - + fontSize = double.parse(value); + break; case 'text-decoration': diff --git a/lib/flutter_html_view.dart b/lib/flutter_html_view.dart index 81fd78f..efe23a3 100644 --- a/lib/flutter_html_view.dart +++ b/lib/flutter_html_view.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; - -import 'package:html2md/html2md.dart' as html2md; -import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_custom_tabs/flutter_custom_tabs.dart' as cTab; +import 'package:flutter_markdown/flutter_markdown.dart'; +import 'package:html2md/html2md.dart' as html2md; import 'package:url_launcher/url_launcher.dart'; class HtmlView extends StatelessWidget { @@ -16,13 +15,14 @@ class HtmlView extends StatelessWidget { /// If [scrollable] is set to false then you must handle scrolling outside of this widget. /// This can be acheived by using a [SingleChildScrollView]. - HtmlView( - {this.data, - this.stylingOptions, - this.onLaunchFail, - this.scrollable = true, - this.padding, - this.styleSheet = null}); + HtmlView({ + this.data, + this.stylingOptions, + this.onLaunchFail, + this.scrollable = true, + this.padding, + this.styleSheet, + }); @override Widget build(BuildContext context) { diff --git a/lib/html_parser.dart b/lib/html_parser.dart index 3a13ce7..6f22552 100644 --- a/lib/html_parser.dart +++ b/lib/html_parser.dart @@ -70,7 +70,12 @@ class HtmlParser { } else if (!e.outerHtml.contains(" 0) e.children.forEach((e) => _parseChildren(e, widgetList)); } diff --git a/pubspec.yaml b/pubspec.yaml index 8acabd5..4632165 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_html_view description: Flutter Plugin to render html, Flutter has no default support to render html so this package helps you to render your html to native widgets -version: 0.5.12 +version: 0.6.0 author: Karthik Ponnam homepage: https://github.com/PonnamKarthik/FlutterHtmlView @@ -8,13 +8,12 @@ dependencies: flutter: sdk: flutter flutter_custom_tabs: ^0.6.0 - html: ^0.13.3+3 - video_player: 0.10.0+2 - cached_network_image: ^0.7.0 - - flutter_markdown: ^0.2.0 - html2md: ^0.3.0 + html: ^0.14.0+3 + video_player: ^0.10.7 + cached_network_image: ^2.0.0 + flutter_markdown: ^0.3.3 + html2md: ^0.5.1 environment: - sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=0.1.4 <2.0.0" + sdk: ">=2.2.2 <3.0.0" + flutter: ">=1.10.7 <2.0.0"