bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve names (and translate german names)

master
czeppi 2024-12-31 16:13:22 +01:00
parent ed58557824
commit 0625b4c8c1
1 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
apps/cc_clock24/app.js
View File

@ -9,57 +9,58 @@ const defaultSettings = {
const settings = Object.assign(defaultSettings, require('Storage').readJSON('cc_clock24.json', 1) || {});
const c = {
const center = {
"x": g.getWidth()/2,
"y": g.getHeight()/2
};
const zahlpos = (function() {
const hourNumberPositions = (function() {
let z = [];
let sk = 1;
for (let i = -10; i < 50; i += 5){
let win = i * 2 * Math.PI / 60;
let xsk = c.x + 2 + Math.cos(win) * (c.x - 10),
ysk = c.y + 2 + Math.sin(win) * (c.x - 10);
if (sk==3){ xsk -=10; }
if (sk==6){ ysk -=10; }
if (sk==9){ xsk +=10; }
if (sk==12){ ysk +=10; }
if (sk==10){ xsk +=3; }
let alpha = i * 2 * Math.PI / 60;
let xsk = center.x + 2 + Math.cos(alpha) * (center.x - 10),
ysk = center.y + 2 + Math.sin(alpha) * (center.x - 10);
if (sk==3){ xsk -= 10; }
if (sk==6){ ysk -= 10; }
if (sk==9){ xsk += 10; }
if (sk==12){ ysk += 10; }
if (sk==10){ xsk += 3; }
z.push([sk, xsk, ysk]);
sk += 1;
}
return z;
})();
const zeiger = function(len, dia, tim) {
const x = c.x + Math.cos(tim) * len/2,
y = c.y + Math.sin(tim) * len/2,
const calcHandPolygon = function(len, dia, alpha) {
const x = center.x + Math.cos(alpha) * len/2,
y = center.y + Math.sin(alpha) * len/2,
d = {
"d": 3,
"x": dia/2 * Math.cos(tim + Math.PI/2),
"y": dia/2 * Math.sin(tim + Math.PI/2)
"x": dia/2 * Math.cos(alpha + Math.PI/2),
"y": dia/2 * Math.sin(alpha + Math.PI/2)
},
pol = [
c.x - d.x,
c.y - d.y,
c.x + d.x,
c.y + d.y,
x + d.x,
y + d.y,
x - d.x,
y - d.y
];
return pol;
return [
center.x - d.x,
center.y - d.y,
center.x + d.x,
center.y + d.y,
x + d.x,
y + d.y,
x - d.x,
y - d.y
];
};
const drawHands = function(d) {
let m = d.getMinutes(), h = d.getHours(), s = d.getSeconds();
const drawHands = function(date) {
let m = date.getMinutes(),
h = date.getHours(),
s = date.getSeconds();
g.setColor(1, 1, 1);
let numHoursForHourHand = settings.show24HourMode? 24 : 12;
if(h > numHoursForHourHand){
if (h > numHoursForHourHand){
h = h - numHoursForHourHand;
}
@ -69,29 +70,32 @@ const drawHands = function(d) {
s = 2 * Math.PI / 60 * s - Math.PI/2;
//g.setColor(1,0,0);
const hz = zeiger(settings.shortHrHand? 88 : 100, 5, h);
g.fillPoly(hz, true);
const hourPolygon = calcHandPolygon(settings.shortHrHand? 88 : 100, 5, h);
g.fillPoly(hourPolygon, true);
//g.setColor(1, 1, 1);
const minz = zeiger(150, 5, m);
g.fillPoly(minz, true);
const minutePolygon = calcHandPolygon(150, 5, m);
g.fillPoly(minutePolygon, true);
if (unlock){
const sekz = zeiger(150, 2, s);
g.fillPoly(sekz, true);
const secondPolygon = calcHandPolygon(150, 2, s);
g.fillPoly(secondPolygon, true);
}
g.fillCircle(c.x, c.y, 4);
g.fillCircle(center.x, center.y, 4);
};
const drawText = function(d) {
const drawText = function(date) {
g.setFont("Vector", 10);
g.setBgColor(0, 0, 0);
g.setColor(1, 1, 1);
const dateStr = require("locale").date(d);
g.drawString(dateStr, c.x, c.y + 20, true);
const batStr = Math.round(E.getBattery()/5) * 5 + "%";
const dateStr = require("locale").date(date);
g.drawString(dateStr, center.x, center.y + 20, true);
const batteryStr = Math.round(E.getBattery()/5) * 5 + "%";
if (Bangle.isCharging()) {
g.setBgColor(1, 0, 0);
}
g.drawString(batStr, c.x, c.y + 40, true);
g.drawString(batteryStr, center.x, center.y + 40, true);
};
const drawNumbers = function() {
@ -100,11 +104,11 @@ const drawNumbers = function() {
g.setColor(1, 1, 1);
g.setBgColor(0, 0, 0);
for(let i = 0; i < 12; i++){
hour = zahlpos[i][0]
hour = hourNumberPositions[i][0]
if (settings.show24HourMode){
hour *= 2;
}
g.drawString(hour, zahlpos[i][1], zahlpos[i][2], true);
g.drawString(hour, hourNumberPositions[i][1], hourNumberPositions[i][2], true);
}
};
@ -139,16 +143,18 @@ const queueDraw = function() {
const draw = function() {
// draw black rectangle in the middle to clear screen from scale and hands
g.setColor(0, 0, 0);
g.fillRect(10, 10, 2 * c.x - 10, 2 * c.x - 10);
g.fillRect(10, 10, 2 * center.x - 10, 2 * center.x - 10);
// prepare for drawing the text
g.setFontAlign(0, 0);
// do drawing
drawNumbers();
const d = new Date();
const date = new Date();
if (settings.textAboveHands) {
drawHands(d); drawText(d);
drawHands(date);
drawText(date);
} else {
drawText(d); drawHands(d);
drawText(date);
drawHands(date);
}
queueDraw();
};
@ -158,14 +164,17 @@ const drawScale = function() {
// clear the screen
g.setBgColor(0, 0, 0);
g.clear();
// draw the ticks of the scale
for (let i = -14; i < 47; i++){
const win= i * 2 * Math.PI/60;
const alpha = i * 2 * Math.PI/60;
let d = 2;
if (i % 5==0){ d =5; }
g.fillPoly(zeiger(300, d, win), true);
if (i % 5 == 0) {
d = 5;
}
g.fillPoly(calcHandPolygon(300, d, alpha), true);
g.setColor(0, 0, 0);
g.fillRect(10, 10, 2 * c.x - 10, 2 * c.x - 10);
g.fillRect(10, 10, 2 * center.x - 10, 2 * center.x - 10);
g.setColor(1, 1, 1);
}
};
@ -181,7 +190,10 @@ Bangle.setUI({
Bangle.removeListener('charging', draw);
// We clear drawTimout after removing all listeners, because they can add one again
if (drawTimeout) clearTimeout(drawTimeout);
if (drawTimeout) {
clearTimeout(drawTimeout);
}
drawTimeout = undefined;
require("widget_utils").show();
}