Added 12 hr view to Vaporwave Clock face
parent
9be612592d
commit
5b634db78d
|
|
@ -12,10 +12,6 @@ You can select the text color:
|
||||||
- ref
|
- ref
|
||||||
- purple
|
- purple
|
||||||
|
|
||||||
# Todo
|
|
||||||
|
|
||||||
- add support for AM/PM time
|
|
||||||
|
|
||||||
# Author
|
# Author
|
||||||
|
|
||||||
paul-arg [github](https://github.com/paul-arg)
|
paul-arg [github](https://github.com/paul-arg)
|
||||||
|
|
@ -34,6 +34,7 @@ Graphics.prototype.setFontMadeSunflower = function () {
|
||||||
// default values
|
// default values
|
||||||
foregroundColor: 0
|
foregroundColor: 0
|
||||||
}, require('Storage').readJSON("vpw_clock.settings.json", true) || {});
|
}, require('Storage').readJSON("vpw_clock.settings.json", true) || {});
|
||||||
|
settings.is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"] || false;
|
||||||
|
|
||||||
let foregroundColor;
|
let foregroundColor;
|
||||||
|
|
||||||
|
|
@ -105,6 +106,16 @@ Graphics.prototype.setFontMadeSunflower = function () {
|
||||||
}, 60000 - (Date.now() % 60000));
|
}, 60000 - (Date.now() % 60000));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let getTimeStr = function(date) {
|
||||||
|
var hours = date.getHours();
|
||||||
|
const minutes = date.getMinutes();
|
||||||
|
if (settings.is12Hour) {
|
||||||
|
hours = hours % 12;
|
||||||
|
if (hours === 0) hours = 12;
|
||||||
|
}
|
||||||
|
return (" " + hours).slice(-2) + ":" + ("0" + minutes).slice(-2);
|
||||||
|
};
|
||||||
|
|
||||||
let draw = function () {
|
let draw = function () {
|
||||||
var x = g.getWidth() / 2;
|
var x = g.getWidth() / 2;
|
||||||
var y = 24 + 20;
|
var y = 24 + 20;
|
||||||
|
|
@ -132,7 +143,7 @@ Graphics.prototype.setFontMadeSunflower = function () {
|
||||||
|
|
||||||
// work out locale-friendly date/time
|
// work out locale-friendly date/time
|
||||||
var date = new Date();
|
var date = new Date();
|
||||||
var timeStr = require("locale").time(date, 1);
|
var timeStr = getTimeStr(date);
|
||||||
var dateStr = require("locale").date(date).toUpperCase();
|
var dateStr = require("locale").date(date).toUpperCase();
|
||||||
var dowStr = require("locale").dow(date).toUpperCase();
|
var dowStr = require("locale").dow(date).toUpperCase();
|
||||||
// draw time
|
// draw time
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue