Merge pull request #2693 from c-mauderer/master

widalarmeta: Selectable font. Optional hour padding.

apps/widalarmeta/ChangeLog

@@ -9,3 +9,4 @@
 0.06: Remember next alarm to reduce calculation amount
       Redraw only every hour when no alarm in next 24h
 0.07: Fix when no alarms are present
+0.08: Selectable font. Allow to disable hour padding.

apps/widalarmeta/metadata.json

@@ -2,7 +2,7 @@
   "id": "widalarmeta",
   "name": "Alarm & Timer ETA",
   "shortName": "Alarm ETA",
-  "version": "0.07",
+  "version": "0.08",
   "description": "A widget that displays the time to the next Alarm or Timer in hours and minutes, maximum 24h (configurable).",
   "icon": "widget.png",
   "type": "widget",

apps/widalarmeta/settings.js

@@ -4,7 +4,9 @@
   const settings = Object.assign({
     maxhours: 24,
     drawBell: false,
+    padHours: true,
     showSeconds: 0, // 0=never, 1=only when display is unlocked, 2=for less than a minute
+    font: 0, // 0=segment style font, 1=teletest font, 2=4x5
   }, require("Storage").readJSON(CONFIGFILE,1) || {});
 
   function writeSettings() {
@@ -40,5 +42,21 @@
         writeSettings();
       }
     },
+    /*LANG*/'Pad hours': {
+      value: !!settings.padHours,
+      onchange: v => {
+        settings.padHours = v;
+        writeSettings();
+      }
+    },
+    /*LANG*/'Font': {
+      value: settings.font,
+      min: 0, max: 2,
+      format: v => [/*LANG*/"Segment", /*LANG*/"Teletext", /*LANG*/"4x5"][v || 0],
+      onchange: v => {
+        settings.font = v;
+        writeSettings();
+      }
+    },
   });
 });

apps/widalarmeta/widget.js

@@ -1,9 +1,13 @@
 (() => {
   require("Font5x9Numeric7Seg").add(Graphics);
+  require("FontTeletext5x9Ascii").add(Graphics);
+  require("Font4x5").add(Graphics);
   const config = Object.assign({
     maxhours: 24,
     drawBell: false,
+    padHours: true,
     showSeconds: 0, // 0=never, 1=only when display is unlocked, 2=for less than a minute
+    font: 0, // 0=segment style font, 1=teletest font, 2=4x5
   }, require("Storage").readJSON("widalarmeta.json",1) || {});
 
   function getNextAlarm(date) {
@@ -46,20 +50,30 @@
       drawSeconds = (config.showSeconds & 0b01 && !Bangle.isLocked()) || (config.showSeconds & 0b10 && next <= 1000*60);
 
       g.reset(); // reset the graphics context to defaults (color/font/etc)
-      g.setFontAlign(0,0); // center fonts
+      g.setFontAlign(-1,0); // center font in y direction
       g.clearRect(this.x, this.y, this.x+this.width-1, this.y+23);
 
-      var text = hours.padStart(2, '0') + ":" + minutes.padStart(2, '0');
+      var text = "";
+      if (config.padHours) {
+        text += hours.padStart(2, '0');
+      } else {
+        text += hours;
+      }
+      text += ":" + minutes.padStart(2, '0');
       if (drawSeconds) {
         text += ":" + seconds.padStart(2, '0');
       }
-      g.setFont("5x9Numeric7Seg:1x2");
-      g.drawString(text, this.x+this.width/2, this.y+12);
-
-      calcWidth = 5*5+2;
-      if (drawSeconds) {
-        calcWidth += 3*5;
+      if (config.font == 1) {
+        g.setFont("Teletext5x9Ascii:1x2");
+      } else if (config.font == 2) {
+        g.setFont("4x5");
+      } else {
+        // Default to this if no other font is set.
+        g.setFont("5x9Numeric7Seg:1x2");
       }
+      g.drawString(text, this.x+1, this.y+12);
+
+      calcWidth = g.stringWidth(text) + 2; // One pixel on each side
       this.bellVisible = false;
     } else if (config.drawBell && this.numActiveAlarms > 0) {
       calcWidth = 24;