Merge pull request #3817 from voloved/vaporwave_12_hr

Added 12 hr view to Vaporwave Clock face

apps/vpw_clock/ChangeLog

@@ -4,3 +4,4 @@
 0.04: Handle fast loading
 0.05: Fix theme reset for some themes
 0.06: Minor fix: do not remove VGA8 font
+0.07: Added AM/PM functionality

apps/vpw_clock/README.md

@@ -12,10 +12,6 @@ You can select the text color:
 - ref
 - purple
 
-# Todo
-
-- add support for AM/PM time
-
 # Author
 
 paul-arg [github](https://github.com/paul-arg)

apps/vpw_clock/app.js

@@ -34,6 +34,7 @@ Graphics.prototype.setFontMadeSunflower = function () {
     // default values
     foregroundColor: 0
   }, require('Storage').readJSON("vpw_clock.settings.json", true) || {});
+  settings.is12Hour = (require("Storage").readJSON("setting.json",1)||{})["12hour"] || false;
 
   let foregroundColor;
 
@@ -105,6 +106,16 @@ Graphics.prototype.setFontMadeSunflower = function () {
     }, 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 () {
     var x = g.getWidth() / 2;
     var y = 24 + 20;
@@ -132,7 +143,7 @@ Graphics.prototype.setFontMadeSunflower = function () {
 
     // work out locale-friendly date/time
     var date = new Date();
-    var timeStr = require("locale").time(date, 1);
+    var timeStr = getTimeStr(date);                            
     var dateStr = require("locale").date(date).toUpperCase();
     var dowStr = require("locale").dow(date).toUpperCase();
     // draw time

apps/vpw_clock/metadata.json

@@ -3,7 +3,7 @@
   "name": "Vaporwave Sunset Clock",
   "shortName": "Vaporwave Sunset",
   "type": "clock",
-  "version":"0.06",
+  "version":"0.07",
   "description": "A clock with a vaporwave sunset theme.",
   "tags": "clock",
   "supports": ["BANGLEJS2"],