Merge pull request #862 from daohoangson/renovate/flutter_svg-2.x

daohoangson · web-flow · commit 58331702b3ab · 2023-02-08T09:18:46.000+07:00
Update dependency flutter_svg to v2
diff --git a/demo_app/ios/Podfile.lock b/demo_app/ios/Podfile.lock
@@ -70,7 +70,7 @@ SPEC CHECKSUMS:
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
+  url_launcher_ios: fb12c43172927bb5cf75aeebd073f883801f1993
   video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
diff --git a/demo_app/pubspec.lock b/demo_app/pubspec.lock
@@ -133,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: coverage
-      sha256: "961c4aebd27917269b1896382c7cb1b1ba81629ba669ba09c27a7e5710ec9040"
+      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.3"
   crypto:
     dependency: transitive
     description:
@@ -215,10 +215,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_svg
-      sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2"
+      sha256: f999d84ad2efda1c4c3956e7968b713b3a24b06f0a0e4798e844e16bbb9bb70b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.6"
+    version: "2.0.0+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -494,14 +494,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.2"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
   path_parsing:
     dependency: transitive
     description:
@@ -799,10 +791,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809"
+      sha256: e8f2efc804810c0f2f5b485f49e7942179f56eabcfe81dce3387fec4bb55876b
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.8"
+    version: "6.1.9"
   url_launcher_android:
     dependency: transitive
     description:
@@ -815,10 +807,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3
+      sha256: "0a5af0aefdd8cf820dd739886efb1637f1f24489900204f50984634c07a54815"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.18"
+    version: "6.1.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -867,6 +859,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.7"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "09562ef5f47aa84f6567495adb6b9cb2a3192b82c352623b8bd00b300d62603b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "886e57742644ebed024dc3ade29712e37eea1b03d294fb314c0a3386243fe5a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "5d9010c4a292766c55395b2288532579a85673f8148460d1e233d98ffe10d24e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   vector_math:
     dependency: transitive
     description:
@@ -1060,5 +1076,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.0 <3.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=2.19.0-0 <3.0.0"
+  flutter: ">=3.7.0-0"
diff --git a/demo_app/test/goldens/SVG.png b/demo_app/test/goldens/SVG.png
diff --git a/packages/enhanced/pubspec.yaml b/packages/enhanced/pubspec.yaml
@@ -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:
@@ -14,7 +14,7 @@ dependencies:
   fwfh_cached_network_image: ^0.7.0+3
   fwfh_chewie: ^0.7.1
   fwfh_just_audio: ^0.9.0
-  fwfh_svg: ^0.7.2+1
+  fwfh_svg: ^0.8.0
   fwfh_url_launcher: ^0.9.0
   fwfh_webview: ">=0.6.2+5 <0.8.0"
   html: ^0.15.0
diff --git a/packages/enhanced/test/mixin_test.dart b/packages/enhanced/test/mixin_test.dart
@@ -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)'
         ']]',
       ),
     );
diff --git a/packages/fwfh_svg/CHANGELOG.md b/packages/fwfh_svg/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0
+
+- Update dependency flutter_svg to v2 #862
+
 ## 0.7.2+1
 
 - Add support for flutter_widget_from_html_core@0.9.0 (#828)
diff --git a/packages/fwfh_svg/README.md b/packages/fwfh_svg/README.md
@@ -14,7 +14,7 @@ Add this to your app's `pubspec.yaml` file:
 ```yaml
 dependencies:
   flutter_widget_from_html_core: any
-  fwfh_svg: ^0.7.2
+  fwfh_svg: ^0.8.0
 ```
 
 ## Usage
diff --git a/packages/fwfh_svg/example/main.dart b/packages/fwfh_svg/example/main.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) {
diff --git a/packages/fwfh_svg/lib/src/internal/platform_specific/fallback.dart b/packages/fwfh_svg/lib/src/internal/platform_specific/fallback.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;
diff --git a/packages/fwfh_svg/lib/src/internal/platform_specific/io.dart b/packages/fwfh_svg/lib/src/internal/platform_specific/io.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));
diff --git a/packages/fwfh_svg/lib/src/svg_factory.dart b/packages/fwfh_svg/lib/src/svg_factory.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,
diff --git a/packages/fwfh_svg/pubspec.yaml b/packages/fwfh_svg/pubspec.yaml
@@ -1,16 +1,16 @@
 name: fwfh_svg
-version: 0.7.2+1
+version: 0.8.0
 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: ">=0.23.0+1 <2.0.0"
+  flutter_svg: ^2.0.0
   flutter_widget_from_html_core: ">=0.8.0 <0.10.0"
 
 dependency_overrides:
diff --git a/packages/fwfh_svg/test/_.dart b/packages/fwfh_svg/test/_.dart
@@ -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;
diff --git a/packages/fwfh_svg/test/svg_factory_test.dart b/packages/fwfh_svg/test/svg_factory_test.dart

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +## 0.8.0
++
 +- Update dependency flutter_svg to v2 #862
++
 ## 0.7.2+1
 - Add support for [email protected] (#828)