Skip to content

Commit 412e230

Browse files
erickgon92erick
and
erick
authored
fix: added fixes for flutter 3.22 (#32)
Co-authored-by: erick <[email protected]>
1 parent caa0f57 commit 412e230

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

Diff for: lib/src/internals.dart

+10-14
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class Parser {
5151
final TextStyle? defaultTextStyle;
5252

5353
TextSpan _getTextSpan(String text, String style, TextStyle overrideStyle) {
54-
final Iterable<String> rules =
55-
style.split(';').where((String item) => item.trim().isNotEmpty);
54+
final Iterable<String> rules = style.split(';').where((String item) => item.trim().isNotEmpty);
5655
TextStyle textStyle = DefaultTextStyle.of(context).style;
5756
textStyle = textStyle.apply(color: const Color(0xff000000));
5857
textStyle = textStyle.merge(defaultTextStyle);
@@ -161,7 +160,7 @@ class Parser {
161160
case 'h1':
162161
double h1;
163162
if (defaultFontSize == null) {
164-
h1 = Theme.of(context).textTheme.headline5?.fontSize ?? 24.0;
163+
h1 = Theme.of(context).textTheme.headlineLarge?.fontSize ?? 24.0;
165164
} else {
166165
h1 = defaultFontSize * 2;
167166
}
@@ -171,7 +170,7 @@ class Parser {
171170
case 'h2':
172171
double h2;
173172
if (defaultFontSize == null) {
174-
h2 = Theme.of(context).textTheme.headline6?.fontSize ?? 20.0;
173+
h2 = Theme.of(context).textTheme.headlineLarge?.fontSize ?? 20.0;
175174
} else {
176175
h2 = defaultFontSize * 1.5;
177176
}
@@ -181,7 +180,7 @@ class Parser {
181180
case 'h3':
182181
double h3;
183182
if (defaultFontSize == null) {
184-
h3 = Theme.of(context).textTheme.subtitle1?.fontSize ?? 16.0;
183+
h3 = Theme.of(context).textTheme.headlineMedium?.fontSize ?? 16.0;
185184
} else {
186185
h3 = defaultFontSize * 1.17;
187186
}
@@ -191,7 +190,7 @@ class Parser {
191190
case 'h4':
192191
double h4;
193192
if (defaultFontSize == null) {
194-
h4 = Theme.of(context).textTheme.bodyText1?.fontSize ?? 16.0;
193+
h4 = Theme.of(context).textTheme.headlineMedium?.fontSize ?? 16.0;
195194
} else {
196195
h4 = defaultFontSize;
197196
}
@@ -201,7 +200,7 @@ class Parser {
201200
case 'h5':
202201
double h5;
203202
if (defaultFontSize == null) {
204-
h5 = Theme.of(context).textTheme.bodyText1?.fontSize ?? 16.0;
203+
h5 = Theme.of(context).textTheme.headlineMedium?.fontSize ?? 16.0;
205204
} else {
206205
h5 = defaultFontSize * .83;
207206
}
@@ -211,7 +210,7 @@ class Parser {
211210
case 'h6':
212211
double h6;
213212
if (defaultFontSize == null) {
214-
h6 = Theme.of(context).textTheme.bodyText2?.fontSize ?? 14.0;
213+
h6 = Theme.of(context).textTheme.headlineSmall?.fontSize ?? 14.0;
215214
} else {
216215
h6 = defaultFontSize * .67;
217216
}
@@ -251,8 +250,7 @@ class Parser {
251250
break;
252251

253252
case 'a':
254-
styles =
255-
'''visit_link:__#TO_GET#__; text-decoration: underline; color: #4287f5;''';
253+
styles = '''visit_link:__#TO_GET#__; text-decoration: underline; color: #4287f5;''';
256254
break;
257255

258256
// dropping partial support for ul-li bullets
@@ -285,8 +283,7 @@ class Parser {
285283
if (attribute.name == 'style') {
286284
styles = '$styles;${attribute.value}';
287285
} else if (attribute.name == 'href') {
288-
styles = styles.replaceFirst('__#TO_GET#__',
289-
attribute.value.replaceAll(':', '__#COLON#__'));
286+
styles = styles.replaceFirst('__#TO_GET#__', attribute.value.replaceAll(':', '__#COLON#__'));
290287
}
291288
}
292289
_stack.add(_Tag(event.name, styles, overrideStyles));
@@ -338,8 +335,7 @@ class Parser {
338335
if (spans.isNotEmpty) {
339336
final List<TextSpan> reversed = spans.reversed.toList();
340337

341-
while (reversed.isNotEmpty &&
342-
(reversed.first.text == '\n\n' || reversed.first.text == '\n')) {
338+
while (reversed.isNotEmpty && (reversed.first.text == '\n\n' || reversed.first.text == '\n')) {
343339
reversed.removeAt(0);
344340
}
345341

Diff for: pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ dependencies:
1212
flutter:
1313
sdk: flutter
1414
html_unescape: ^2.0.0
15-
xml: ^6.1.0
15+
xml: ^6.5.0
1616

1717
dev_dependencies:
18-
flutter_lints: ^2.0.1
18+
flutter_lints: ^4.0.0
1919
flutter_test:
2020
sdk: flutter
2121

0 commit comments

Comments
 (0)