Skip to content

Commit c53cb80

Browse files
Sub6ResourcesSub6Resources
committed
Run flutter formatter
1 parent 8b06d38 commit c53cb80

22 files changed

+155
-115
lines changed

‎example/lib/main.dart

Lines changed: 50 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ class MyHomePageState extends State<MyHomePage> {
265265
floatingActionButton: FloatingActionButton(
266266
child: const Icon(Icons.arrow_downward),
267267
onPressed: () {
268-
final anchorContext = AnchorKey.forId(staticAnchorKey, "bottom")?.currentContext;
268+
final anchorContext =
269+
AnchorKey.forId(staticAnchorKey, "bottom")?.currentContext;
269270
if (anchorContext != null) {
270271
Scrollable.ensureVisible(anchorContext);
271272
}
@@ -294,51 +295,64 @@ class MyHomePageState extends State<MyHomePage> {
294295
},
295296
tagsList: Html.tags..addAll(['tex', 'bird', 'flutter']),
296297
customRenders: {
297-
tagMatcher("tex"): CustomRender.widget(widget: (context, buildChildren) => Math.tex(
298-
context.tree.element?.innerHtml ?? '',
299-
mathStyle: MathStyle.display,
300-
textStyle: context.style.generateTextStyle(),
301-
onErrorFallback: (FlutterMathException e) {
302-
return Text(e.message);
303-
},
304-
)),
305-
tagMatcher("bird"): CustomRender.inlineSpan(inlineSpan: (context, buildChildren) => const TextSpan(text: "🐦")),
306-
tagMatcher("flutter"): CustomRender.widget(widget: (context, buildChildren) => FlutterLogo(
307-
style: (context.tree.element!.attributes['horizontal'] != null)
308-
? FlutterLogoStyle.horizontal
309-
: FlutterLogoStyle.markOnly,
310-
textColor: context.style.color!,
311-
size: context.style.fontSize!.value * 5,
312-
)),
313-
tagMatcher("table"): CustomRender.widget(widget: (context, buildChildren) => SingleChildScrollView(
314-
scrollDirection: Axis.horizontal,
315-
child: tableRender.call().widget!.call(context, buildChildren),
316-
)),
298+
tagMatcher("tex"): CustomRender.widget(
299+
widget: (context, buildChildren) => Math.tex(
300+
context.tree.element?.innerHtml ?? '',
301+
mathStyle: MathStyle.display,
302+
textStyle: context.style.generateTextStyle(),
303+
onErrorFallback: (FlutterMathException e) {
304+
return Text(e.message);
305+
},
306+
)),
307+
tagMatcher("bird"): CustomRender.inlineSpan(
308+
inlineSpan: (context, buildChildren) =>
309+
const TextSpan(text: "🐦")),
310+
tagMatcher("flutter"): CustomRender.widget(
311+
widget: (context, buildChildren) => FlutterLogo(
312+
style: (context.tree.element!.attributes['horizontal'] !=
313+
null)
314+
? FlutterLogoStyle.horizontal
315+
: FlutterLogoStyle.markOnly,
316+
textColor: context.style.color!,
317+
size: context.style.fontSize!.value * 5,
318+
)),
319+
tagMatcher("table"): CustomRender.widget(
320+
widget: (context, buildChildren) => SingleChildScrollView(
321+
scrollDirection: Axis.horizontal,
322+
child: tableRender
323+
.call()
324+
.widget!
325+
.call(context, buildChildren),
326+
)),
317327
audioMatcher(): audioRender(),
318328
iframeMatcher(): iframeRender(),
319-
mathMatcher(): mathRender(onMathError: (error, exception, exceptionWithType) {
329+
mathMatcher():
330+
mathRender(onMathError: (error, exception, exceptionWithType) {
320331
debugPrint(exception);
321332
return Text(exception);
322333
}),
323334
svgTagMatcher(): svgTagRender(),
324335
svgDataUriMatcher(): svgDataImageRender(),
325336
svgAssetUriMatcher(): svgAssetImageRender(),
326337
svgNetworkSourceMatcher(): svgNetworkImageRender(),
327-
networkSourceMatcher(domains: ["flutter.dev"]): CustomRender.widget(
328-
widget: (context, buildChildren) {
329-
return const FlutterLogo(size: 36);
330-
}),
338+
networkSourceMatcher(domains: ["flutter.dev"]):
339+
CustomRender.widget(widget: (context, buildChildren) {
340+
return const FlutterLogo(size: 36);
341+
}),
331342
networkSourceMatcher(domains: ["mydomain.com"]): networkImageRender(
332343
headers: {"Custom-Header": "some-value"},
333344
altWidget: (alt) => Text(alt ?? ""),
334345
loadingWidget: () => const Text("Loading..."),
335346
),
336347
// On relative paths starting with /wiki, prefix with a base url
337-
(context) => context.tree.element?.attributes["src"] != null
338-
&& context.tree.element!.attributes["src"]!.startsWith("/wiki"):
339-
networkImageRender(mapUrl: (url) => "https://upload.wikimedia.org${url!}"),
348+
(context) =>
349+
context.tree.element?.attributes["src"] != null &&
350+
context.tree.element!.attributes["src"]!
351+
.startsWith("/wiki"): networkImageRender(
352+
mapUrl: (url) => "https://upload.wikimedia.org${url!}"),
340353
// Custom placeholder image for broken links
341-
networkSourceMatcher(): networkImageRender(altWidget: (_) => const FlutterLogo()),
354+
networkSourceMatcher():
355+
networkImageRender(altWidget: (_) => const FlutterLogo()),
342356
videoMatcher(): videoRender(),
343357
},
344358
onLinkTap: (url, _, __, ___) {
@@ -364,8 +378,11 @@ class MyHomePageState extends State<MyHomePage> {
364378
}
365379
}
366380

367-
CustomRenderMatcher texMatcher() => (context) => context.tree.element?.localName == 'tex';
381+
CustomRenderMatcher texMatcher() =>
382+
(context) => context.tree.element?.localName == 'tex';
368383

369-
CustomRenderMatcher birdMatcher() => (context) => context.tree.element?.localName == 'bird';
384+
CustomRenderMatcher birdMatcher() =>
385+
(context) => context.tree.element?.localName == 'bird';
370386

371-
CustomRenderMatcher flutterMatcher() => (context) => context.tree.element?.localName == 'flutter';
387+
CustomRenderMatcher flutterMatcher() =>
388+
(context) => context.tree.element?.localName == 'flutter';

‎lib/custom_render.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,12 +370,16 @@ CustomRender networkImageRender({
370370
if (!completer.isCompleted) {
371371
context.parser.cachedImageSizes[src] = size;
372372
completer.complete(size);
373-
image.image.resolve(const ImageConfiguration()).removeListener(listener!);
373+
image.image
374+
.resolve(const ImageConfiguration())
375+
.removeListener(listener!);
374376
}
375377
}, onError: (object, stacktrace) {
376378
if (!completer.isCompleted) {
377379
completer.completeError(object);
378-
image.image.resolve(const ImageConfiguration()).removeListener(listener!);
380+
image.image
381+
.resolve(const ImageConfiguration())
382+
.removeListener(listener!);
379383
}
380384
});
381385

‎lib/flutter_html.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,8 @@ class SelectableHtml extends StatefulWidget {
327327
/// fallback to the default rendering.
328328
final Map<CustomRenderMatcher, SelectableCustomRender> customRenders;
329329

330-
static List<String> get tags => List<String>.from(HtmlElements.selectableElements);
330+
static List<String> get tags =>
331+
List<String>.from(HtmlElements.selectableElements);
331332

332333
@override
333334
State<StatefulWidget> createState() => _SelectableHtmlState();

‎lib/html_parser.dart

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ class HtmlParser extends StatelessWidget {
6060
this.root,
6161
this.selectionControls,
6262
this.scrollPhysics,
63-
}) : internalOnAnchorTap = onAnchorTap ?? (key != null
64-
? _handleAnchorTap(key, onLinkTap)
65-
: onLinkTap);
63+
}) : internalOnAnchorTap = onAnchorTap ??
64+
(key != null ? _handleAnchorTap(key, onLinkTap) : onLinkTap);
6665

6766
/// As the widget [build]s, the HTML data is processed into a tree of [StyledElement]s,
6867
/// which are then parsed into an [InlineSpan] tree that is then rendered to the screen by Flutter
@@ -184,7 +183,8 @@ class HtmlParser extends StatelessWidget {
184183
return parseLayoutElement(node, children);
185184
} else if (HtmlElements.tableCellElements.contains(node.localName)) {
186185
return parseTableCellElement(node, children);
187-
} else if (HtmlElements.tableDefinitionElements.contains(node.localName)) {
186+
} else if (HtmlElements.tableDefinitionElements
187+
.contains(node.localName)) {
188188
return parseTableDefinitionElement(node, children);
189189
} else {
190190
final StyledElement tree = parseStyledElement(node, children);
@@ -285,7 +285,6 @@ class HtmlParser extends StatelessWidget {
285285
/// child that doesn't specify a different style.
286286
static StyledElement _cascadeStyles(
287287
Map<String, Style> style, StyledElement tree) {
288-
289288
for (var child in tree.children) {
290289
child.style = tree.style.copyOnlyInherited(child.style);
291290
_cascadeStyles(style, child);
@@ -372,7 +371,7 @@ class HtmlParser extends StatelessWidget {
372371
shrinkWrap: newContext.parser.shrinkWrap,
373372
childIsReplaced: true, //TODO is this true?
374373
child:
375-
customRenders[entry]!.widget!.call(newContext, buildChildren),
374+
customRenders[entry]!.widget!.call(newContext, buildChildren),
376375
),
377376
);
378377
}
@@ -655,9 +654,8 @@ class HtmlParser extends StatelessWidget {
655654
if (olStack.last.data <= 0) {
656655
marker = '${olStack.last.data}.';
657656
} else {
658-
marker = "${(olStack.last.data as int)
659-
.toRomanNumeralString()!
660-
.toLowerCase()}.";
657+
marker =
658+
"${(olStack.last.data as int).toRomanNumeralString()!.toLowerCase()}.";
661659
}
662660
break;
663661
case ListStyleType.upperRoman:

‎lib/src/css_box_widget.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CssBoxWidget extends StatelessWidget {
2525
bool selectable = false,
2626
TextSelectionControls? selectionControls,
2727
ScrollPhysics? scrollPhysics,
28-
}) : child = selectable
28+
}) : child = selectable
2929
? _generateSelectableWidgetChild(
3030
children,
3131
style,
@@ -676,9 +676,9 @@ extension Normalize on Dimension {
676676
void normalize(double emValue) {
677677
switch (unit) {
678678
case Unit.rem:
679-
// Because CSSBoxWidget doesn't have any information about any
680-
// sort of tree structure, treat rem the same as em. The HtmlParser
681-
// widget handles rem/em values before they get to CSSBoxWidget.
679+
// Because CSSBoxWidget doesn't have any information about any
680+
// sort of tree structure, treat rem the same as em. The HtmlParser
681+
// widget handles rem/em values before they get to CSSBoxWidget.
682682
case Unit.em:
683683
value *= emValue;
684684
unit = Unit.px;

‎lib/src/css_parser.dart

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,8 +1083,8 @@ class ExpressionMapping {
10831083
// return LengthOrPercent(double.parse(value.text), Unit.rem);
10841084
// TODO there are several other available terms processed by the CSS parser
10851085
} else if (value is css.LengthTerm) {
1086-
double number = double.parse(
1087-
value.text.replaceAll(RegExp(r'\s+(\d+\.\d+)\s+'), ''));
1086+
double number =
1087+
double.parse(value.text.replaceAll(RegExp(r'\s+(\d+\.\d+)\s+'), ''));
10881088
Unit unit = _unitMap(value.unit);
10891089
return LengthOrPercent(number, unit);
10901090
}
@@ -1204,31 +1204,23 @@ class ExpressionMapping {
12041204
shadow.add(Shadow(
12051205
color: expressionToColor(color)!,
12061206
offset: Offset(
1207-
double.tryParse((offsetX)
1208-
.text
1209-
.replaceAll(nonNumberRegex, ''))!,
1210-
double.tryParse((offsetY)
1211-
.text
1212-
.replaceAll(nonNumberRegex, ''))!),
1207+
double.tryParse((offsetX).text.replaceAll(nonNumberRegex, ''))!,
1208+
double.tryParse(
1209+
(offsetY).text.replaceAll(nonNumberRegex, ''))!),
12131210
blurRadius: (blurRadius is css.LiteralTerm)
1214-
? double.tryParse((blurRadius)
1215-
.text
1216-
.replaceAll(nonNumberRegex, ''))!
1211+
? double.tryParse(
1212+
(blurRadius).text.replaceAll(nonNumberRegex, ''))!
12171213
: 0.0,
12181214
));
12191215
} else {
12201216
shadow.add(Shadow(
12211217
offset: Offset(
1222-
double.tryParse((offsetX)
1223-
.text
1224-
.replaceAll(nonNumberRegex, ''))!,
1225-
double.tryParse((offsetY)
1226-
.text
1227-
.replaceAll(nonNumberRegex, ''))!),
1218+
double.tryParse((offsetX).text.replaceAll(nonNumberRegex, ''))!,
1219+
double.tryParse(
1220+
(offsetY).text.replaceAll(nonNumberRegex, ''))!),
12281221
blurRadius: (blurRadius is css.LiteralTerm)
1229-
? double.tryParse((blurRadius)
1230-
.text
1231-
.replaceAll(nonNumberRegex, ''))!
1222+
? double.tryParse(
1223+
(blurRadius).text.replaceAll(nonNumberRegex, ''))!
12321224
: 0.0,
12331225
));
12341226
}

‎lib/src/html_elements.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ export 'interactable_element.dart';
33
export 'replaced_element.dart';
44

55
class HtmlElements {
6-
76
static const styledElements = [
87
"abbr",
98
"acronym",
@@ -205,5 +204,4 @@ class HtmlElements {
205204
"var",
206205
"wbr",
207206
];
208-
209-
}
207+
}

‎lib/src/replaced_element.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class EmptyContentElement extends ReplacedElement {
7171
}
7272

7373
class RubyElement extends ReplacedElement {
74-
7574
@override
7675
dom.Element element;
7776

‎lib/src/style/length.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ enum UnitType {
44
length,
55
auto,
66
lengthPercent(children: [UnitType.length, UnitType.percent]),
7-
lengthPercentAuto(children: [UnitType.length, UnitType.percent, UnitType.auto]);
7+
lengthPercentAuto(
8+
children: [UnitType.length, UnitType.percent, UnitType.auto]);
89

910
final List<UnitType> children;
1011

@@ -45,7 +46,8 @@ abstract class Dimension {
4546
/// This dimension takes a value with a length unit such as px or em. Note that
4647
/// these can be fixed or relative (but they must not be a percent)
4748
class Length extends Dimension {
48-
Length(double value, [Unit unit = Unit.px]) : super(value, unit, UnitType.length);
49+
Length(double value, [Unit unit = Unit.px])
50+
: super(value, unit, UnitType.length);
4951
}
5052

5153
/// This dimension takes a value with a length-percent unit such as px or em

‎packages/flutter_html_audio/lib/flutter_html_audio.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class AudioWidget extends StatefulWidget {
2828
final RenderContext context;
2929
final AudioControllerCallback? callback;
3030

31-
const AudioWidget({Key? key,
31+
const AudioWidget({
32+
Key? key,
3233
required this.context,
3334
this.callback,
3435
}) : super(key: key);

‎packages/flutter_html_iframe/lib/iframe_unsupported.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ import 'package:webview_flutter/webview_flutter.dart';
44

55
CustomRender iframeRender({NavigationDelegate? navigationDelegate}) =>
66
CustomRender.widget(widget: (context, buildChildren) {
7-
return const Text("Iframes are currently not supported in this environment");
7+
return const Text(
8+
"Iframes are currently not supported in this environment");
89
});

‎packages/flutter_html_math/lib/flutter_html_math.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ String _parseMathRecursive(dom.Node node, String parsed) {
5252
node.localName == "mover") &&
5353
nodeList.length == 2) {
5454
parsed = _parseMathRecursive(nodeList[0], parsed);
55-
parsed = "${_parseMathRecursive(
56-
nodeList[1],
57-
"$parsed${node.localName == "msup" || node.localName == "mover" ? "^" : "_"}{")}}";
55+
parsed =
56+
"${_parseMathRecursive(nodeList[1], "$parsed${node.localName == "msup" || node.localName == "mover" ? "^" : "_"}{")}}";
5857
}
5958
if ((node.localName == "msubsup" || node.localName == "munderover") &&
6059
nodeList.length == 3) {

‎packages/flutter_html_table/lib/flutter_html_table.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CustomRender tableRender() =>
1313
key: context.key,
1414
style: context.style,
1515
child: LayoutBuilder(
16-
builder: (_, constraints) => _layoutCells(context, constraints),
16+
builder: (_, constraints) => _layoutCells(context, constraints),
1717
),
1818
);
1919
});

‎packages/flutter_html_video/lib/flutter_html_video.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ class VideoWidget extends StatefulWidget {
2525
final RenderContext context;
2626
final VideoControllerCallback? callback;
2727

28-
const VideoWidget({Key? key,
28+
const VideoWidget({
29+
Key? key,
2930
required this.context,
3031
this.callback,
3132
}) : super(key: key);

‎test/flutter_html_test.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void main() {
3333

3434
testWidgets(
3535
"Check that widget displays given text",
36-
(tester) async {
36+
(tester) async {
3737
await tester.pumpWidget(
3838
MaterialApp(
3939
home: Html(
@@ -56,7 +56,9 @@ void main() {
5656
expect(find.text('Text', findRichText: true), findsOneWidget);
5757
});
5858

59-
testWidgets('Check that a simple element is hidden when tagsList does not contain it', (tester) async {
59+
testWidgets(
60+
'Check that a simple element is hidden when tagsList does not contain it',
61+
(tester) async {
6062
await tester.pumpWidget(
6163
MaterialApp(
6264
home: Html(
@@ -68,7 +70,9 @@ void main() {
6870
expect(find.text('Text', findRichText: true), findsNothing);
6971
});
7072

71-
testWidgets('Check that a simple element is displayed when it is included in tagsList', (tester) async {
73+
testWidgets(
74+
'Check that a simple element is displayed when it is included in tagsList',
75+
(tester) async {
7276
await tester.pumpWidget(
7377
MaterialApp(
7478
home: Html(

0 commit comments

Comments
 (0)