Merge pull request #828 from daohoangson/fix/TODO

Fix TODOs

Author: daohoangson

.github/workflows/backward_compatibility.yml

@@ -16,6 +16,7 @@ jobs:
           - enhanced
           - fwfh_cached_network_image
           - fwfh_chewie
+          - fwfh_just_audio
           - fwfh_svg
           - fwfh_url_launcher
           - fwfh_webview

packages/core/lib/src/core_helpers.dart

@@ -1,10 +1,5 @@
 import 'dart:convert';
 
-// TODO: remove import when our minimum Flutter version >=3.3
-// https://github.com/flutter/flutter/pull/105648
-// ignore: unnecessary_import
-import 'dart:typed_data';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:html/dom.dart' as dom;

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

@@ -117,7 +117,7 @@ class AnchorRegistry {
       return completer.complete(false);
     }
 
-    _widgetsBindingInstance?.addPostFrameCallback(
+    WidgetsBinding.instance.addPostFrameCallback(
       (_) => _ensureVisible(
         id,
         completer: completer,
@@ -227,9 +227,6 @@ class AnchorRegistry {
   }
 }
 
-// TODO: remove workaround when our minimum Flutter version >2.12
-WidgetsBinding? get _widgetsBindingInstance => WidgetsBinding.instance;
-
 class _AnchorBodyItemIndex {
   final bool isExact;
   final int min;

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

@@ -44,23 +44,6 @@ class HtmlListMarker extends LeafRenderObjectWidget {
     properties.add(DiagnosticsProperty('textStyle', textStyle));
   }
 
-  @override
-  String toStringShort() {
-    // TODO: bring this into test/_.dart once 0.7.0 reaches stable
-    switch (markerType) {
-      case HtmlListMarkerType.circle:
-        return '[HtmlListMarker.circle]';
-      case HtmlListMarkerType.disc:
-        return '[HtmlListMarker.disc]';
-      case HtmlListMarkerType.disclosureClosed:
-        return '[HtmlListMarker.disclosureClosed]';
-      case HtmlListMarkerType.disclosureOpen:
-        return '[HtmlListMarker.disclosureOpen]';
-      case HtmlListMarkerType.square:
-        return '[HtmlListMarker.square]';
-    }
-  }
-
   @override
   void updateRenderObject(BuildContext _, RenderObject renderObject) {
     (renderObject as _ListMarkerRenderObject)

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

@@ -192,9 +192,6 @@ class HtmlTableValignBaseline extends SingleChildRenderObjectWidget {
   }
 }
 
-// TODO: remove workaround when our minimum Flutter version >2.12
-WidgetsBinding? get _widgetsBindingInstance => WidgetsBinding.instance;
-
 extension _IterableDouble on Iterable<double> {
   double get sum => isEmpty ? 0.0 : reduce(_sum);
 
@@ -591,8 +588,8 @@ class _ValignBaselineRenderObject extends RenderProxyBox {
           // skip painting this frame, wait for the correct padding
           _paddingTop += offsetY;
           _baselineWithOffset = rowBaseline;
-          _widgetsBindingInstance
-              ?.addPostFrameCallback((_) => markNeedsLayout());
+          WidgetsBinding.instance
+              .addPostFrameCallback((_) => markNeedsLayout());
           return;
         }
       } else if (rowBaseline < baselineWithOffset) {
@@ -605,8 +602,8 @@ class _ValignBaselineRenderObject extends RenderProxyBox {
           if (offsetY != 0.0) {
             sibling._paddingTop += offsetY;
             sibling._baselineWithOffset = baselineWithOffset;
-            _widgetsBindingInstance
-                ?.addPostFrameCallback((_) => sibling.markNeedsLayout());
+            WidgetsBinding.instance
+                .addPostFrameCallback((_) => sibling.markNeedsLayout());
           }
         }
       }

packages/core/test/_.dart

@@ -13,8 +13,7 @@ const kColorPrimary = Color(0xFF123456);
 const kDataBase64 = 'R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
 const kDataUri = 'data:image/gif;base64,$kDataBase64';
 
-// TODO: switch to GlobalKey<HtmlWidgetState> when backward compatibility allows
-final hwKey = GlobalKey<State<HtmlWidget>>();
+final hwKey = GlobalKey<HtmlWidgetState>();
 
 Widget? buildCurrentState({GlobalKey? key}) {
   final hws = (key ?? hwKey).currentState;
@@ -336,6 +335,21 @@ class Explainer {
           '${e.bottom.truncate()},${e.left.truncate()})'
       : e.toString();
 
+  String _htmlListMarker(HtmlListMarker marker) {
+    switch (marker.markerType) {
+      case HtmlListMarkerType.circle:
+        return '[HtmlListMarker.circle]';
+      case HtmlListMarkerType.disc:
+        return '[HtmlListMarker.disc]';
+      case HtmlListMarkerType.disclosureClosed:
+        return '[HtmlListMarker.disclosureClosed]';
+      case HtmlListMarkerType.disclosureOpen:
+        return '[HtmlListMarker.disclosureOpen]';
+      case HtmlListMarkerType.square:
+        return '[HtmlListMarker.square]';
+    }
+  }
+
   String _image(Image image) {
     final buffer = StringBuffer();
 
@@ -553,8 +567,8 @@ class Explainer {
       return '[widget0]';
     }
 
-    if (widget.runtimeType.toString() == 'HtmlListMarker') {
-      return widget.toStringShort();
+    if (widget is HtmlListMarker) {
+      return _htmlListMarker(widget);
     }
 
     if (widget is TshWidget) {

packages/core/test/anchor_test.dart

@@ -373,11 +373,10 @@ Future<void> pumpWidget(WidgetTester tester, Widget child) async {
   tester.binding.window.devicePixelRatioTestValue = 1.0;
   addTearDown(tester.binding.window.clearDevicePixelRatioTestValue);
 
-  // TODO: remove lint ignore when our minimum Flutter version >2.11
-  // ignore: deprecated_member_use
-  tester.binding.window.textScaleFactorTestValue = 1.0;
-  // ignore: deprecated_member_use
-  addTearDown(tester.binding.window.clearTextScaleFactorTestValue);
+  tester.binding.window.platformDispatcher.textScaleFactorTestValue = 1.0;
+  addTearDown(
+    tester.binding.window.platformDispatcher.clearTextScaleFactorTestValue,
+  );
 
   await tester.pumpWidget(MaterialApp(home: child));
   await tester.pump();

packages/core/test/core_test.dart

@@ -1275,11 +1275,11 @@ Future<void> main() async {
 
     group('textScaleFactor=2', () {
       Future<String> explain2x(WidgetTester tester, String html) async {
-        // TODO: remove lint ignore when our minimum Flutter version >2.11
-        // ignore: deprecated_member_use
-        tester.binding.window.textScaleFactorTestValue = 2;
-        // ignore: deprecated_member_use
-        addTearDown(tester.binding.window.clearTextScaleFactorTestValue);
+        tester.binding.window.platformDispatcher.textScaleFactorTestValue = 2;
+        addTearDown(
+          tester
+              .binding.window.platformDispatcher.clearTextScaleFactorTestValue,
+        );
 
         final explained = await explain(tester, html);
         return explained;

packages/fwfh_cached_network_image/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_cache_manager: ^3.0.0
-  flutter_widget_from_html_core: ">=0.7.0 <0.9.0"
+  flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
 
 dependency_overrides:
   flutter_widget_from_html_core:

packages/fwfh_chewie/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   chewie: ^1.0.0
   flutter:
     sdk: flutter
-  flutter_widget_from_html_core: ">=0.7.0 <0.9.0"
+  flutter_widget_from_html_core: ">=0.8.0 <0.9.0"
   video_player: ^2.2.9
 
 dependency_overrides: