Use the Barcode library to generate QR-Codes

 # Changelog
 # Changelog
 
 
+## 1.6.2
+
+- Use the Barcode library to generate QR-Codes
+
 ## 1.6.1
 ## 1.6.1
 
 
 - Fix Image width and height attributes
 - Fix Image width and height attributes

@@ -23,9 +23,10 @@ import 'dart:typed_data';
 import 'package:barcode/barcode.dart';
 import 'package:barcode/barcode.dart';
 import 'package:meta/meta.dart';
 import 'package:meta/meta.dart';
 import 'package:pdf/pdf.dart';
 import 'package:pdf/pdf.dart';
-import 'package:qr/qr.dart';
 import 'package:vector_math/vector_math_64.dart';
 import 'package:vector_math/vector_math_64.dart';
 
 
+export 'package:barcode/barcode.dart';
+
 part 'widgets/annotations.dart';
 part 'widgets/annotations.dart';
 part 'widgets/barcode.dart';
 part 'widgets/barcode.dart';
 part 'widgets/basic.dart';
 part 'widgets/basic.dart';

@@ -20,98 +20,12 @@ part of widget;
 
 
 typedef QrError = void Function(dynamic error);
 typedef QrError = void Function(dynamic error);
 
 
-class _QrCodeWidget extends Widget {
-  _QrCodeWidget({
-    @required String data,
-    this.version,
-    this.errorCorrectionLevel,
-    this.color,
-    this.onError,
-    this.gapless = false,
-  })  : assert(data != null),
-        _qr = version == null
-            ? QrCode.fromData(
-                data: data,
-                errorCorrectLevel: errorCorrectionLevel,
-              )
-            : QrCode(
-                version,
-                errorCorrectionLevel,
-              ) {
-    // configure and make the QR code data
-    try {
-      if (version != null) {
-        _qr.addData(data);
-      }
-      _qr.make();
-    } catch (ex) {
-      if (onError != null) {
-        _hasError = true;
-        onError(ex);
-      }
-    }
-  }
-
-  @override
-  void layout(Context context, BoxConstraints constraints,
-      {bool parentUsesSize = false}) {
-    box = PdfRect.fromPoints(PdfPoint.zero, constraints.biggest);
-  }
-
-  /// the qr code version
-  final int version;
-
-  /// the qr code error correction level
-  final int errorCorrectionLevel;
-
-  /// the color of the dark squares
-  final PdfColor color;
-
-  final QrError onError;
-
-  final bool gapless;
-
-  // our qr code data
-  final QrCode _qr;
-
-  bool _hasError = false;
-
-  @override
-  void paint(Context context) {
-    super.paint(context);
-
-    if (_hasError) {
-      return;
-    }
-
-    final double shortestSide = box.width < box.height ? box.width : box.height;
-    assert(shortestSide > 0);
-
-    context.canvas.setFillColor(color);
-    final double squareSize = shortestSide / _qr.moduleCount.toDouble();
-    final int pxAdjustValue = gapless ? 1 : 0;
-    for (int x = 0; x < _qr.moduleCount; x++) {
-      for (int y = 0; y < _qr.moduleCount; y++) {
-        if (_qr.isDark(y, x)) {
-          context.canvas.drawRect(
-            box.left + x * squareSize,
-            box.top - (y + 1) * squareSize,
-            squareSize + pxAdjustValue,
-            squareSize + pxAdjustValue,
-          );
-        }
-      }
-    }
-
-    context.canvas.fillPath();
-  }
-}
-
+@Deprecated('Use BarcodeWidget instead')
 class QrCodeWidget extends StatelessWidget {
 class QrCodeWidget extends StatelessWidget {
   QrCodeWidget({
   QrCodeWidget({
     @required this.data,
     @required this.data,
     this.version,
     this.version,
-    this.errorCorrectionLevel = QrErrorCorrectLevel.L,
+    this.errorCorrectionLevel = BarcodeQRCorrectionLevel.low,
     this.color = PdfColors.black,
     this.color = PdfColors.black,
     this.backgroundColor,
     this.backgroundColor,
     this.decoration,
     this.decoration,
@@ -129,7 +43,7 @@ class QrCodeWidget extends StatelessWidget {
   final int version;
   final int version;
 
 
   /// the qr code error correction level
   /// the qr code error correction level
-  final int errorCorrectionLevel;
+  final BarcodeQRCorrectionLevel errorCorrectionLevel;
 
 
   /// the color of the dark squares
   /// the color of the dark squares
   final PdfColor color;
   final PdfColor color;
@@ -150,41 +64,19 @@ class QrCodeWidget extends StatelessWidget {
 
 
   @override
   @override
   Widget build(Context context) {
   Widget build(Context context) {
-    Widget qrcode = AspectRatio(
-        aspectRatio: 1.0,
-        child: _QrCodeWidget(
+    return BarcodeWidget(
+      barcode: Barcode.qrCode(
+        typeNumber: version,
+        errorCorrectLevel: errorCorrectionLevel,
+      ),
       data: data,
       data: data,
-          version: version,
-          errorCorrectionLevel: errorCorrectionLevel,
+      backgroundColor: backgroundColor,
       color: color,
       color: color,
-          onError: onError,
-          gapless: gapless,
-        ));
-
-    if (padding != null) {
-      qrcode = Padding(padding: padding, child: qrcode);
-    }
-
-    if (decoration != null) {
-      qrcode = DecoratedBox(
       decoration: decoration,
       decoration: decoration,
-        child: qrcode,
-      );
-    } else if (backgroundColor != null) {
-      qrcode = DecoratedBox(
-        decoration: BoxDecoration(color: backgroundColor),
-        child: qrcode,
+      width: size,
+      height: size,
+      margin: margin,
+      padding: padding,
     );
     );
   }
   }
-
-    if (size != null) {
-      qrcode = SizedBox(width: size, height: size, child: qrcode);
-    }
-
-    if (margin != null) {
-      qrcode = Padding(padding: margin, child: qrcode);
-    }
-
-    return qrcode;
-  }
 }
 }

@@ -4,7 +4,7 @@ description: A pdf producer for Dart. It can create pdf files for both web or fl
 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf
 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf
 repository: https://github.com/DavBfr/dart_pdf
 repository: https://github.com/DavBfr/dart_pdf
 issue_tracker: https://github.com/DavBfr/dart_pdf/issues
 issue_tracker: https://github.com/DavBfr/dart_pdf/issues
-version: 1.6.1
+version: 1.6.2
 
 
 environment:
 environment:
   sdk: ">=2.3.0 <3.0.0"
   sdk: ">=2.3.0 <3.0.0"
@@ -15,8 +15,7 @@ dependencies:
   utf: ^0.9.0
   utf: ^0.9.0
   crypto: ^2.0.6
   crypto: ^2.0.6
   archive: ^2.0.10
   archive: ^2.0.10
-  qr: ^1.2.0
-  barcode: ^1.5.0
+  barcode: ^1.7.0
   image: ^2.1.4
   image: ^2.1.4
 
 
 dev_dependencies:
 dev_dependencies:

@@ -18,14 +18,17 @@
 
 
 import 'dart:io';
 import 'dart:io';
 
 
-import 'package:barcode/barcode.dart';
-import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart';
 import 'package:pdf/widgets.dart';
 import 'package:test/test.dart';
 import 'package:test/test.dart';
 
 
 Document pdf;
 Document pdf;
 
 
-Widget barcode(Barcode barcode, String data, {double width = 200}) {
+Widget barcode(
+  Barcode barcode,
+  String data, {
+  double width = 200,
+  double height = 80,
+}) {
   return Row(
   return Row(
     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
     children: <Widget>[
     children: <Widget>[
@@ -42,7 +45,7 @@ Widget barcode(Barcode barcode, String data, {double width = 200}) {
             barcode: barcode,
             barcode: barcode,
             data: data,
             data: data,
             width: width,
             width: width,
-            height: 80,
+            height: height,
             margin: const EdgeInsets.symmetric(vertical: 20),
             margin: const EdgeInsets.symmetric(vertical: 20),
           ),
           ),
         ),
         ),
@@ -72,34 +75,13 @@ void main() {
           barcode(Barcode.ean2(), '44', width: 40),
           barcode(Barcode.ean2(), '44', width: 40),
           barcode(Barcode.ean5(), '30897', width: 60),
           barcode(Barcode.ean5(), '30897', width: 60),
           barcode(Barcode.itf14(), '2578639587234'),
           barcode(Barcode.itf14(), '2578639587234'),
+          barcode(Barcode.telepen(), 'Telepen'),
+          barcode(Barcode.qrCode(), 'QR-Code!', width: 120, height: 120),
         ],
         ],
       ),
       ),
     );
     );
   });
   });
 
 
