fix: module gap

zino-hofmann · Aug 27, 2020 · 134ef55 · 134ef55
1 parent b2055e6
commit 134ef55
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [1.1.1] - 27-08-2020.
+
+- Fixed an issue where small lines between modules were visible.
+
 ## [1.1.0+1] - 10-08-2020.
 
 - Fixed the licence path in the readme.

diff --git a/example/README.md b/example/README.md
@@ -2,7 +2,7 @@
 
 ## Default
 
-By default the modules in the QR code will have rounded corners with a radius of `4.0`.
+By default the modules in the QR code will have rounded corners with a radius of `2.0`.
 
 ```dart
 import 'package:flutter/material.dart';

diff --git a/lib/src/rounded_qr.dart b/lib/src/rounded_qr.dart
@@ -49,7 +49,7 @@ class RoundedQR extends StatefulWidget {
     this.errorCorrectLevel = QrErrorCorrectLevel.M,
     this.quietZone = 4,
     this.moduleColor = Colors.black,
-    this.moduleRadius = 4.0,
+    this.moduleRadius = 2.0,
     this.backgroundColor = Colors.white,
     this.backgroundRadius = 8.0,
     this.image,

diff --git a/lib/src/rounded_qr_painter.dart b/lib/src/rounded_qr_painter.dart
@@ -98,15 +98,16 @@ class RoundedQRPainter extends CustomPainter {
     }
 
     var pixelSize = size.width / (_qrCode.moduleCount + 2 * quietZone);
+    var gapFill = pixelSize / 40;
 
     for (var x = 0; x < _qrCode.moduleCount; x++) {
       for (var y = 0; y < _qrCode.moduleCount; y++) {
         if (matrix[y + 1][x + 1]) {
           final squareRect = Rect.fromLTWH(
-            (x + quietZone) * pixelSize,
-            (y + quietZone) * pixelSize,
-            pixelSize,
-            pixelSize,
+            ((x + quietZone) * pixelSize) - gapFill,
+            ((y + quietZone) * pixelSize) - gapFill,
+            pixelSize + (2 * gapFill),
+            pixelSize + (2 * gapFill),
           );
 
           _setShape(
@@ -182,7 +183,7 @@ class RoundedQRPainter extends CustomPainter {
     // bottom right check
     if (matrix[y + 1][x] && matrix[y][x + 1] && matrix[y + 1][x + 1]) {
       final p1 = Offset(
-        heightX + pixelSize - (0.25 * pixelSize),
+        heightX + pixelSize - (moduleRadius / 6 * pixelSize),
         widthY + pixelSize,
       );
       final p2 = Offset(
@@ -191,7 +192,7 @@ class RoundedQRPainter extends CustomPainter {
       );
       final p3 = Offset(
         heightX + pixelSize,
-        widthY + pixelSize - (0.25 * pixelSize),
+        widthY + pixelSize - (moduleRadius / 6 * pixelSize),
       );
 
       _drawCurve(
@@ -207,14 +208,14 @@ class RoundedQRPainter extends CustomPainter {
     if (matrix[y - 1][x] && matrix[y][x - 1] && matrix[y - 1][x - 1]) {
       final p1 = Offset(
         heightX,
-        widthY + (0.25 * pixelSize),
+        widthY + (moduleRadius / 6 * pixelSize),
       );
       final p2 = Offset(
         heightX,
         widthY,
       );
       final p3 = Offset(
-        heightX + (0.25 * pixelSize),
+        heightX + (moduleRadius / 6 * pixelSize),
         widthY,
       );
 
@@ -231,14 +232,14 @@ class RoundedQRPainter extends CustomPainter {
     if (matrix[y + 1][x] && matrix[y][x - 1] && matrix[y + 1][x - 1]) {
       final p1 = Offset(
         heightX,
-        widthY + pixelSize - (0.25 * pixelSize),
+        widthY + pixelSize - (moduleRadius / 6 * pixelSize),
       );
       final p2 = Offset(
         heightX,
         widthY + pixelSize,
       );
       final p3 = Offset(
-        heightX + (0.25 * pixelSize),
+        heightX + (moduleRadius / 6 * pixelSize),
         widthY + pixelSize,
       );
 
@@ -254,7 +255,7 @@ class RoundedQRPainter extends CustomPainter {
     // top right check
     if (matrix[y - 1][x] && matrix[y][x + 1] && matrix[y - 1][x + 1]) {
       final p1 = Offset(
-        heightX + pixelSize - (0.25 * pixelSize),
+        heightX + pixelSize - (moduleRadius / 6 * pixelSize),
         widthY,
       );
       final p2 = Offset(
@@ -263,7 +264,7 @@ class RoundedQRPainter extends CustomPainter {
       );
       final p3 = Offset(
         heightX + pixelSize,
-        widthY + (0.25 * pixelSize),
+        widthY + (moduleRadius / 6 * pixelSize),
       );
 
       _drawCurve(
@@ -299,10 +300,10 @@ class RoundedQRPainter extends CustomPainter {
       canvas.drawRRect(
         RRect.fromRectAndCorners(
           squareRect,
-          bottomRight: Radius.circular(moduleRadius / 2),
-          bottomLeft: Radius.circular(moduleRadius / 2),
-          topLeft: Radius.circular(moduleRadius / 2),
-          topRight: Radius.circular(moduleRadius / 2),
+          bottomRight: Radius.circular(moduleRadius),
+          bottomLeft: Radius.circular(moduleRadius),
+          topLeft: Radius.circular(moduleRadius),
+          topRight: Radius.circular(moduleRadius),
         ),
         paint,
       );
@@ -361,6 +362,7 @@ class RoundedQRPainter extends CustomPainter {
 
     // size of point
     final pixelSize = size.width / (_qrCode.moduleCount + 2 * quietZone);
+    var gapFill = pixelSize / 40;
 
     for (var x = 0; x < _qrCode.moduleCount; x++) {
       for (var y = 0; y < _qrCode.moduleCount; y++) {
@@ -375,10 +377,10 @@ class RoundedQRPainter extends CustomPainter {
         if (_qrCode.isDark(y, x)) {
           canvas.drawRect(
             Rect.fromLTWH(
-              (x + quietZone) * pixelSize,
-              (y + quietZone) * pixelSize,
-              pixelSize,
-              pixelSize,
+              ((x + quietZone) * pixelSize) - gapFill,
+              ((y + quietZone) * pixelSize) - gapFill,
+              pixelSize + (2 * gapFill),
+              pixelSize + (2 * gapFill),
             ),
             _paint,
           );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: rounded_qr
 description: An easy to use package for creating QR codes that can be rounded, and can have an image in the center.
-version: 1.1.0+1
+version: 1.1.1
 homepage: https://github.com/zino-hofmann/rounded-qr-flutter
 
 environment: