Fix conflict

Author: daohoangson

demo_app/test/goldens/SVG.png

@@ -4,8 +4,8 @@ description: Flutter package to render html as widgets that supports hyperlink,
 homepage: https://github.com/daohoangson/flutter_widget_from_html
 
 environment:
-  flutter: ">=3.3.0"
-  sdk: ">=2.18.0 <3.0.0"
+  flutter: ">=3.7.0"
+  sdk: ">=2.19.0 <3.0.0"
 
 dependencies:
   flutter:

packages/enhanced/pubspec.yaml

@@ -16,14 +16,10 @@ void main() {
   <circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
   SVG support is not enabled.
 </svg>''';
-    final e = await explain(tester, html);
-    final explained = e.replaceAll(RegExp('String#[0-9a-f]+,'), 'String,');
+    final explained = await explain(tester, html);
     expect(
       explained,
-      equals(
-        '[SvgPicture:pictureProvider='
-        'StringPicture(String, colorFilter: null)]',
-      ),
+      equals('[SvgPicture:bytesLoader=SvgStringLoader]'),
     );
   });
 
@@ -37,8 +33,7 @@ void main() {
       equals(
         '[CssSizing:$sizingConstraints,child='
         '[SvgPicture:'
-        'pictureProvider=ExactAssetPicture(name: "$assetName", '
-        'bundle: null, colorFilter: null)'
+        'bytesLoader=SvgAssetLoader(assetName: $assetName, packageName: null)'
         ']]',
       ),
     );

packages/enhanced/test/mixin_test.dart

@@ -5,7 +5,7 @@ import 'package:fwfh_svg/fwfh_svg.dart';
 void main() => runApp(const MyApp());
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

packages/fwfh_svg/example/main.dart

@@ -1,9 +1,3 @@
-import 'dart:typed_data';
-
 import 'package:flutter_svg/flutter_svg.dart';
 
-PictureProvider? filePicture(
-  PictureInfoDecoderBuilder<Uint8List> decoderBuilder,
-  String path,
-) =>
-    null;
+BytesLoader? fileLoader(String path) => null;

packages/fwfh_svg/lib/src/internal/platform_specific/fallback.dart

@@ -1,10 +1,5 @@
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:flutter_svg/flutter_svg.dart';
 
-PictureProvider? filePicture(
-  PictureInfoDecoderBuilder<Uint8List> decoderBuilder,
-  String path,
-) =>
-    FilePicture(decoderBuilder, File(path));
+BytesLoader? fileLoader(String path) => SvgFileLoader(File(path));

packages/fwfh_svg/lib/src/internal/platform_specific/io.dart

@@ -20,85 +20,67 @@ mixin SvgFactory on WidgetFactory {
   Widget? buildImageWidget(BuildMetadata meta, ImageSource src) {
     final url = src.url;
 
-    PictureProvider? provider;
+    BytesLoader? bytesLoader;
     if (url.startsWith('data:image/svg+xml')) {
-      provider = imageSvgFromDataUri(url);
+      bytesLoader = imageSvgFromDataUri(url);
     } else if (Uri.tryParse(url)?.path.toLowerCase().endsWith('.svg') == true) {
       if (url.startsWith('asset:')) {
-        provider = imageSvgFromAsset(url);
+        bytesLoader = imageSvgFromAsset(url);
       } else if (url.startsWith('file:')) {
-        provider = imageSvgFromFileUri(url);
+        bytesLoader = imageSvgFromFileUri(url);
       } else {
-        provider = imageSvgFromNetwork(url);
+        bytesLoader = imageSvgFromNetwork(url);
       }
     }
 
-    if (provider == null) {
+    if (bytesLoader == null) {
       return super.buildImageWidget(meta, src);
     }
 
-    return _buildSvgPicture(meta, src, provider);
+    return _buildSvgPicture(meta, src, bytesLoader);
   }
 
-  /// Returns an [ExactAssetPicture].
-  PictureProvider? imageSvgFromAsset(String url) {
+  /// Returns an [SvgAssetLoader].
+  BytesLoader? imageSvgFromAsset(String url) {
     final uri = Uri.parse(url);
     final assetName = uri.path;
     if (assetName.isEmpty) {
       return null;
     }
 
-    return ExactAssetPicture(
-      svgAllowDrawingOutsideViewBox
-          ? SvgPicture.svgStringDecoderOutsideViewBoxBuilder
-          : SvgPicture.svgStringDecoderBuilder,
+    return SvgAssetLoader(
       assetName,
-      package: uri.queryParameters['package'],
+      packageName: uri.queryParameters['package'],
     );
   }
 
-  /// Returns a [MemoryPicture].
-  PictureProvider? imageSvgFromDataUri(String dataUri) {
+  /// Returns a [SvgBytesLoader].
+  BytesLoader? imageSvgFromDataUri(String dataUri) {
     final bytes = bytesFromDataUri(dataUri);
     if (bytes == null) {
       return null;
     }
 
-    return MemoryPicture(
-      svgAllowDrawingOutsideViewBox
-          ? SvgPicture.svgByteDecoderOutsideViewBoxBuilder
-          : SvgPicture.svgByteDecoderBuilder,
-      bytes,
-    );
+    return SvgBytesLoader(bytes);
   }
 
-  /// Returns a [FilePicture].
-  PictureProvider? imageSvgFromFileUri(String url) {
+  /// Returns a [SvgFileLoader].
+  BytesLoader? imageSvgFromFileUri(String url) {
     final filePath = Uri.parse(url).toFilePath();
     if (filePath.isEmpty) {
       return null;
     }
 
-    return filePicture(
-      svgAllowDrawingOutsideViewBox
-          ? SvgPicture.svgByteDecoderOutsideViewBoxBuilder
-          : SvgPicture.svgByteDecoderBuilder,
-      filePath,
-    );
+    return fileLoader(filePath);
   }
 
-  /// Returns a [NetworkPicture].
-  PictureProvider? imageSvgFromNetwork(String url) {
+  /// Returns a [SvgNetworkLoader].
+  BytesLoader? imageSvgFromNetwork(String url) {
     if (url.isEmpty) {
       return null;
     }
 
-    return NetworkPicture(
-      svgAllowDrawingOutsideViewBox
-          ? SvgPicture.svgByteDecoderOutsideViewBoxBuilder
-          : SvgPicture.svgByteDecoderBuilder,
-      url,
-    );
+    return SvgNetworkLoader(url);
   }
 
   @override
@@ -107,13 +89,8 @@ mixin SvgFactory on WidgetFactory {
       case 'svg':
         _tagSvg ??= BuildOp(
           onWidgets: (meta, widgets) {
-            final provider = StringPicture(
-              svgAllowDrawingOutsideViewBox
-                  ? SvgPicture.svgStringDecoderOutsideViewBoxBuilder
-                  : SvgPicture.svgStringDecoderBuilder,
-              meta.element.outerHtml,
-            );
-            return [_buildSvgPicture(meta, const ImageSource(''), provider)];
+            final bytesLoader = SvgStringLoader(meta.element.outerHtml);
+            return [_buildSvgPicture(meta, const ImageSource(''), bytesLoader)];
           },
         );
         meta.register(_tagSvg!);
@@ -126,13 +103,13 @@ mixin SvgFactory on WidgetFactory {
   Widget _buildSvgPicture(
     BuildMetadata meta,
     ImageSource src,
-    PictureProvider provider,
+    BytesLoader bytesLoader,
   ) {
     final image = src.image;
     final semanticLabel = image?.alt ?? image?.title;
 
     return SvgPicture(
-      provider,
+      bytesLoader,
       allowDrawingOutsideViewBox: svgAllowDrawingOutsideViewBox,
       excludeFromSemantics: semanticLabel == null,
       fit: BoxFit.fill,

packages/fwfh_svg/lib/src/svg_factory.dart

@@ -4,13 +4,13 @@ description: WidgetFactory extension to render SVG with flutter_svg plugin.
 homepage: https://github.com/daohoangson/flutter_widget_from_html
 
 environment:
-  flutter: ">=2.5.0"
-  sdk: ">=2.14.0 <3.0.0"
+  flutter: ">=3.7.0"
+  sdk: ">=2.19.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_svg: "<3.0.0"
+  flutter_svg: ^2.0.0
   flutter_widget_from_html_core: ">=0.8.0 <0.10.0"
 
 dependency_overrides:

packages/fwfh_svg/pubspec.yaml

@@ -8,7 +8,16 @@ import '../../core/test/_.dart' as helper;
 
 String? svgExplainer(helper.Explainer parent, Widget widget) {
   if (widget is SvgPicture) {
-    return '[SvgPicture:pictureProvider=${widget.pictureProvider}]';
+    final bytesLoader = widget.bytesLoader;
+    var bytesLoaderString = bytesLoader.runtimeType.toString();
+    if (bytesLoader is SvgAssetLoader) {
+      bytesLoaderString = 'SvgAssetLoader(assetName: ${bytesLoader.assetName}, '
+          'packageName: ${bytesLoader.packageName})';
+    } else if (bytesLoader is SvgFileLoader) {
+      bytesLoaderString = 'SvgFileLoader(${bytesLoader.file.path})';
+    }
+
+    return '[SvgPicture:bytesLoader=$bytesLoaderString]';
   }
 
   return null;

packages/fwfh_svg/test/_.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_widget_from_html_core/flutter_widget_from_html_core.dart';
 import 'package:fwfh_svg/fwfh_svg.dart';
@@ -36,9 +35,7 @@ Future<void> main() async {
     final explained = await helper.explain(tester, html);
     expect(
       explained.replaceAll(RegExp('String#[^,]+,'), 'String,'),
-      equals(
-        '[SvgPicture:pictureProvider=StringPicture(String, colorFilter: null)]',
-      ),
+      equals('[SvgPicture:bytesLoader=SvgStringLoader]'),
     );
   });
 
@@ -52,8 +49,7 @@ Future<void> main() async {
         equals(
           '[CssSizing:$sizingConstraints,child='
           '[SvgPicture:'
-          'pictureProvider=ExactAssetPicture(name: "$assetName", '
-          'bundle: null, colorFilter: null)'
+          'bytesLoader=SvgAssetLoader(assetName: test/images/logo.svg, packageName: null)'
           ']]',
         ),
       );
@@ -68,7 +64,7 @@ Future<void> main() async {
         equals(
           '[CssSizing:$sizingConstraints,child='
           '[SvgPicture:'
-          'pictureProvider=FilePicture("$filePath", colorFilter: null)'
+          'bytesLoader=SvgFileLoader($filePath)'
           ']]',
         ),
       );
@@ -93,7 +89,7 @@ Future<void> main() async {
           explained,
           equals(
             '[CssSizing:$sizingConstraints,child='
-            '[SvgPicture:pictureProvider=MemoryPicture(bytes)]'
+            '[SvgPicture:bytesLoader=SvgBytesLoader]'
             ']',
           ),
         );
@@ -107,15 +103,15 @@ Future<void> main() async {
           explained,
           equals(
             '[CssSizing:$sizingConstraints,child='
-            '[SvgPicture:pictureProvider=MemoryPicture(bytes)]'
+            '[SvgPicture:bytesLoader=SvgBytesLoader]'
             ']',
           ),
         );
       });
     });
 
     group('network picture', () {
-      const expectedPicture = '└RawPicture';
+      const expectedPicture = '└_RawPictureVectorGraphicWidget';
 
       testWidgets('renders picture', (WidgetTester tester) async {
         const src = 'http://domain.com/loading.svg';
@@ -208,7 +204,6 @@ Future<void> main() async {
         () {
           setUp(() {
             WidgetFactory.debugDeterministicLoadingWidget = true;
-            PictureProvider.cache.clear();
           });
           tearDown(
             () => WidgetFactory.debugDeterministicLoadingWidget = false,
@@ -293,8 +288,7 @@ class _Golden extends StatelessWidget {
   const _Golden(
     this.contents, {
     required this.allowDrawingOutsideViewBox,
-    Key? key,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext _) => Scaffold(