Bugfixes and improvements

master
David Peer 2022-02-23 21:47:22 +01:00
parent 4cb1cf2ba4
commit e678892223
2 changed files with 14 additions and 15 deletions

View File

@ -1,13 +1,13 @@
Bangle.loadWidgets();
const storage = require('Storage');
let settingsChronowid;
const screenWidth = g.getWidth();
const screenHeight = g.getHeight();
const screenHalfWidth = parseInt(screenWidth/2);
const screenHalfHeight = parseInt(screenHeight/2);
let interval = 0;
function updateSettings() {
@ -15,10 +15,11 @@ function updateSettings() {
const goal = new Date(now.getFullYear(), now.getMonth(), now.getDate(),
now.getHours() + settingsChronowid.hours, now.getMinutes() + settingsChronowid.minutes, now.getSeconds() + settingsChronowid.seconds);
settingsChronowid.goal = goal.getTime();
storage.writeJSON('chronowid.json', settingsChronowid);
storage.writeJSON('chronosimplewid.json', settingsChronowid);
if (WIDGETS["chronowid"]) WIDGETS["chronowid"].reload();
}
function resetSettings() {
settingsChronowid = {
hours : 0,
@ -31,34 +32,34 @@ function resetSettings() {
updateSettings();
}
settingsChronowid = storage.readJSON('chronowid.json',1);
settingsChronowid = storage.readJSON('chronosimplewid.json',1);
if (!settingsChronowid) resetSettings();
E.on('kill', () => {
updateSettings();
});
setWatch(_=>load(), BTN1);
function draw(){
g.clear(1);
Bangle.drawWidgets();
g.setColor(g.theme.fg);
g.setFont("Vector", 25).setFontAlign(0,-1);
g.setFont("Vector", 26).setFontAlign(0,-1);
g.setFontAlign(0, 0, 0);
g.drawString("T-" + settingsChronowid.minutes + " min.", screenHalfWidth, screenHalfHeight);
if(settingsChronowid.started){
g.setColor("#ff0000");
g.setFont("Vector", 16).setFontAlign(0,-1);
g.setFont("Vector", 20).setFontAlign(0,-1);
g.drawString("[started]", screenHalfWidth, screenHalfHeight+20);
}
}
Bangle.on('touch', function(btn, e){
var left = parseInt(g.getWidth() * 0.2);
var right = g.getWidth() - left;
var upper = 24 + parseInt(g.getHeight() * 0.2);
var upper = parseInt(g.getHeight() * 0.2);
var lower = g.getHeight() - upper;
var isLeft = e.x < left;
@ -89,6 +90,4 @@ Bangle.on('touch', function(btn, e){
});
g.reset();
setWatch(_=>load(), BTN1);
Bangle.loadWidgets();
draw();

View File

@ -30,7 +30,7 @@
Bangle.buzz(1500);
//write timer off to file
settingsChronowid.started = false;
require('Storage').writeJSON('chronowid.json', settingsChronowid);
require('Storage').writeJSON('chronosimplewid.json', settingsChronowid);
clearInterval(interval); //stop interval
interval = undefined;
}
@ -64,7 +64,7 @@
if (last != this.width) Bangle.drawWidgets();
else this.draw();
}, reload:function() {
settingsChronowid = require('Storage').readJSON("chronowid.json",1)||{};
settingsChronowid = require('Storage').readJSON("chronosimplewid.json",1)||{};
if (interval) clearInterval(interval);
interval = undefined;
// start countdown each second