Skip to content

Commit f4f3795

Browse files
committed
1 parent eb5953b commit f4f3795

File tree

6 files changed

+65
-54
lines changed

6 files changed

+65
-54
lines changed

lib/src/widgets/html.dart

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: avoid_renaming_method_parameters, deprecated_member_use
2+
13
import 'dart:convert';
24

35
import 'package:flutter/material.dart';
@@ -140,19 +142,14 @@ class TinhteWidgetFactory extends WidgetFactory {
140142
}
141143

142144
BuildOp get smilieOp {
143-
return _smilieOp ??= BuildOp(
144-
onTree: (meta, tree) {
145-
final a = meta.element.attributes;
145+
return _smilieOp ??= BuildOp.v1(
146+
onParsed: (tree) {
147+
final a = tree.element.attributes;
146148
final title = a['data-title'];
147-
if (title == null) return;
149+
if (title == null) return tree;
148150
final smilie = _kSmilies[title];
149-
if (smilie == null) return;
150-
final parentTree = tree.parent;
151-
if (parentTree == null) return;
152-
153-
// TODO: use `replaceWith` when it comes back in v0.9
154-
TextBit(parentTree, smilie).insertBefore(tree);
155-
tree.detach();
151+
if (smilie == null) return tree;
152+
return tree.parent.sub()..addText(smilie);
156153
},
157154
);
158155
}

lib/src/widgets/html/chr.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: deprecated_member_use
2+
13
part of '../html.dart';
24

35
class Chr {

lib/src/widgets/html/galleria.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: deprecated_member_use
2+
13
part of '../html.dart';
24

35
const kColumns = 3;

lib/src/widgets/html/lb_trigger.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: deprecated_member_use
2+
13
part of '../html.dart';
24

35
const kCaptionColor = Colors.white70;

pubspec.lock

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ packages:
1313
dependency: transitive
1414
description:
1515
name: _flutterfire_internals
16-
sha256: "2e3a565cdd40b32df6ff9a0d1f16b9144fcce769455597ee9195f568ffbb3a59"
16+
sha256: "554f148e71e9e016d9c04d4af6b103ca3f74a1ceed7d7307b70a0f41e991eb77"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "1.3.8"
19+
version: "1.3.26"
2020
analyzer:
2121
dependency: transitive
2222
description:
@@ -29,10 +29,10 @@ packages:
2929
dependency: transitive
3030
description:
3131
name: archive
32-
sha256: "49b1fad315e57ab0bbc15bcbb874e83116a1d78f77ebd500a4af6c9407d6b28e"
32+
sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
3333
url: "https://pub.dev"
3434
source: hosted
35-
version: "3.3.8"
35+
version: "3.4.10"
3636
args:
3737
dependency: transitive
3838
description:
@@ -261,10 +261,10 @@ packages:
261261
dependency: "direct main"
262262
description:
263263
name: firebase_core
264-
sha256: "761d0a00562ba09d491eacdceaf1885df62d072c9431bf3110333e2a9904b1e1"
264+
sha256: "67bf0d5fd78f12f51c6b54a72f6141314136a1a90e98b1b7c45e7fac883254ed"
265265
url: "https://pub.dev"
266266
source: hosted
267-
version: "2.18.0"
267+
version: "2.27.1"
268268
firebase_core_platform_interface:
269269
dependency: "direct main"
270270
description:
@@ -277,50 +277,50 @@ packages:
277277
dependency: transitive
278278
description:
279279
name: firebase_core_web
280-
sha256: "0631a2ec971dbc540275e2fa00c3a8a2676f0a7adbc3c197d6fba569db689d97"
280+
sha256: "5377eaac3b9fe8aaf22638d87f92b62784f23572e132dfc029195e84d6cb37de"
281281
url: "https://pub.dev"
282282
source: hosted
283-
version: "2.8.1"
283+
version: "2.12.0"
284284
firebase_crashlytics:
285285
dependency: "direct main"
286286
description:
287287
name: firebase_crashlytics
288-
sha256: "85f1098487d1b177bb4b7e0d552f57029d6964d2da665104d6299acce2f58bb6"
288+
sha256: cf120df5b473f5f8cd24f9de663edc8aed3a1888d29d805076be0448bdee249e
289289
url: "https://pub.dev"
290290
source: hosted
291-
version: "3.4.0"
291+
version: "3.4.19"
292292
firebase_crashlytics_platform_interface:
293293
dependency: transitive
294294
description:
295295
name: firebase_crashlytics_platform_interface
296-
sha256: "8bdcca9109595d353b467a97278becb726286596741b9cc0ace59abf9def9645"
296+
sha256: "99656cc39228e8f2b845cddb4d43307bb44294a03e7d00b4d8e35536889bc65c"
297297
url: "https://pub.dev"
298298
source: hosted
299-
version: "3.6.8"
299+
version: "3.6.26"
300300
firebase_messaging:
301301
dependency: "direct main"
302302
description:
303303
name: firebase_messaging
304-
sha256: "26febca93007cdfd0e4684c9ca2f3e59b096d5fb39b83ae42bc9c1f726b27b0c"
304+
sha256: "34fac43b70d5c41dc864eeb52417128da1f68b0a48604a0c56cd3190f0f609b8"
305305
url: "https://pub.dev"
306306
source: hosted
307-
version: "14.7.0"
307+
version: "14.7.20"
308308
firebase_messaging_platform_interface:
309309
dependency: transitive
310310
description:
311311
name: firebase_messaging_platform_interface
312-
sha256: "049da43147b078c8d389e2c24e6acfdda96968a53da2061632bb0cb74fea92c5"
312+
sha256: "1dcf7d0d6776396bb2e488c53b0e4cc671c45a65717a73d881e52190d23aca3c"
313313
url: "https://pub.dev"
314314
source: hosted
315-
version: "4.5.9"
315+
version: "4.5.28"
316316
firebase_messaging_web:
317317
dependency: transitive
318318
description:
319319
name: firebase_messaging_web
320-
sha256: ac22d3c09949cd37d94431e7deba4e270a93e5134c4842a9d784bd884835b54b
320+
sha256: ceabccf24d15d03c89dfd6c7eaef11c58fbf00b9c76ebc94028408943b8d2bfd
321321
url: "https://pub.dev"
322322
source: hosted
323-
version: "3.5.9"
323+
version: "3.7.0"
324324
flutter:
325325
dependency: "direct main"
326326
description: flutter
@@ -338,10 +338,10 @@ packages:
338338
dependency: "direct dev"
339339
description:
340340
name: flutter_lints
341-
sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5
341+
sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
342342
url: "https://pub.dev"
343343
source: hosted
344-
version: "3.0.0"
344+
version: "3.0.1"
345345
flutter_localizations:
346346
dependency: "direct main"
347347
description: flutter
@@ -433,18 +433,18 @@ packages:
433433
dependency: "direct main"
434434
description:
435435
name: flutter_widget_from_html
436-
sha256: "8d2a9a7979a9c1a5d866d1f4134d2ec2cca78716c112c76803d6a552281405cc"
436+
sha256: "7b290290bfe34fe95d8b64aa5420746e5ae214862465399c682e8da87bc1759d"
437437
url: "https://pub.dev"
438438
source: hosted
439-
version: "0.10.6"
439+
version: "0.13.1-alpha.2"
440440
flutter_widget_from_html_core:
441441
dependency: transitive
442442
description:
443443
name: flutter_widget_from_html_core
444-
sha256: "22140caa191cb4bba0fe4d5e4ad875c7e8a9ba47d61517f56d733019cf76396d"
444+
sha256: "2dba32b7dbd2134af46138f6171683aff51b888c4d0b3efe289a79e3322f172e"
445445
url: "https://pub.dev"
446446
source: hosted
447-
version: "0.10.6"
447+
version: "0.13.1-alpha.2"
448448
font_awesome_flutter:
449449
dependency: "direct main"
450450
description:
@@ -473,50 +473,50 @@ packages:
473473
dependency: transitive
474474
description:
475475
name: fwfh_cached_network_image
476-
sha256: "3de22aa3a6943c968e0d9fbcba4463b3dbbf7103171d62c84b6c672fb83eebdf"
476+
sha256: "5ef697aa59ab5c5343ade651ae503fe920ad9fc5a08f42ed11b77b0bf8064664"
477477
url: "https://pub.dev"
478478
source: hosted
479-
version: "0.7.0+7"
479+
version: "0.13.0-alpha.1"
480480
fwfh_chewie:
481481
dependency: transitive
482482
description:
483483
name: fwfh_chewie
484-
sha256: "0b51a1c976bb74da5e8e45d545c74cb54a7168ad3938dd77103a7aee485f55fa"
484+
sha256: c0dbfe12f04bf54eef8e93718ae5b7f177d477513d7ed670a2d896e2bbb7e5b8
485485
url: "https://pub.dev"
486486
source: hosted
487-
version: "0.7.1+4"
487+
version: "0.13.1-alpha.2"
488488
fwfh_just_audio:
489489
dependency: transitive
490490
description:
491491
name: fwfh_just_audio
492-
sha256: "237b93a4cb9f0495a4b51940f361adda2a5abd57231dd44f07459db00144a6cd"
492+
sha256: "7f3aa6a9a80461cea044f4d19e53175306b761c2f713ddaebdb1d5f81002f9be"
493493
url: "https://pub.dev"
494494
source: hosted
495-
version: "0.9.0+3"
495+
version: "0.13.1-alpha.2"
496496
fwfh_svg:
497497
dependency: transitive
498498
description:
499499
name: fwfh_svg
500-
sha256: "3fd83926b7245d287f133a437ef430befd99d3b00ba8c600f26cc324af281f72"
500+
sha256: a7257a6128fa2853dbb080ba1cf48a9fde3e6091ed493ea95966f9e5bdc7d841
501501
url: "https://pub.dev"
502502
source: hosted
503-
version: "0.8.1"
503+
version: "0.13.1-alpha.2"
504504
fwfh_url_launcher:
505505
dependency: transitive
506506
description:
507507
name: fwfh_url_launcher
508-
sha256: "2a526c9819f74b4106ba2fba4dac79f0082deecd8d2c7011cd0471cb710e3eff"
508+
sha256: "5d30a71e01d9a2eb1f4b971588665d3af00f49b7b7aa307451e3e6d758995729"
509509
url: "https://pub.dev"
510510
source: hosted
511-
version: "0.9.0+4"
511+
version: "0.13.0-alpha.1"
512512
fwfh_webview:
513513
dependency: "direct main"
514514
description:
515515
name: fwfh_webview
516-
sha256: "90a8dda0695403cf57abd7e8b83f6fb1f1a12933930a0bf9cac7cafb06e06a18"
516+
sha256: "16e4d0fd65b28dd04790c355415891543f88f287cf2837d0d4d05ceefd774e8b"
517517
url: "https://pub.dev"
518518
source: hosted
519-
version: "0.9.0+2"
519+
version: "0.13.1-alpha.2"
520520
get_it:
521521
dependency: transitive
522522
description:
@@ -1057,18 +1057,18 @@ packages:
10571057
dependency: "direct main"
10581058
description:
10591059
name: share_plus
1060-
sha256: f86c5acc512b20e074137075824fc29e29b2cf395dcbfcc371e96e3e6290cce1
1060+
sha256: "05ec043470319bfbabe0adbc90d3a84cbff0426b9d9f3a6e2ad3e131fa5fa629"
10611061
url: "https://pub.dev"
10621062
source: hosted
1063-
version: "8.0.0"
1063+
version: "8.0.2"
10641064
share_plus_platform_interface:
10651065
dependency: transitive
10661066
description:
10671067
name: share_plus_platform_interface
1068-
sha256: "357412af4178d8e11d14f41723f80f12caea54cf0d5cd29af9dcdab85d58aea7"
1068+
sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496"
10691069
url: "https://pub.dev"
10701070
source: hosted
1071-
version: "3.3.0"
1071+
version: "3.4.0"
10721072
shared_preferences:
10731073
dependency: "direct main"
10741074
description:
@@ -1496,6 +1496,14 @@ packages:
14961496
url: "https://pub.dev"
14971497
source: hosted
14981498
version: "1.1.0"
1499+
web:
1500+
dependency: transitive
1501+
description:
1502+
name: web
1503+
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
1504+
url: "https://pub.dev"
1505+
source: hosted
1506+
version: "0.5.1"
14991507
web_socket_channel:
15001508
dependency: transitive
15011509
description:
@@ -1524,10 +1532,10 @@ packages:
15241532
dependency: transitive
15251533
description:
15261534
name: webview_flutter_android
1527-
sha256: ddc167c6676f57c8b367d19fcbee267d6dc6adf81bd6c3cb87981d30746e0a6d
1535+
sha256: "9427774649fd3c8b7ff53523051395d13aed2ca355822b822e6493d79f5fc05a"
15281536
url: "https://pub.dev"
15291537
source: hosted
1530-
version: "3.10.1"
1538+
version: "3.10.0"
15311539
webview_flutter_platform_interface:
15321540
dependency: transitive
15331541
description:

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
firebase_messaging: ^14.6.5
1616

1717
# ours
18-
flutter_widget_from_html: ^0.10.6
18+
flutter_widget_from_html: ^0.13.0-alpha.4
1919
fwfh_webview: any
2020
the_api:
2121
path: ./packages/api

0 commit comments

Comments
 (0)