From 50e139bd991f90a942c76b41b0e005a58da5eb3b Mon Sep 17 00:00:00 2001
From: Hilmar Strauch <56518493+HilmarSt@users.noreply.github.com>
Date: Wed, 26 Jan 2022 14:26:41 +0100
Subject: [PATCH 1/5] Update ChangeLog

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

diff --git a/apps/widram/ChangeLog b/apps/widram/ChangeLog
index 4c21f3ace..e7b406081 100644
--- a/apps/widram/ChangeLog
+++ b/apps/widram/ChangeLog
@@ -1 +1,2 @@
 0.01: New Widget!
+0.02: Now also visible on Bangle.js 2

From 88ac23b657e53cd5e9ab8980b9a08a84488baf55 Mon Sep 17 00:00:00 2001
From: Hilmar Strauch <56518493+HilmarSt@users.noreply.github.com>
Date: Wed, 26 Jan 2022 14:27:12 +0100
Subject: [PATCH 2/5] Update metadata.json

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

diff --git a/apps/widram/metadata.json b/apps/widram/metadata.json
index 8ea309ebf..e6b6f7ce2 100644
--- a/apps/widram/metadata.json
+++ b/apps/widram/metadata.json
@@ -2,7 +2,7 @@
   "id": "widram",
   "name": "RAM Widget",
   "shortName": "RAM Widget",
-  "version": "0.01",
+  "version": "0.02",
   "description": "Display your Bangle's available RAM percentage in a widget",
   "icon": "widget.png",
   "type": "widget",

From 947f403ba032535e998ead353b648847c735c10b Mon Sep 17 00:00:00 2001
From: Hilmar Strauch <56518493+HilmarSt@users.noreply.github.com>
Date: Wed, 26 Jan 2022 14:29:53 +0100
Subject: [PATCH 3/5] Update widget.js

---
 apps/widram/widget.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/widram/widget.js b/apps/widram/widget.js
index dc7fed6c3..f5e936510 100644
--- a/apps/widram/widget.js
+++ b/apps/widram/widget.js
@@ -1,11 +1,15 @@
 (() => {
   function draw() {
+    BANGLEJS2 = process.env.HWVERSION==2;
     g.reset();
     var m = process.memory();
-    var pc = Math.round(m.usage*100/m.total);
+    var percent = Math.round(m.usage*100/m.total);
     g.drawImage(atob("BwgBqgP////AVQ=="), this.x+(24-7)/2, this.y+4);
-    g.setColor(pc>70 ? "#ff0000" : (pc>50 ? "#ffff00" : "#ffffff"));
-    g.setFont("6x8").setFontAlign(0,0).drawString(pc+"%", this.x+12, this.y+20, true/*solid*/);
+    if (!BANGLEJS2)
+      g.setColor(percent>70 ? "#ff0000" : (percent>50 ? "#ffff00" : "#ffffff"));
+    else
+      g.setColor(percent>70 ? "#0f0" : (percent>50 ? "#00f" : "#f00"));
+    g.setFont("6x8").setFontAlign(0,0).drawString(percent+"%", this.x+12, this.y+20, true/*solid*/);
   }
   var ramInterval;
   Bangle.on('lcdPower', function(on) {
@@ -20,4 +24,4 @@
     }
   });
   WIDGETS["ram"]={area:"tl",width: 24,draw:draw};
-})()
+})();

From b7cb979c6b17d7684b5810ce261038ed0bd5d9c5 Mon Sep 17 00:00:00 2001
From: Hilmar Strauch <56518493+HilmarSt@users.noreply.github.com>
Date: Wed, 26 Jan 2022 14:41:38 +0100
Subject: [PATCH 4/5] Update metadata.json

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

diff --git a/apps/widram/metadata.json b/apps/widram/metadata.json
index e6b6f7ce2..19ae6d311 100644
--- a/apps/widram/metadata.json
+++ b/apps/widram/metadata.json
@@ -3,7 +3,7 @@
   "name": "RAM Widget",
   "shortName": "RAM Widget",
   "version": "0.02",
-  "description": "Display your Bangle's available RAM percentage in a widget",
+  "description": "Display your Bangle's RAM usage percentage in a widget",
   "icon": "widget.png",
   "type": "widget",
   "tags": "widget",

From b6d425f4ad962cc069d0894d0d98d1e1ce0b219a Mon Sep 17 00:00:00 2001
From: Hilmar Strauch <56518493+HilmarSt@users.noreply.github.com>
Date: Wed, 26 Jan 2022 14:42:48 +0100
Subject: [PATCH 5/5] Update widget.js

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

diff --git a/apps/widram/widget.js b/apps/widram/widget.js
index f5e936510..210c85357 100644
--- a/apps/widram/widget.js
+++ b/apps/widram/widget.js
@@ -8,7 +8,7 @@
     if (!BANGLEJS2)
       g.setColor(percent>70 ? "#ff0000" : (percent>50 ? "#ffff00" : "#ffffff"));
     else
-      g.setColor(percent>70 ? "#0f0" : (percent>50 ? "#00f" : "#f00"));
+      g.setColor(percent>70 ? "#f00" : (percent>50 ? "#00f" : "#0f0"));
     g.setFont("6x8").setFontAlign(0,0).drawString(percent+"%", this.x+12, this.y+20, true/*solid*/);
   }
   var ramInterval;