From f357111babf3ff2dbfdd038882ebcc06d58fb892 Mon Sep 17 00:00:00 2001
From: Hank <hank@kueper.info>
Date: Wed, 6 Jul 2022 14:06:47 +0200
Subject: [PATCH 1/3] Flappy: Tweked for Bangle.js 2

---
 apps/flappy/ChangeLog     |  1 +
 apps/flappy/app.js        | 35 ++++++++++++++++++++++++-----------
 apps/flappy/metadata.json |  2 +-
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/apps/flappy/ChangeLog b/apps/flappy/ChangeLog
index 349cb9d07..bbaabe296 100644
--- a/apps/flappy/ChangeLog
+++ b/apps/flappy/ChangeLog
@@ -2,3 +2,4 @@
 0.03: A few tweaks to improve rendering speed
 0.04: Add "ram" keyword to allow 2v06 Espruino builds to cache function that needs to be fast
 0.05: Don't use Bangle.setLCDMode, just use offscreen buffer (allows widgets)
+0.06: Tweaked a bit for Bangle.js 2 - still much to do...
diff --git a/apps/flappy/app.js b/apps/flappy/app.js
index e9ca31fa5..0a0a9268c 100644
--- a/apps/flappy/app.js
+++ b/apps/flappy/app.js
@@ -1,22 +1,28 @@
-b = Graphics.createArrayBuffer(120,120,8);
-var gimg = {
-    width:120,
-    height:104,
-    bpp:8,
-    buffer:b.buffer
-  };
-
 if (process.env.HWVERSION==2) {
+  b = Graphics.createArrayBuffer(176,176,8);
+  var gimg = {
+      width:176,
+      height:176,
+      bpp:8,
+      buffer:b.buffer
+    };
   b.flip = function() {
-    g.drawImage(gimg,28,50);
+    g.drawImage(gimg,0,0);
   };
 } else {
+  b = Graphics.createArrayBuffer(120,120,8);
+  var gimg = {
+      width:120,
+      height:104,
+      bpp:8,
+      buffer:b.buffer
+    };
   b.flip = function() {
     g.drawImage(gimg,0,24,{scale:2});
   };
 }
 
-var BIRDIMG = E.toArrayBuffer(atob("EQyI/v7+/v7+/gAAAAAAAP7+/v7+/v7+/gYG0tLS0gDXAP7+/v7+/v4A0tLS0tIA19fXAP7+/v4AAAAA0tLS0gDX1wDXAP7+ANfX19cA0tLSANfXANcA/v4A19fX19cA0tLSANfX1wD+/gDS19fX0gDS0tLSAAAAAAD+/gDS0tIA0tLS0gDAwMDAwAD+/gAAAM3Nzc0AwAAAAAAA/v7+/v4Azc3Nzc0AwMDAwAD+/v7+/v4AAM3Nzc0AAAAAAP7+/v7+/v7+AAAAAP7+/v7+/g=="))
+var BIRDIMG = E.toArrayBuffer(atob("EQyI/v7+/v7+/gAAAAAAAP7+/v7+/v7+/gYG0tLS0gDXAP7+/v7+/v4A0tLS0tIA19fXAP7+/v4AAAAA0tLS0gDX1wDXAP7+ANfX19cA0tLSANfXANcA/v4A19fX19cA0tLSANfX1wD+/gDS19fX0gDS0tLSAAAAAAD+/gDS0tIA0tLS0gDAwMDAwAD+/gAAAM3Nzc0AwAAAAAAA/v7+/v4Azc3Nzc0AwMDAwAD+/v7+/v4AAM3Nzc0AAAAAAP7+/v7+/v7+AAAAAP7+/v7+/g=="));
 var FLOORIMG = require("heatshrink").decompress(atob("iEKxH+kklABuLAAlgAAwNFB34OLmAAO0YAO5wAOA"));
 
 
