Fix sizing issues (#529)

Author: dnfield

third_party/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## 0.21.0-nullsafety.1
+
+- Fix bug introduced when width and height are both null on the widget.
+- Use more efficient method for XML attribute parsing.
+
 ## 0.21.0-nullsafety.0
 
 - Fix sizing when both width and height are null. This is potentially breaking.

third_party/lib/svg.dart

@@ -766,26 +766,30 @@ class _SvgPictureState extends State<SvgPicture> {
         height = width / viewport.width * viewport.height;
       }
 
-      child = FittedBox(
-        fit: widget.fit,
-        alignment: widget.alignment,
-        clipBehavior: widget.clipBehavior,
-        child: SizedBox.fromSize(
-          size: viewport.size,
-          child: RawPicture(
-            _picture,
-            matchTextDirection: widget.matchTextDirection,
-            allowDrawingOutsideViewBox: widget.allowDrawingOutsideViewBox,
+      if (height == null && width == null) {
+        height = viewport.height;
+        width = viewport.width;
+      }
+      assert(height != null);
+      assert(width != null);
+
+      child = SizedBox(
+        width: width,
+        height: height,
+        child: FittedBox(
+          fit: widget.fit,
+          alignment: widget.alignment,
+          clipBehavior: widget.clipBehavior,
+          child: SizedBox.fromSize(
+            size: viewport.size,
+            child: RawPicture(
+              _picture,
+              matchTextDirection: widget.matchTextDirection,
+              allowDrawingOutsideViewBox: widget.allowDrawingOutsideViewBox,
+            ),
           ),
         ),
       );
-      if (width != null && height != null) {
-        child = SizedBox(
-          width: width,
-          height: height,
-          child: child,
-        );
-      }
 
       if (widget.pictureProvider.colorFilter == null &&
           widget.colorFilter != null) {

third_party/pubspec.yaml

@@ -1,7 +1,7 @@
 name: flutter_svg
 description: An SVG rendering and widget library for Flutter, which allows painting and displaying Scalable Vector Graphics 1.1 files.
 homepage: https://github.com/dnfield/flutter_svg
-version: 0.21.0-nullsafety.0
+version: 0.21.0-nullsafety.1
 
 dependencies:
   flutter: