lcdclocks Allow - and . in clockinfo menus (fix espruino#4007)

      Use slightly narrower clockinfo font

Author: gfwilliams

apps/lcdclock/ChangeLog

@@ -4,4 +4,6 @@
 0.04: clock_info is loaded before widgets to match other clocks
 0.05: fix alignment of clock items caused by 0.04 (fix #2970)
 0.06: Minor code improvements
-0.07: fix special characters in clockinfo menus 
+0.07: fix special characters in clockinfo menus
+0.08: Allow - and . in clockinfo menus (fix #4007)
+      Use slightly narrower clockinfo font

apps/lcdclock/app.js

@@ -1,6 +1,25 @@
 Graphics.prototype.setFont7Seg = function() {
-  return this.setFontCustom(atob("AAAAAAAAAAAACAQCAAAAAAIAd0BgMBdwAAAAAAAADuAAAB0RiMRcAAAAAiMRiLuAAAcAQCAQdwAADgiMRiIOAAAd0RiMRBwAAAAgEAgDuAAAd0RiMRdwAADgiMRiLuAAAABsAAAd0QiEQdwAADuCIRCIOAAAd0BgMBAAAAAOCIRCLuAAAd0RiMRAAAADuiEQiAAAAAd0BgMBBwAADuCAQCDuAAAdwAAAAAAAAAAAIBALuAAAdwQCAQdwAADuAIBAIAAAAd0AgEAcEAgEAdwAd0AgEAdwAADugMBgLuAAAd0QiEQcAAADgiEQiDuAAAd0AgEAAAAADgiMRiIOAAAAEAgEAdwAADuAIBALuAAAdwBAIBdwAADuAIBAIOAIBALuADuCAQCDuAAAcAQCAQdwAAAOiMRiLgAAAA=="), 32, atob("BwAAAAAAAAAAAAAAAAcCAAcHBwcHBwcHBwcEAAAAAAAABwcHBwcHBwcHBwcHCgcHBwcHBwcHBwoHBwc="), 9);
-}
+  return this.setFontCustom(atob("AAAAAAAAACAQAAAAIAd0BgLuAAAAAAdwAB0RiLgAAAiMRdwAcAQCDuADgiMRBwAd0RiIOAAAgEAdwAd0RiLuADgiMRdwAABsADuiEQdwAdwRCIOADugMBAAABwRCLuADuiMRAAAd0QiAAADugMBBwAdwQCDuADuAAAAAAAABALuADuCAQdwAdwBAIAADugEAcEAdwAd0AgDuADugMBdwAd0QiDgADgiEQdwAd0AgAAADgiMRBwAAEAgDuADuAIBdwAdwBALuADuAIBBwBdwAdwQCDuADgCAQdwAB0RiLgAA="), 32, atob("BQAAAAAAAAAAAAAAAAUCAAUFBQUFBQUFBQUDAAAAAAAABQUFBQUFBQUFBQUFBwUFBQUFBQUFBQcFBQU="), 9);
+};
+/* font created with:
+require("sevenseg_font_tools").createFont({
+  img : `
+ aa j
+f  b i
+fx b i
+fx b i
+ gg
+ex c i
+ex c i
+e  c i
+odd h`,
+  width : 5, // width +1 for empty column
+  colonWidth : 3, // width of colon
+  doubleWidth : 7, // width for double-size (eg 'W' and 'M')
+  height : 9,
+  export : "alphanum"
+});
+*/
 
 
 { // must be inside our own scope here so that when we are unloaded everything disappears
@@ -38,7 +57,7 @@ let clockInfoDraw = (itm, info, options) => {
 
   if (info.img) g.drawImage(info.img, options.x+2, options.y+2);
   var title = clockInfoItems[options.menuA].name;
-  var text = info.text.toString().toUpperCase().replace(/[^A-Z0-9]/g, "");
+  var text = info.text.toString().toUpperCase().replace(/[^A-Z0-9-.]/g, "");
   if (title!="Bangle") g.setFontAlign(1,0).drawString(title.toUpperCase(), options.x+options.w-2, options.y+14);
   if (g.setFont("7Seg:2").stringWidth(text)+8>options.w) g.setFont("7Seg");
   g.setFontAlign(0,0).drawString(text, options.x+options.w/2, options.y+40);
@@ -83,3 +102,5 @@ let clockInfoItems = require("clock_info").load();
 let clockInfoMenu = require("clock_info").addInteractive(clockInfoItems, { app:"lcdclock", x:R.x, y:R.y, w:midX-2, h:barY-R.y-2, draw : clockInfoDraw});
 let clockInfoMenu2 = require("clock_info").addInteractive(clockInfoItems, {  app:"lcdclock", x:midX+2, y:R.y, w:midX-3, h:barY-R.y-2, draw : clockInfoDraw});
 }
+
+

apps/lcdclock/metadata.json

@@ -1,6 +1,6 @@
 { "id": "lcdclock",
   "name": "LCD Clock",
-  "version": "0.07",
+  "version": "0.08",
   "description": "A Casio-style clock, with ClockInfo areas at the top and bottom. Tap them and swipe up/down to toggle between different information",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],

apps/lcdclockplus/ChangeLog

@@ -1,3 +1,5 @@
 0.01: New App!
 0.02: Minor code improvements
 0.03: fix special characters in clockinfo menus
+0.04: Allow - and . in clockinfo menus (fix #4007)
+      Use slightly narrower clockinfo font

apps/lcdclockplus/app.js

@@ -1,6 +1,25 @@
 Graphics.prototype.setFont7Seg = function() {
-  return this.setFontCustom(atob("AAAAAAAAAAAACAQCAAAAAAIAd0BgMBdwAAAAAAAADuAAAB0RiMRcAAAAAiMRiLuAAAcAQCAQdwAADgiMRiIOAAAd0RiMRBwAAAAgEAgDuAAAd0RiMRdwAADgiMRiLuAAAABsAAAd0QiEQdwAADuCIRCIOAAAd0BgMBAAAAAOCIRCLuAAAd0RiMRAAAADuiEQiAAAAAd0BgMBBwAADuCAQCDuAAAdwAAAAAAAAAAAIBALuAAAdwQCAQdwAADuAIBAIAAAAd0AgEAcEAgEAdwAd0AgEAdwAADugMBgLuAAAd0QiEQcAAADgiEQiDuAAAd0AgEAAAAADgiMRiIOAAAAEAgEAdwAADuAIBALuAAAdwBAIBdwAADuAIBAIOAIBALuADuCAQCDuAAAcAQCAQdwAAAOiMRiLgAAAA=="), 32, atob("BwAAAAAAAAAAAAAAAAcCAAcHBwcHBwcHBwcEAAAAAAAABwcHBwcHBwcHBwcHCgcHBwcHBwcHBwoHBwc="), 9);
+  return this.setFontCustom(atob("AAAAAAAAACAQAAAAIAd0BgLuAAAAAAdwAB0RiLgAAAiMRdwAcAQCDuADgiMRBwAd0RiIOAAAgEAdwAd0RiLuADgiMRdwAABsADuiEQdwAdwRCIOADugMBAAABwRCLuADuiMRAAAd0QiAAADugMBBwAdwQCDuADuAAAAAAAABALuADuCAQdwAdwBAIAADugEAcEAdwAd0AgDuADugMBdwAd0QiDgADgiEQdwAd0AgAAADgiMRBwAAEAgDuADuAIBdwAdwBALuADuAIBBwBdwAdwQCDuADgCAQdwAB0RiLgAA="), 32, atob("BQAAAAAAAAAAAAAAAAUCAAUFBQUFBQUFBQUDAAAAAAAABQUFBQUFBQUFBQUFBwUFBQUFBQUFBQcFBQU="), 9);
 };
+/* font created with:
+require("sevenseg_font_tools").createFont({
+  img : `
+ aa j
+f  b i
+fx b i
+fx b i
+ gg
+ex c i
+ex c i
+e  c i
+odd h`,
+  width : 5, // width +1 for empty column
+  colonWidth : 3, // width of colon
+  doubleWidth : 7, // width for double-size (eg 'W' and 'M')
+  height : 9,
+  export : "alphanum"
+});
+*/
 
 
 { // must be inside our own scope here so that when we are unloaded everything disappears
@@ -48,10 +67,8 @@ let clockInfoDraw = (itm, info, options) => {
   if (options.focus) g.setBgColor("#FF0");
   g.clearRect({x:options.x,y:options.y,w:options.w,h:options.h,r:8});
 
-  if (info.img) {
-    g.drawImage(info.img, options.x+1,options.y+2);
-  }
-  var text = info.text.toString().toUpperCase().replace(/[^A-Z0-9]/g, "");
+  if (info.img) g.drawImage(info.img, options.x+1,options.y+2);
+  var text = info.text.toString().toUpperCase().replace(/[^A-Z0-9-.]/g, "");
   if (g.setFont("7Seg:2").stringWidth(text)+24-2>options.w) g.setFont("7Seg");
   g.setFontAlign(0,-1).drawString(text, options.x+options.w/2+13, options.y+6);
 };

apps/lcdclockplus/metadata.json

@@ -1,6 +1,6 @@
 { "id": "lcdclockplus",
   "name": "LCD Clock Plus",
-  "version": "0.03",
+  "version": "0.04",
   "description": "A Casio-style clock, with four ClockInfo areas at the top and bottom. Tap them and swipe up/down and left/right to toggle between different information.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"},{"url":"screenshot2.png"}],