@@ -53,6 +59,7 @@ function draw() {
   "ram"
   var H = b.getHeight()-24;
   b.setColor("#71c6cf");
+  if (process.env.HWVERSION==2) b.setColor("#000000");
   b.fillRect(0,0,b.getWidth(),H-1);
   floorpos++;
   for (var x=-(floorpos&15);x<b.getWidth();x+=16)
@@ -62,6 +69,7 @@ function draw() {
   if (!running) {
     var x = b.getWidth()/2;
     b.setColor("#000000");
+    if (process.env.HWVERSION==2) b.setColor("#ffffff");	
     b.setFontAlign(0,0);
     b.setFont("4x6",2);
     b.drawString("GAME OVER!",x,20);
@@ -88,16 +96,20 @@ function draw() {
     r.x2--;
     var btop = r.y-r.gap;
     var bbot = r.y+r.gap;
-    b.setColor("#73bf2f"); // middle
+    b.setColor("#ffff00"); // middle
+    if (process.env.HWVERSION==2) b.setColor("#000000");	
     b.fillRect(r.x1+4, 0, r.x2-4, btop-1);
     b.fillRect(r.x1+4, bbot, r.x2-4, H-1);
     b.setColor("#c0f181"); // left
+    if (process.env.HWVERSION==2) b.setColor("#00ff00");	
     b.fillRect(r.x1+1, 0, r.x1+3, btop-1);
     b.fillRect(r.x1+1, bbot, r.x1+3, H-1);
     b.setColor("#538917"); // right
+    if (process.env.HWVERSION==2) b.setColor("#00ff00");
     b.fillRect(r.x2-3, 0, r.x2-1, btop-1);
     b.fillRect(r.x2-3, bbot, r.x2-1, H-1);
     b.setColor("#808080"); // outlines
+    if (process.env.HWVERSION==2) b.setColor("#ffffff");	
     b.drawRect(r.x1, btop-5, r.x2, btop); // top
     b.drawLine(r.x1+1, 0, r.x1+1, btop-6);
     b.drawLine(r.x2-2, 0, r.x2-2, btop-6);
@@ -127,5 +139,6 @@ Bangle.loadWidgets();
 g.clear();
 Bangle.drawWidgets();
 b.setBgColor("#e3db9d");
+if (process.env.HWVERSION==2) b.setBgColor("#000000");	
 gameStart();
 setInterval(draw, 100);
diff --git a/apps/flappy/metadata.json b/apps/flappy/metadata.json
index 910797066..cb50f0094 100644
--- a/apps/flappy/metadata.json
+++ b/apps/flappy/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "flappy",
   "name": "Flappy Bird",
-  "version": "0.05",
+  "version": "0.06",
   "description": "A Flappy Bird game clone",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot1_flappy.png"},{"url":"screenshot2_flappy.png"}],

From 50ba9ed56611d7b186143c984b86d77d909fcabb Mon Sep 17 00:00:00 2001
From: Hank <hank@kueper.info>
Date: Wed, 6 Jul 2022 14:11:30 +0200
Subject: [PATCH 2/3] Revert "Flappy: Tweked for Bangle.js 2"

This reverts commit f357111babf3ff2dbfdd038882ebcc06d58fb892.
---
 apps/flappy/ChangeLog     |  1 -
 apps/flappy/app.js        | 35 +++++++++++------------------------
 apps/flappy/metadata.json |  2 +-
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/apps/flappy/ChangeLog b/apps/flappy/ChangeLog
index bbaabe296..349cb9d07 100644
--- a/apps/flappy/ChangeLog
+++ b/apps/flappy/ChangeLog
@@ -2,4 +2,3 @@
 0.03: A few tweaks to improve rendering speed
 0.04: Add "ram" keyword to allow 2v06 Espruino builds to cache function that needs to be fast
 0.05: Don't use Bangle.setLCDMode, just use offscreen buffer (allows widgets)
-0.06: Tweaked a bit for Bangle.js 2 - still much to do...
diff --git a/apps/flappy/app.js b/apps/flappy/app.js
index 0a0a9268c..e9ca31fa5 100644
--- a/apps/flappy/app.js
+++ b/apps/flappy/app.js
@@ -1,28 +1,22 @@
+b = Graphics.createArrayBuffer(120,120,8);
+var gimg = {
+    width:120,
+    height:104,
+    bpp:8,
+    buffer:b.buffer
+  };
+
 if (process.env.HWVERSION==2) {
-  b = Graphics.createArrayBuffer(176,176,8);
-  var gimg = {
-      width:176,
-      height:176,
-      bpp:8,
-      buffer:b.buffer
-    };
   b.flip = function() {
-    g.drawImage(gimg,0,0);
+    g.drawImage(gimg,28,50);
   };
 } else {
-  b = Graphics.createArrayBuffer(120,120,8);
-  var gimg = {
-      width:120,
-      height:104,
-      bpp:8,
-      buffer:b.buffer
-    };
   b.flip = function() {
     g.drawImage(gimg,0,24,{scale:2});
   };
 }
 
-var BIRDIMG = E.toArrayBuffer(atob("EQyI/v7+/v7+/gAAAAAAAP7+/v7+/v7+/gYG0tLS0gDXAP7+/v7+/v4A0tLS0tIA19fXAP7+/v4AAAAA0tLS0gDX1wDXAP7+ANfX19cA0tLSANfXANcA/v4A19fX19cA0tLSANfX1wD+/gDS19fX0gDS0tLSAAAAAAD+/gDS0tIA0tLS0gDAwMDAwAD+/gAAAM3Nzc0AwAAAAAAA/v7+/v4Azc3Nzc0AwMDAwAD+/v7+/v4AAM3Nzc0AAAAAAP7+/v7+/v7+AAAAAP7+/v7+/g=="));
+var BIRDIMG = E.toArrayBuffer(atob("EQyI/v7+/v7+/gAAAAAAAP7+/v7+/v7+/gYG0tLS0gDXAP7+/v7+/v4A0tLS0tIA19fXAP7+/v4AAAAA0tLS0gDX1wDXAP7+ANfX19cA0tLSANfXANcA/v4A19fX19cA0tLSANfX1wD+/gDS19fX0gDS0tLSAAAAAAD+/gDS0tIA0tLS0gDAwMDAwAD+/gAAAM3Nzc0AwAAAAAAA/v7+/v4Azc3Nzc0AwMDAwAD+/v7+/v4AAM3Nzc0AAAAAAP7+/v7+/v7+AAAAAP7+/v7+/g=="))
 var FLOORIMG = require("heatshrink").decompress(atob("iEKxH+kklABuLAAlgAAwNFB34OLmAAO0YAO5wAOA"));
 
 
@@ -59,7 +53,6 @@ function draw() {
   "ram"
   var H = b.getHeight()-24;
   b.setColor("#71c6cf");
-  if (process.env.HWVERSION==2) b.setColor("#000000");
   b.fillRect(0,0,b.getWidth(),H-1);
   floorpos++;
   for (var x=-(floorpos&15);x<b.getWidth();x+=16)
@@ -69,7 +62,6 @@ function draw() {
   if (!running) {
     var x = b.getWidth()/2;
     b.setColor("#000000");
-    if (process.env.HWVERSION==2) b.setColor("#ffffff");	
     b.setFontAlign(0,0);
     b.setFont("4x6",2);
     b.drawString("GAME OVER!",x,20);
@@ -96,20 +88,16 @@ function draw() {
     r.x2--;
     var btop = r.y-r.gap;
     var bbot = r.y+r.gap;
-    b.setColor("#ffff00"); // middle
-    if (process.env.HWVERSION==2) b.setColor("#000000");	
+    b.setColor("#73bf2f"); // middle
     b.fillRect(r.x1+4, 0, r.x2-4, btop-1);
     b.fillRect(r.x1+4, bbot, r.x2-4, H-1);
     b.setColor("#c0f181"); // left
-    if (process.env.HWVERSION==2) b.setColor("#00ff00");	
     b.fillRect(r.x1+1, 0, r.x1+3, btop-1);
     b.fillRect(r.x1+1, bbot, r.x1+3, H-1);
     b.setColor("#538917"); // right
-    if (process.env.HWVERSION==2) b.setColor("#00ff00");
     b.fillRect(r.x2-3, 0, r.x2-1, btop-1);
     b.fillRect(r.x2-3, bbot, r.x2-1, H-1);
     b.setColor("#808080"); // outlines
-    if (process.env.HWVERSION==2) b.setColor("#ffffff");	
     b.drawRect(r.x1, btop-5, r.x2, btop); // top
     b.drawLine(r.x1+1, 0, r.x1+1, btop-6);
     b.drawLine(r.x2-2, 0, r.x2-2, btop-6);
@@ -139,6 +127,5 @@ Bangle.loadWidgets();
 g.clear();
 Bangle.drawWidgets();
 b.setBgColor("#e3db9d");
-if (process.env.HWVERSION==2) b.setBgColor("#000000");	
 gameStart();
 setInterval(draw, 100);
diff --git a/apps/flappy/metadata.json b/apps/flappy/metadata.json
index cb50f0094..910797066 100644
--- a/apps/flappy/metadata.json
+++ b/apps/flappy/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "flappy",
   "name": "Flappy Bird",
-  "version": "0.06",
+  "version": "0.05",
   "description": "A Flappy Bird game clone",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot1_flappy.png"},{"url":"screenshot2_flappy.png"}],

From 3aace6daffda6948366debe3f9f5950e7695c45d Mon Sep 17 00:00:00 2001
From: Hank <hank@kueper.info>
Date: Thu, 7 Jul 2022 08:58:14 +0200
Subject: [PATCH 3/3] Teatimer: Fix BG/FG color

---
 apps/teatimer/ChangeLog     | 1 +
 apps/teatimer/app.js        | 2 ++
 apps/teatimer/metadata.json | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/teatimer/ChangeLog b/apps/teatimer/ChangeLog
index 91eb720eb..db8dd270b 100644
--- a/apps/teatimer/ChangeLog
+++ b/apps/teatimer/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New App!
 0.02: Fix issue setting colors after showMessage
+0.03: Fix BG/FG Color if e.g. theme background is black
diff --git a/apps/teatimer/app.js b/apps/teatimer/app.js
index 80a731317..c394b5e00 100644
--- a/apps/teatimer/app.js
+++ b/apps/teatimer/app.js
@@ -216,6 +216,8 @@ function initDragEvents() {
 function showHelp() {
   if (state == states.start) {
     state = states.help;
+	g.setBgColor(g.theme.bg);
+	g.setColor(g.theme.fg);
     E.showMessage("Swipe up/down\n+/- one minute\n\nSwipe left/right\n+/- 15 seconds\n\nPress Btn1 to start","Tea timer help");
   }
   // return to start
diff --git a/apps/teatimer/metadata.json b/apps/teatimer/metadata.json
index f53ed374f..b5cdce92e 100644
--- a/apps/teatimer/metadata.json
+++ b/apps/teatimer/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "teatimer",
   "name": "Tea Timer",
-  "version": "0.02",
+  "version": "0.03",
   "description": "A simple timer. You can easyly set up the time.",
   "icon": "teatimer.png",
   "type": "app",