Skip to content

Commit 8ee6dce

Browse files
committed
Bump core>=0.8 at the minimum
1 parent 0e4b38e commit 8ee6dce

File tree

9 files changed

+27
-29
lines changed

9 files changed

+27
-29
lines changed

.github/workflows/backward_compatibility.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- enhanced
1717
- fwfh_cached_network_image
1818
- fwfh_chewie
19+
- fwfh_just_audio
1920
- fwfh_svg
2021
- fwfh_url_launcher
2122
- fwfh_webview

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,6 @@ class HtmlListMarker extends LeafRenderObjectWidget {
4444
properties.add(DiagnosticsProperty('textStyle', textStyle));
4545
}
4646

47-
@override
48-
String toStringShort() {
49-
// TODO: bring this into test/_.dart once 0.7.0 reaches stable
50-
switch (markerType) {
51-
case HtmlListMarkerType.circle:
52-
return '[HtmlListMarker.circle]';
53-
case HtmlListMarkerType.disc:
54-
return '[HtmlListMarker.disc]';
55-
case HtmlListMarkerType.disclosureClosed:
56-
return '[HtmlListMarker.disclosureClosed]';
57-
case HtmlListMarkerType.disclosureOpen:
58-
return '[HtmlListMarker.disclosureOpen]';
59-
case HtmlListMarkerType.square:
60-
return '[HtmlListMarker.square]';
61-
}
62-
}
63-
6447
@override
6548
void updateRenderObject(BuildContext _, RenderObject renderObject) {
6649
(renderObject as _ListMarkerRenderObject)

packages/core/test/_.dart

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ const kColorPrimary = Color(0xFF123456);
1313
const kDataBase64 = 'R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
1414
const kDataUri = 'data:image/gif;base64,$kDataBase64';
1515

16-
// TODO: switch to GlobalKey<HtmlWidgetState> when backward compatibility allows
17-
final hwKey = GlobalKey<State<HtmlWidget>>();
16+
final hwKey = GlobalKey<HtmlWidgetState>();
1817

1918
Widget? buildCurrentState({GlobalKey? key}) {
2019
final hws = (key ?? hwKey).currentState;
@@ -336,6 +335,21 @@ class Explainer {
336335
'${e.bottom.truncate()},${e.left.truncate()})'
337336
: e.toString();
338337

338+
String _htmlListMarker(HtmlListMarker marker) {
339+
switch (marker.markerType) {
340+
case HtmlListMarkerType.circle:
341+
return '[HtmlListMarker.circle]';
342+
case HtmlListMarkerType.disc:
343+
return '[HtmlListMarker.disc]';
344+
case HtmlListMarkerType.disclosureClosed:
345+
return '[HtmlListMarker.disclosureClosed]';
346+
case HtmlListMarkerType.disclosureOpen:
347+
return '[HtmlListMarker.disclosureOpen]';
348+
case HtmlListMarkerType.square:
349+
return '[HtmlListMarker.square]';
350+
}
351+
}
352+
339353
String _image(Image image) {
340354
final buffer = StringBuffer();
341355

@@ -553,8 +567,8 @@ class Explainer {
553567
return '[widget0]';
554568
}
555569

556-
if (widget.runtimeType.toString() == 'HtmlListMarker') {
557-
return widget.toStringShort();
570+
if (widget is HtmlListMarker) {
571+
return _htmlListMarker(widget);
558572
}
559573

560574
if (widget is TshWidget) {

packages/fwfh_cached_network_image/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
flutter:
1313
sdk: flutter
1414
flutter_cache_manager: ^3.0.0
15-
flutter_widget_from_html_core: ">=0.7.0 <0.9.0"
15+
flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
1616

1717
dependency_overrides:
1818
flutter_widget_from_html_core:

packages/fwfh_chewie/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
chewie: ^1.0.0
1212
flutter:
1313
sdk: flutter
14-
flutter_widget_from_html_core: ">=0.7.0 <0.9.0"
14+
flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
1515
video_player: ^2.2.9
1616

1717
dependency_overrides:

packages/fwfh_just_audio/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ description: WidgetFactory extension to render AUDIO with the just_audio plugin.
44
homepage: https://github.com/daohoangson/flutter_widget_from_html
55

66
environment:
7-
flutter: ">=2.0.0"
7+
flutter: ">=2.2.0"
88
sdk: ">=2.12.0 <3.0.0"
99

1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
flutter_widget_from_html_core: ">=0.6.0 <0.9.0"
13+
flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
1414
just_audio: ">=0.7.0 <0.10.0"
1515

1616
dependency_overrides:

packages/fwfh_svg/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
flutter:
1212
sdk: flutter
1313
flutter_svg: ">=0.23.0+1 <2.0.0"
14-
flutter_widget_from_html_core: ">=0.7.0 <0.9.0"
14+
flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
1515

1616
dependency_overrides:
1717
flutter_widget_from_html_core:

packages/fwfh_url_launcher/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ description: WidgetFactory extension to launch A tag via url_launcher plugin.
44
homepage: https://github.com/daohoangson/flutter_widget_from_html
55

66
environment:
7-
flutter: ">=2.0.0"
7+
flutter: ">=2.2.0"
88
sdk: ">=2.12.0 <3.0.0"
99

1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
flutter_widget_from_html_core: ">=0.6.1 <0.9.0"
13+
flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
1414
url_launcher: ^6.0.0
1515

1616
dependency_overrides:

packages/fwfh_webview/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
flutter_widget_from_html_core: ">=0.6.1 <0.9.0"
13+
flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
1414
webview_flutter: ">=2.2.0 <4.0.0"
1515

1616
dependency_overrides:

0 commit comments

Comments
 (0)