Merge branch 'master' of github.com:espruino/BangleApps

2021-12-17 11:26:38 +00:00 · 2021-12-17 11:26:38 +00:00 · e67f15710d
parent df810fc7bb a8fa6faafa
commit e67f15710d
14 changed files with 268 additions and 20 deletions
--- a/apps.json
+++ b/apps.json
@ -77,7 +77,7 @@
  {
    "id": "messages",
    "name": "Messages",
-    "version": "0.13",
+    "version": "0.14",
    "description": "App to display notifications from iOS and Gadgetbridge",
    "icon": "app.png",
    "type": "app",
@ -167,7 +167,7 @@
  {
    "id": "setting",
    "name": "Settings",
-    "version": "0.37",
+    "version": "0.38",
    "description": "A menu for setting up Bangle.js",
    "icon": "settings.png",
    "tags": "tool,system",
@ -5007,6 +5007,24 @@
      {"name":"lapcounter.img","url":"app-icon.js","evaluate":true}
    ]
  },
+  {
+    "id": "pebbled",
+    "name": "Pebble Clock with distance",
+    "shortName": "Pebble + distance",
+    "version": "0.1",
+    "description": "Fork of Pebble Clock with distance in KM. Both step count and the distance are on the main screen. Default step length = 0.75m (can be changed in settings).",
+    "readme": "README.md",
+    "icon": "pebbled.png",
+    "screenshots": [{"url":"pebble_screenshot.png"}],
+    "type": "clock",
+    "tags": "clock,distance",
+    "supports": ["BANGLEJS2"],
+    "storage": [
+      {"name":"pebbled.app.js","url":"pebbled.app.js"},
+      {"name":"pebbled.settings.js","url":"pebbled.settings.js"},
+      {"name":"pebbled.img","url":"pebbled.icon.js","evaluate":true}
+    ]
+  },
  { "id": "circlesclock",
      "name": "Circles clock",
      "shortName":"Circles clock",
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@ -20,3 +20,4 @@
 0.13: Add /*LANG*/ comments for internationalisation
      Add 'Delete All' option to message options
      Now update correctly when 'require("messages").clearAll()' is called
+0.14: Hide widget when all unread notifications are dismissed from phone
--- a/apps/messages/lib.js
+++ b/apps/messages/lib.js
@ -30,6 +30,10 @@ exports.pushMessage = function(event) {
  require("Storage").writeJSON("messages.json",messages);
  // if in app, process immediately
  if (inApp) return onMessagesModified(mIdx<0 ? {id:event.id} : messages[mIdx]);
+  // if we've removed the last new message, hide the widget
+  if (event.t=="remove" && !messages.some(m=>m.new)) {
+    if (global.WIDGETS && WIDGETS.messages) WIDGETS.messages.hide();
+  }
  // ok, saved now - we only care if it's new
  if (event.t!="add") {
    return;
--- a/apps/pebbled/ChangeLog
+++ b/apps/pebbled/ChangeLog
@ -0,0 +1 @@
+0.1: first release
--- a/apps/pebbled/LECO
+++ b/apps/pebbled/LECO
--- a/apps/pebbled/README.md
+++ b/apps/pebbled/README.md
@ -0,0 +1,22 @@
+# Pebble with distance and steps
+
+- Forked from [Pebble](https://github.com/espruino/BangleApps/tree/master/apps/pebble)
+- Added distance in km (kilometers) based on step length (can be changed in settings and is equal 0.75m by default)
+- Battery warning changed to 15% instead of 30%
+
+![](pebble_screenshot.png)
+![](photo.jpg)
+
+Initially written by: [Hugh Barney](https://github.com/hughbarney)
+
+Forked and changed by [RomanistHere](https://github.com/RomanistHere)
+
+For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/)
+
+## How to measure step length
+
+It's much easier than you think. When you're walking, just note number of current steps at two points and then see the distance in any map service. For example, your route from bus station to home. Write number of steps at bus station (let's say 3451) and when you entered your home (3921). You passed 3921 - 3451 = 470 steps. Then see the actual distance in Google maps. Let's say it shows 300 meters. So your step length (in settings) used in app should be 300 / 470 = 0.64. After you have set it, the displayed distance at the main screen should be more accurate.
+
+## Plans
+
+Make step length depend on height/sex/age for lazy ones who don't want to measure it.
--- a/apps/pebbled/pebble_screenshot.png
+++ b/apps/pebbled/pebble_screenshot.png
--- a/apps/pebbled/pebbled.app.js
+++ b/apps/pebbled/pebbled.app.js
@ -0,0 +1,129 @@
+Graphics.prototype.setFontLECO1976Regular42 = function(scale) {
+  // Actual height 42 (41 - 0)
+  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAA/AAAAAAAAH/AAAAAAAA//AAAAAAAP//AAAAAAB///AAAAAAP///AAAAAB////AAAAAf////AAAAD////4AAAAf////AAAAH////4AAAA////+AAAAA////wAAAAA///+AAAAAA///gAAAAAA//8AAAAAAA//gAAAAAAA/4AAAAAAAA/AAAAAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAH/AAAAAAAAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA//h////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////gD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4AAAH/AAA/4B/gH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAA////wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAAAAB/wAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA////x//AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/wB////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/4B////AAA/wB////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA//gAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA/4AAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA////wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA/4B/wH/AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAA///////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAP+AAH/AAAAH+AAD/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), 46, atob("ERkmHyYmJiYmJCYmEQ=="), 60+(scale<<8)+(1<<16));
+};
+
+Graphics.prototype.setFontLECO1976Regular22 = function(scale) {
+  // Actual height 22 (21 - 0)
+  g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/nA/+cD/5wP/nAAAAAAAAPwAA/gAD+AAPwAAAAAD+AAP4AA/gAAAAAAAAAAAAAcOAP//A//8D//wP//AHDgAcOAP//A//8D//wP//AHDgAAAAAAAAH/jgf+OB/44H/jj8OP/w4//Dj/8OPxw/4HD/gcP+Bw/4AAAAAAAP+AA/8AD/wQOHHA4c8D//wP/8A//gAD4AAfAAH/8A//wP//A84cDjhwIP/AA/8AB/wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8ABwAAAAAAAAD8AAP4AA/gAD8AAAAAAAAAAAEAAD+AB//A///v/D//gB/wABwAAAAAADgAA/wAf/4P8///wf/4AP8AAOAAAAAAAAAyAAHcAAPwAD/gAP/AA/8AA/AAH8AAMwAAAAAAAAAAAAADgAAOAAA4AAf8AD/wAP/AA/8AAOAAA4AADgAAAAAAAAAAD8AAfwAB/AAD8AAAAAAAADgAAOAAA4AADgAAOAAA4AADgAAAAAAAAAADgAAOAAA4AADgAAAAAAAAABwAB/AA/8A//gP/gA/wADwAAIAAAAAAD//wP//A//8D//wOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA4AcDgBwOAHA//8D//wP//A//8AABwAAHAAAcAAAAAAAA+f8D5/wPn/A+f8DhxwOHHA4ccDhxwP/HA/8cD/xwP/HAAAAAAAAOAHA4AcDhxwOHHA4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/wAP/AA/8AD/wAAHAAAcAABwAAHAA//8D//wP//A//8AAAAAAAA/98D/3wP/fA/98DhxwOHHA4ccDhxwOH/A4f8Dh/wOH/AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccDh/wOH/A4f8Dh/wAAAAAAAD4AAPgAA+AADgAAOAAA4AADgAAP//A//8D//wP//AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA//8D//wP//A//8AAAAAAAAOA4A4DgDgOAOA4AAAAAAAAOA/A4H8DgfwOA/AAAAAAAAB4AAPwAA/AAD8AAf4ABzgAPPAA8cAHh4AAAAAAAAAAAAHHAAccABxwAHHAAccABxwAHHAAccABxwAHHAAAAAAAAAOHAA4cADzwAPPAAf4AB/gAD8AAPwAAeAAB4AAAAAAAAA+AAD4AAPgAA+ecDh9wOH3A4fcDhwAP/AA/8AD/wAP/AAAAAAAAAP//4///j//+P//44ADjn/OOf845/zjnHOP8c4//zj//OP/84AAAAAAAP//A//8D//wP//A4cADhwAOHAA4cAD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA//8D//wP9/A/j8AAAAAAAA//8D//wP//A//8DgBwOAHA4AcDgBwOAHA4AcDgBwOAHAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA8A8D//wH/+AP/wAf+AAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4ccDhxwOAHA4AcAAAAAAAA//8D//wP//A//8DhwAOHAA4cADhwAOHAA4cADgAAOAAAAAAD//wP//A//8D//wOAHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA//8D//wP//A//8ABwAAHAAAcAABwAP//A//8D//wP//AAAAAAAAP//A//8D//wP//AAAAAAAAOAHA4AcDgBwOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA//8D//wP//A//8AHwAA/AAP8AB/wAPn/A8f8DB/wIH/AAAAAAAAP//A//8D//wP//AAAcAABwAAHAAAcAABwAAHAAAAAAAAP//A//8D//wP//Af8AAP+AAH/AAD8AAHwAD/AB/wAf8AP+AA//8D//wP//AAAAAAAAP//A//8D//wP//AfwAAfwAAfwAAfwAAfwP//A//8D//wAAAAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHAA4cADhwAOHAA/8AD/wAP/AA/8AAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//+P//4///j//+AAA4AADgAAAP//A//8D//wP//A4eADh+AOH8A4f4D/3wP/HA/8MD/wQAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA4AADgAAOAAA//8D//wP//A//8DgAAOAAA4AADgAAAAAA//8D//wP//A//8AABwAAHAAAcAABwP//A//8D//wP//AAAADAAAPgAA/wAD/4AB/8AA/8AAfwAB/AA/8Af+AP/AA/wAD4AAMAAA4AAD+AAP/gA//8AH/wAB/AAf8Af/wP/4A/4AD/gAP/4AH/8AB/wAB/AB/8D//wP/gA/gADgAAIABA4AcDwDwPw/Afn4Af+AA/wAD/AA//AH5+A/D8DwDwOAHAgAEAAAAP/AA/8AD/wAP/AAAf8AB/wAH/AAf8D/wAP/AA/8AD/wAAAAAAAADh/wOH/A4f8Dh/wOHHA4ccDhxwOHHA/8cD/xwP/HA/8cAAAAAAAAf//9///3///f//9wAA3AADcAAMAAAOAAA/gAD/wAH/8AB/8AA/wAAPAAAEAAAAHAADcAANwAB3///f//9///wAA"), 32, atob("BwYLDg4UDwYJCQwMBgkGCQ4MDg4ODg4NDg4GBgwMDA4PDg4ODg4NDg4GDQ4MEg8ODQ8ODgwODhQODg4ICQg="), 22+(scale<<8)+(1<<16));
+};
+
+const SETTINGS_FILE = "pebbleDistance.json";
+let settings;
+
+function loadSettings() {
+  settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75};
+}
+
+var img = require("heatshrink").decompress(atob("oFAwkEogA/AH4A/AH4A/AH4A/AE8AAAoeXoAfeDQUBmcyD7A+Dh///8QD649CiAfaHwUvD4sEHy0DDYIfEICg+Cn4fHICY+DD4nxcgojOHwgfEIAYfRCIQaDD4ZAFD5r7DH4//kAfRCIZ/GAAnwD5p9DX44fTHgYSBf4ofVDAQEBl4fFUAgfOXoQzBgIfFBAIfPP4RAEAoYAB+cRiK/SG4h/WIBAfXIA7CBAAswD55AHn6fUIBMCD65AHl4gCmcziAfQQJqfQQJpiDgk0IDXxQLRAEECaBM+QgRYRYgUIA0CD4ggSQJiDCiAKBICszAAswD55AHABKBVD7BAFABIqBD5pAFABPxD55AOD6BADiIAJQAyxLABwf/gaAPAH4A/AH4ARA=="));
+
+const h = g.getHeight();
+const w = g.getWidth();
+const ha = 2*h/5 - 11;
+const h2 = 3*h/5 - 19;
+const h3 = 7*h/8 - 10;
+
+let batteryWarning = false;
+
+function draw() {
+  let date = new Date();
+  let da = date.toString().split(" ");
+  let timeStr = da[4].substr(0,5);
+  const t = 6;
+  const stps = getSteps();
+
+  // turn the warning on once we have dipped below 15%
+  if (E.getBattery() < 15)
+    batteryWarning = true;
+
+  // turn the warning off once we have dipped above 20%
+  if (E.getBattery() > 20)
+    batteryWarning = false;
+
+  g.reset();
+  g.setColor(settings.bg);
+  g.fillRect(0, 0, w, h2 - t);
+
+  // contrast bar
+  g.setColor(g.theme.fg);
+  g.fillRect(0, h2 - t, w, h2);
+
+  // day and steps
+  if (settings.color == 'Blue' || settings.color == 'Red')
+    g.setColor('#fff'); // white on blue or red best contrast
+  else
+    g.setColor('#000'); // otherwise black regardless of theme
+
+  g.setFontLECO1976Regular22();
+  g.setFontAlign(0, -1);
+  g.drawString(da[0].toUpperCase(), w/4, ha); // day of week
+  g.drawString(stps, 3*w/4, ha);
+
+  // time
+  // white on red for battery warning
+  g.setColor(!batteryWarning ? g.theme.bg : '#f00');
+  g.fillRect(0, h2, w, h3);
+
+  g.setFontLECO1976Regular42();
+  g.setFontAlign(0, -1);
+  g.setColor(!batteryWarning ? g.theme.fg : '#fff');
+  g.drawString(timeStr, w/2, h2 + 8);
+
+  // contrast bar
+  g.setColor(g.theme.fg);
+  g.fillRect(0, h3, w, h3 + t);
+
+  // the bottom
+  g.setColor(settings.bg);
+  g.fillRect(0, h3 + t, w, h);
+
+  g.setColor(settings.bg);
+  g.drawImage(img, w/2 + ((w/2) - 64)/2, -2, { scale: 1 });
+  drawCalendar(((w/2) - 42)/2, 11, 42, 4, da[2]);
+  
+  // distance 
+  if (settings.color == 'Blue' || settings.color == 'Red')
+    g.setColor('#fff'); // white on blue or red best contrast
+  else
+    g.setColor('#000'); // otherwise black regardless of theme
+  g.drawString((stps / 1000 * settings.avStep).toFixed(2) + ' KM', w/2, ha + 107);
+}
+
+// at x,y width:wi thicknes:th
+function drawCalendar(x,y,wi,th,str) {
+  g.setColor(g.theme.fg);
+  g.fillRect(x, y, x + wi, y + wi);
+  g.setColor(g.theme.bg);
+  g.fillRect(x + th, y + th, x + wi - th, y + wi - th);
+  g.setColor(g.theme.fg);
+
+  let hook_t = 6;
+  // first calendar hook, one third in
+  g.fillRect(x + (wi/3) - (th/2), y - hook_t, x + wi/3 + th - (th/2), y + hook_t);
+  // second calendar hook, two thirds in
+  g.fillRect(x + (2*wi/3) -(th/2), y - hook_t, x + 2*wi/3 + th - (th/2), y + hook_t);
+
+  g.setFontLECO1976Regular22();
+  g.setFontAlign(0, 0);
+  g.drawString(str, x + wi/2, y + wi/2 + th);
+}
+
+function getSteps() {
+  if (WIDGETS.wpedom !== undefined) {
+    return WIDGETS.wpedom.getSteps();
+  }
+  return '0';
+}
+
+g.clear();
+Bangle.loadWidgets();
+/*
+ * we are not drawing the widgets as we are taking over the whole screen
+ * so we will blank out the draw() functions of each widget and change the
+ * area to the top bar doesn't get cleared.
+ */
+for (let wd of WIDGETS) {wd.draw=()=>{};wd.area="";}
+loadSettings();
+setInterval(draw, 15000); // refresh every 15s
+draw();
+Bangle.setUI("clock");
--- a/apps/pebbled/pebbled.icon.js
+++ b/apps/pebbled/pebbled.icon.js
@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEw4kB78A/4ACj/fn8Rz/Or987+M38hv8Rn++z9Cn8y/9rj9Tr+diIAHiAxDgIOICpYADCywyNCxQYMSxouVGBIWODBDgRC7hGQJAwWRGAguSC7JICCyYXYJAQXWLyhICC94LKu8Gqk1gGD+AjQ//C6Ei2HS0AXQ/U2gEquFVC6Pyk8AlssmwXK3oGF+fi2Et0v2C4ONoAPFhsiwBfFhU0lvS2wXBsVUC4vSkwHF90Etlso0L6CSBkowEFwNgM5sImQwEFw4AJGAguQGAsQ6UvxAAQ2UloMYkQAU0MZmUjmYAQmUi+MRSowAM4UmiMRSowALhiKBC4MQGCIuBgAXCGCAuCgIXBiLGCFyQXCGAJINsToBC4cQgGMI50AIwYwCACAWEGAQAOFwowRCwwwPFw4wPCxAYNCxRJLCxYxKCxwyGORI"))
--- a/apps/pebbled/pebbled.png
+++ b/apps/pebbled/pebbled.png
--- a/apps/pebbled/pebbled.settings.js
+++ b/apps/pebbled/pebbled.settings.js
@ -0,0 +1,48 @@
+(function(back) {
+    const SETTINGS_FILE = "pebbleDistance.json";
+
+    // initialize with default settings...
+    let s = {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75};
+
+    // ...and overwrite them with any saved values
+    // This way saved values are preserved if a new version adds more settings
+    const storage = require('Storage');
+    let settings = storage.readJSON(SETTINGS_FILE, 1) || s;
+    const saved = settings || {};
+    for (const key in saved) {
+        s[key] = saved[key];
+    }
+
+    function save() {
+        settings = s;
+        storage.write(SETTINGS_FILE, settings);
+    }
+
+    var color_options = ['Green','Orange','Cyan','Purple','Red','Blue'];
+    var bg_code = ['#0f0','#ff0','#0ff','#f0f','#f00','#00f'];
+
+    E.showMenu({
+        '': { 'title': 'Pebble Clock' },
+        '< Back': back,
+        'Color': {
+            value: 0 | color_options.indexOf(s.color),
+            min: 0, max: 5,
+            format: v => color_options[v],
+            onchange: v => {
+                s.color = color_options[v];
+                s.bg = bg_code[v];
+                save();
+            },
+        },
+        'Step length': {
+            value: 0.75 || s.avStep,
+            min: 0.2,
+            max: 1.5,
+            step: 0.01,
+            onchange : v => {
+                s.avStep = v;
+                save();
+            }
+        }
+    });
+});
--- a/apps/pebbled/photo.jpg
+++ b/apps/pebbled/photo.jpg
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@ -40,3 +40,4 @@
 0.35: Change App/Widget settings to 'App Settings' so it fits on Bangle screen
 0.36: Added 'Utils' menu with helpful utilities for restoring Bangle.js
 0.37: Going into passkey menu now saves settings with passkey
+0.38: Restructed menus as per forum discussion
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@ -61,6 +61,37 @@ if (!settings) resetSettings();
 const boolFormat = v => v ? /*LANG*/"On" : /*LANG*/"Off";

 function showMainMenu() {
+
+  const mainmenu = {
+    '': { 'title': 'Settings' },
+    '< Back': ()=>load(),
+    /*LANG*/'Apps': ()=>showAppSettingsMenu(),
+    /*LANG*/'Bluetooth': ()=>showBLEMenu(),
+    /*LANG*/'System': ()=>showSystemMenu(),
+    /*LANG*/'Alerts': ()=>showAlertsMenu(),
+    /*LANG*/'Utils': ()=>showUtilMenu(),
+    /*LANG*/'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() }
+  };
+
+  return E.showMenu(mainmenu);
+}
+
+function showSystemMenu() {
+
+  const mainmenu = {
+    '': { 'title': 'System' },
+    '< Back': ()=>showMainMenu(),
+    /*LANG*/'Theme': ()=>showThemeMenu(),
+    /*LANG*/'LCD': ()=>showLCDMenu(),
+    /*LANG*/'Locale': ()=>showLocaleMenu(),
+    /*LANG*/'Select Clock': ()=>showClockMenu(),
+    /*LANG*/'Set Time': ()=>showSetTimeMenu()
+  };
+
+  return E.showMenu(mainmenu);
+}
+
+function showAlertsMenu() {
  var beepMenuItem;
  if (BANGLEJS2) {
    beepMenuItem = {
@ -91,12 +122,9 @@ function showMainMenu() {
    };
  }

-
  const mainmenu = {
-    '': { 'title': 'Settings' },
-    '< Back': ()=>load(),
-    /*LANG*/'App Settings': ()=>showAppSettingsMenu(),
-    /*LANG*/'BLE': ()=>showBLEMenu(),
+    '': { 'title': 'Alerts' },
+    '< Back': ()=>showMainMenu(),
    /*LANG*/'Beep': beepMenuItem,
    /*LANG*/'Vibration': {
      value: settings.vibrate,
@ -119,23 +147,18 @@ function showMainMenu() {
        updateOptions();
        if ("qmsched" in WIDGETS) WIDGETS["qmsched"].draw();
      },
-    },
-    /*LANG*/'Locale': ()=>showLocaleMenu(),
-    /*LANG*/'Select Clock': ()=>showClockMenu(),
-    /*LANG*/'Set Time': ()=>showSetTimeMenu(),
-    /*LANG*/'LCD': ()=>showLCDMenu(),
-    /*LANG*/'Theme': ()=>showThemeMenu(),
-    /*LANG*/'Utils': ()=>showUtilMenu(),
-    /*LANG*/'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() },
+    }
  };

  return E.showMenu(mainmenu);
 }

+
 function showBLEMenu() {
  var hidV = [false, "kbmedia", "kb", "joy"];
  var hidN = ["Off", "Kbrd & Media", "Kbrd","Joystick"];
  E.showMenu({
+    '': { 'title': 'Bluetooth' },
    '< Back': ()=>showMainMenu(),
    'Make Connectable': ()=>makeConnectable(),
    'BLE': {
@ -190,7 +213,7 @@ function showThemeMenu() {
  }
  var m = E.showMenu({
    '':{title:'Theme'},
-    '< Back': ()=>showMainMenu(),
+    '< Back': ()=>showSystemMenu(),
    'Dark BW': ()=>{
      upd({
        fg:cl("#fff"), bg:cl("#000"),
@ -335,7 +358,7 @@ function showWhitelistMenu() {
 function showLCDMenu() {
  const lcdMenu = {
    '': { 'title': 'LCD' },
-    '< Back': ()=>showMainMenu(),
+    '< Back': ()=>showSystemMenu(),
    'LCD Brightness': {
      value: settings.brightness,
      min: 0.1,
@ -447,7 +470,7 @@ function showLCDMenu() {
 function showLocaleMenu() {
  const localemenu = {
    '': { 'title': 'Locale' },
-    '< Back': ()=>showMainMenu(),
+    '< Back': ()=>showSystemMenu(),
    'Time Zone': {
      value: settings.timezone,
      min: -11,
@ -551,7 +574,7 @@ function showClockMenu() {
    '': {
      'title': 'Select Clock',
    },
-    '< Back': ()=>showMainMenu(),
+    '< Back': ()=>showSystemMenu(),
  };
  clockApps.forEach((app, index) => {
    var label = app.name;
@ -578,7 +601,7 @@ function showSetTimeMenu() {
    '': { 'title': 'Set Time' },
    '< Back': function () {
      setTime(d.getTime() / 1000);
-      showMainMenu();
+      showSystemMenu();
    },
    'Hour': {
      value: d.getHours(),
				`@ -0,0 +1 @@`
				`require("heatshrink").decompress(atob("mEw4kB78A/4ACj/fn8Rz/Or987+M38hv8Rn++z9Cn8y/9rj9Tr+diIAHiAxDgIOICpYADCywyNCxQYMSxouVGBIWODBDgRC7hGQJAwWRGAguSC7JICCyYXYJAQXWLyhICC94LKu8Gqk1gGD+AjQ//C6Ei2HS0AXQ/U2gEquFVC6Pyk8AlssmwXK3oGF+fi2Et0v2C4ONoAPFhsiwBfFhU0lvS2wXBsVUC4vSkwHF90Etlso0L6CSBkowEFwNgM5sImQwEFw4AJGAguQGAsQ6UvxAAQ2UloMYkQAU0MZmUjmYAQmUi+MRSowAM4UmiMRSowALhiKBC4MQGCIuBgAXCGCAuCgIXBiLGCFyQXCGAJINsToBC4cQgGMI50AIwYwCACAWEGAQAOFwowRCwwwPFw4wPCxAYNCxRJLCxYxKCxwyGORI"))`