mirror of https://github.com/espruino/BangleApps
Modify fuzzyw clock to use fastload & widget_utils
parent
7091194596
commit
364888d959
|
@ -1,2 +1,3 @@
|
|||
0.01: First release
|
||||
0.02: Move translations to locale module (removed watch settings, now pick language in Bangle App Loader, More..., Settings)
|
||||
0.03: Change for fast loading, use widget_utils to hide widgets
|
|
@ -1,6 +1,8 @@
|
|||
// adapted from https://github.com/hallettj/Fuzzy-Text-International/
|
||||
{
|
||||
const SETTINGS_FILE = "fuzzyw.settings.json";
|
||||
|
||||
let fuzzy_string = {
|
||||
let fuzzy_string = {
|
||||
"hours":[
|
||||
/*LANG*/"twelve",
|
||||
/*LANG*/"one",
|
||||
|
@ -35,7 +37,11 @@ let text_scale = 3.5;
|
|||
let timeout = 2.5*60;
|
||||
let drawTimeout;
|
||||
|
||||
function queueDraw(seconds) {
|
||||
let loadSettings = function() {
|
||||
settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false};
|
||||
}
|
||||
|
||||
let queueDraw = function(seconds) {
|
||||
let millisecs = seconds * 1000;
|
||||
if (drawTimeout) clearTimeout(drawTimeout);
|
||||
drawTimeout = setTimeout(function() {
|
||||
|
@ -47,7 +53,7 @@ function queueDraw(seconds) {
|
|||
const h = g.getHeight();
|
||||
const w = g.getWidth();
|
||||
|
||||
function getTimeString(date) {
|
||||
let getTimeString = function(date) {
|
||||
let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300);
|
||||
let hour = date.getHours() + Math.floor(segment/12);
|
||||
f_string = fuzzy_string.minutes[segment % 12];
|
||||
|
@ -59,7 +65,7 @@ function getTimeString(date) {
|
|||
return f_string;
|
||||
}
|
||||
|
||||
function draw() {
|
||||
let draw = function() {
|
||||
let time_string = getTimeString(new Date()).replace('*', '');
|
||||
// print(time_string);
|
||||
g.setFont('Vector', (h-24*2)/text_scale);
|
||||
|
@ -71,7 +77,7 @@ function draw() {
|
|||
}
|
||||
|
||||
g.clear();
|
||||
draw();
|
||||
loadSettings();
|
||||
|
||||
// Stop updates when LCD is off, restart when on
|
||||
Bangle.on('lcdPower',on=>{
|
||||
|
@ -83,6 +89,22 @@ Bangle.on('lcdPower',on=>{
|
|||
}
|
||||
});
|
||||
|
||||
Bangle.setUI('clock');
|
||||
Bangle.setUI({
|
||||
mode : 'clock',
|
||||
remove : function() {
|
||||
// Called to unload all of the clock app
|
||||
if (drawTimeout) clearTimeout(drawTimeout);
|
||||
drawTimeout = undefined;
|
||||
require('widget_utils').show(); // re-show widgets
|
||||
}
|
||||
});
|
||||
|
||||
Bangle.loadWidgets();
|
||||
Bangle.drawWidgets();
|
||||
if (settings.showWidgets) {
|
||||
Bangle.drawWidgets();
|
||||
} else {
|
||||
require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
|
||||
}
|
||||
|
||||
draw();
|
||||
}
|
|
@ -0,0 +1,33 @@
|
|||
(function(back) {
|
||||
const SETTINGS_FILE = "fuzzy.settings.json";
|
||||
|
||||
// initialize with default settings...
|
||||
let s = {'showWidgets': false}
|
||||
|
||||
// ...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)
|
||||
}
|
||||
|
||||
E.showMenu({
|
||||
'': { 'title': 'Fuzzy Word Clock' },
|
||||
'< Back': back,
|
||||
'Show Widgets': {
|
||||
value: settings.showWidgets,
|
||||
format: () => (settings.showWidgets ? 'Yes' : 'No'),
|
||||
onchange: () => {
|
||||
settings.showWidgets = !settings.showWidgets;
|
||||
save();
|
||||
}
|
||||
},
|
||||
});
|
||||
})
|
|
@ -2,7 +2,7 @@
|
|||
"id":"fuzzyw",
|
||||
"name":"Fuzzy Text Clock",
|
||||
"shortName": "Fuzzy Text",
|
||||
"version": "0.02",
|
||||
"version": "0.03",
|
||||
"description": "An imprecise clock for when you're not in a rush",
|
||||
"readme": "README.md",
|
||||
"icon":"fuzzyw.png",
|
||||
|
@ -13,6 +13,10 @@
|
|||
"allow_emulator": true,
|
||||
"storage": [
|
||||
{"name":"fuzzyw.app.js","url":"fuzzyw.app.js"},
|
||||
{"name":"fuzzyw.settings.js","url":"fuzzyw.settings.js"},
|
||||
{"name":"fuzzyw.img","url":"fuzzyw.icon.js","evaluate":true}
|
||||
],
|
||||
"data": [
|
||||
{"name":"fuzzyw.settings.json"}
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue