diff --git a/apps/pebble/ChangeLog b/apps/pebble/ChangeLog index 54f2e7452..fc3ff3ba4 100644 --- a/apps/pebble/ChangeLog +++ b/apps/pebble/ChangeLog @@ -1,3 +1,3 @@ 0.01: first release 0.02: included deployment of pebble.settings.js in apps.json -0.03: Changed time font to LECO1976Regular42 +0.03: Changed time+calendar font to LECO1976Regular, changed to slanting boot diff --git a/apps/pebble/LECO 1976-Regular.otf b/apps/pebble/LECO 1976-Regular.otf new file mode 100644 index 000000000..05a318224 Binary files /dev/null and b/apps/pebble/LECO 1976-Regular.otf differ diff --git a/apps/pebble/icons8-sport-shoes-64.png b/apps/pebble/icons8-sport-shoes-64.png deleted file mode 100644 index 4ae00db96..000000000 Binary files a/apps/pebble/icons8-sport-shoes-64.png and /dev/null differ diff --git a/apps/pebble/pebble.app.js b/apps/pebble/pebble.app.js index 45cce90e4..ce9ab3340 100644 --- a/apps/pebble/pebble.app.js +++ b/apps/pebble/pebble.app.js @@ -15,7 +15,7 @@ function loadSettings() { settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'bg': '#0f0', 'color': 'Green'}; } -var img = require("heatshrink").decompress(atob("oFAwkGswA/AH4A/AH4A/AH4A/AFEAD74gdsAfBELlggMhD70iILsAiUAIKQRBgxAHgUiIKQQJUAMSD4JBQsBVBIAq/DEAJBCJ45VHkAxEDwKfDIIUREBq2BmcQCAQeCkczmRBEiAgND4MxSoYGBAAQgCAAohKDARhBG4IeDEAQ8BAA5fJABgpBgFDgEiQgJEHT4IeMmMBkMFAYJJDEQaYDiYfMkECiEEoEDBAX//8ykJsBD4MAWwIALiBeCqAyDn//BoYgBgAeMYAMhgE0CRIOBD58BkEEmCRKkEGD5szkUQqdASJUxD4MAgKBKmUigFEGJZgBAATODFw0CkEBmoOJAAQdB7owBOBDdCgbdED5fd6pRIgDdCeBkxD4fdeAgNEkMFmheLdgIfE6BgGmDdCoDdKDwYfD6gzGiBeBrpLHXYUQXIMgD4NND4SAFZgMRgAKBPwroBBYIeBIAL/CADESL4VmsAcWgMRkQeDAAMAkQAWMAQeCD4MSDqqdBDwgfBAC8GDwiAXDowA/AH4A/AH4A/AH4A/AEA")); +var img = require("heatshrink").decompress(atob("oFAwkEogA/AH4A/AH4A/AH4A/AE8AAAoeXoAfeDQUBmcyD7A+Dh///8QD649CiAfaHwUvD4sEHy0DDYIfEICg+Cn4fHICY+DD4nxcgojOHwgfEIAYfRCIQaDD4ZAFD5r7DH4//kAfRCIZ/GAAnwD5p9DX44fTHgYSBf4ofVDAQEBl4fFUAgfOXoQzBgIfFBAIfPP4RAEAoYAB+cRiK/SG4h/WIBAfXIA7CBAAswD55AHn6fUIBMCD65AHl4gCmcziAfQQJqfQQJpiDgk0IDXxQLRAEECaBM+QgRYRYgUIA0CD4ggSQJiDCiAKBICszAAswD55AHABKBVD7BAFABIqBD5pAFABPxD55AOD6BADiIAJQAyxLABwf/gaAPAH4A/AH4ARA==")); const h = g.getHeight(); const w = g.getWidth(); @@ -66,7 +66,6 @@ function draw() { g.setFontLECO1976Regular42(); g.setFontAlign(0, -1); g.setColor(!batteryWarning ? g.theme.fg : '#fff'); - //g.drawString(timeStr, w/2, h2 - 8); g.drawString(timeStr, w/2, h2 + 8); // contrast bar @@ -78,8 +77,8 @@ function draw() { g.fillRect(0, h3 + t, w, h); g.setColor(settings.bg); - g.drawImage(img, w/2 + ((w/2) - 64)/2, 10, { scale: 1 }); - drawCalendar(((w/2) - 48)/2, 10, 48, 4, da[2]); + g.drawImage(img, w/2 + ((w/2) - 64)/2, 1, { scale: 1 }); + drawCalendar(((w/2) - 42)/2, 14, 42, 4, da[2]); } // at x,y width:wi thicknes:th @@ -96,9 +95,9 @@ function drawCalendar(x,y,wi,th,str) { // second calendar hook, two thirds in g.fillRect(x + (2*wi/3) -(th/2), y - hook_t, x + 2*wi/3 + th - (th/2), y + hook_t); - g.setFont('Vector', 22); + g.setFontLECO1976Regular22(); g.setFontAlign(0, 0); - g.drawString(str, x + wi/2 + th/2, y + wi/2 + th/2); + g.drawString(str, x + wi/2, y + wi/2 + th); } function getSteps() { diff --git a/apps/pebble/pebble_screenshot.png b/apps/pebble/pebble_screenshot.png index f0bd2dd53..169df2d22 100644 Binary files a/apps/pebble/pebble_screenshot.png and b/apps/pebble/pebble_screenshot.png differ diff --git a/apps/pebble/pebble_screenshot2.png b/apps/pebble/pebble_screenshot2.png index 9ae37325c..cd09e1c2f 100644 Binary files a/apps/pebble/pebble_screenshot2.png and b/apps/pebble/pebble_screenshot2.png differ diff --git a/apps/pebble/pebble_screenshot3.png b/apps/pebble/pebble_screenshot3.png index 802f1a9ed..0de8df516 100644 Binary files a/apps/pebble/pebble_screenshot3.png and b/apps/pebble/pebble_screenshot3.png differ