From a89dd4d544b306acb94edeb63de6a90e1e946565 Mon Sep 17 00:00:00 2001
From: johan-m-o <85756863+johan-m-o@users.noreply.github.com>
Date: Fri, 26 Nov 2021 11:23:43 +0100
Subject: [PATCH 1/5] Update ChangeLog

---
 apps/slevel/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/slevel/ChangeLog b/apps/slevel/ChangeLog
index 5560f00bc..3a6431e50 100644
--- a/apps/slevel/ChangeLog
+++ b/apps/slevel/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Updated to work with both Bangle.js 1 and 2.

From fe5ca8bc76b9c1a1d28159af6dba92af14fd4e57 Mon Sep 17 00:00:00 2001
From: johan-m-o <85756863+johan-m-o@users.noreply.github.com>
Date: Fri, 26 Nov 2021 11:33:49 +0100
Subject: [PATCH 2/5] Update spiritlevel.js

---
 apps/slevel/spiritlevel.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/slevel/spiritlevel.js b/apps/slevel/spiritlevel.js
index 492fc60e1..9db54b825 100644
--- a/apps/slevel/spiritlevel.js
+++ b/apps/slevel/spiritlevel.js
@@ -1,5 +1,7 @@
 g.clear();
 var old = {x:0,y:0};
+var W = g.getWidth();
+var H = g.getHeight();
 Bangle.on('accel',function(v) {
   var max = Math.max(Math.abs(v.x),Math.abs(v.y),Math.abs(v.z));
   if (Math.abs(v.y)==max) {
@@ -14,17 +16,17 @@ Bangle.on('accel',function(v) {
   g.setColor(1,1,1);
   g.setFont("6x8",2);
   g.setFontAlign(0,-1);
-  g.clearRect(60,0,180,16);
-  g.drawString(ang.toFixed(1),120,0);
+  g.clearRect(W*(1/4),0,W*(3/4),H*(1/16));
+  g.drawString(ang.toFixed(1),W/2,0);
   var n = {
-    x:E.clip(120+v.x*256,4,236),
-    y:E.clip(120+v.y*256,4,236)};
+    x:E.clip(W/2+v.x*256,4,W-4),
+    y:E.clip(H/2+v.y*256,4,H-4)};
   g.clearRect(old.x-3,old.y-3,old.x+6,old.y+6);
   g.setColor(1,1,1);
   g.fillRect(n.x-3,n.y-3,n.x+6,n.y+6);
   g.setColor(1,0,0);
-  g.drawCircle(120,120,20);
-  g.drawCircle(120,120,60);
-  g.drawCircle(120,120,100);
+  g.drawCircle(W/2,H/2,W*(1/12));
+  g.drawCircle(W/2,H/2,W*(1/4));
+  g.drawCircle(W/2,H/2,W*(5/12));
   old = n;
 });

From 6f300299b55f60098d262c02e0c7ed1a5576fc38 Mon Sep 17 00:00:00 2001
From: johan-m-o <85756863+johan-m-o@users.noreply.github.com>
Date: Fri, 26 Nov 2021 11:34:52 +0100
Subject: [PATCH 3/5] Update apps.json

---
 apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 3b6490b46..8814b49d2 100644
--- a/apps.json
+++ b/apps.json
@@ -734,11 +734,11 @@
   {
     "id": "slevel",
     "name": "Spirit Level",
-    "version": "0.01",
+    "version": "0.02",
     "description": "Show the current angle of the watch, so you can use it to make sure something is absolutely flat",
     "icon": "spiritlevel.png",
     "tags": "tool",
-    "supports": ["BANGLEJS"],
+    "supports": ["BANGLEJS","BANGLEJS2"],
     "storage": [
       {"name":"slevel.app.js","url":"spiritlevel.js"},
       {"name":"slevel.img","url":"spiritlevel-icon.js","evaluate":true}

From b6e5175675890222b1f23318a2b466dcf6302238 Mon Sep 17 00:00:00 2001
From: johan-m-o <85756863+johan-m-o@users.noreply.github.com>
Date: Fri, 26 Nov 2021 11:44:21 +0100
Subject: [PATCH 4/5] Update spiritlevel.js

---
 apps/slevel/spiritlevel.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/slevel/spiritlevel.js b/apps/slevel/spiritlevel.js
index 9db54b825..030eeae97 100644
--- a/apps/slevel/spiritlevel.js
+++ b/apps/slevel/spiritlevel.js
@@ -2,6 +2,10 @@ g.clear();
 var old = {x:0,y:0};
 var W = g.getWidth();
 var H = g.getHeight();
+var fontS = 1;
+if (process.env.HWVERSION==1) {
+  fontS = 2;
+}
 Bangle.on('accel',function(v) {
   var max = Math.max(Math.abs(v.x),Math.abs(v.y),Math.abs(v.z));
   if (Math.abs(v.y)==max) {
@@ -14,7 +18,7 @@ Bangle.on('accel',function(v) {
   var ang = Math.atan2(d,Math.abs(v.z))*180/Math.PI;
   
   g.setColor(1,1,1);
-  g.setFont("6x8",2);
+  g.setFont("6x8",fontS);
   g.setFontAlign(0,-1);
   g.clearRect(W*(1/4),0,W*(3/4),H*(1/16));
   g.drawString(ang.toFixed(1),W/2,0);

From 045251f55f9a71f755ffdcdb120e032dc437096a Mon Sep 17 00:00:00 2001
From: johan-m-o <85756863+johan-m-o@users.noreply.github.com>
Date: Fri, 26 Nov 2021 11:50:19 +0100
Subject: [PATCH 5/5] Update spiritlevel.js

---
 apps/slevel/spiritlevel.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/apps/slevel/spiritlevel.js b/apps/slevel/spiritlevel.js
index 030eeae97..9db54b825 100644
--- a/apps/slevel/spiritlevel.js
+++ b/apps/slevel/spiritlevel.js
@@ -2,10 +2,6 @@ g.clear();
 var old = {x:0,y:0};
 var W = g.getWidth();
 var H = g.getHeight();
-var fontS = 1;
-if (process.env.HWVERSION==1) {
-  fontS = 2;
-}
 Bangle.on('accel',function(v) {
   var max = Math.max(Math.abs(v.x),Math.abs(v.y),Math.abs(v.z));
   if (Math.abs(v.y)==max) {
@@ -18,7 +14,7 @@ Bangle.on('accel',function(v) {
   var ang = Math.atan2(d,Math.abs(v.z))*180/Math.PI;
   
   g.setColor(1,1,1);
-  g.setFont("6x8",fontS);
+  g.setFont("6x8",2);
   g.setFontAlign(0,-1);
   g.clearRect(W*(1/4),0,W*(3/4),H*(1/16));
   g.drawString(ang.toFixed(1),W/2,0);