Merge branch 'master' into app_settings

apps.json

@@ -662,7 +662,7 @@
   { "id": "miclock",
     "name": "Mixed Clock",
     "icon": "clock-mixed.png",
-    "version":"0.03",
+    "version":"0.04",
     "description": "A mix of analog and digital Clock",
     "tags": "clock",
     "type":"clock",
@@ -941,6 +941,19 @@
       {"name":"barclock.img","url":"clock-bar-icon.js","evaluate":true}
     ]
   },
+  { "id": "dotclock",
+    "name": "Dot Clock",
+    "icon": "clock-dot.png",
+    "version":"0.01",
+    "description": "A Minimal Dot Analog Clock",
+    "tags": "clock",
+    "type":"clock",
+    "allow_emulator":true,
+    "storage": [
+      {"name":"dotclock.app.js","url":"clock-dot.js"},
+      {"name":"dotclock.img","url":"clock-dot-icon.js","evaluate":true}
+    ]
+  },
   { "id": "widtbat",
     "name": "Tiny Battery Widget",
     "icon": "widget.png",

apps/dotclock/ChangeLog

@@ -0,0 +1 @@
+0.01: Based on the Analog Clock app, minimal dot interface

apps/dotclock/clock-dot-icon.js

@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("AH4A/AH4A/AH4AmgkEF/4A/KyxodDpHX66YtF5AA/AH4AobDYbTF94A/AH4A/AG/X64FIAgILEACcEggvIAIQCGAYgfPF+qPUF5QA/AH4AGyAuuAAJf/ABEEggbtF94A/AH4A/bCzqdF96Y/F/4A/AH4A/AGIA=="))

apps/dotclock/clock-dot.js

@@ -0,0 +1,162 @@
+let g;
+let Bangle;
+
+const locale = require('locale');
+const p = Math.PI / 2;
+const pRad = Math.PI / 180;
+const faceWidth = 100; // watch face radius
+let timer = null;
+let currentDate = new Date();
+let hourRadius = 60;
+let minRadius = 80;
+const centerPx = g.getWidth() / 2;
+
+const seconds = (angle) => {
+  const a = angle * pRad;
+  const x = centerPx + Math.sin(a) * faceWidth;
+  const y = centerPx - Math.cos(a) * faceWidth;
+
+  // if 15 degrees, make hour marker larger
+  const radius = (angle % 15) ? 2 : 4;
+  g.fillCircle(x, y, radius);
+};
+
+const hourDot = (angle,radius) => {
+  const a = angle * pRad;
+  const x = centerPx + Math.sin(a) * hourRadius;
+  const y = centerPx - Math.cos(a) * hourRadius;
+  g.fillCircle(x, y, radius);
+};
+
+const minDot = (angle,radius) => {
+  const a = angle * pRad;
+  const x = centerPx + Math.sin(a) * minRadius;
+  const y = centerPx - Math.cos(a) * minRadius;
+  g.fillCircle(x, y, radius);
+};
+
+const drawAll = () => {
+  g.clear();
+  currentDate = new Date();
+  // draw hands first
+  onMinute();
+  // draw seconds
+  const currentSec = currentDate.getSeconds();
+  // draw all secs
+
+  for (let i = 0; i < 60; i++) {
+    if (i > currentSec) {
+      g.setColor(0, 0, 0.6);
+    } else {
+      g.setColor(0.3, 0.3, 1);
+    }
+    seconds((360 * i) / 60);
+  }
+  onSecond();
+};
+
+const resetSeconds = () => {
+  g.setColor(0, 0, 0.6);
+  for (let i = 0; i < 60; i++) {
+    seconds((360 * i) / 60);
+  }
+};
+
+const drawMin = () => {
+  g.setColor(0.5, 0.5, 0.5);
+  for (let i = 0; i < 60; i++) {
+    minDot((360 * i) / 60,1);
+  }
+};
+
+const drawHour = () => {
+  g.setColor(0.5, 0.5, 0.5);
+  for (let i = 0; i < 12; i++) {
+    hourDot((360 * 5 * i) / 60,1);
+  }
+};
+
+const onSecond = () => {
+  g.setColor(0.3, 0.3, 1);
+  seconds((360 * currentDate.getSeconds()) / 60);
+  if (currentDate.getSeconds() === 59) {
+    resetSeconds();
+    onMinute();
+  }
+  g.setColor(1, 0.7, 0.2);
+  currentDate = new Date();
+  seconds((360 * currentDate.getSeconds()) / 60);
+  g.setColor(1, 1, 1);
+};
+
+const drawDate = () => {
+  g.reset();
+  g.setColor(1, 1, 1);
+  g.setFont('6x8', 2);
+
+  const dayString = locale.dow(currentDate, true);
+  // pad left date
+  const dateString = ((currentDate.getDate() < 10) ? '0' : '') + currentDate.getDate().toString();
+  const dateDisplay = `${dayString} ${dateString}`;
+  // console.log(`${dayString}|${dateString}`);
+  // center date
+  const l = (g.getWidth() - g.stringWidth(dateDisplay)) / 2;
+  const t = centerPx - 6 ;
+  g.drawString(dateDisplay, l, t);
+  // console.log(l, t);
+};
+const onMinute = () => {
+  if (currentDate.getHours() === 0 && currentDate.getMinutes() === 0) {
+    g.clear();
+    resetSeconds();
+  }
+  // clear existing hands
+  g.setColor(0, 0, 0);
+  hourDot((360 * currentDate.getHours()) / 12,4);
+  minDot((360 * currentDate.getMinutes()) / 60,3);
+
+  // Hour
+  drawHour();
+  // Minute
+  drawMin();
+
+  // get new date, then draw new hands
+  currentDate = new Date();
+  g.setColor(1, 0, 0);
+  // Hour
+  hourDot((360 * currentDate.getHours()) / 12,4);
+  g.setColor(1, 0.9, 0.9);
+  // Minute
+  minDot((360 * currentDate.getMinutes()) / 60,3);
+  if (currentDate.getHours() >= 0 && currentDate.getMinutes() === 0) {
+    Bangle.buzz();
+  }
+  drawDate();
+};
+
+const startTimers = () => {
+  timer = setInterval(onSecond, 1000);
+};
+
+Bangle.on('lcdPower', (on) => {
+  if (on) {
+    // g.clear();
+    drawAll();
+    startTimers();
+    Bangle.drawWidgets();
+  } else {
+    if (timer) {
+      clearInterval(timer);
+    }
+  }
+});
+
+g.clear();
+resetSeconds();
+startTimers();
+drawAll();
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+// Show launcher when middle button pressed
+setWatch(Bangle.showLauncher, BTN2, { repeat: false, edge: "falling" });

