improve icon + screenshots of CC-Clock24

apps/cc_astro/ChangeLog

@@ -0,0 +1 @@
+0.01: First functional release

apps/cc_astro/README.md

@@ -0,0 +1,9 @@
+# Astronomy Clock
+
+## Features
+
+* shows earth as hour and venus as minute hand
+* shows mercury as second hand only on unlocked screen
+* if battery is low, the sun will become to a red giant
+
+![logo](screenshot1.png)

apps/cc_astro/app.js

@@ -0,0 +1,184 @@
+// ----- const -----
+
+const center = {
+  "x": g.getWidth()/2,
+  "y": g.getHeight()/2
+};
+
+const parameters = {
+  "earthOrbitRadius": 80,
+  "venusOrbitRadius": 60,
+  "mercuryOrbitRadius": 40,
+  "earthRadius": 8,
+  "venusRadius": 6,
+  "mercuryRadius": 4,
+  "sunRadius": 12,
+  "maxSunRadius": 115
+};
+
+// ----- global vars -----
+
+let drawTimeout;
+let queueMillis = 1000;
+let unlock = true;
+let lastBatteryStates = [E.getBattery()];
+
+// ----- functions -----
+
+function updateState() {
+  updateBatteryStates();
+
+  if (Bangle.isLCDOn()) {
+    if (!Bangle.isLocked()) {
+      queueMillis = 1000;
+      unlock = true;
+    }
+    else {
+      queueMillis = 60000;
+      unlock = false;
+    }
+    draw();
+  }
+  else {
+    if (drawTimeout)
+      clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+}
+
+function updateBatteryStates() {
+  lastBatteryStates.push(E.getBattery());
+  if (lastBatteryStates.length > 5)
+    lastBatteryStates.shift();  // remove 1st item
+}
+
+function draw() {
+  drawBackground();
+  drawHands();
+  queueDraw();
+}
+
+function drawBackground() {
+  clearScreen();
+  drawSun();
+}
+
+function clearScreen() {
+  g.setBgColor(0, 0, 0);
+  g.clear();
+}
+
+function drawSun() {
+  const batteryState = calcAvgBatteryState();
+
+  if (batteryState <= 25)
+    g.setColor(1, 0, 0);  // red sun, if battery low
+  else
+    g.setColor(1, 1, 0);
+
+  let r = parameters.sunRadius;
+  if (batteryState <= 20) {
+    const relSize = (20 - batteryState) / 20;
+    const dr = parameters.maxSunRadius - parameters.sunRadius;
+    r = parameters.sunRadius + relSize * dr;
+  }
+
+  g.fillCircle(center.x, center.y, r);
+}
+
+function drawHands() {
+  const date = new Date();
+
+  drawHourHand(date.getHours(), date.getMinutes());
+  drawMinuteHand(date.getMinutes());
+
+  if (unlock) {
+    drawSecondHand(date.getSeconds());
+  }
+}
+
+function drawHourHand(hours, minutes) {
+  const r = parameters.earthOrbitRadius;
+  const phi = 30 * (hours + minutes/60) * (Math.PI / 180) - Math.PI/2;
+  const x = center.x + r * Math.cos(phi);
+  const y = center.y + r * Math.sin(phi);
+
+  g.setColor(1, 1, 1);
+  g.drawCircle(center.x, center.y, r);
+
+  g.setColor(0, 1, 1);
+  g.fillCircle(x, y, parameters.earthRadius);
+}
+
+function drawMinuteHand(minutes) {
+  const r = parameters.venusOrbitRadius;
+  const phi = 6 * minutes * (Math.PI / 180) - Math.PI/2;
+  const x = center.x + r * Math.cos(phi);
+  const y = center.y + r * Math.sin(phi);
+
+  g.setColor(1, 1, 1);
+  g.drawCircle(center.x, center.y, r);
+
+  g.setColor(1, 1, 1);
+  g.fillCircle(x, y, parameters.venusRadius);
+}
+
+function drawSecondHand(seconds) {
+  const r = parameters.mercuryOrbitRadius;
+  const phi = 6 * seconds * (Math.PI / 180) - Math.PI/2;
+  const x = center.x + r * Math.cos(phi);
+  const y = center.y + r * Math.sin(phi);
+
+  g.setColor(1, 1, 1);
+  g.drawCircle(center.x, center.y, r);
+
+  g.setColor(1, 0, 1);
+  g.fillCircle(x, y, parameters.mercuryRadius);
+}
+
+function calcAvgBatteryState() {
+  const n = lastBatteryStates.length;
+  if (n == 0)
+    return 100;
+
+  let sum = lastBatteryStates.reduce((acc, value) => acc + value, 0);
+  return Math.round(sum / n);
+}
+
+function queueDraw() {
+  if (drawTimeout) 
+    clearTimeout(drawTimeout);
+
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, queueMillis - (Date.now() % queueMillis));
+}
+
+
+//// main running sequence ////
+
+// Show launcher when middle button pressed, and widgets that we're clock
+Bangle.setUI({
+  mode: "clock",
+  remove: function() {
+    Bangle.removeListener('lcdPower', updateState);
+    Bangle.removeListener('lock', updateState);
+    Bangle.removeListener('charging', draw);
+
+    // We clear drawTimout after removing all listeners, because they can add one again
+    if (drawTimeout)
+      clearTimeout(drawTimeout);
+
+    drawTimeout = undefined;
+    require("widget_utils").show();
+  }
+});
+
+// Stop updates when LCD is off, restart when on
+Bangle.on('lcdPower', updateState);
+Bangle.on('lock', updateState);
+Bangle.on('charging', draw); // Immediately redraw when charger (dis)connected
+
+updateState();
+draw();

