From d75940b9e617595c0a20d89474876a7e5cb2abdb Mon Sep 17 00:00:00 2001
From: Adam Schmalhofer <code@adaschma.name>
Date: Fri, 17 Dec 2021 22:57:09 +0100
Subject: [PATCH 1/4] Ported cprassist to Banglejs2

---
 apps.json                   |  4 ++--
 apps/cprassist/ChangeLog    |  1 +
 apps/cprassist/cprassist.js | 17 +++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps.json b/apps.json
index 8b4e86d52..4f966bbdd 100644
--- a/apps.json
+++ b/apps.json
@@ -2970,11 +2970,11 @@
   {
     "id": "cprassist",
     "name": "CPR Assist",
-    "version": "0.01",
+    "version": "0.02",
     "description": "Provides assistance while performing a CPR",
     "icon": "cprassist-icon.png",
     "tags": "tool,firstaid",
-    "supports": ["BANGLEJS"],
+    "supports": ["BANGLEJS", "BANGLEJS2"],
     "readme": "README.md",
     "allow_emulator": true,
     "screenshots": [{"url":"bangle1-CPR-assist-screenshot.png"}],
diff --git a/apps/cprassist/ChangeLog b/apps/cprassist/ChangeLog
index 5560f00bc..529010aa8 100644
--- a/apps/cprassist/ChangeLog
+++ b/apps/cprassist/ChangeLog
@@ -1 +1,2 @@
 0.01: New App!
+0.02: Ported to Banglejs2
diff --git a/apps/cprassist/cprassist.js b/apps/cprassist/cprassist.js
index 862ae54d6..3e34ea171 100644
--- a/apps/cprassist/cprassist.js
+++ b/apps/cprassist/cprassist.js
@@ -35,23 +35,24 @@ function provideFeedback() {
 }
 
 function drawHeart() {
-  g.fillCircle(40, 92, 12);
-  g.fillCircle(60, 92, 12);
-  g.fillPoly([29, 98, 50, 120, 71, 98]);
+  var lowestPoint = g.getHeight()*3/5;
+  g.fillCircle(40, lowestPoint-29, 12);
+  g.fillCircle(60, lowestPoint-29, 12);
+  g.fillPoly([29, lowestPoint-22, 50, lowestPoint, 71, lowestPoint-22]);
 }
 
 function updateScreen() {
   const colors = [0xFFFF, 0x9492];
-  g.reset().clearRect(0, 50, 250, 150);
+  g.reset().clearRect(0, 0, 250, g.getHeight()*5/6);
   if (counter > 0) {
     g.setFont("Vector", 40).setFontAlign(0, 0);
     g.setColor(colors[counter%2]);
     drawHeart();
-    g.drawString(counter + "", g.getWidth()/2, 100);
+    g.drawString(counter, 120, g.getHeight()*3/5-20);
   } else {
     g.setFont("Vector", 20).setFontAlign(0, 0);
-    g.drawString("RESCUE", g.getWidth()/2, 70);
-    g.drawString("BREATHS", g.getWidth()/2, 120);
+    g.drawString("RESCUE", g.getWidth()/2, g.getHeight()/3);
+    g.drawString("BREATHS", g.getWidth()/2, g.getHeight()*3/5);
   }
 }
 
@@ -73,7 +74,7 @@ function tick() {
 interval = setInterval(tick, 60000/setting('compression_rpm'));
 
 g.clear(1).setFont("6x8");
-g.drawString(setting('compression_count') + ' / ' + setting('breath_count'), 30, 200);
+g.drawString(setting('compression_count') + ' / ' + setting('breath_count'), 30, g.getHeight()*5/6);
 
 Bangle.loadWidgets();
 Bangle.drawWidgets();

From d241cebeb04178e08edd993d7208f04166471a04 Mon Sep 17 00:00:00 2001
From: Adam Schmalhofer <code@adaschma.name>
Date: Fri, 17 Dec 2021 23:23:13 +0100
Subject: [PATCH 2/4] cpassist: work with different bgcolors

---
 apps/cprassist/cprassist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/cprassist/cprassist.js b/apps/cprassist/cprassist.js
index 3e34ea171..ee5b06131 100644
--- a/apps/cprassist/cprassist.js
+++ b/apps/cprassist/cprassist.js
@@ -42,7 +42,7 @@ function drawHeart() {
 }
 
 function updateScreen() {
-  const colors = [0xFFFF, 0x9492];
+  const colors = [0xFFFF-g.getBgColor(), 0x9492];
   g.reset().clearRect(0, 0, 250, g.getHeight()*5/6);
   if (counter > 0) {
     g.setFont("Vector", 40).setFontAlign(0, 0);

From c5303ef657c7b788da37cd952230573406794d7a Mon Sep 17 00:00:00 2001
From: Adam Schmalhofer <code@adaschma.name>
Date: Sat, 18 Dec 2021 01:00:22 +0100
Subject: [PATCH 3/4] Don't blank widgets

---
 apps.json                   | 2 +-
 apps/cprassist/cprassist.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 4f966bbdd..64abacef2 100644
--- a/apps.json
+++ b/apps.json
@@ -2970,7 +2970,7 @@
   {
     "id": "cprassist",
     "name": "CPR Assist",
-    "version": "0.02",
+    "version": "0.02-rc1",
     "description": "Provides assistance while performing a CPR",
     "icon": "cprassist-icon.png",
     "tags": "tool,firstaid",
diff --git a/apps/cprassist/cprassist.js b/apps/cprassist/cprassist.js
index ee5b06131..128ae7407 100644
--- a/apps/cprassist/cprassist.js
+++ b/apps/cprassist/cprassist.js
@@ -43,7 +43,7 @@ function drawHeart() {
 
 function updateScreen() {
   const colors = [0xFFFF-g.getBgColor(), 0x9492];
-  g.reset().clearRect(0, 0, 250, g.getHeight()*5/6);
+  g.reset().clearRect(0, 24, g.getWidth(), g.getHeight()*5/6);
   if (counter > 0) {
     g.setFont("Vector", 40).setFontAlign(0, 0);
     g.setColor(colors[counter%2]);

From 7974e4dd2b8d6dff7477315f9d43cf43b40c3867 Mon Sep 17 00:00:00 2001
From: Adam Schmalhofer <code@adaschma.name>
Date: Tue, 4 Jan 2022 23:32:58 +0100
Subject: [PATCH 4/4] Prepare release of cprassist

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

diff --git a/apps.json b/apps.json
index 64abacef2..4f966bbdd 100644
--- a/apps.json
+++ b/apps.json
@@ -2970,7 +2970,7 @@
   {
     "id": "cprassist",
     "name": "CPR Assist",
-    "version": "0.02-rc1",
+    "version": "0.02",
     "description": "Provides assistance while performing a CPR",
     "icon": "cprassist-icon.png",
     "tags": "tool,firstaid",