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 diff --git a/apps/widram/metadata.json b/apps/widram/metadata.json index 8ea309ebf..19ae6d311 100644 --- a/apps/widram/metadata.json +++ b/apps/widram/metadata.json @@ -2,8 +2,8 @@ "id": "widram", "name": "RAM Widget", "shortName": "RAM Widget", - "version": "0.01", - "description": "Display your Bangle's available RAM percentage in a widget", + "version": "0.02", + "description": "Display your Bangle's RAM usage percentage in a widget", "icon": "widget.png", "type": "widget", "tags": "widget", diff --git a/apps/widram/widget.js b/apps/widram/widget.js index dc7fed6c3..210c85357 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 ? "#f00" : (percent>50 ? "#00f" : "#0f0")); + 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}; -})() +})();