diff --git a/apps/pebblepp/ChangeLog b/apps/pebblepp/ChangeLog index b44914451..3042937f1 100644 --- a/apps/pebblepp/ChangeLog +++ b/apps/pebblepp/ChangeLog @@ -1,6 +1,6 @@ 0.01: First release 0.02: clock_info now uses app name to maintain settings specifically for this clock face - ensure clockinfo text is usppercase (font doesn't render lowercase) + ensure clockinfo text is uppercase (font doesn't render lowercase) 0.03: Use smaller font if clock_info test doesn't fit in area 0.04: Ensure we only scale down clockinfo text if it really won't fit 0.05: Minor code improvements @@ -10,4 +10,6 @@ 0.09: Add date on the bottom 0.10: Fix size of bottom bar after 0.09 Make date toggleable with settings - Optional border around clockinfos (available from settings) \ No newline at end of file + Optional border around clockinfos (available from settings) +0.11: Make the border on clockinfos the default + Fix clockinfos when too long (previously just output '...') \ No newline at end of file diff --git a/apps/pebblepp/app.js b/apps/pebblepp/app.js index 7c01fcade..f242cba33 100644 --- a/apps/pebblepp/app.js +++ b/apps/pebblepp/app.js @@ -20,7 +20,7 @@ Graphics.prototype.setFontLECO1976Regular14 = function() { { const SETTINGS_FILE = "pebblepp.json"; -let settings = Object.assign({'theme':'System', 'showdate':true, 'clkinfoborder': false}, require("Storage").readJSON(SETTINGS_FILE,1)||{}); +let settings = Object.assign({'theme':'System', 'showdate':true, 'clkinfoborder': true}, require("Storage").readJSON(SETTINGS_FILE,1)||{}); let background = require("clockbg"); let theme; let drawTimeout; @@ -102,7 +102,7 @@ let clockInfoDraw = (itm, info, options) => { g.setFontLECO1976Regular14(); if (g.stringWidth(txt) > options.w) {// if still too big, split to 2 lines var l = g.wrapString(txt, options.w); - txt = l.slice(0,2).join("\n") + (l.length>2)?"...":""; + txt = l.slice(0,2).join("\n") + ((l.length>2)?"...":""); } y = options.y+options.h-12; if (settings.clkinfoborder) { @@ -147,4 +147,4 @@ background.fillRect(Bangle.appRect); // start off with completely clear backgrou g.setColor(theme.fg).fillRect(0, h2 - 6, w, h3 + 6); draw(); -} \ No newline at end of file +} diff --git a/apps/pebblepp/metadata.json b/apps/pebblepp/metadata.json index c2187483c..e26500fc9 100644 --- a/apps/pebblepp/metadata.json +++ b/apps/pebblepp/metadata.json @@ -2,7 +2,7 @@ "id": "pebblepp", "name": "Pebble++ Clock", "shortName": "Pebble++", - "version": "0.10", + "version": "0.11", "description": "A Pebble style clock (based on the 'Pebble Clock' app) but with two configurable ClockInfo items at the top and custom backgrounds. Date/theme/borders be reconfigured using settings page.", "icon": "app.png", "screenshots": [{"url":"screenshot.png"},{"url":"screenshot2.png"}], diff --git a/apps/pebblepp/settings.js b/apps/pebblepp/settings.js index f2384577e..1ae7ed4d4 100644 --- a/apps/pebblepp/settings.js +++ b/apps/pebblepp/settings.js @@ -2,7 +2,7 @@ const SETTINGS_FILE = "pebblepp.json"; // Initialize with default settings... - let settings = {'theme':'System', 'showdate':true, 'clkinfoborder':false} + let settings = {'theme':'System', 'showdate':true, 'clkinfoborder':true} // ...and overwrite them with any saved values // This way saved values are preserved if a new version adds more settings const storage = require('Storage');