Skip to content

Commit e8b96b7

Browse files
ali-thowfeekali-thowfeek
committed
updated to use latest flutter sdk
1 parent 47596a3 commit e8b96b7

File tree

7 files changed

+42
-62
lines changed

7 files changed

+42
-62
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [1.0.2+4] - May 8th, 2020
2+
3+
* Updated deprecated terms
4+
* Updated dependency
5+
* Added some TODOs in README
6+
17
## [1.0.2+3] - April 27th, 2020
28

39
* Updated README explaining a render issue

‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Copyright 2020 Ali Ahamed Thowfeek
2-
Copyright 2019 Ashraff Hathibelagal
1+
Modified work: Copyright 2020 Ali Ahamed Thowfeek
2+
Original work: Copyright 2019 Ashraff Hathibelagal
33

44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

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

+1-13
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1412
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1713
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1814
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1915
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -26,8 +22,6 @@
2622
dstPath = "";
2723
dstSubfolderSpec = 10;
2824
files = (
29-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
30-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3125
);
3226
name = "Embed Frameworks";
3327
runOnlyForDeploymentPostprocessing = 0;
@@ -38,13 +32,11 @@
3832
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3933
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4034
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
41-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4235
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4336
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4437
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4538
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4639
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
47-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
4840
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4941
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5042
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -57,8 +49,6 @@
5749
isa = PBXFrameworksBuildPhase;
5850
buildActionMask = 2147483647;
5951
files = (
60-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
61-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
6252
);
6353
runOnlyForDeploymentPostprocessing = 0;
6454
};
@@ -68,9 +58,7 @@
6858
9740EEB11CF90186004384FC /* Flutter */ = {
6959
isa = PBXGroup;
7060
children = (
71-
3B80C3931E831B6300D905FE /* App.framework */,
7261
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
73-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
7462
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7563
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
7664
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -201,7 +189,7 @@
201189
);
202190
runOnlyForDeploymentPostprocessing = 0;
203191
shellPath = /bin/sh;
204-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
192+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
205193
};
206194
9740EEB61CF901F6004384FC /* Run Script */ = {
207195
isa = PBXShellScriptBuildPhase;

‎example/pubspec.lock

+14-21
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@ packages:
77
name: archive
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.0.11"
10+
version: "2.0.13"
1111
args:
1212
dependency: transitive
1313
description:
1414
name: args
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.5.2"
17+
version: "1.6.0"
1818
async:
1919
dependency: transitive
2020
description:
2121
name: async
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "2.4.0"
24+
version: "2.4.1"
2525
boolean_selector:
2626
dependency: transitive
2727
description:
2828
name: boolean_selector
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.0.5"
31+
version: "2.0.0"
3232
charcode:
3333
dependency: transitive
3434
description:
3535
name: charcode
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "1.1.2"
38+
version: "1.1.3"
3939
collection:
4040
dependency: transitive
4141
description:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.14.11"
45+
version: "1.14.12"
4646
convert:
4747
dependency: transitive
4848
description:
@@ -56,7 +56,7 @@ packages:
5656
name: crypto
5757
url: "https://pub.dartlang.org"
5858
source: hosted
59-
version: "2.1.3"
59+
version: "2.1.4"
6060
cupertino_icons:
6161
dependency: "direct main"
6262
description:
@@ -87,7 +87,7 @@ packages:
8787
name: image
8888
url: "https://pub.dartlang.org"
8989
source: hosted
90-
version: "2.1.4"
90+
version: "2.1.12"
9191
matcher:
9292
dependency: transitive
9393
description:
@@ -109,13 +109,6 @@ packages:
109109
url: "https://pub.dartlang.org"
110110
source: hosted
111111
version: "1.6.4"
112-
pedantic:
113-
dependency: transitive
114-
description:
115-
name: pedantic
116-
url: "https://pub.dartlang.org"
117-
source: hosted
118-
version: "1.8.0+1"
119112
petitparser:
120113
dependency: transitive
121114
description:
@@ -129,14 +122,14 @@ packages:
129122
name: quiver
130123
url: "https://pub.dartlang.org"
131124
source: hosted
132-
version: "2.0.5"
125+
version: "2.1.3"
133126
simple_html_css:
134127
dependency: "direct main"
135128
description:
136129
path: ".."
137130
relative: true
138131
source: path
139-
version: "1.0.2+3"
132+
version: "1.0.2+4"
140133
sky_engine:
141134
dependency: transitive
142135
description: flutter
@@ -148,7 +141,7 @@ packages:
148141
name: source_span
149142
url: "https://pub.dartlang.org"
150143
source: hosted
151-
version: "1.5.5"
144+
version: "1.7.0"
152145
stack_trace:
153146
dependency: transitive
154147
description:
@@ -183,7 +176,7 @@ packages:
183176
name: test_api
184177
url: "https://pub.dartlang.org"
185178
source: hosted
186-
version: "0.2.11"
179+
version: "0.2.15"
187180
typed_data:
188181
dependency: transitive
189182
description:
@@ -204,6 +197,6 @@ packages:
204197
name: xml
205198
url: "https://pub.dartlang.org"
206199
source: hosted
207-
version: "3.5.0"
200+
version: "3.6.1"
208201
sdks:
209-
dart: ">=2.4.0 <3.0.0"
202+
dart: ">=2.6.0 <3.0.0"

‎lib/src/internals.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,22 @@ class Parser {
148148

149149
switch (tagName) {
150150
case "h1":
151-
double h1 = Theme.of(_context).textTheme.headline.fontSize;
151+
double h1 = Theme.of(_context).textTheme.headline5.fontSize;
152152
styles = "font-size: ${h1}px;";
153153
break;
154154

155155
case "h2":
156-
double h2 = Theme.of(_context).textTheme.title.fontSize;
156+
double h2 = Theme.of(_context).textTheme.headline6.fontSize;
157157
styles = "font-size: ${h2}px; font-weight: medium;";
158158
break;
159159

160160
case "h3":
161-
double h3 = Theme.of(_context).textTheme.subhead.fontSize;
161+
double h3 = Theme.of(_context).textTheme.subtitle1.fontSize;
162162
styles = "font-size: ${h3}px;";
163163
break;
164164

165165
case "h4":
166-
double h4 = Theme.of(_context).textTheme.body2.fontSize;
166+
double h4 = Theme.of(_context).textTheme.bodyText1.fontSize;
167167
styles = "font-size: ${h4}px; font-weight: medium;";
168168
break;
169169

‎pubspec.lock

+13-20
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,42 @@ packages:
77
name: archive
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.0.11"
10+
version: "2.0.13"
1111
args:
1212
dependency: transitive
1313
description:
1414
name: args
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.5.2"
17+
version: "1.6.0"
1818
async:
1919
dependency: transitive
2020
description:
2121
name: async
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "2.4.0"
24+
version: "2.4.1"
2525
boolean_selector:
2626
dependency: transitive
2727
description:
2828
name: boolean_selector
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "1.0.5"
31+
version: "2.0.0"
3232
charcode:
3333
dependency: transitive
3434
description:
3535
name: charcode
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "1.1.2"
38+
version: "1.1.3"
3939
collection:
4040
dependency: transitive
4141
description:
4242
name: collection
4343
url: "https://pub.dartlang.org"
4444
source: hosted
45-
version: "1.14.11"
45+
version: "1.14.12"
4646
convert:
4747
dependency: transitive
4848
description:
@@ -56,7 +56,7 @@ packages:
5656
name: crypto
5757
url: "https://pub.dartlang.org"
5858
source: hosted
59-
version: "2.1.3"
59+
version: "2.1.4"
6060
flutter:
6161
dependency: "direct main"
6262
description: flutter
@@ -80,7 +80,7 @@ packages:
8080
name: image
8181
url: "https://pub.dartlang.org"
8282
source: hosted
83-
version: "2.1.4"
83+
version: "2.1.12"
8484
matcher:
8585
dependency: transitive
8686
description:
@@ -102,13 +102,6 @@ packages:
102102
url: "https://pub.dartlang.org"
103103
source: hosted
104104
version: "1.6.4"
105-
pedantic:
106-
dependency: transitive
107-
description:
108-
name: pedantic
109-
url: "https://pub.dartlang.org"
110-
source: hosted
111-
version: "1.8.0+1"
112105
petitparser:
113106
dependency: transitive
114107
description:
@@ -122,7 +115,7 @@ packages:
122115
name: quiver
123116
url: "https://pub.dartlang.org"
124117
source: hosted
125-
version: "2.0.5"
118+
version: "2.1.3"
126119
sky_engine:
127120
dependency: transitive
128121
description: flutter
@@ -134,7 +127,7 @@ packages:
134127
name: source_span
135128
url: "https://pub.dartlang.org"
136129
source: hosted
137-
version: "1.5.5"
130+
version: "1.7.0"
138131
stack_trace:
139132
dependency: transitive
140133
description:
@@ -169,7 +162,7 @@ packages:
169162
name: test_api
170163
url: "https://pub.dartlang.org"
171164
source: hosted
172-
version: "0.2.11"
165+
version: "0.2.15"
173166
typed_data:
174167
dependency: transitive
175168
description:
@@ -190,6 +183,6 @@ packages:
190183
name: xml
191184
url: "https://pub.dartlang.org"
192185
source: hosted
193-
version: "3.5.0"
186+
version: "3.6.1"
194187
sdks:
195-
dart: ">=2.4.0 <3.0.0"
188+
dart: ">=2.6.0 <3.0.0"

‎pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: simple_html_css
22
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.
3-
version: 1.0.2+3
3+
version: 1.0.2+4
44
homepage: https://github.com/ali-thowfeek/simple_html_css_flutter
55
repository: https://github.com/ali-thowfeek/simple_html_css_flutter
66
environment:
@@ -9,7 +9,7 @@ environment:
99
dependencies:
1010
flutter:
1111
sdk: flutter
12-
xml: ^3.5.0
12+
xml: ^3.6.1
1313
html_unescape: ^1.0.1+3
1414

1515
dev_dependencies:

0 commit comments

Comments
 (0)