Cleanup

Author: jowlo

src/misc/QrCodeUtils.js

@@ -2,15 +2,15 @@
 import qrcode from "../../libs/qrcode"
 
 export type qrCodeOptions = {
-	padding: number, //options.padding || 4,
-	width: number, //options.width || 256,
-	height: number, //options.height || 256,
-	typeNumber: number, //options.typeNumber || 0, // Use 0 for auto detect depending on input data length (size)
-	color: string, //options.color || "#fff",
-	background: string, //options.background || "#000",
-	ecl: string,// options.ecl || "M",
-	container: string, //options.container || "svg",
-	content: string, //options.content
+	padding: number,
+	width: number,
+	height: number,
+	typeNumber: number, // Use 0 for auto detect depending on input data length (size)
+	fill: string,
+	background: string,
+	ecl: string,
+	container: string,
+	content: string,
 };
 
 /** Generates QR Code as SVG image */
@@ -28,78 +28,12 @@ export function getQRCodeSvg(options: qrCodeOptions): string {
 	var qrcodeGenerator = qrcode(options.typeNumber, options.ecl)
 	qrcodeGenerator.addData(content)
 	qrcodeGenerator.make()
-	return qrcodeGenerator.createSvgTag()
-
-	// var modules = qrcodeGenerator.modules
-	//
-	// var width = options.width
-	// var height = options.height
-	// var length = modules.length;
-	// var xsize = width / (length + 2 * options.padding);
-	// var ysize = height / (length + 2 * options.padding);
-	//
-	// //Background rectangle
-	// var bgrect = '<rect x="0" y="0" width="' + width + '" height="' + height + '" style="fill:' + options.background
-	// 	+ ';shape-rendering:optimizeSpeed;"></rect>';
-	//
-	// //Rectangles representing modules
-	// var modrect = '';
-	// var pathdata = '';
-	//
-	// for (var y = 0; y < length; y++) {
-	// 	for (var x = 0; x < length; x++) {
-	// 		var module = modules[x][y];
-	// 		if (module) {
-	//
-	// 			var px = (x * xsize + options.padding * xsize);
-	// 			var py = (y * ysize + options.padding * ysize);
-	//
-	// 			//Module as a part of svg path data, thanks to @danioso
-	// 			var w = xsize + px
-	// 			var h = ysize + py
-	//
-	// 			px = (Number.isInteger(px)) ? Number(px) : px.toFixed(2);
-	// 			py = (Number.isInteger(py)) ? Number(py) : py.toFixed(2);
-	// 			w = (Number.isInteger(w)) ? Number(w) : w.toFixed(2);
-	// 			h = (Number.isInteger(h)) ? Number(h) : h.toFixed(2);
-	//
-	// 			pathdata += ('M' + px + ',' + py + ' V' + h + ' H' + w + ' V' + py + ' H' + px + ' Z ');
-	// 		}
-	// 	}
-	// }
-	//
-	//
-	// modrect = '<path x="0" y="0" style="fill:' + options.color + ';shape-rendering:optimizeSpeed;" d="' + pathdata + '" />';
-	//
-	// var svg = "";
-	// switch (options.container) {
-	// 	//Wrapped in SVG document
-	// 	case "svg":
-	// 		svg += '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="' + width + '" height="' + height + '">';
-	// 		svg += bgrect + modrect;
-	// 		svg += '</svg>';
-	// 		break;
-	//
-	// 	//Viewbox for responsive use in a browser, thanks to @danioso
-	// 	case "svg-viewbox":
-	// 		svg += '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 ' + width + ' ' + height + '">';
-	// 		svg += bgrect + modrect;
-	// 		svg += '</svg>';
-	// 		break;
-	//
-	//
-	// 	//Wrapped in group element
-	// 	case "g":
-	// 		svg += '<g width="' + width + '" height="' + height + '">';
-	// 		svg += bgrect + modrect;
-	// 		svg += '</g>';
-	// 		break;
-	//
-	// 	//Without a container
-	// 	case "none":
-	// 		svg += (bgrect + modrect).replace(/^\s+/, ""); //Clear indents on each line
-	// 		break;
-	// }
-	//
-	// return svg;
+	return qrcodeGenerator.createSvgPath({
+		// Round to two decimals
+		cellSize: Math.round(options.width / (qrcodeGenerator.getModuleCount() + 2 * options.padding) * 100) / 100,
+		background: null,
+		fill: options.fill,
+		scalable: true,
+		padding: options.padding
+	})
 }

src/settings/EditSecondFactorsForm.js

@@ -195,7 +195,7 @@ export class EditSecondFactorsForm {
 						let qrCode = getQRCodeSvg({
 							typeNumber: 0,
 							background: "#fff",
-							color: "#000",
+							fill: "#000",
 							container: "svg",
 							ecl: "M",
 							padding: 10,

src/subscription/giftcards/GiftCardUtils.js

@@ -281,7 +281,7 @@ export function renderGiftCardSvg(price: number, country: Country, link: ?string
 			width: qrCodeSize,
 			content: link,
 			background: theme.content_accent,
-			color: theme.content_bg,
+			fill: theme.content_bg,
 			container: "none",
 			padding: 4,
 			ecl: "M",