From dc4bc9860a5d6c43718274db736082148a56b36b Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 10:43:25 +0000
Subject: [PATCH 01/11] implement wifi qr code

add input for ssid, password, encryption type and if wifi is hidden.
generate wifi qr code.
---
 apps/qrcode/custom.html | 67 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 8 deletions(-)
diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index fff39c535..d0d9ac007 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -5,6 +5,22 @@
   <body>
 
     <p>Enter a URL: <input type="text" id="url" class="form-input" value="http://espruino.com"></p>
+    <p>or Enter Wifi name: <input type="text" id="ssid" class="form-input" value=""></p>
+    <p>and Wifi password: <input type="password" id="password" class="form-input" value=""></p>
+    <div class="form-group">
+            <label for="encryption" class="control-label">Encryption</label>
+            <div class="input-group">
+                <select name="encryption" id="encryption" class="form-control">
+                    <option value="WPA">WPA/WPA2</option>
+                    <option value="WEP">WEP</option>
+                    <option value="nopass">None</option>
+                </select>
+            </div>
+    </div>
+    <div>
+      <input type="checkbox" id="hidden" name="hidden" >
+      <label for="hidden">Hidden</label>
+    </div>
     <p>Try your QR Code: <div id="qrcode"></div></p>
     <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
 
@@ -14,19 +30,54 @@
     <script src="../../lib/imageconverter.js"></script>
 
     <script>