apps/cc_astro/metadata.json

@@ -0,0 +1,21 @@
+{ "id": "cc_astro",
+  "name": "CC Astro",
+  "shortName": "CC-Astro",
+  "version": "0.01",
+  "description": "A clock with planets as clock hands",
+  "icon": "app_icon.png",
+  "type": "clock",
+  "tags": "clock,astro,planets,earth,venus,mercury,sun",
+  "supports" : ["BANGLEJS2"],
+  "screenshots": [
+    {"url":"screenshot1.png"}, 
+    {"url":"screenshot2.png"}, 
+    {"url":"screenshot3.png"}
+  ],
+  "readme": "README.md",
+  "storage": [
+    {"name": "cc_astro.app.js", "url": "app.js"},
+    {"name": "cc_astro.img", "url": "app_icon.js", "evaluate":true}
+  ],
+  "data": [{"name":"cc_astro.json"}]
+}

apps/cc_clock24/ChangeLog

@@ -1,3 +1,4 @@
 0.01: copied from andark (V0.08)
       refactored
       add 24 hour mode
+0.02: fix icon + screenshots

apps/cc_clock24/README.md

@@ -1,4 +1,4 @@
-# Analog Clock With 24 hour hands
+# Analog Clock With Optional 24 hour hands
 
 ## Features
 
@@ -7,7 +7,7 @@
 * battery percentage (showing charge status with color)
 * turned off or swipeable widgets (choose in settings)
 
-![logo](cc_clock24_screen.png)
+![logo](screenshot1.png)
 
 ## Settings
 

apps/cc_clock24/metadata.json

@@ -1,18 +1,18 @@
 { "id": "cc_clock24",
   "name": "CC Clock 24",
-  "shortName":"CC-Clock24",
-  "version":"0.01",
+  "shortName": "CC-Clock24",
+  "version": "0.02",
   "description": "analog clock face with 24 hour pointer",
-  "icon": "cc_clock24_icon.png",
+  "icon": "app_icon.png",
   "type": "clock",
   "tags": "clock",
   "supports" : ["BANGLEJS2"],
-  "screenshots": [{"url":"cc_clock24_screen.png"}],
+  "screenshots": [{"url": "screenshot1.png"}, {"url": "screenshot2.png"}, {"url": "screenshot3.png"}],
   "readme": "README.md",
   "storage": [
-    {"name":"cc_clock24.app.js","url":"app.js"},
-    {"name":"cc_clock24.settings.js","url":"settings.js"},
-    {"name":"cc_clock24.img","url":"app_icon.js","evaluate":true}
+    {"name": "cc_clock24.app.js", "url": "app.js"},
+    {"name": "cc_clock24.settings.js", "url": "settings.js"},
+    {"name": "cc_clock24.img", "url": "app_icon.js", "evaluate": true}
   ],
-  "data": [{"name":"cc_clock24.json"}]
+  "data": [{"name": "cc_clock24.json"}]
 }

apps/cc_clock24/settings.js

@@ -5,27 +5,27 @@
     shortHrHand    : false,
     show24HourMode : false
   }
-  let settings = Object.assign(defaultSettings, require('Storage').readJSON('cc_clock24.json',1) || {});
+  let settings = Object.assign(defaultSettings, require('Storage').readJSON('cc_clock24.json', 1) || {});
 
   const save = () => require('Storage').write('cc_clock24.json', settings);
 
   const appMenu = {
     '': {title: 'cc_clock24'}, '< Back': back,
     /*LANG*/'Load widgets': {
       value : !!settings.loadWidgets,
-      onchange : v => { settings.loadWidgets=v; save();}
+      onchange : v => { settings.loadWidgets = v; save();}
     },
     /*LANG*/'Text above hands': {
       value : !!settings.textAboveHands,
-      onchange : v => { settings.textAboveHands=v; save();}
+      onchange : v => { settings.textAboveHands = v; save();}
     },
     /*LANG*/'Short hour hand': {
       value : !!settings.shortHrHand,
-      onchange : v => { settings.shortHrHand=v; save();}
+      onchange : v => { settings.shortHrHand = v; save();}
     },
     /*LANG*/'Show 24 hour mode': {
       value : !!settings.show24HourMode,
-      onchange : v => { settings.show24HourMode=v; save();}
+      onchange : v => { settings.show24HourMode = v; save();}
     },
   };