apps/locale/locales.js

@@ -1,4 +1,4 @@
-
+/* jshint esversion: 6 */
 const distanceUnits = { // how many meters per X?
   "m" : 1,
   "yd" : 0.9144,
@@ -387,4 +387,21 @@ var locales = {
         abday: "Dom,Seg,Ter,Qua,Qui,Sex,Sab",
         day: "Domingo,Segunda-feira,Terça-feira,Quarta-feira,Quinta-feira,Sexta-feira,Sábado",
         trans: { yes: "sim", Yes: "Sim", no: "não", No: "Não", ok: "certo", on: "ligado", off: "desligado" }},
+    "cs_CZ": {   
+        lang: "cs_CZ",
+        decimal_point: ",",
+        thousands_sep: " ",
+        currency_symbol: "Kč",
+        int_curr_symbol: " CZK",
+        speed: 'kmh',
+        distance: { "0": "m", "1": "km" },
+        temperature: '°C',
+        ampm: {0:"dop",1:"odp"},
+        timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" },
+        datePattern: { 0: "%d. %b %Y", 1: "%d.%m.%Y" }, // "30. led 2020" // "30.01.2020"(short)
+        abmonth: "led,úno,bře,dub,kvě,čvn,čvc,srp,zář,říj,lis,pro",
+        month: "leden,únor,březen,duben,květen,červen,červenec,srpen,září,říjen,listopad,prosinec",
+        abday: "ne,po,út,st,čt,pá,so",
+        day: "neděle,pondělí,úterý,středa,čtvrtek,pátek,sobota",
+        trans: { yes: "tak", Yes: "Tak", no: "nie", No: "Nie", ok: "ok", on: "na", off: "poza" }}  
 };

apps/miclock/ChangeLog

@@ -1,2 +1,3 @@
 0.02: Modified for use with new bootloader and firmware
 0.03: Localization
+0.04: move jshint to the top

apps/miclock/clock-mixed.js

@@ -1,5 +1,5 @@
-var locale = require("locale");
 /* jshint esversion: 6 */
+var locale = require("locale");
 const Radius = { "center": 8, "hour": 78, "min": 95, "dots": 102 };
 const Center = { "x": 120, "y": 132 };