Skip to content

Commit 1e0d9fd

Browse files
andy1xx8andy1xx8
committed
add fromElement constructor and merge witth current master
2 parents 0e83da0 + d13ca75 commit 1e0d9fd

File tree

117 files changed

+4629
-1775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+4629
-1775
lines changed

‎CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
## [3.0.0-alpha.2] - January 5, 2022:
2+
* **BREAKING** Full modularization using split packages; see our upgrade guide or use flutter_html_all
3+
4+
## [3.0.0-alpha.1] - December 21, 2021:
5+
* **BREAKING** Reworked custom renders pending full modularation in 3.0.0
6+
* Extended support custom render when using SelectableHtml
7+
* Updated flutter_svg to 1.0.0
8+
* Support flutter_webview 3.x
9+
* Automatic disposal of video and audio controllers
10+
* Fix block elements bottom spacing in table cells
11+
12+
## [2.2.1] - December 8, 2021:
13+
* Allow styling on ruby tags
14+
* Allow width/height/alignment styling on table/tr/td tags
15+
* Prevent images causing rebuilding and leaking memory
16+
* Fixes display of list items on iOS with font weights below 400
17+
* Prevent crash on negative margins or paddings
18+
19+
## [2.2.0] - November 29, 2021:
20+
* Explicitly declare multiplatform support
21+
* Extended and fixed list-style (marker) support
22+
* Basic support for height/width css properties
23+
* Support changing scroll physics of SelectableText.rich
24+
* Support text transform css property
25+
* Bumped minimum flutter_math_fork version for Flutter 2.5 compatibility
26+
* Fix styling of iframes
27+
* Fix nested font tag application
28+
* Fix whitespace rendering between list items
29+
* Prevent crash on empty <table> tag and tables with both colspan/rowspan
30+
* Prevent crash on use of negative margins in css
31+
32+
## [2.1.5] - October 7, 2021:
33+
* Ignore unsupported custom style selectors when using fromCss
34+
* Fix SVG tag usage inside tables
35+
* Properly fix regression in usage of line breaks
36+
37+
## [2.1.4] - October 3, 2021:
38+
* Fix regression in usage of line breaks in body being stripped
39+
40+
## [2.1.3] - October 1, 2021:
41+
* Update minimum versions of dependencies for Flutter 2.5 compatibility
42+
* Extended and fixed support for css shadow
43+
* Fix block tags with explicit whitespace from being stripped
44+
145
## [2.1.2] - September 2, 2021:
246
* Allow setting selectionControls with SelectableHtml
347
* Fix onLinkTap not working with SelectableHtml

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Matthew Whitaker
3+
Copyright (c) 2019-2022 The flutter_html developers
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 240 additions & 331 deletions
Large diffs are not rendered by default.

‎example/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ const htmlData = """
158158
body: SingleChildScrollView(
159159
child: Html(
160160
data: htmlData,
161+
tagsList: Html.tags..addAll(["flutter"]),
161162
//Optional parameters:
162163
style: {
163164
"html": Style(

‎example/analysis_options.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This file configures the analyzer, which statically analyzes Dart code to
2+
# check for errors, warnings, and lints.
3+
#
4+
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
5+
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
6+
# invoked from the command line by running `flutter analyze`.
7+
8+
# The following line activates a set of recommended lints for Flutter apps,
9+
# packages, and plugins designed to encourage good coding practices.
10+
include: package:flutter_lints/flutter.yaml
11+
12+
linter:
13+
# The lint rules applied to this project can be customized in the
14+
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
15+
# included above or to enable additional rules. A list of all available lints
16+
# and their documentation is published at
17+
# https://dart-lang.github.io/linter/lints/index.html.
18+
#
19+
# Instead of disabling a lint rule for the entire project in the
20+
# section below, it can also be suppressed for a single line of code
21+
# or a specific dart file by using the `// ignore: name_of_lint` and
22+
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
23+
# producing the lint.
24+
rules:
25+
# avoid_print: false # Uncomment to disable the `avoid_print` rule
26+
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
27+
28+
# Additional information about this file can be found at
29+
# https://dart.dev/guides/language/analysis-options

‎example/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 28
28+
compileSdkVersion 31
2929

3030
lintOptions {
3131
disable 'InvalidPackage'
@@ -34,7 +34,7 @@ android {
3434
defaultConfig {
3535
applicationId "com.example.example"
3636
minSdkVersion 19
37-
targetSdkVersion 28
37+
targetSdkVersion 31
3838
versionCode flutterVersionCode.toInteger()
3939
versionName flutterVersionName
4040
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎example/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
android:theme="@style/LaunchTheme"
1313
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1414
android:hardwareAccelerated="true"
15-
android:windowSoftInputMode="adjustResize">
15+
android:windowSoftInputMode="adjustResize"
16+
android:exported="true">
1617
<intent-filter>
1718
<action android:name="android.intent.action.MAIN"/>
1819
<category android:name="android.intent.category.LAUNCHER"/>

‎example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

‎example/ios/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ EXTERNAL SOURCES:
2424
:path: ".symlinks/plugins/webview_flutter/ios"
2525

2626
SPEC CHECKSUMS:
27-
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
27+
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
2828
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
29-
wakelock: b0843b2479edbf6504d8d262c2959446f35373aa
29+
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
3030
webview_flutter: 9f491a9b5a66f2573946a389b2677987b0ff8c0b
3131

3232
PODFILE CHECKSUM: 8e679eca47255a8ca8067c4c67aab20e64cb974d
3333

34-
COCOAPODS: 1.10.1
34+
COCOAPODS: 1.11.2

‎example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -167,7 +167,7 @@
167167
97C146E61CF9000F007C117D /* Project object */ = {
168168
isa = PBXProject;
169169
attributes = {
170-
LastUpgradeCheck = 1020;
170+
LastUpgradeCheck = 1300;
171171
ORGANIZATIONNAME = "The Chromium Authors";
172172
TargetAttributes = {
173173
97C146ED1CF9000F007C117D = {
@@ -335,7 +335,7 @@
335335
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
336336
GCC_WARN_UNUSED_FUNCTION = YES;
337337
GCC_WARN_UNUSED_VARIABLE = YES;
338-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
338+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
339339
MTL_ENABLE_DEBUG_INFO = NO;
340340
SDKROOT = iphoneos;
341341
TARGETED_DEVICE_FAMILY = "1,2";
@@ -414,7 +414,7 @@
414414
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
415415
GCC_WARN_UNUSED_FUNCTION = YES;
416416
GCC_WARN_UNUSED_VARIABLE = YES;
417-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
417+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
418418
MTL_ENABLE_DEBUG_INFO = YES;
419419
ONLY_ACTIVE_ARCH = YES;
420420
SDKROOT = iphoneos;
@@ -463,7 +463,7 @@
463463
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
464464
GCC_WARN_UNUSED_FUNCTION = YES;
465465
GCC_WARN_UNUSED_VARIABLE = YES;
466-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
466+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
467467
MTL_ENABLE_DEBUG_INFO = NO;
468468
SDKROOT = iphoneos;
469469
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)