Skip to content

Commit f0cd0eb

Browse files
committed
Update for lint warnings
1 parent 6cf43b8 commit f0cd0eb

File tree

12 files changed

+53
-50
lines changed

12 files changed

+53
-50
lines changed

demo_app/lib/screens/huge_html.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5198,17 +5198,17 @@ class HugeHtmlScreen extends StatelessWidget {
51985198
body: ListView(
51995199
children: [
52005200
ListTile(
5201-
title: Text('renderMode: Column'),
5201+
title: const Text('renderMode: Column'),
52025202
onTap: () => Navigator.push(
52035203
context, MaterialPageRoute(builder: (_) => _ColumnScreen())),
52045204
),
52055205
ListTile(
5206-
title: Text('renderMode: ListView'),
5206+
title: const Text('renderMode: ListView'),
52075207
onTap: () => Navigator.push(context,
52085208
MaterialPageRoute(builder: (_) => _ListViewScreen())),
52095209
),
52105210
ListTile(
5211-
title: Text('renderMode: SliverList'),
5211+
title: const Text('renderMode: SliverList'),
52125212
onTap: () => Navigator.push(context,
52135213
MaterialPageRoute(builder: (_) => _SliverListScreen())),
52145214
),
@@ -5220,12 +5220,12 @@ class HugeHtmlScreen extends StatelessWidget {
52205220
class _ColumnScreen extends StatelessWidget {
52215221
@override
52225222
Widget build(BuildContext context) => Scaffold(
5223-
appBar: AppBar(title: Text('renderMode: Column')),
5223+
appBar: AppBar(title: const Text('renderMode: Column')),
52245224
body: SingleChildScrollView(
52255225
child: Padding(
52265226
padding: const EdgeInsets.all(8.0),
52275227
child: RepaintBoundary(
5228-
child: HtmlWidget(kHtml, renderMode: RenderMode.Column),
5228+
child: HtmlWidget(kHtml),
52295229
),
52305230
),
52315231
),
@@ -5235,10 +5235,10 @@ class _ColumnScreen extends StatelessWidget {
52355235
class _ListViewScreen extends StatelessWidget {
52365236
@override
52375237
Widget build(BuildContext context) => Scaffold(
5238-
appBar: AppBar(title: Text('renderMode: ListView')),
5238+
appBar: AppBar(title: const Text('renderMode: ListView')),
52395239
body: Padding(
52405240
padding: const EdgeInsets.all(8.0),
5241-
child: HtmlWidget(kHtml, renderMode: RenderMode.ListView),
5241+
child: HtmlWidget(kHtml, renderMode: RenderMode.listView),
52425242
),
52435243
);
52445244
}
@@ -5248,15 +5248,15 @@ class _SliverListScreen extends StatelessWidget {
52485248
Widget build(BuildContext context) => Scaffold(
52495249
body: CustomScrollView(
52505250
slivers: [
5251-
SliverAppBar(
5251+
const SliverAppBar(
52525252
title: Text('renderMode: SliverList'),
52535253
floating: true,
52545254
expandedHeight: 200,
52555255
flexibleSpace: Placeholder(),
52565256
),
52575257
SliverPadding(
52585258
padding: const EdgeInsets.all(8.0),
5259-
sliver: HtmlWidget(kHtml, renderMode: RenderMode.SliverList),
5259+
sliver: HtmlWidget(kHtml, renderMode: RenderMode.sliverList),
52605260
),
52615261
],
52625262
),

packages/core/lib/src/core_helpers.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,20 @@ enum RenderMode {
101101
///
102102
/// This is the default render mode.
103103
/// It's good enough for small / medium document and can be used easily.
104-
Column,
104+
column,
105105

106106
/// The body will be rendered as a `ListView` widget.
107107
///
108108
/// It's good for medium / large document in a dedicated page layout
109109
/// (e.g. the HTML document is the only thing on the screen).
110-
ListView,
110+
listView,
111111

112112
/// The body will be rendered as a `SliverList` sliver.
113113
///
114114
/// It's good for large / huge document and can be put in the same scrolling
115115
/// context with other contents.
116116
/// A [CustomScrollView] or similar is required for this to work.
117-
SliverList,
117+
sliverList,
118118
}
119119

120120
/// An extension on [Widget] to keep track of anchors.

packages/core/lib/src/core_html_widget.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class HtmlWidget extends StatefulWidget {
119119
this.onTapImage,
120120
this.onTapUrl,
121121
RebuildTriggers? rebuildTriggers,
122-
this.renderMode = RenderMode.Column,
122+
this.renderMode = RenderMode.column,
123123
this.textStyle = const TextStyle(),
124124
}) : _rebuildTriggers = rebuildTriggers,
125125
super(key: key);
@@ -229,10 +229,10 @@ class _HtmlWidgetState extends State<HtmlWidget> {
229229
child: CircularProgressIndicator()));
230230

231231
switch (widget.renderMode) {
232-
case RenderMode.Column:
233-
case RenderMode.ListView:
232+
case RenderMode.column:
233+
case RenderMode.listView:
234234
return indicator;
235-
case RenderMode.SliverList:
235+
case RenderMode.sliverList:
236236
return SliverToBoxAdapter(child: indicator);
237237
}
238238
}

packages/core/lib/src/core_widget_factory.dart

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import 'internal/platform_specific/fallback.dart'
1717
/// A factory to build widgets.
1818
class WidgetFactory {
1919
late AnchorRegistry _anchorRegistry;
20-
late final _flattener;
20+
late final Flattener _flattener;
2121

2222
BuildOp? _styleBgColor;
2323
BuildOp? _styleBlock;
@@ -91,7 +91,7 @@ class WidgetFactory {
9191
/// Builds body widget (see [HtmlWidget.renderMode]).
9292
Widget buildBodyWidget(BuildContext context, Widget child) {
9393
var children = child is Column ? child.children : [child];
94-
final renderMode = _widget?.renderMode ?? RenderMode.Column;
94+
final renderMode = _widget?.renderMode ?? RenderMode.column;
9595

9696
if (children.isNotEmpty && children.first is HeightPlaceholder) {
9797
children.removeAt(0);
@@ -107,7 +107,7 @@ class WidgetFactory {
107107
continue;
108108
}
109109

110-
if (renderMode != RenderMode.Column && child is CssBlock) {
110+
if (renderMode != RenderMode.column && child is CssBlock) {
111111
final grandChild = child.child;
112112
if (grandChild is Column) {
113113
children = grandChild.children;
@@ -119,12 +119,12 @@ class WidgetFactory {
119119
}
120120

121121
switch (renderMode) {
122-
case RenderMode.Column:
122+
case RenderMode.column:
123123
return buildColumnWidget(context, children);
124-
case RenderMode.ListView:
124+
case RenderMode.listView:
125125
_anchorRegistry.prepareIndexByAnchor(children);
126126
return buildBodyListView(context, children);
127-
case RenderMode.SliverList:
127+
case RenderMode.sliverList:
128128
_anchorRegistry.prepareIndexByAnchor(children);
129129
return buildBodySliverList(context, children);
130130
}
@@ -248,8 +248,10 @@ class WidgetFactory {
248248
final image = src.image;
249249
final semanticLabel = image?.alt ?? image?.title;
250250
return Image(
251-
errorBuilder: (_1, _2, _3) => imageErrorBuilder(_1, _2, _3, src),
252-
loadingBuilder: (_1, _2, _3) => imageLoadingBuilder(_1, _2, _3, src),
251+
errorBuilder: (context, error, stackTrace) =>
252+
imageErrorBuilder(context, error, stackTrace, src),
253+
loadingBuilder: (context, child, loadingProgress) =>
254+
imageLoadingBuilder(context, child, loadingProgress, src),
253255
excludeFromSemantics: semanticLabel == null,
254256
fit: BoxFit.fill,
255257
image: provider,
@@ -271,7 +273,7 @@ class WidgetFactory {
271273
/// Builder for error widget if an error occurs during image loading.
272274
Widget imageErrorBuilder(
273275
BuildContext context,
274-
Object error,
276+
dynamic error,
275277
StackTrace? stackTrace,
276278
ImageSource src,
277279
) {
@@ -289,7 +291,6 @@ class WidgetFactory {
289291
return text.isNotEmpty
290292
? RichText(
291293
maxLines: 1,
292-
overflow: TextOverflow.clip,
293294
softWrap: false,
294295
text: TextSpan(style: style, text: text),
295296
textDirection: tsh.textDirection,

packages/core/lib/src/internal/ops/anchor.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ class AnchorRegistry {
7676
if (anchorMin < effectiveMin) {
7777
movedOk = await _ensureVisibleContext(
7878
_bodyItemKeys[currentMin].currentContext,
79-
alignment: 0.0,
8079
curve: jumpCurve,
8180
duration: jumpDuration,
8281
);

packages/core/lib/src/widgets/html_list_marker.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class _ListMarkerRenderObject extends RenderBox {
5050
_ListMarkerRenderObject(this._markerType, this._textStyle);
5151

5252
HtmlListMarkerType _markerType;
53+
// ignore: avoid_setters_without_getters
5354
set markerType(HtmlListMarkerType v) {
5455
if (v == _markerType) return;
5556
_markerType = v;
@@ -65,6 +66,7 @@ class _ListMarkerRenderObject extends RenderBox {
6566
}
6667

6768
TextStyle _textStyle;
69+
// ignore: avoid_setters_without_getters
6870
set textStyle(TextStyle v) {
6971
if (v == _textStyle) return;
7072
__textPainter = null;
@@ -87,8 +89,9 @@ class _ListMarkerRenderObject extends RenderBox {
8789
var lineMetrics = <LineMetrics>[];
8890
try {
8991
lineMetrics = _textPainter.computeLineMetrics();
90-
// ignore: empty_catches
91-
} on UnimplementedError {}
92+
} catch (e) {
93+
debugPrint('computeLineMetrics error: $e');
94+
}
9295

9396
final m = lineMetrics.isNotEmpty ? lineMetrics.first : null;
9497
final center = offset +

packages/core/test/anchor_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Future<void> main() async {
5151
hw: HtmlWidget(
5252
html,
5353
key: hwKey,
54-
renderMode: RenderMode.ListView,
54+
renderMode: RenderMode.listView,
5555
),
5656
useExplainer: false,
5757
);
@@ -68,7 +68,7 @@ Future<void> main() async {
6868
HtmlWidget(
6969
html,
7070
key: hwKey,
71-
renderMode: RenderMode.SliverList,
71+
renderMode: RenderMode.sliverList,
7272
)
7373
]),
7474
useExplainer: false,
@@ -389,7 +389,7 @@ class _ListViewTestApp extends StatelessWidget {
389389
body: HtmlWidget(
390390
html ?? htmlDefault,
391391
factoryBuilder: () => _WidgetFactory(),
392-
renderMode: RenderMode.ListView,
392+
renderMode: RenderMode.listView,
393393
),
394394
);
395395
}
@@ -408,7 +408,7 @@ class _SliverListTestApp extends StatelessWidget {
408408
HtmlWidget(
409409
html ?? htmlDefault,
410410
factoryBuilder: () => _WidgetFactory(),
411-
renderMode: RenderMode.SliverList,
411+
renderMode: RenderMode.sliverList,
412412
),
413413
SliverToBoxAdapter(child: Container(height: 1, key: keyBottom)),
414414
],

packages/core/test/core_config_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ void main() {
464464
});
465465

466466
group('renderMode', () {
467-
final explain = (
467+
Future<String> explain(
468468
WidgetTester tester,
469469
RenderMode renderMode, {
470470
bool buildAsync = false,
@@ -480,39 +480,39 @@ void main() {
480480
return helper.explain(
481481
tester,
482482
null,
483-
hw: renderMode == RenderMode.SliverList
483+
hw: renderMode == RenderMode.sliverList
484484
? CustomScrollView(slivers: [hw])
485485
: hw,
486486
useExplainer: false,
487487
);
488-
};
488+
}
489489

490490
testWidgets('renders Column', (WidgetTester tester) async {
491-
final explained = await explain(tester, RenderMode.Column);
491+
final explained = await explain(tester, RenderMode.column);
492492
expect(explained, contains('└Column('));
493493
});
494494

495495
testWidgets('renders ListView', (WidgetTester tester) async {
496-
final explained = await explain(tester, RenderMode.ListView);
496+
final explained = await explain(tester, RenderMode.listView);
497497
expect(explained, contains('└ListView('));
498498
expect(explained, isNot(contains('└Column(')));
499499
});
500500

501501
testWidgets('renders SliverList', (WidgetTester tester) async {
502-
final explained = await explain(tester, RenderMode.SliverList);
502+
final explained = await explain(tester, RenderMode.sliverList);
503503
expect(explained, contains('└SliverList('));
504504
expect(explained, isNot(contains('└Column(')));
505505
});
506506

507507
testWidgets('renders SliverList (buildAsync)', (WidgetTester tester) async {
508-
final e = await explain(tester, RenderMode.SliverList, buildAsync: true);
508+
final e = await explain(tester, RenderMode.sliverList, buildAsync: true);
509509
expect(e, contains('└SliverToBoxAdapter('));
510510
});
511511

512512
testWidgets('renders SliverList (CssBlock unwrap)', (tester) async {
513513
final explained = await explain(
514514
tester,
515-
RenderMode.SliverList,
515+
RenderMode.sliverList,
516516
html: '<div><p>Foo</p><p>Bar</p></div>',
517517
);
518518
expect(explained.split('└CssBlock(').length, equals(3),

packages/core/test/tag_li_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ Future<void> main() async {
603603
});
604604

605605
testWidgets('null buildListMarker', (WidgetTester tester) async {
606-
final html = '<ul><li>Foo</li></ul>';
606+
const html = '<ul><li>Foo</li></ul>';
607607
final explained = await explain(tester, null,
608608
hw: HtmlWidget(
609609
html,

packages/enhanced/lib/src/html_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class HtmlWidget extends core.HtmlWidget {
5151
void Function(ImageMetadata)? onTapImage,
5252
dynamic Function(String)? onTapUrl,
5353
core.RebuildTriggers? rebuildTriggers,
54-
RenderMode renderMode = RenderMode.Column,
54+
RenderMode renderMode = RenderMode.column,
5555
TextStyle textStyle = const TextStyle(),
5656
this.webView = false,
5757
this.webViewDebuggingEnabled = false,

0 commit comments

Comments
 (0)