-
-    var qrcode = new QRCode("qrcode", {
-      text: document.getElementById("url").value,
-      width: 200,
-      height: 200,
-      colorDark : "#000000",
-      colorLight : "#ffffff",
-    });
+      //https://github.com/evgeni/qifi/blob/gh-pages/index.html#L168
+      function escapeString (string) {
+        var to_escape = ['\\', ';', ',', ':', '"'];
+        var hex_only = /^[0-9a-f]+$/i;
+        var output = "";
+        for (var i=0; i<string.length; i++) {
+            if($.inArray(string[i], to_escape) != -1) {
+                output += '\\'+string[i];
+            }
+            else {
+                output += string[i];
+            }
+        }
+        return output;
+      }
+      function generateWifiString(ssid, password, hidden,encryption){
+        //https://github.com/evgeni/qifi/blob/gh-pages/index.html#L198
+        var qrstring = 'WIFI:S:'+escapeString(ssid)+';T:'+encryption+';P:'+escapeString(password)+';';
+        if (hidden) {
+            qrstring += 'H:true';
+        }
+        return qrstring;
+      }
+      function refreshWifiQRCode(){
+        const ssid = document.getElementById("ssid").value;
+        const password = document.getElementById("ssid)".value;
+        const encryption = document.getElementById("encryption").value;
+        const hidden = document.getElementById("hidden").checked;
+        const wifiString = generateWifiString(ssid, password, hidden, encryption);
+        qrcode.clear();
+        qrcode.makeCode(wifiString);
+      }
+      var qrcode = new QRCode("qrcode", {
+        text: document.getElementById("url").value,
+        width: 200,
+        height: 200,
+        colorDark : "#000000",
+        colorLight : "#ffffff",
+      });
 
       document.getElementById("url").addEventListener("change", function() {
         qrcode.clear(); // clear the code.
         qrcode.makeCode(document.getElementById("url").value); // make another code.
       });
+      document.getElementById("ssid").addEventListener("change",refreshWifiQRCode);
+      document.getElementById("password").addEventListener("change",refreshWifiQRCode);
+      document.getElementById("encryption").addEventListener("change",refreshWifiQRCode);
+      document.getElementById("hidden").addEventListener("change",refreshWifiQRCode);
       document.getElementById("upload").addEventListener("click", function() {
         var url = document.getElementById("url").value;
         var img = imageconverter.canvastoString(document.getElementsByTagName("canvas")[0],{mode:"1bit",output:"string",compression:true});

From de6cc1bd90fb14f60962cdba7113242f8ac3394a Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 10:47:07 +0000
Subject: [PATCH 02/11] fix typo

---
 apps/qrcode/custom.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index d0d9ac007..589c0958d 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -55,7 +55,7 @@
       }
       function refreshWifiQRCode(){
         const ssid = document.getElementById("ssid").value;
-        const password = document.getElementById("ssid)".value;
+        const password = document.getElementById("ssid").value;
         const encryption = document.getElementById("encryption").value;
         const hidden = document.getElementById("hidden").checked;
         const wifiString = generateWifiString(ssid, password, hidden, encryption);

From 45a76871bed92c03fa36f7853ea3de3130ccfc90 Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 10:51:24 +0000
Subject: [PATCH 03/11] replace jquery inArray

---
 apps/qrcode/custom.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index 589c0958d..f32dd5eb0 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -36,7 +36,7 @@
         var hex_only = /^[0-9a-f]+$/i;
         var output = "";
         for (var i=0; i<string.length; i++) {
-            if($.inArray(string[i], to_escape) != -1) {
+            if(string[i].includes(to_escape)) {
                 output += '\\'+string[i];
             }
             else {

From 8e5c1202d9d40392519396c1db705ab7317c4138 Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:10:00 +0000
Subject: [PATCH 04/11] fix typo, add radio input, display ssid on device

---
 apps/qrcode/custom.html | 54 +++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index f32dd5eb0..9c6f5500a 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -3,10 +3,14 @@
     <link rel="stylesheet" href="../../css/spectre.min.css">
   </head>
   <body>
-
+     <input type="radio" id="useUrl" name="useURL"/>
+     <label for="useURL">Use URL</label>
     <p>Enter a URL: <input type="text" id="url" class="form-input" value="http://espruino.com"></p>
-    <p>or Enter Wifi name: <input type="text" id="ssid" class="form-input" value=""></p>
-    <p>and Wifi password: <input type="password" id="password" class="form-input" value=""></p>
+    <hr>
+    <input type="radiox" id="useWIFI" name="useWIFI"/>
+    <label for="useWIFI">Use WIFI</label>
+    <p>Enter Wifi name: <input type="text" id="ssid" class="form-input" value=""></p>
+    <p>Wifi password: <input type="password" id="password" class="form-input" value=""></p>
     <div class="form-group">
             <label for="encryption" class="control-label">Encryption</label>
             <div class="input-group">
@@ -18,7 +22,7 @@
             </div>
     </div>
     <div>
-      <input type="checkbox" id="hidden" name="hidden" >
+      <input type="checkbox" id="hidden" name="hidden"/>
       <label for="hidden">Hidden</label>
     </div>
     <p>Try your QR Code: <div id="qrcode"></div></p>
@@ -53,14 +57,18 @@
         }
         return qrstring;
       }
-      function refreshWifiQRCode(){
-        const ssid = document.getElementById("ssid").value;
-        const password = document.getElementById("ssid").value;
-        const encryption = document.getElementById("encryption").value;
-        const hidden = document.getElementById("hidden").checked;
-        const wifiString = generateWifiString(ssid, password, hidden, encryption);
-        qrcode.clear();
-        qrcode.makeCode(wifiString);
+      function refreshQRCode(){
+        qrcode.clear(); // clear the code.
+        if(document.getElementById("useWIFI").checked){
+            const ssid = document.getElementById("ssid").value;
+            const password = document.getElementById("password").value;
+            const encryption = document.getElementById("encryption").value;
+            const hidden = document.getElementById("hidden").checked;
+            const wifiString = generateWifiString(ssid, password, hidden, encryption);
+            qrcode.makeCode(wifiString);
+        }else{
+            qrcode.makeCode(document.getElementById("url").value);
+        }
       }
       var qrcode = new QRCode("qrcode", {
         text: document.getElementById("url").value,
@@ -70,26 +78,26 @@
         colorLight : "#ffffff",
       });
 
-      document.getElementById("url").addEventListener("change", function() {
-        qrcode.clear(); // clear the code.
-        qrcode.makeCode(document.getElementById("url").value); // make another code.
-      });
-      document.getElementById("ssid").addEventListener("change",refreshWifiQRCode);
-      document.getElementById("password").addEventListener("change",refreshWifiQRCode);
-      document.getElementById("encryption").addEventListener("change",refreshWifiQRCode);
-      document.getElementById("hidden").addEventListener("change",refreshWifiQRCode);
+      document.getElementById("url").addEventListener("change", refreshQRCode});
+      document.getElementById("ssid").addEventListener("change",refreshQRCode);
+      document.getElementById("password").addEventListener("change",refreshQRCode);
+      document.getElementById("encryption").addEventListener("change",refreshQRCode);
+      document.getElementById("hidden").addEventListener("change",refreshQRCode);
       document.getElementById("upload").addEventListener("click", function() {
-        var url = document.getElementById("url").value;
+        var content = document.getElementById("url").value;
+        if(document.getElementById("useWIFI").checked){
+            content = document.getElementById("ssid").value
+        }
         var img = imageconverter.canvastoString(document.getElementsByTagName("canvas")[0],{mode:"1bit",output:"string",compression:true});
         var app = `var img = ${img};
-var url = ${JSON.stringify(url)};
+var content = ${JSON.stringify(content)};
 g.setColor(1,1,1);
 g.fillRect(0,0,239,239);
 g.drawImage(img,20,20);
 g.setFontAlign(0,0);
 g.setFont("6x8");
 g.setColor(0,0,0);
-g.drawString(url,120,230);
+g.drawString(content,120,230);
 g.setColor(1,1,1);
 `;
         sendCustomizedApp({

From 21e3d659c910f051a7351505c07d0189d145caad Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:15:09 +0000
Subject: [PATCH 05/11] fix typo, remove label

---
 apps/qrcode/custom.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index 9c6f5500a..758989612 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -5,11 +5,11 @@
   <body>
      <input type="radio" id="useUrl" name="useURL"/>
      <label for="useURL">Use URL</label>
-    <p>Enter a URL: <input type="text" id="url" class="form-input" value="http://espruino.com"></p>
+    <input type="text" id="url" class="form-input" value="http://espruino.com">
     <hr>
-    <input type="radiox" id="useWIFI" name="useWIFI"/>
-    <label for="useWIFI">Use WIFI</label>
-    <p>Enter Wifi name: <input type="text" id="ssid" class="form-input" value=""></p>
+    <input type="radio" id="useWIFI" name="useWIFI"/>
+    <label for="useWIFI">Use Wifi Credentials</label>
+    <input type="text" id="ssid" class="form-input" value="">
     <p>Wifi password: <input type="password" id="password" class="form-input" value=""></p>
     <div class="form-group">
             <label for="encryption" class="control-label">Encryption</label>
@@ -23,7 +23,7 @@
     </div>
     <div>
       <input type="checkbox" id="hidden" name="hidden"/>
-      <label for="hidden">Hidden</label>
+      <label for="hidden">Wifi is hidden</label>
     </div>
     <p>Try your QR Code: <div id="qrcode"></div></p>
     <p>Click <button id="upload" class="btn btn-primary">Upload</button></p>
@@ -78,7 +78,7 @@
         colorLight : "#ffffff",
       });
 
-      document.getElementById("url").addEventListener("change", refreshQRCode});
+      document.getElementById("url").addEventListener("change", refreshQRCode);
       document.getElementById("ssid").addEventListener("change",refreshQRCode);
       document.getElementById("password").addEventListener("change",refreshQRCode);
       document.getElementById("encryption").addEventListener("change",refreshQRCode);

From f79e7e522288918b209f2900ac7504739c2ec854 Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:18:50 +0000
Subject: [PATCH 06/11] change label, connect radio boxes

---
 apps/qrcode/custom.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index 758989612..b1252a017 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -3,12 +3,12 @@
     <link rel="stylesheet" href="../../css/spectre.min.css">
   </head>
   <body>
-     <input type="radio" id="useUrl" name="useURL"/>
-     <label for="useURL">Use URL</label>
+     <input type="radio" id="useUrl" name="mode"/>
+     <label for="useURL">Use URL:</label>
     <input type="text" id="url" class="form-input" value="http://espruino.com">
     <hr>
-    <input type="radio" id="useWIFI" name="useWIFI"/>
-    <label for="useWIFI">Use Wifi Credentials</label>
+    <input type="radio" id="useWIFI" name="mode"/>
+    <label for="useWIFI">Use Wifi Credentials:</label>
     <input type="text" id="ssid" class="form-input" value="">
     <p>Wifi password: <input type="password" id="password" class="form-input" value=""></p>
     <div class="form-group">

From 312ba418a5114459f7541bc41458216f8105b7a1 Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:21:45 +0000
Subject: [PATCH 07/11] add changelog

---
 apps/qrcode/ChangeLog | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 apps/qrcode/ChangeLog

diff --git a/apps/qrcode/ChangeLog b/apps/qrcode/ChangeLog
new file mode 100644
index 000000000..e2ae6b02a
--- /dev/null
+++ b/apps/qrcode/ChangeLog
@@ -0,0 +1,2 @@
+0.01: New App!
+0.02: Add posibillity to generate Wifi code.

From 5456a10f65d7eaa915f1dc695ad7531a6bc8670c Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:22:41 +0000
Subject: [PATCH 08/11] bump app version

---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 3c8f0671b..9caa60ee7 100644
--- a/apps.json
+++ b/apps.json
@@ -552,7 +552,7 @@
   { "id": "qrcode",
     "name": "Custom QR Code",
     "icon": "app.png",
-    "version":"0.01",
+    "version":"0.02",
     "description": "Use this to upload a customised QR code to Bangle.js",
     "tags": "qrcode",
     "custom": "custom.html",

From 8386f0ba9da4796f7b5fc877a0ae8ee0bd7143b5 Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:29:00 +0000
Subject: [PATCH 09/11] make url default, add event for radio onchange

---
 apps/qrcode/custom.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index b1252a017..f0fe0ee21 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -3,7 +3,7 @@
     <link rel="stylesheet" href="../../css/spectre.min.css">
   </head>
   <body>
-     <input type="radio" id="useUrl" name="mode"/>
+     <input type="radio" id="useUrl" name="mode" checked/>
      <label for="useURL">Use URL:</label>
     <input type="text" id="url" class="form-input" value="http://espruino.com">
     <hr>
@@ -83,6 +83,8 @@
       document.getElementById("password").addEventListener("change",refreshQRCode);
       document.getElementById("encryption").addEventListener("change",refreshQRCode);
       document.getElementById("hidden").addEventListener("change",refreshQRCode);
+      document.getElementById("useURL").addEventListener("change",refreshQRCode);
+      document.getElementById("useWIFI").addEventListener("change",refreshQRCode);
       document.getElementById("upload").addEventListener("click", function() {
         var content = document.getElementById("url").value;
         if(document.getElementById("useWIFI").checked){

From 237bf485833083b3967d5e647469fd4de57704a5 Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:41:58 +0000
Subject: [PATCH 10/11] change "change" to "click" event for radio inputs

I dont get why it doesnt work with change event..
---
 apps/qrcode/custom.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index f0fe0ee21..8912da58b 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -83,8 +83,8 @@
       document.getElementById("password").addEventListener("change",refreshQRCode);
       document.getElementById("encryption").addEventListener("change",refreshQRCode);
       document.getElementById("hidden").addEventListener("change",refreshQRCode);
-      document.getElementById("useURL").addEventListener("change",refreshQRCode);
-      document.getElementById("useWIFI").addEventListener("change",refreshQRCode);
+      document.getElementById("useURL").addEventListener("click",refreshQRCode);
+      document.getElementById("useWIFI").addEventListener("click",refreshQRCode);
       document.getElementById("upload").addEventListener("click", function() {
         var content = document.getElementById("url").value;
         if(document.getElementById("useWIFI").checked){

From 58b0ce31b5328f300b006716bc729240bf86905d Mon Sep 17 00:00:00 2001
From: v1nc <github@reckendrees.systems>
Date: Mon, 11 May 2020 11:52:26 +0000
Subject: [PATCH 11/11] fix typo, change event back to "change"

---
 apps/qrcode/custom.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/qrcode/custom.html b/apps/qrcode/custom.html
index 8912da58b..b37038ff7 100644
--- a/apps/qrcode/custom.html
+++ b/apps/qrcode/custom.html
@@ -3,7 +3,7 @@
     <link rel="stylesheet" href="../../css/spectre.min.css">
   </head>
   <body>
-     <input type="radio" id="useUrl" name="mode" checked/>
+     <input type="radio" id="useURL" name="mode" checked/>
      <label for="useURL">Use URL:</label>
     <input type="text" id="url" class="form-input" value="http://espruino.com">
     <hr>
@@ -83,8 +83,8 @@
       document.getElementById("password").addEventListener("change",refreshQRCode);
       document.getElementById("encryption").addEventListener("change",refreshQRCode);
       document.getElementById("hidden").addEventListener("change",refreshQRCode);
-      document.getElementById("useURL").addEventListener("click",refreshQRCode);
-      document.getElementById("useWIFI").addEventListener("click",refreshQRCode);
+      document.getElementById("useURL").addEventListener("change",refreshQRCode);
+      document.getElementById("useWIFI").addEventListener("change",refreshQRCode);
       document.getElementById("upload").addEventListener("click", function() {
         var content = document.getElementById("url").value;
         if(document.getElementById("useWIFI").checked){