-  test('QrCode Widgets', () {
-    pdf.addPage(
-      Page(
-        build: (Context context) => QrCodeWidget(
-          data: 'HELLO 123',
-          size: 200,
-          padding: const EdgeInsets.all(20),
-          margin: const EdgeInsets.all(20),
-          decoration: const BoxDecoration(
-              borderRadius: 20,
-              color: PdfColors.white,
-              border: BoxBorder(
-                color: PdfColors.blue,
-                top: true,
-                bottom: true,
-                left: true,
-                right: true,
-              )),
-        ),
-      ),
-    );
-  });
-
   tearDownAll(() {
   tearDownAll(() {
     final File file = File('widgets-barcode.pdf');
     final File file = File('widgets-barcode.pdf');
     file.writeAsBytesSync(pdf.save());
     file.writeAsBytesSync(pdf.save());

@@ -100,7 +100,12 @@ Future<pw.Document> generateDocument(PdfPageFormat format) async {
             Percent(size: 60, value: .7, title: pw.Text('Word')),
             Percent(size: 60, value: .7, title: pw.Text('Word')),
             Percent(size: 60, value: .4, title: pw.Text('Excel')),
             Percent(size: 60, value: .4, title: pw.Text('Excel')),
           ]),
           ]),
-          pw.QrCodeWidget(data: 'Parnella Charlesbois', size: 60),
+          pw.BarcodeWidget(
+            data: 'Parnella Charlesbois',
+            width: 60,
+            height: 60,
+            barcode: pw.Barcode.qrCode(),
+          ),
         ],
         ],
       )
       )
     ]),
     ]),