diff --git a/apps/bordle/ChangeLog b/apps/bordle/ChangeLog index f45509a34..ddbd6239c 100644 --- a/apps/bordle/ChangeLog +++ b/apps/bordle/ChangeLog @@ -1,2 +1,3 @@ 0.01: New App 0.02: app keeps track of statistics now +0.03: Fix bug in valid word detection diff --git a/apps/bordle/bordle.app.js b/apps/bordle/bordle.app.js index 20aa02bc2..07e954a6d 100644 --- a/apps/bordle/bordle.app.js +++ b/apps/bordle/bordle.app.js @@ -110,7 +110,12 @@ class Wordle { } } addGuess(w) { - if ((this.words.indexOf(w.toLowerCase())%5)!=0) { + let idx = -1; + do{ + idx = this.words.indexOf(w.toLowerCase(), idx+1); + } + while(idx !== -1 && idx%5 !== 0); + if(idx%5 !== 0) { E.showAlert(w+"\nis not a word", "Invalid word").then(function() { layout = getKeyLayout(""); wordle.render(true); diff --git a/apps/bordle/metadata.json b/apps/bordle/metadata.json index 37ef5c855..f6011f798 100644 --- a/apps/bordle/metadata.json +++ b/apps/bordle/metadata.json @@ -2,7 +2,7 @@ "name": "Bordle", "shortName":"Bordle", "icon": "app.png", - "version":"0.02", + "version":"0.03", "description": "Bangle version of a popular word search game", "supports" : ["BANGLEJS2"], "readme": "README.md", diff --git a/apps/calibration/README.md b/apps/calibration/README.md new file mode 100644 index 000000000..37f637d21 --- /dev/null +++ b/apps/calibration/README.md @@ -0,0 +1,11 @@ +# Banglejs - Touchscreen calibration +A simple calibration app for the touchscreen + +## Usage + +Once lauched touch the cross that appear on the screen to make +another spawn elsewhere. + +each new touch on the screen will help to calibrate the offset +of your finger on the screen. After five or more input, press +the button to save the calibration and close the application. \ No newline at end of file diff --git a/apps/calibration/app-icon.js b/apps/calibration/app-icon.js new file mode 100644 index 000000000..af66c3f68 --- /dev/null +++ b/apps/calibration/app-icon.js @@ -0,0 +1 @@ +require("heatshrink").decompress(atob("mEwwkB/4AJ+EPBhQXg+BBDCyJaGGR5zIDBoQEL4QYOLYR3GBIouJR5AYBGBILBU5QMGFwgiFX4wwIEI4XGGBAgHd44+HD44XHNw4XWM5IIHCIoXWV5IXICQgXvLxAAKCYYXh5nMC6n8C4PPC5MAAA8PC4ZxBACAXOI653hU5zvJABASEC5PwHI4XcMBIXICIoXXJBAXHCAwXXJBAXHB5AfGC4ygJEAwXGQ5BoIQxoiDBYgXECwIuIBgb5ECIQJFGBQmCC4QHEDBwAFCxoYICx5ZELZoZJFiIXpA=")) \ No newline at end of file diff --git a/apps/calibration/app.js b/apps/calibration/app.js new file mode 100644 index 000000000..d3823de63 --- /dev/null +++ b/apps/calibration/app.js @@ -0,0 +1,85 @@ +class BanglejsApp { + constructor() { + this.x = 0; + this.y = 0; + this.settings = { + xoffset: 0, + yoffset: 0, + }; + } + + load_settings() { + let settings = require('Storage').readJSON('calibration.json', true) || {active: false}; + + // do nothing if the calibration is deactivated + if (settings.active === true) { + // cancel the calibration offset + Bangle.on('touch', function(button, xy) { + xy.x += settings.xoffset; + xy.y += settings.yoffset; + }); + } + if (!settings.xoffset) settings.xoffset = 0; + if (!settings.yoffset) settings.yoffset = 0; + + console.log('loaded settings:'); + console.log(settings); + + return settings; + } + + save_settings() { + this.settings.active = true; + this.settings.reload = false; + require('Storage').writeJSON('calibration.json', this.settings); + + console.log('saved settings:'); + console.log(this.settings); + } + + explain() { + /* + * TODO: + * Present how to use the application + * + */ + } + + drawTarget() { + this.x = 16 + Math.floor(Math.random() * (g.getWidth() - 32)); + this.y = 40 + Math.floor(Math.random() * (g.getHeight() - 80)); + + g.clearRect(0, 24, g.getWidth(), g.getHeight() - 24); + g.drawLine(this.x, this.y - 5, this.x, this.y + 5); + g.drawLine(this.x - 5, this.y, this.x + 5, this.y); + g.setFont('Vector', 10); + g.drawString('current offset: ' + this.settings.xoffset + ', ' + this.settings.yoffset, 0, 24); + } + + setOffset(xy) { + this.settings.xoffset = Math.round((this.settings.xoffset + (this.x - Math.floor((this.x + xy.x)/2)))/2); + this.settings.yoffset = Math.round((this.settings.yoffset + (this.y - Math.floor((this.y + xy.y)/2)))/2); + } +} + + +E.srand(Date.now()); +Bangle.loadWidgets(); +Bangle.drawWidgets(); + +calibration = new BanglejsApp(); +calibration.load_settings(); + +let modes = { + mode : 'custom', + btn : function(n) { + calibration.save_settings(this.settings); + load(); + }, + touch : function(btn, xy) { + calibration.setOffset(xy); + calibration.drawTarget(); + }, +}; +Bangle.setUI(modes); +calibration.drawTarget(); diff --git a/apps/calibration/boot.js b/apps/calibration/boot.js new file mode 100644 index 000000000..237fb2e0d --- /dev/null +++ b/apps/calibration/boot.js @@ -0,0 +1,14 @@ +let cal_settings = require('Storage').readJSON("calibration.json", true) || {active: false}; +Bangle.on('touch', function(button, xy) { + // do nothing if the calibration is deactivated + if (cal_settings.active === false) return; + + // reload the calibration offset at each touch event /!\ bad for the flash memory + if (cal_settings.reload === true) { + cal_settings = require('Storage').readJSON("calibration.json", true); + } + + // apply the calibration offset + xy.x += cal_settings.xoffset; + xy.y += cal_settings.yoffset; +}); diff --git a/apps/calibration/calibration.png b/apps/calibration/calibration.png new file mode 100644 index 000000000..3fb44beee Binary files /dev/null and b/apps/calibration/calibration.png differ diff --git a/apps/calibration/metadata.json b/apps/calibration/metadata.json new file mode 100644 index 000000000..122a2c175 --- /dev/null +++ b/apps/calibration/metadata.json @@ -0,0 +1,17 @@ +{ "id": "calibration", + "name": "Touchscreen Calibration", + "shortName":"Calibration", + "icon": "calibration.png", + "version":"1.00", + "description": "A simple calibration app for the touchscreen", + "supports": ["BANGLEJS","BANGLEJS2"], + "readme": "README.md", + "tags": "tool", + "storage": [ + {"name":"calibration.app.js","url":"app.js"}, + {"name":"calibration.boot.js","url":"boot.js"}, + {"name":"calibration.settings.js","url":"settings.js"}, + {"name":"calibration.img","url":"app-icon.js","evaluate":true} + ], + "data": [{"name":"calibration.json"}] +} diff --git a/apps/calibration/settings.js b/apps/calibration/settings.js new file mode 100644 index 000000000..6db8dd3bb --- /dev/null +++ b/apps/calibration/settings.js @@ -0,0 +1,23 @@ +(function(back) { + var FILE = "calibration.json"; + var settings = Object.assign({ + active: true, + }, require('Storage').readJSON(FILE, true) || {}); + + function writeSettings() { + require('Storage').writeJSON(FILE, settings); + } + + E.showMenu({ + "" : { "title" : "Calibration" }, + "< Back" : () => back(), + 'Active': { + value: !!settings.active, + format: v => v? "On":"Off", + onchange: v => { + settings.active = v; + writeSettings(); + } + }, + }); +}) \ No newline at end of file diff --git a/apps/game1024/ChangeLog b/apps/game1024/ChangeLog index 29838413e..800fa6b9d 100644 --- a/apps/game1024/ChangeLog +++ b/apps/game1024/ChangeLog @@ -6,4 +6,5 @@ 0.06: Fixed issue 1609 added a message popup state handler to control unwanted screen redraw 0.07: Optimized the mover algorithm for efficiency (work in progress) 0.08: Bug fix at end of the game with victorious splash and glorious orchestra -0.09: Added settings menu, removed symbol selection button (*), added highscore reset \ No newline at end of file +0.09: Added settings menu, removed symbol selection button (*), added highscore reset +0.10: fixed clockmode in settings diff --git a/apps/game1024/metadata.json b/apps/game1024/metadata.json index e2c4bdb3e..728b5dc0e 100644 --- a/apps/game1024/metadata.json +++ b/apps/game1024/metadata.json @@ -1,7 +1,7 @@ { "id": "game1024", "name": "1024 Game", "shortName" : "1024 Game", - "version": "0.09", + "version": "0.10", "icon": "game1024.png", "screenshots": [ {"url":"screenshot.png" } ], "readme":"README.md", diff --git a/apps/game1024/settings.js b/apps/game1024/settings.js index c8e393663..24a972600 100644 --- a/apps/game1024/settings.js +++ b/apps/game1024/settings.js @@ -32,10 +32,10 @@ } }, "Exit press:": { - value: !settings.debugMode, // ! converts undefined to true + value: !settings.clockMode, // ! converts undefined to true format: v => v?"short":"long", onchange: v => { - settings.debugMode = v; + settings.clockMode = v; writeSettings(); }, }, @@ -67,4 +67,4 @@ } // Show the menu E.showMenu(settingsMenu); - }) \ No newline at end of file + }) diff --git a/apps/kbmorse/ChangeLog b/apps/kbmorse/ChangeLog new file mode 100644 index 000000000..f62348ec8 --- /dev/null +++ b/apps/kbmorse/ChangeLog @@ -0,0 +1 @@ +0.01: New Keyboard! \ No newline at end of file diff --git a/apps/kbmorse/README.md b/apps/kbmorse/README.md new file mode 100644 index 000000000..2d5aa166f --- /dev/null +++ b/apps/kbmorse/README.md @@ -0,0 +1,25 @@ +# Morse Keyboard + +A library that provides the ability to input text by entering morse code. + +![demo](demo.gif) + +## Usage + + +* Press `BTN1` to input a dot, `BTN3` to input a dash, and `BTN2` to accept the +character for your current input. +* Long-press `BTN1` to toggle UPPERCASE for your next character. +* Long-press `BTN2` to finish editing. +* Tap the left side of the screen for backspace. +* Swipe left/right to move the cursor. +* Input three spaces in a row for a newline. + +The top/bottom of the screen show which characters start with your current input, +so basically you just look which side includes the letter you want to type, and +press that button to narrow your selection, until it appears next to `BTN2`. + + +## For Developers + +See the README for `kbswipe`/`kbtouch` for instructions on how to use this in your app. \ No newline at end of file diff --git a/apps/kbmorse/app.png b/apps/kbmorse/app.png new file mode 100644 index 000000000..0abc7e67d Binary files /dev/null and b/apps/kbmorse/app.png differ diff --git a/apps/kbmorse/demo.gif b/apps/kbmorse/demo.gif new file mode 100644 index 000000000..991c8c68d Binary files /dev/null and b/apps/kbmorse/demo.gif differ diff --git a/apps/kbmorse/lib.js b/apps/kbmorse/lib.js new file mode 100644 index 000000000..8bc177a46 --- /dev/null +++ b/apps/kbmorse/lib.js @@ -0,0 +1,247 @@ +exports.input = function(options) { + options = options || {}; + let text = options.text; + if ("string"!= typeof text) text = ""; + let code = "", + cur = text.length, // cursor position + uc = !text.length, // uppercase + spc = 0; // consecutive spaces entered + + const codes = { + // letters + "a": ".-", + "b": "-...", + "c": "-.-.", + "d": "-..", + "e": ".", + // no é + "f": "..-.", + "g": "--.", + "h": "....", + "i": "..", + "j": ".---", + "k": "-.-", + "l": ".-..", + "m": "--", + "n": "-.", + "o": "---", + "p": ".--.", + "q": "--.-", + "r": ".-.", + "s": "...", + "t": "-", + "u": "..-", + "v": "...-", + "w": ".--", + "x": "-..-", + "y": "-.--", + "z": "--..", + //digits + "1": ".----", + "2": "..---", + "3": "...--", + "4": "....-", + "5": ".....", + "6": "-....", + "7": "--...", + "8": "---..", + "9": "----.", + "0": "-----", + // punctuation + ".": ".-.-.-", + ",": "--..--", + ":": "---...", + "?": "..--..", + "!": "-.-.--", + "'": ".----.", + "-": "-....-", + "_": "..--.-", + "/": "-..-.", + "(": "-.--.", + ")": "-.--.-", + "\"": ".-..-.", + "=": "-...-", + "+": ".-.-.", + "*": "-..-", + "@": ".--.-.", + "$": "...-..-", + "&": ".-...", + }, chars = Object.keys(codes); + + function choices(start) { + return chars.filter(char => codes[char].startsWith(start)); + } + function char(code) { + if (code==="") return " "; + for(const char in codes) { + if (codes[char]===code) return char; + } + const c = choices(code); + if (c.length===1) return c[0]; // "-.-.-" is nothing, and only "-.-.--"(!) starts with it + return null; + } + + return new Promise((resolve, reject) => { + + function update() { + let dots = [], dashes = []; + layout.pick.label = (code==="" ? " " : ""); + choices(code).forEach(char => { + const c = codes[char]; + if (c===code) { + layout.pick.label = char; + } + const next = c.substring(code.length, code.length+1); + if (next===".") dots.push(char); + else if (next==="-") dashes.push(char); + }); + if (!code && spc>1) layout.pick.label = atob("ABIYAQAAAAAAAAAABwABwABwABwABwABwOBwOBwOBxwBxwBxwB/////////xwABwABwAAOAAOAAOAA=="); + g.setFont("6x8:2"); + const wrap = t => g.wrapString(t, Bangle.appRect.w-60).join("\n"); + layout.del.label = cur ? atob("AAwIAQ/hAiKkEiKhAg/gAA==") : " "; + layout.code.label = code; + layout.dots.label = wrap(dots.join(" ")); + layout.dashes.label = wrap(dashes.join(" ")); + if (uc) { + layout.pick.label = layout.pick.label.toUpperCase(); + layout.dots.label = layout.dots.label.toUpperCase(); + layout.dashes.label = layout.dashes.label.toUpperCase(); + } + let label = text.slice(0, cur)+"|"+text.slice(cur); + layout.text.label = g.wrapString(label, Bangle.appRect.w-80).join("\n") + .replace("|", atob("AAwQAfPPPAwAwAwAwAwAwAwAwAwAwAwAwPPPPA==")); + layout.update(); + layout.render(); + } + + function add(d) { + code += d; + const l = choices(code).length; + if (l===1) done(); + else if (l<1) { + Bangle.buzz(20); + code = code.slice(0, -1); + } else update(); + } + function del() { + if (code.length) code = code.slice(0, -1); // delete last dot/dash + else if (cur) { // delete char at cursor + text = text.slice(0, cur-1)+text.slice(cur); + cur--; + } else Bangle.buzz(20); // (already) at start of text + spc = 0; + uc = false; + update(); + } + + function done() { + let c = char(code); + if (c!==null) { + if (uc) c = c.toUpperCase(); + uc = false; + text = text.slice(0, cur)+c+text.slice(cur); + cur++; + code = ""; + if (c===" ") spc++; + else spc = 0; + if (spc>=3) { + text = text.slice(0, cur-3)+"\n"+text.slice(cur); + cur -= 2; + uc = true; + spc = 0; + } + update(); + } else { + console.log(`No char for ${code}!`); + Bangle.buzz(20); + } + } + + const Layout = require("Layout"); + let layout = new Layout({ + type: "h", c: [ + { + type: "v", width: Bangle.appRect.w-8, bgCol: g.theme.bg, c: [ + {id: "dots", type: "txt", font: "6x8:2", label: "", fillx: 1, bgCol: g.theme.bg}, + {filly: 1, bgCol: g.theme.bg}, + { + type: "h", fillx: 1, c: [ + {id: "del", type: "txt", font: "6x8", label: " + ({type: "txt", font: "6x8", height: Math.floor(Bangle.appRect.h/3), r: 1, label: l}) + ) + } + ] + }); + g.reset().clear(); + update(); + + if (Bangle.btnWatches) Bangle.btnWatches.forEach(clearWatch); + Bangle.btnWatches = []; + + // BTN1: press for dot, long-press to toggle uppercase + let ucTimeout; + const UC_TIME = 500; + Bangle.btnWatches.push(setWatch(e => { + if (ucTimeout) clearTimeout(ucTimeout); + ucTimeout = null; + if (e.state) { + // pressed: start UpperCase toggle timer + ucTimeout = setTimeout(() => { + ucTimeout = null; + uc = !uc; + update(); + }, UC_TIME); + } else if (e.time-e.lastTime { + if (enterTimeout) clearTimeout(enterTimeout); + enterTimeout = null; + if (e.state) { + // pressed: start UpperCase toggle timer + enterTimeout = setTimeout(() => { + enterTimeout = null; + resolve(text); + }, ENTER_TIME); + } else if (e.time-e.lastTime { + add("-"); + }, BTN3, {repeat: true, edge: "falling"})); + + // Left-hand side: backspace + if (Bangle.touchHandler) Bangle.removeListener("touch", Bangle.touchHandler); + Bangle.touchHandler = side => { + if (side===1) del(); + }; + Bangle.on("touch", Bangle.touchHandler); + + // swipe: move cursor + if (Bangle.swipeHandler) Bangle.removeListener("swipe", Bangle.swipeHandler); + Bangle.swipeHandler = dir => { + cur = Math.max(0, Math.min(text.length, cur+dir)); + update(); + }; + Bangle.on("swipe", Bangle.swipeHandler); + }); +}; \ No newline at end of file diff --git a/apps/kbmorse/metadata.json b/apps/kbmorse/metadata.json new file mode 100644 index 000000000..f9c5354f1 --- /dev/null +++ b/apps/kbmorse/metadata.json @@ -0,0 +1,15 @@ +{ + "id": "kbmorse", + "name": "Morse keyboard", + "version": "0.01", + "description": "A library for text input as morse code", + "icon": "app.png", + "type": "textinput", + "tags": "keyboard", + "supports" : ["BANGLEJS"], + "screenshots": [{"url":"screenshot.png"}], + "readme": "README.md", + "storage": [ + {"name":"textinput","url":"lib.js"} + ] +} diff --git a/apps/kbmorse/screenshot.png b/apps/kbmorse/screenshot.png new file mode 100644 index 000000000..9050a45cd Binary files /dev/null and b/apps/kbmorse/screenshot.png differ diff --git a/apps/kbmulti/ChangeLog b/apps/kbmulti/ChangeLog new file mode 100644 index 000000000..04b2430bb --- /dev/null +++ b/apps/kbmulti/ChangeLog @@ -0,0 +1 @@ +0.01: New keyboard diff --git a/apps/kbmulti/README.md b/apps/kbmulti/README.md new file mode 100644 index 000000000..d40b2dd07 --- /dev/null +++ b/apps/kbmulti/README.md @@ -0,0 +1,16 @@ +# Multitap Keyboard + +A library that provides the ability to input text in a style familiar to anyone who had a mobile phone before they went all touchscreen. + +Swipe right for Space, left for Backspace, and up/down for Caps lock. Tap the '?' button in the app if you need a reminder! + +At time of writing, only the [Noteify app](http://microco.sm/out/Ffe9i) uses a keyboard. + +Uses the multitap keypad logic originally from here: http://www.espruino.com/Morse+Code+Texting + +![](screenshot_1.png) +![](screenshot_2.png) + +Written by: [Sir Indy](https://github.com/sir-indy) and [Thyttan](https://github.com/thyttan) + +For support and discussion please post in the [Bangle JS Forum](http://forum.espruino.com/microcosms/1424/) \ No newline at end of file diff --git a/apps/kbmulti/app.png b/apps/kbmulti/app.png new file mode 100644 index 000000000..5607a0553 Binary files /dev/null and b/apps/kbmulti/app.png differ diff --git a/apps/kbmulti/lib.js b/apps/kbmulti/lib.js new file mode 100644 index 000000000..79c2d861a --- /dev/null +++ b/apps/kbmulti/lib.js @@ -0,0 +1,145 @@ +//Multitap logic originally from here: http://www.espruino.com/Morse+Code+Texting + +exports.input = function(options) { + options = options||{}; + var text = options.text; + if ("string"!=typeof text) text=""; + + var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {}; + if (settings.firstLaunch===undefined) { settings.firstLaunch = true; } + if (settings.charTimeout===undefined) { settings.charTimeout = 500; } + + var fontSize = "6x15"; + var Layout = require("Layout"); + var letters = { + "1":".,!?1","2":"ABC2","3":"DEF3", + "4":"GHI4","5":"JKL5","6":"MNO6", + "7":"PQRS7","8":"TUV80","9":"WXYZ9", + }; + var helpMessage = 'swipe:\nRight: Space\nLeft:Backspace\nUp/Down: Caps lock\n'; + + var charTimeout; // timeout after a key is pressed + var charCurrent; // current character (index in letters) + var charIndex; // index in letters[charCurrent] + var caps = true; + var layout; + + function displayText() { + layout.clear(layout.text); + layout.text.label = text.slice(-12); + layout.render(layout.text); + } + + function backspace() { + // remove the timeout if we had one + if (charTimeout!==undefined) { + clearTimeout(charTimeout); + charTimeout = undefined; + } + text = text.slice(0, -1); + newCharacter(); + } + + function setCaps() { + caps = !caps; + for (var key in letters) { + layout[key].label = caps ? letters[key].toUpperCase() : letters[key].toLowerCase(); + } + layout.render(); + } + + function newCharacter(ch) { + displayText(); + charCurrent = ch; + charIndex = 0; + } + + function onKeyPad(key) { + // remove the timeout if we had one + if (charTimeout!==undefined) { + clearTimeout(charTimeout); + charTimeout = undefined; + } + // work out which char was pressed + if (key==charCurrent) { + charIndex = (charIndex+1) % letters[charCurrent].length; + text = text.slice(0, -1); + } else { + newCharacter(key); + } + var newLetter = letters[charCurrent][charIndex]; + text += (caps ? newLetter.toUpperCase() : newLetter.toLowerCase()); + displayText(); + // set a timeout + charTimeout = setTimeout(function() { + charTimeout = undefined; + newCharacter(); + }, settings.charTimeout); + } + + function onSwipe(dirLeftRight, dirUpDown) { + if (dirUpDown) { + setCaps(); + } else if (dirLeftRight == 1) { + text += ' '; + newCharacter(); + } else if (dirLeftRight == -1) { + backspace(); + } + } + + function onHelp(resolve,reject) { + Bangle.removeListener("swipe", onSwipe); + E.showPrompt( + helpMessage, {title: "Help", buttons : {"Ok":true}} + ).then(function(v) { + Bangle.on('swipe', onSwipe); + generateLayout(resolve,reject); + layout.render(); + }); + } + + function generateLayout(resolve,reject) { + layout = new Layout( { + type:"v", c: [ + {type:"h", c: [ + {type:"txt", font:"12x20", label:text.slice(-12), id:"text", fillx:1}, + {type:"btn", font:'6x8', label:'?', cb: l=>onHelp(resolve,reject), filly:1 }, + ]}, + {type:"h", c: [ + {type:"btn", font:fontSize, label:letters[1], cb: l=>onKeyPad(1), id:'1', fillx:1, filly:1 }, + {type:"btn", font:fontSize, label:letters[2], cb: l=>onKeyPad(2), id:'2', fillx:1, filly:1 }, + {type:"btn", font:fontSize, label:letters[3], cb: l=>onKeyPad(3), id:'3', fillx:1, filly:1 }, + ]}, + {type:"h", filly:1, c: [ + {type:"btn", font:fontSize, label:letters[4], cb: l=>onKeyPad(4), id:'4', fillx:1, filly:1 }, + {type:"btn", font:fontSize, label:letters[5], cb: l=>onKeyPad(5), id:'5', fillx:1, filly:1 }, + {type:"btn", font:fontSize, label:letters[6], cb: l=>onKeyPad(6), id:'6', fillx:1, filly:1 }, + ]}, + {type:"h", filly:1, c: [ + {type:"btn", font:fontSize, label:letters[7], cb: l=>onKeyPad(7), id:'7', fillx:1, filly:1 }, + {type:"btn", font:fontSize, label:letters[8], cb: l=>onKeyPad(8), id:'8', fillx:1, filly:1 }, + {type:"btn", font:fontSize, label:letters[9], cb: l=>onKeyPad(9), id:'9', fillx:1, filly:1 }, + ]}, + ] + },{back: ()=>{ + Bangle.setUI(); + Bangle.removeListener("swipe", onSwipe); + g.clearRect(Bangle.appRect); + resolve(text); + }}); + } + + return new Promise((resolve,reject) => { + g.clearRect(Bangle.appRect); + if (settings.firstLaunch) { + onHelp(resolve,reject); + settings.firstLaunch = false; + require('Storage').writeJSON("kbmulti.settings.json", settings); + } else { + generateLayout(resolve,reject); + Bangle.on('swipe', onSwipe); + layout.render(); + } + }); +}; diff --git a/apps/kbmulti/metadata.json b/apps/kbmulti/metadata.json new file mode 100644 index 000000000..6c813e321 --- /dev/null +++ b/apps/kbmulti/metadata.json @@ -0,0 +1,18 @@ +{ "id": "kbmulti", + "name": "Multitap keyboard", + "version":"0.01", + "description": "A library for text input via multitap/T9 style keypad", + "icon": "app.png", + "type":"textinput", + "tags": "keyboard", + "supports" : ["BANGLEJS2"], + "screenshots": [{"url":"screenshot_1.png"},{"url":"screenshot_2.png"}], + "readme": "README.md", + "storage": [ + {"name":"textinput","url":"lib.js"}, + {"name":"kbmulti.settings.js","url":"settings.js"} + ], + "data": [ + {"name":"kbmulti.settings.json"} + ] +} diff --git a/apps/kbmulti/screenshot_1.png b/apps/kbmulti/screenshot_1.png new file mode 100644 index 000000000..37e6e5da2 Binary files /dev/null and b/apps/kbmulti/screenshot_1.png differ diff --git a/apps/kbmulti/screenshot_2.png b/apps/kbmulti/screenshot_2.png new file mode 100644 index 000000000..d150d13bf Binary files /dev/null and b/apps/kbmulti/screenshot_2.png differ diff --git a/apps/kbmulti/settings.js b/apps/kbmulti/settings.js new file mode 100644 index 000000000..d3148eca7 --- /dev/null +++ b/apps/kbmulti/settings.js @@ -0,0 +1,31 @@ +(function(back) { + function settings() { + var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {}; + if (settings.firstLaunch===undefined) { settings.firstLaunch = true; } + if (settings.charTimeout===undefined) { settings.charTimeout = 500; } + return settings; + } + + function updateSetting(setting, value) { + var settings = require('Storage').readJSON("kbmulti.settings.json", true) || {}; + settings[setting] = value; + require('Storage').writeJSON("kbmulti.settings.json", settings); + } + + var mainmenu = { + "" : { "title" : /*LANG*/"Multitap keyboard" }, + "< Back" : back, + /*LANG*/'Character selection timeout [ms]': { + value: settings().charTimeout, + min: 200, max: 1500, step : 50, + format: v => v, + onchange: v => updateSetting("charTimeout", v), + }, + /*LANG*/'Show help on first launch': { + value: !!settings().firstLaunch, + format: v => v?"Yes":"No", + onchange: v => updateSetting("firstLaunch", v) + } + }; + E.showMenu(mainmenu); + }) \ No newline at end of file diff --git a/apps/locale/locales.js b/apps/locale/locales.js index 2bc71fd75..d1ac7687f 100644 --- a/apps/locale/locales.js +++ b/apps/locale/locales.js @@ -564,7 +564,7 @@ var locales = { month: "Janeiro,Fevereiro,Março,Abril,Maio,Junho,Julho,Agosto,Setembro,Outubro,Novembro,Dezembro", abday: "Dom,Seg,Ter,Qua,Qui,Sex,Sab", day: "Domingo,Segunda-feira,Terça-feira,Quarta-feira,Quinta-feira,Sexta-feira,Sábado", - trans: { yes: "sim", Yes: "Sim", no: "não", No: "Não", ok: "certo", on: "ligado", off: "desligado" } + trans: { yes: "sim", Yes: "Sim", no: "não", No: "Não", ok: "confirmar", on: "ativado", off: "desativado" } }, "cs_CZ": { // THIS NEVER WORKED PROPERLY - many chars are not in the ISO8859-1 codepage and we use CODEPAGE_CONVERSIONS lang: "cs_CZ", diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog index 7baded76d..d6ad393d6 100644 --- a/apps/messages/ChangeLog +++ b/apps/messages/ChangeLog @@ -49,3 +49,5 @@ 0.34: Don't buzz for 'map' update messages 0.35: Reset graphics colors before rendering a message (possibly fix #1752) 0.36: Ensure a new message plus an almost immediate deletion of that message doesn't load the messages app (fix #1362) +0.37: Now use the setUI 'back' icon in the top left rather than specific buttons/menu items + diff --git a/apps/messages/app.js b/apps/messages/app.js index 644f780b4..aac59e246 100644 --- a/apps/messages/app.js +++ b/apps/messages/app.js @@ -13,11 +13,11 @@ /* For example for maps: // a message -{"t":"add","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"} +require("messages").pushMessage({"t":"add","id":1575479849,"src":"Hangouts","title":"A Name","body":"message contents"}) // maps -{"t":"add","id":1,"src":"Maps","title":"0 yd - High St","body":"Campton - 11:48 ETA","img":"GhqBAAAMAAAHgAAD8AAB/gAA/8AAf/gAP/8AH//gD/98B//Pg/4B8f8Afv+PP//n3/f5//j+f/wfn/4D5/8Aef+AD//AAf/gAD/wAAf4AAD8AAAeAAADAAA="} +require("messages").pushMessage({"t":"add","id":1,"src":"Maps","title":"0 yd - High St","body":"Campton - 11:48 ETA","img":"GhqBAAAMAAAHgAAD8AAB/gAA/8AAf/gAP/8AH//gD/98B//Pg/4B8f8Afv+PP//n3/f5//j+f/wfn/4D5/8Aef+AD//AAf/gAD/wAAf4AAD8AAAeAAADAAA="}); // call -{"t":"add","id":"call","src":"Phone","name":"Bob","number":"12421312",positive:true,negative:true} +require("messages").pushMessage({"t":"add","id":"call","src":"Phone","title":"Bob","body":"12421312",positive:true,negative:true}) */ var Layout = require("Layout"); @@ -67,9 +67,6 @@ function saveMessages() { require("Storage").writeJSON("messages.json",MESSAGES) } -function getBackImage() { - return atob("FhYBAAAAEAAAwAAHAAA//wH//wf//g///BwB+DAB4EAHwAAPAAA8AADwAAPAAB4AAHgAB+AH/wA/+AD/wAH8AA=="); -} function getNotificationImage() { return atob("HBKBAD///8H///iP//8cf//j4//8f5//j/x/8//j/H//H4//4PB//EYj/44HH/Hw+P4//8fH//44///xH///g////A=="); } @@ -123,7 +120,6 @@ function getMessageImage(msg) { if (s=="wordfeud") return atob("GBgCWqqqqqqlf//////9v//////+v/////++v/////++v8///Lu+v8///L++v8///P/+v8v//P/+v9v//P/+v+fx/P/+v+Pk+P/+v/PN+f/+v/POuv/+v/Ofdv/+v/NvM//+v/I/Y//+v/k/k//+v/i/w//+v/7/6//+v//////+v//////+f//////9Wqqqqqql"); if (s=="youtube") return atob("GBgBAAAAAAAAAAAAAAAAAf8AH//4P//4P//8P//8P5/8P4/8f4P8f4P8P4/8P5/8P//8P//8P//4H//4Af8AAAAAAAAAAAAAAAAA"); if (msg.id=="music") return atob("FhaBAH//+/////////////h/+AH/4Af/gB/+H3/7/f/v9/+/3/7+f/vB/w8H+Dwf4PD/x/////////////3//+A="); - if (msg.id=="back") return getBackImage(); return getNotificationImage(); } function getMessageImageCol(msg,def) { @@ -195,13 +191,13 @@ function showMapMessage(msg) { ]}); g.reset().clearRect(Bangle.appRect); layout.render(); - Bangle.setUI("updown",function() { - // any input to mark as not new and return to menu + function back() { // mark as not new and return to menu msg.new = false; saveMessages(); layout = undefined; checkMessages({clockIfNoMsg:1,clockIfAllRead:1,showMsgIfUnread:1,openMusic:0}); - }); + } + Bangle.setUI({mode:"updown", back: back}, back); // any input takes us back } var updateLabelsInterval; @@ -224,8 +220,6 @@ function showMusicMessage(msg) { var sliceLength = offset + maxLen > text.length ? text.length - offset : maxLen; return text.substr(offset, sliceLength).padEnd(maxLen, " "); } - - function back() { clearInterval(updateLabelsInterval); updateLabelsInterval = undefined; @@ -254,7 +248,6 @@ function showMusicMessage(msg) { layout = new Layout({ type:"v", c: [ {type:"h", fillx:1, bgCol:g.theme.bg2, col: g.theme.fg2, c: [ - { type:"btn", src:getBackImage, cb:back }, { type:"v", fillx:1, c: [ { type:"txt", font:fontMedium, bgCol:g.theme.bg2, label:artistName, pad:2, id:"artist" }, { type:"txt", font:fontMedium, bgCol:g.theme.bg2, label:albumName, pad:2, id:"album" } @@ -267,7 +260,7 @@ function showMusicMessage(msg) { {type:"btn", pad:8, label:"\0"+atob("EhKBAMAB+AB/gB/wB/8B/+B//B//x//5//5//x//B/+B/8B/wB/gB+AB8ABw"), cb:()=>Bangle.musicControl("next")}, // next ]}:{}, {type:"txt", font:"6x8:2", label:msg.dur?fmtTime(msg.dur):"--:--" } - ]}); + ]}, { back : back }); g.reset().clearRect(Bangle.appRect); layout.render(); @@ -302,12 +295,9 @@ function showMessageScroller(msg) { }, select : function(idx) { if (idx>=lines.length-2) showMessage(msg.id); - } + }, + back : () => showMessage(msg.id) }); - // ensure button-press on Bangle.js 2 takes us back - if (process.env.HWVERSION>1) Bangle.btnWatches = [ - setWatch(() => showMessage(msg.id), BTN1, {repeat:1,edge:"falling"}) - ]; } function showMessageSettings(msg) { @@ -395,10 +385,8 @@ function showMessage(msgid) { checkMessages({clockIfNoMsg:1,clockIfAllRead:0,showMsgIfUnread:0,openMusic:openMusic}); } var buttons = [ - {type:"btn", src:getBackImage(), cb:goBack} // back ]; if (msg.positive) { - buttons.push({fillx:1}); buttons.push({type:"btn", src:getPosImage(), cb:()=>{ msg.new = false; saveMessages(); cancelReloadTimeout(); // don't auto-reload to clock now @@ -407,7 +395,7 @@ function showMessage(msgid) { }}); } if (msg.negative) { - buttons.push({fillx:1}); + if (buttons.length) buttons.push({width:32}); // nasty hack... buttons.push({type:"btn", src:getNegImage(), cb:()=>{ msg.new = false; saveMessages(); cancelReloadTimeout(); // don't auto-reload to clock now @@ -419,27 +407,23 @@ function showMessage(msgid) { layout = new Layout({ type:"v", c: [ {type:"h", fillx:1, bgCol:g.theme.bg2, col: g.theme.fg2, c: [ - { type:"btn", src:getMessageImage(msg), col:getMessageImageCol(msg), pad: 3, cb:()=>{ - cancelReloadTimeout(); // don't auto-reload to clock now - showMessageSettings(msg); - }}, { type:"v", fillx:1, c: [ {type:"txt", font:fontSmall, label:msg.src||/*LANG*/"Message", bgCol:g.theme.bg2, col: g.theme.fg2, fillx:1, pad:2, halign:1 }, title?{type:"txt", font:titleFont, label:title, bgCol:g.theme.bg2, col: g.theme.fg2, fillx:1, pad:2 }:{}, ]}, + { type:"btn", src:getMessageImage(msg), col:getMessageImageCol(msg), pad: 3, cb:()=>{ + cancelReloadTimeout(); // don't auto-reload to clock now + showMessageSettings(msg); + }}, ]}, {type:"txt", font:bodyFont, label:body, fillx:1, filly:1, pad:2, cb:()=>{ // allow tapping to show a larger version showMessageScroller(msg); } }, {type:"h",fillx:1, c: buttons} - ]}); + ]},{back:goBack}); g.reset().clearRect(Bangle.appRect); layout.render(); - // ensure button-press on Bangle.js 2 takes us back - if (process.env.HWVERSION>1) Bangle.btnWatches = [ - setWatch(goBack, BTN1, {repeat:1,edge:"falling"}) - ]; } @@ -475,13 +459,12 @@ function checkMessages(options) { // Otherwise show a menu E.showScroller({ h : 48, - c : Math.max(MESSAGES.length+1,3), // workaround for 2v10.219 firmware (min 3 not needed for 2v11) + c : Math.max(MESSAGES.length,3), // workaround for 2v10.219 firmware (min 3 not needed for 2v11) draw : function(idx, r) {"ram" - var msg = MESSAGES[idx-1]; + var msg = MESSAGES[idx]; if (msg && msg.new) g.setBgColor(g.theme.bgH).setColor(g.theme.fgH); else g.setColor(g.theme.fg); g.clearRect(r.x,r.y,r.x+r.w, r.y+r.h); - if (idx==0) msg = {id:"back", title:"< Back"}; if (!msg) return; var x = r.x+2, title = msg.title, body = msg.body; var img = getMessageImage(msg); @@ -510,13 +493,12 @@ function checkMessages(options) { if (!longBody && msg.src) g.setFontAlign(1,1).setFont("6x8").drawString(msg.src, r.x+r.w-2, r.y+r.h-2); g.setColor("#888").fillRect(r.x,r.y+r.h-1,r.x+r.w-1,r.y+r.h-1); // dividing line between items }, - select : idx => { - if (idx==0) load(); - else showMessage(MESSAGES[idx-1].id); - } + select : idx => showMessage(MESSAGES[idx].id), + back : () => load() }); } + function cancelReloadTimeout() { if (!unreadTimeout) return; clearTimeout(unreadTimeout); diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json index 1f9e4147b..ab9b03273 100644 --- a/apps/messages/metadata.json +++ b/apps/messages/metadata.json @@ -1,7 +1,7 @@ { "id": "messages", "name": "Messages", - "version": "0.36", + "version": "0.37", "description": "App to display notifications from iOS and Gadgetbridge/Android", "icon": "app.png", "type": "app", diff --git a/apps/noteify/README.md b/apps/noteify/README.md index d3868efcf..c846709de 100644 --- a/apps/noteify/README.md +++ b/apps/noteify/README.md @@ -18,3 +18,6 @@ This app uses the [Scheduler library](https://banglejs.com/apps/?id=sched) and r ![](note.png) ![](timer-alert.png) + +## Web interface +You can also add, edit or delete notes in the web interface, accessible with the download button. diff --git a/apps/noteify/interface.html b/apps/noteify/interface.html new file mode 100644 index 000000000..027c98860 --- /dev/null +++ b/apps/noteify/interface.html @@ -0,0 +1,93 @@ + + + + + +
+
+
+ +
+
+ +
+
+
+ + + + diff --git a/apps/noteify/metadata.json b/apps/noteify/metadata.json index bedff0e5b..7e897d1f0 100644 --- a/apps/noteify/metadata.json +++ b/apps/noteify/metadata.json @@ -14,6 +14,7 @@ ], "data": [{"name":"noteify.json"}], "dependencies": {"scheduler":"type","textinput":"type"}, + "interface": "interface.html", "screenshots": [ {"url": "menu.png"}, {"url": "note.png"}, diff --git a/apps/pie/app.js b/apps/pie/app.js index 69b67d3bd..74f4b4575 100644 --- a/apps/pie/app.js +++ b/apps/pie/app.js @@ -11,7 +11,7 @@ function scrollX(){ gfx.clearRect(0,gfx.getHeight()*(1/4),gfx.getWidth(),0); gfx.scroll(0,gfx.getHeight()/4); score++; - if(typeof(m) != undefined && score>0){ + if(typeof m !== 'undefined' && score>0){ clearInterval(m); m = setInterval(scrollY,Math.abs(100/score+15-0.1*score));} gfx.setColor(1,1,1); diff --git a/apps/scribble/app.js b/apps/scribble/app.js index 99ee3f717..319a02d2c 100644 --- a/apps/scribble/app.js +++ b/apps/scribble/app.js @@ -368,8 +368,8 @@ class TextBox { // x and y are the center points this.x = x; this.y = y; - this.text = (typeof text !== undefined) ? text : "Default"; - this.col = (typeof col !== undefined) ? col : red; + this.text = text || "Default"; + this.col = col || red; // console.log(`Constr TextBox ${this.text} -> Center: (${this.x}, ${this.y}) | Col ${this.col}`); } diff --git a/apps/tabanchi/ChangeLog b/apps/tabanchi/ChangeLog new file mode 100644 index 000000000..23b44dd5d --- /dev/null +++ b/apps/tabanchi/ChangeLog @@ -0,0 +1 @@ +0.0.1: Initial implementation diff --git a/apps/tabanchi/README.md b/apps/tabanchi/README.md new file mode 100644 index 000000000..71ad22558 --- /dev/null +++ b/apps/tabanchi/README.md @@ -0,0 +1,47 @@ +たばんち (tabanchi) +=================== + +A Tamagotchi clone watch app for the BangleJS2 smartwatch. + +Author +------ + +Written by pancake in 2022, powered by insomnia + +Source repository: https://github.com/trufae/tabanchi + +Features +-------- + +* [x] 12/24 clock with HH:mm:ss +* [x] Battery level indicator +* [x] Eating meals and snacks +* [x] Refusing to do things +* [x] Getting sick +* [x] Take a shower +* [x] Switch on/off the light +* [x] Status for happy/hunger/discipline +* [ ] Evolutions +* [ ] Hatching eggs +* [x] Playing a game +* [ ] Education +* [x] Medicine +* [ ] Death + + +Resources +--------- + +* Original pixmaps taken from: + - https://www.spriters-resource.com/resources/sheets/141/144400.png +* Espruino Image converter: + - https://www.espruino.com/Image+Converter +* Tamagotchi Essentials + - https://tamagotchi.fandom.com/wiki/Tamagotchi_(1996_Pet) +* Tamagotchi Emulator Source (Java) + - https://gist.github.com/aerospark/80c60e801398fd961e3f + +Screenshots +----------- +![tama on bangle](screenshot.jpg) + diff --git a/apps/tabanchi/app-icon.js b/apps/tabanchi/app-icon.js new file mode 100644 index 000000000..95796eb16 --- /dev/null +++ b/apps/tabanchi/app-icon.js @@ -0,0 +1 @@ +atob("MDDBAP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//gAAAAD//gAAAAD//gAAAAf//8AAAAf//8AAAAf//8AAAD/////gAD/////gAD/////gAf/////8Af/////8Af/////8D//////8D//////8D//////8D//////8D//////8D//////8D//////8D//////8D//////8D//////8D//////8D//////8f//////gf//////gf//////gD/////gAD/////gAD/////gAAf///8AAAf///8AAAf///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=") diff --git a/apps/tabanchi/app.js b/apps/tabanchi/app.js new file mode 100644 index 000000000..c87a08817 --- /dev/null +++ b/apps/tabanchi/app.js @@ -0,0 +1,1603 @@ +// GPL TAMAGOTCHI CLONE FOR THE BANGLEJS2 SMARTWATCH BY pancake 2022 +// TABANCHI -- たばんち + +const scale = 6; +let tool = -1; +const w = g.getWidth(); +const h = g.getHeight(); +let hd = 1; +let vd = 1; +let x = 20; +let sx = 0; // screen scroll x position +const y = 40 - scale; +let animated = true; +let transition = false; +let caca = null; +let egg = null; +let mode = ''; +let evolution = 1; +let callForAttention = false; // TODO : move into tama{} +let useAmPm = true; +let oldMode = ''; +let gameChoice = 0; +let gameTries = 0; +let gameWins = 0; + +g.setBgColor(0); + +const tama06eat0 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('/////4A/vd+B7+N3g/e714P39/f39/f3++/8H/////8=') +}; +const meal0 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('gXp6tbW1tYE=') +}; +const meal1 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('v19htbW1tYE=') +}; + +const meal2 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/////5+htYE=') +}; +const snack0 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('358D08vA+fs=') +}; +const snack1 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('///708vA+fs=') +}; +const snack2 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/////+vA+fs=') +}; + +const angry0 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/////8/Pv/8=') +}; + +const angry1 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('8/Dg4fn/v/8=') +}; + +const right = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('7+eDgYPn7/8=') +}; + +const left = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('9+fBgcHn9/8=') +}; + +const img_on = { + width: 16, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('//+M73VvdW91r3Wvjc///w==') +}; + +const img_off = { + width: 16, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('//+MIXXvdGN173Xvje///w==') +}; + +const right0 = { + width: 3, + height: 5, + bpp: 1, + transparent: 1, + buffer: atob('d1Y=') +}; + +const right1 = { + width: 3, + height: 5, + bpp: 1, + transparent: 1, + buffer: atob('ZBY=') +}; + +const am = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('w7mBuf+Rqak=') +}; + +const pm = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('g52Dn/+Rqak=') +}; +const numbers = [ + { // 0 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('lmZmnw==') + }, { // 1 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('2d3d3w==') + }, { // 2 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('lu23Dw==') + }, { // 3 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('Hu3uHw==') + }, { // 4 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('lVVQ3w==') + }, { // 5 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('B3HuHw==') + }, { // 6 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('l3Fmnw==') + }, { // 7 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('Bm7d3w==') + }, { // 8 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('lmlmnw==') + }, { // 9 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('lmjunw==') + } +]; + +const snumbers = [ + { // 0 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/4qqjw==') + }, { // 1 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/93d3w==') + }, { // 2 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/46Ljw==') + }, { // 3 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/46Ojw==') + }, { // 4 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/6qO7w==') + }, { // 5 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/4uOjw==') + }, { // 6 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/4uKjw==') + }, { // 7 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/4ru7w==') + }, { // 8 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/4qKjw==') + }, { // 9 + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/4qOjw==') + } +]; + +const colon = { + width: 4, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/f/9/w==') +}; + +const egg00 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('/////////D/7n/GP8e/n9+537nfvx/OP+Z/wD/////8=') +}; + +const h24 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('ldWxnf/bw9s=') +}; + +const discipline = { + width: 32, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('///v/x//7/9v/i//akqqI27erqtqWiqja1rqrxpK6qM=') +}; + +const linebar = { + width: 32, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/////4AAAA9////3f///93////d////3f///94AAAA8=') +}; + +const hungry = { + width: 32, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/////2////9qiKr/aqqa/wqquv9qqLz/aK6+/2/4+f8=') +}; + +const happy = { + width: 32, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/////2/iP/9v6qv/bGqr/w9iK/9obvP/a277/2yu5/8=') +}; + +const vs = { + width: 16, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('Uf9V/1f/W/9d/7X/sf///w==') +}; + +const egg01 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('///////////8P/uf8Y/x7+P37nfud/PP+Z/gB/////8=') +}; + +const tama06no0 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('//////w/+9/3gey974Hv3e/B7/fv9+/39+/4H/////8=') +}; + +const tama06no1 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('//////w/+9+B7703gfe794P37/fv9+/39+/4H/////8=') +}; + +const caca00 = { + width: 12, + height: 12, + bpp: 1, + transparent: 1, + buffer: atob('/////733v72/+f4vw3wH////') +}; + +const caca01 = { + width: 12, + height: 12, + bpp: 1, + transparent: 1, + buffer: atob('////v/33v7+3+f4v0HwH////') +}; + +// var img = hs.decompress(atob("sFggP/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A+A")); +const tama00 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('///////////8H/vv9oHvveuB793vwd/34A////////8=') +}; +const tama01 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('/////////AH7vfeB7sfvwevd78Hv7+/v7+/33/g///8=') +}; + +const tool00 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('//////7v4f8zHwP8zHwP8zHwP8zHwP8THwP8DHwP8BHgP8AHgP8AHgP+AHgP+APgP/AfAP/g/AP/x/AP/x/AP/x/AP/w/gP/w/8P/w/8P/gf8P/gf8P/AP8P/AP4P/AP4P/gf4P/wf4P/4/8f/////A=') +}; + +const tool01 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('///////D///fD4/+Pn4/+P/4//P/7/v+Af3n4APjDwAHDjgADP/AGD//DPh/+H/h/+O5x/GOkxxCOkxBOG8xh/GYz//HBz//jBn//xjmPw4/ODx///Dx+AfH/8AP///////+Af//8AP///////////A=') +}; + +const tool02 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('///////////////+D///4B///x8///xUf/hmTf+An/f4AmTfwAmTfgAl8fABx8+AD4B8AH8D4AP//wAf//gA///AB//+AH//8AP//4A///wD//8AP//4A///4H///4H///8H///+P/////////////A=') +}; + +const tool03 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('/////////////x////g////gf//fwP/+P4P/+OMH/+GEH/8DCD/4BjB/wxhB/h4xg/D8Qw8H8Yw4H+M5wH+H/gD/H/gD/D/wB8B/wAwB/wAAz/wAD//gAH//CAf//PB////n//////////////////A=') +}; + +const tool10 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('////////////////wf///AH//yAD/Dkfh8B0/wAA8/wA44vnD545Bgx8ZA4x4H58xznP8RjjH8ZnmP8ZmGPw5gPAB58fAHx8fw/x4///j8///j8f//D8f/8H+D/gf/AAA//gAD//+Af///////////A=') +}; + +const tool11 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('//////////////////////B///wAD/+AAA/8D/wPwfz+Hg/z/Dj7z3xH5znYM5znIM5TmIOdT8YGeL85GOP45neP/xj+P/zz+P/zx+H/nx+H/n4///H4/h/P8QAGP+AAAf/D/g////////////////A=') +}; +const tool12 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('/////////////////////////////z////5////5///94///48/g/8c8AH8M4AGcEwAOEEgAyAgAAwAgAB4YwAH8YwAH+c4AH/c4AAf84gAB/4gAB/5wAB/54AD//8AH///gf/////////////////A=') +}; + +const tool13 = { + width: 30, + height: 30, + bpp: 1, + transparent: 1, + buffer: atob('/////////////////////////+A///8AP//weH//x/jg/j/yAPnPwOHnM4/jnM9/5n8//5k/+fkk/vHEmPPgMjAbgcxxjmc4fD/48AB/4+AQ/x//4fj//+AH///AP/////////////////////////A=') +}; + +const shower = { + width: 8, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('5cuXy+XLl8vly5fL5cuXyw==') +}; + +const tools = [ + tool00, tool01, tool02, tool03, + tool10, tool11, tool12, tool13 +]; + +const tamabg = { + width: 176, + height: 176, + bpp: 8, + buffer: require('heatshrink').decompress(atob('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')) +}; + +const tama06happy = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('/////4Afvm+Hd+B74duDq7v7g/vv++/79/f4D/////8=') +}; + +const battery = { + width: 32, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/////x/t//9vxP//bG2arx9taa9obQuPa2177xy2i58=') +}; +const snack = { + width: 24, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('z//7t//7vDGbzb1q9aF5ta1qzbKa////') +}; +const meal = { + width: 24, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('////k//fqzjfqt7fqhDfqvbfuxlf////') +}; + +const face = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/8OlgZmBw/8=') +}; + +const year = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/6qpq8vrn/8=') +}; + +const weight = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/34A54G9pQA=') +}; + +const weight_g = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('49vj+cO7x/8=') +}; + +const heart0 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('yba+vt3r9/8=') +}; + +const heart1 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('yaCgoMHj9/8=') +}; + +g.clear(); +g.setColor(1, 1, 1); +g.fillRect(0, 0, 200, 200); + +g.setColor(0); + +g.drawString('Loading...', 10, 10); +egg = egg00; +n = tama00; + +const tama = { + // visible + age: 0, + weight: 1, + aspect: 6, + discipline: 0, + happy: 3, + sick: false, + hungry: 3, + cacas: 0, // move from cacas + // hidden + sickness: 0, + defenses: 100, + tummy: 100, + awake: 3 +}; + +function drawHearts (n) { + for (i = 0; i < 4; i++) { + const himg = (i < n) ? heart1 : heart0; + g.drawImage(himg, 1 + (scale * (8 * i)) - scale - scale, 40 + (scale * 8), { scale: (scale) }); + } +} + +function drawLinebar (n, arrow) { // 0-100 + const yy = 34; + g.drawImage(linebar, 0, yy + (scale * 8), { scale: scale }); + + let wop = scale * 2; // (frame++%2)? scale*3:scale*2; + if (frame % 2) { + wop += scale; + } + let twelve = 12; + if (arrow) { + twelve = 11; + } + const val = (n * twelve) / 100; + const max = val || twelve; + + for (let i = 0; i < max; i++) { + g.setColor(0, 0, 0); + + if (arrow) { + const x = wop + (i * scale * 2) + ((i % 2) * scale); + const y = yy + (scale * 11); + g.fillRect(x + (scale * 2), y, x + (scale * 3), y + scale); + g.fillRect(x + scale, y + scale, x + (scale * 2), y + (scale * 2)); + g.fillRect(x, y + (scale * 2), x + scale, y + (scale * 3)); + } else { + const x = (i * scale * 2) + (scale * 2); + const y = yy + (scale * 11); + g.fillRect(x, y, x + scale, y + scale * 3); + } + } +} + +function drawStatus () { + const yy = 34; + switch (statusMode) { + case 0: + g.drawImage(face, scale, yy, { scale: scale }); + g.drawImage(weight, scale, yy + (scale * 8), { scale: scale }); + g.drawImage(numbers[0], w - (scale * 14), yy, { scale: scale }); + g.drawImage(year, w - (scale * 8), yy, { scale: scale }); + g.drawImage(numbers[1], w - (scale * 14), yy + (scale * 9), { scale: scale }); + g.drawImage(weight_g, w - (scale * 8), yy + (scale * 9), { scale: scale }); + break; + case 1: // discipline + g.drawImage(discipline, 0, yy, { scale: scale }); + drawLinebar(tama.discipline, false); + break; + case 2: // hungry + g.drawImage(hungry, scale, yy, { scale: scale }); + drawHearts(tama.hungry); + break; + case 3: // happy + g.drawImage(happy, scale, yy, { scale: scale }); + drawHearts(tama.happy); + break; + case 5: // battery + g.drawImage(battery, scale, yy, { scale: scale }); + drawLinebar(E.getBattery(), true); + break; + default: + statusMode = 0; + drawStatus(); + break; + } +} + +function drawScene () { + if (Bangle.isLocked()) { + tool = -1; + } + g.setColor(0, 0, 0); + g.fillRect(0, 0, 200, 200); + g.drawImage(tamabg, 0, 0, { scale: 1 }); + g.setColor(1, 1, 1); + + if (evolution == 0) { + g.drawImage(egg, w / 4, 32, { scale: scale }); + return; + } + if (callForAttention) { + g.drawImage(tool13, 10 + 30 + 10 + 30 + 10 + 30 + 10, 135); + } + if (mode == 'game') { + drawGame(); + if (!transition) { + if (gameChoice == 2) { + g.drawImage(right, w - (scale * 7), 40 + (scale * 4), { scale: scale }); + } else if (gameChoice == 1) { + g.drawImage(left, 0, 40 + (scale * 4), { scale: scale }); + } + return; + } + } + if (gameTries > 4) { + mode = ''; + oldMode = ''; + const s0 = numbers[gameWins]; + const s1 = numbers[(5 - gameWins)]; + g.drawImage(s0, (scale * 5), 60, { scale: scale }); + g.drawImage(vs, (scale * 12), 60, { scale: scale }); + g.drawImage(s1, (scale * 22), 60, { scale: scale }); + + gameTries++; + if (gameTries > 10) { + const winrar = (gameWins > 2); + gameTries = 0; + gameWins = 0; + oldMode = ''; + mode = ''; + if (winrar) { + tama.happy++; + animateHappy(); + } + } + return; + } + + if (mode == 'clock') { + drawClock(); + if (!transition) { + return; + } + } + + drawTools(); + if (mode == 'status') { + drawStatus(); + return; + } + if (mode == 'food') { + drawFoodMenu(); + return; + } + if (mode == 'light') { + drawLight(); + return; + } + if (mode == 'happy') { + drawHappy(); + return; + } + if (mode == 'angry') { + drawAngry(); + return; + } + if (mode == 'medicine') { + if (tama.sick > 0) { + drawMedicine(); + } else { + animateAngry(); + } + return; + } + if (mode == 'eating') { + if (lightSelect == 0 && tama.hungry > 4) { + drawEatingNo(); + } else { + drawEating(); + } + return; + } + if (lightMode) { + // just dark screen and maybe zZz if its sleeping + g.setColor(0, 0, 0); + g.fillRect(0, 38, w + sx, h - 50); + if (tama.sleep) { + drawCaca(); + } + } else { + // draw tamagotchi + g.drawImage(n, x + sx, y, { scale: scale }); + // draw caca + drawCaca(); + } +} + +var statusMode = 0; +var lightSelect = 0; +var lightMode = 0; // on is zero +let frame = 0; + +function drawAngry () { + const one = angryState % 2; + g.drawImage(one ? tama06no0 : tama06no1, (scale * 5), 40, { scale: scale }); + g.drawImage(one ? angry0 : angry1, (scale * 20), 40, { scale: scale }); +} + +function drawHappy () { + const one = angryState % 2; + g.drawImage(one ? tama06happy : tama06no1, (scale * 5), 40, { scale: scale }); + if (one) { + g.drawImage(sun, (scale * 20), 46, { scale: scale }); + } +} + +function drawEatingNo () { // food eating animation + const one = angryState % 2; + + g.drawImage(lightSelect ? snack0 : meal0, scale, 40 + (scale * 7), { scale: scale }); + + g.drawImage(one ? tama06no0 : tama06no1, (scale * 10), 40, { scale: scale }); +} + +const med0 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('///4P/1//X/9f+AP+7/4P/o/+j/4P/g//H/+//7///8=') +}; +const med1 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('//////g//X/9f+AP+z/7P/o/+D/7P/g//H/+//7///8=') +}; + +const med2 = { + width: 16, + height: 16, + bpp: 1, + transparent: 1, + buffer: atob('////////+D/9f+AP+j/7P/s/+z/7v/g//H/+//7///8=') +}; + +function drawMedicine () { // food eating animation + const med = [med0, med1, med2]; + const img = med[0 | ((frame / 2) % 3)]; + if (img) { + g.drawImage(img, 0, 34, { scale: scale }); + } + g.drawImage(tama06no0, (scale * 10), 40, { scale: scale }); +} + +var sun = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('773nW9rnvfc=') +}; + +function drawEating () { // food eating animation + const one = angryState % 2; + const snack = [snack0, snack1, snack2]; + const meal = [meal0, meal1, meal2]; + const img = lightSelect ? snack[0 | (frame / 2)] : meal[0 | (frame / 2)]; + if (img) { + g.drawImage(img, scale, 40 + (scale * 7), { scale: scale }); + } + g.drawImage(one ? tama06no1 : tama06eat0, (scale * 10), 40, { scale: scale }); +} + +function drawFoodMenu () { // food menu + if (lightSelect == 0) { + g.drawImage(right, -scale, 40, { scale: scale }); + } else { + g.drawImage(right, -scale, 40 + (7 * scale), { scale: scale }); + } + g.drawImage(meal, scale * 5, 34, { scale: scale }); + g.drawImage(snack, scale * 5, 40 + (7 * scale), { scale: scale }); +} + +function drawLight () { + if (lightSelect == 0) { + g.drawImage(right, 2, 40, { scale: scale }); + } else { + g.drawImage(right, 2, 40 + (7 * scale), { scale: scale }); + } + g.drawImage(img_on, scale * 8, 34, { scale: scale }); + g.drawImage(img_off, scale * 8, 40 + (7 * scale), { scale: scale }); +} + +function drawTools () { + if (tool >= 0) { + // top actions + if (tool == 0) { g.drawImage(tool00, 10, 2); } + if (tool == 1) { g.drawImage(tool01, 10 + 30 + 10, 2); } + if (tool == 2) { g.drawImage(tool02, 10 + 30 + 10 + 30 + 10, 2); } + if (tool == 3) { g.drawImage(tool03, 10 + 30 + 10 + 30 + 10 + 30 + 10, 2); } + // bottom actions + if (tool == 4) { g.drawImage(tool10, 10, 135); } + if (tool == 5) { g.drawImage(tool11, 10 + 30 + 10, 135); } + if (tool == 6) { g.drawImage(tool12, 10 + 30 + 10 + 30 + 10, 135); } + } +} + +// this function is executed once per second. so the animations look stable and consistent +function updateAnimation () { + frame++; + if (evolution == 0) { + // animate the egg + egg = (egg == egg00) ? egg01 : egg00; + return; + } + if (mode == 'game') { + // console.log("update Animation"); + if (transition) { + const beep = frame % 4; + if (beep == 0) { + Bangle.beep(150, 4000); + } else if (beep == 2) { + Bangle.beep(150, 3200); + } + } else { + Bangle.beep(100); + } + if (gameChoice != 0) { + // do things + gameChoice = 0; + if ((0 | (Math.random() * 3)) > 0) { + animateHappy(); + gameWins++; + } else { + animateAngry(); + } + } + return; + } + if (mode == 'medicine') { + if (frame > 3) { + mode = ''; + tama.sick = 0; + } + } + x += (scale) * hd; + if (x + (tama00.width * scale) >= w) { + hd = -hd; + } + if (x < 0) { + hd = -hd; + } + caca = (caca == caca00) ? caca01 : caca00; + // y += vd * scale; + vd = -vd; + const width = (w / scale); + if (tama.sleep) { + n = tama00; + x = (width / 2); + } else { + n = n == tama00 ? tama01 : tama00; + if (tama.cacas > 0 || tama.sick > 0) { + if (x > (width / 2)) { + hd = -1; + x = (width / 2); + } + } + } +} + +function nextItem () { + tool++; + if (tool > 6) tool = 0; +} +function prevItem () { + tool--; + if (tool < 0) tool = 7; +} + +function activateItem () { + if (mode != '') { + return; + } + switch (tool) { + case -1: + animateToClock(); + break; + case 0: // food + if (tama.sleep) { + } else { + // evolution = 0; + mode = 'food'; + lightSelect = 0; + } + break; + case 1: // onoff + mode = 'light'; + break; + case 2: // game + if (tama.sleep) { + } else { + animateToGame(); + } + break; + case 3: // vax + if (tama.sleep) { + // cant medicate if sleeping + } else { + mode = 'medicine'; + frame = 0; + angryState = 0; + } + break; + case 4: // shower + if (tama.sleep) { + tama.happy = 0; + } + tama.awake = 10; // time to go to sleep again if in time + tama.sleep = false; + animateShower(); + break; + case 5: // status + mode = 'status'; + statusMode = 0; + break; + case 6: // blame + if (tama.sleep) { + tama.happy = 0; + tama.sleep = false; + } else if (callForAttention) { + if (tama.happy > 0 && tama.hungry > 0 && tama.sick < 1) { + tama.discipline += 2; + callForAttention = false; + } else if (tama.sick > 0) { + tama.discipline--; + } + } + animateAngry(); + break; + } +} + +const skull = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('gwFtARGDq/8=') +}; + +const zz0 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('//H9+/fRf/8=') +}; + +const zz1 = { + width: 8, + height: 8, + bpp: 1, + transparent: 1, + buffer: atob('/8P79+/fw/8=') +}; + +const zz2 = { + width: 8, + height: 8, + bpp: 1, + transparent: 0, + buffer: atob('AA4CBAgugAA=') +}; +const zz3 = { + width: 8, + height: 8, + bpp: 1, + transparent: 0, + buffer: atob('ADwECBAgPAA=') +}; + +function drawCaca () { + if (mode == 'game') { + return; + } + if (!caca) { + caca = caca00; + } + let zz = [zz0, zz1]; + + if (lightMode) { + zz = [zz2, zz3]; + g.setColor(1, 1, 1); + var fi = ((frame) / 2) % 2; + g.drawImage(zz[fi ? 1 : 0], sx + w - (scale * 9), 40, { scale: scale }); + return; + } + g.setColor(0, 0, 0); + if (tama.sleep) { + var fi = ((frame) / 2) % 2; + g.drawImage(zz[fi ? 1 : 0], sx + w - (scale * 9), 34, { scale: scale }); + if (tama.sick > 0) { + g.drawImage(skull, sx + w - (scale * 9), 34 + (scale * 6), { scale: scale }); + } else if (tama.cacas > 0) { + g.drawImage(caca, sx + w - (scale * 11), 32 + (scale * 6), { scale: scale }); + } + } else if (tama.sick > 0) { + g.drawImage(skull, sx + w - (scale * 9), 34 + scale, { scale: scale }); + if (tama.cacas > 0) { + g.drawImage(caca, sx + w - (scale * 11), 32 + (scale * 6), { scale: scale }); + } + } else { + if (tama.cacas > 0) { + g.drawImage(caca, sx + w - (scale * 11), 34 + (scale * 6), { scale: scale }); + } + if (tama.cacas > 1) { + g.drawImage(caca, sx + w - (scale * 11), 24, { scale: scale }); + } + } +} +var angryState = 0; + +function animateHappy () { + if (transition || mode == 'happy') { + return; + } + angryState = 0; + mode = 'happy'; + transition = true; + const width = w / scale; + const cx = w; + var iv = setInterval(function () { + angryState++; + if (angryState > 3) { + clearInterval(iv); + transition = false; + angryState = 0; + mode = oldMode; + if (mode == 'game') { + gameTries++; + } + } + drawScene(); + }, 1000); +} + +function animateAngry () { + if (transition || mode == 'angry') { + return; + } + angryState = 0; + mode = 'angry'; + transition = true; + const width = w / scale; + const cx = w; + var iv = setInterval(function () { + angryState++; + if (angryState > 3) { + clearInterval(iv); + transition = false; + angryState = 0; + mode = oldMode; + if (mode == 'game') { + gameTries++; + } + } + drawScene(); + }, 1000); +} + +function animateFood () { + if (transition || mode == 'eating') { + return; + } + // XXX TODO this is printing the angry state not the eating one + angryState = 0; + mode = 'eating'; + tama.hungry++; + if (lightSelect == 1) { // snack + tama.happy++; + tama.hungry++; + tama.sickness += 2; + } + frame = 0; + transition = true; + const width = w / scale; + const cx = w; + var iv = setInterval(function () { + angryState++; + if (angryState > 3) { + clearInterval(iv); + transition = false; + angryState = 0; + mode = 'food'; + } + drawScene(); + }, 1000); +} + +function animateShower () { + if (transition) { + return; + } + transition = true; + const width = w / scale; + let cx = w; + var iv = setInterval(function () { + sx -= scale * 4; + drawScene(); + cx -= scale * 4; + g.setColor(1, 1, 1); + g.drawImage(shower, cx, 40 - scale, { scale: scale }); + if (cx < 0) { + clearInterval(iv); + mode = ''; + transition = false; + animated = true; + sx += width; + if (sx < 0) sx = 0; + if (tama.cacas > 0) { + // if it was dirty, play the happy animation + } + tama.cacas = 0; + drawScene(); + } + }, 100); +} + +function animateToGame () { + if (transition || mode == 'game') { + return; + } + mode = 'game'; + gameChoice = 0; + transition = true; + let cx = 0; + sx = -w; + animated = false; + var iv = setInterval(function () { + sx += scale * 2; + updateAnimation(); + drawScene(); + cx += scale * 2; + if (cx > w) { + clearInterval(iv); + sx = 0; + animated = true; + transition = false; + drawScene(); + } + }, 100); +} + +function animateToClock () { + if (transition) { + return; + } + if (mode == 'clock') { + return; + } + mode = 'clock'; + transition = true; + const width = w / scale; + let cx = w; + sx = 0; + animated = false; + var iv = setInterval(function () { + sx -= scale * 4; + drawScene(); + cx -= scale * 4; + g.setColor(0, 0, 0); + if (cx < 0) { + clearInterval(iv); + mode = 'clock'; + transition = false; + animated = true; + drawScene(); + } + }, 100); +} + +function animateFromClock () { + if (transition) { + return; + } + if (mode != 'clock') { + return; + } + transition = true; + let cx = 0; + const width = w / scale; + animated = false; + var iv = setInterval(function () { + sx += scale * 4; + drawScene(); + cx += scale * 4; + if (cx > w) { + clearInterval(iv); + mode = ''; + sx = 0; + animated = true; + transition = false; + drawScene(); + } + }, 100); +} + +function button (n) { + if (evolution == 0) { + if (n == 3) { + evolution = 1; + return; + } + } + if (mode == 'happy' || mode == 'angry') { + return; + } + + if (mode == 'game') { + /* + if (gameTries > 3) { + mode = ""; + gameWins = 0; + gameTries = 0; + //tama.tired++; + } + */ + switch (n) { + case 1: + // pick left + gameChoice = 1; + drawScene(); + oldMode = 'game'; + break; + case 2: + // pick right + gameChoice = 2; + drawScene(); + oldMode = 'game'; + break; + case 3: + mode = ''; + // exit game + break; + } + return; + } + if (mode == 'eating') { + Bangle.buzz(); + return; + } + Bangle.beep(150); + + switch (n) { + case 1: + switch (mode) { + case 'clock': + useAmPm = !useAmPm; + drawScene(); + break; + case 'food': + case 'light': + lightSelect = lightSelect ? 0 : 1; + drawScene(); + break; + case 'status': + if (oldMode == 'clock') { + } else { + statusMode++; + drawScene(); + } + break; + default: + nextItem(); + drawScene(); + break; + } + break; + case 2: + switch (mode) { + case 'clock': + animateFromClock(); + break; + case 'status': + if (oldMode == 'clock') { + } else { + statusMode++; + drawScene(); + } + break; + case 'food': + animateFood(); + break; + case 'light': + mode = ''; + lightMode = lightSelect; + drawScene(); + break; + default: + activateItem(); + tool = -1; + drawScene(); + } + break; + case 3: + switch (mode) { + case 'clock': + animateFromClock(); + break; + case 'light': + case 'food': + mode = ''; + lightState = 0; + drawScene(); + break; + case 'status': + if (oldMode == 'clock') { + mode = 'clock'; + oldMode = ''; + } else { + mode = ''; + statusMode = 0; + drawScene(); + } + break; + default: + mode = ''; + tool = -1; + drawScene(); + break; + } + break; + } +} + +function drawGame () { + g.setColor(0, 0, 0); + + let one = frame % 2; + if (transition) { + one = 0; + g.drawImage(heart1, sx + w + (scale * 6), 40, { scale: scale }); + g.drawImage(heart1, sx + w + (scale * 16), 40, { scale: scale }); + g.drawImage(heart0, sx + w, 40 + (scale * 8), { scale: scale }); + g.drawImage(heart0, sx + w + (scale * 12), 40 + (scale * 8), { scale: scale }); + } else { + if (gameTries > 4) { + if (oldMode != '') { + if (gameWins > 2) { + animateHappy(); + } + } + mode = oldMode; + oldMode = ''; + // g.drawImage(); + } else { + g.drawImage(one ? tama06no1 : tama06no0, (scale * 7) + sx, 40, { scale: scale }); + } + } +} + +function drawClock () { + const d = new Date(); + let hh = ''; + if (useAmPm) { + const h = (d.getHours() > 12) ? d.getHours() - 12 : d.getHours(); + hh = (h < 10) ? ' ' + h : '' + h; + } else { + hh = (d.getHours() < 10) ? ' ' + d.getHours() : '' + d.getHours(); + } + const mm = (d.getMinutes() < 10) ? '0' + d.getMinutes() : '' + d.getMinutes(); + const ss = (d.getSeconds() < 10) ? '0' + d.getSeconds() : '' + d.getSeconds(); + const ts = hh + ':' + mm; + const useVector = false; + const wsx = w + sx + ((2.4) * scale); + + if (useVector) { + g.setFont('Vector', 60); + g.setColor(0, 0, 0); + g.drawString(ts, w + sx + 30, 54); + g.setFont('Vector', 24); + g.setColor(0, 0, 0); + g.drawString(ss, w + sx + (w - 20), 104); + } else { + const s0 = numbers[ts[0] - '0']; + const s1 = numbers[ts[1] - '0']; + const s2 = numbers[ts[3] - '0']; + const s3 = numbers[ts[4] - '0']; + const yy = 34; + // hours + if (s0) { + g.drawImage(s0, wsx, yy, { scale: scale }); + } + g.drawImage(s1, wsx + (5 * scale), yy, { scale: scale }); + g.drawImage(colon, wsx + (scale + scale + scale + (5 * scale)), yy, { scale: scale }); + // minutes + g.drawImage(s2, wsx + (2 * scale) + (5 * 2 * scale), yy, { scale: scale }); + g.drawImage(s3, wsx + (2 * scale) + (5 * 3 * scale), yy, { scale: scale }); + // seconds + const s4 = snumbers[ss[0] - '0']; + const s5 = snumbers[ss[1] - '0']; + g.drawImage(s4, wsx + (3 * scale) + (3 * 6 * scale), yy, { scale: scale }); + g.drawImage(s5, wsx + scale + (4 * 6 * scale), yy, { scale: scale }); + const arrows = [ + '00000', + '10000', + '11000', + '11100', + '11110', + '11111', + '01111', + '00111', + '00011', + '00001' + ]; + // arrow + for (let i = 0; i < 5; i++) { + const n = d.getSeconds() % 10; + const arrow = arrows[n]; + const img = (arrow[i] == '1') ? right1 : right0; + g.drawImage(img, wsx + (3 * i * scale) + (scale * 14), yy + (10 * scale), { scale: scale }); + } + } + if (useAmPm) { + if (d.getHours() < 13) { + g.drawImage(am, wsx, yy + (8 * scale), { scale: scale }); + } else { + g.drawImage(pm, wsx, yy + (8 * scale), { scale: scale }); + } + } else { + g.drawImage(h24, wsx, yy + (8 * scale), { scale: scale }); + // show something from tamagotchi stats + } +} + +setInterval(function () { + // if (animated) { + updateAnimation(); + drawScene(); + // } +}, 1000); + +let cacaLevel = 0; +let cacaBirth = null; + +setInterval(function () { + // poo maker + if (tama.hungry > 0 && !tama.sleep) { + const a = 0 | (cacaLevel / tama.tummy); + const b = 0 | ((cacaLevel + tama.hungry) / tama.tummy); + cacaLevel += tama.hungry; + if (a != b) { + if (tama.cacas == 0) { + cacaBirth = new Date(); + } + tama.hungry--; + tama.cacas++; + } + } + const d = new Date(); + const h = d.getHours(); + tama.sleep = (h > 22 || h < 8); + if (tama.awake > 0) { + tama.awake--; + tama.sleep = false; + } +}, 5000); + +setInterval(function () { + if (tama.sleep) { + return; + } + callForAttention = false; + + // health check + tama.sickness += tama.cacas; + if (tama.hungry == 0) { + callForAttention = true; + // tama.sickness++; + } + if (tama.hungry == 4) { + // tama.sickness++; + } + if (tama.sickness > tama.defenses) { + tama.sickness = 0; + tama.sick++; + } + if (tama.sick > 0) { + callForAttention = true; + } +}, 2000); + +updateAnimation(); + +Bangle.on('touch', function (r, s) { + const w4 = w / 3; + if (s.x > w - w4) { + if (s.y < 50) { + Bangle.beep(150); + if (oldMode == 'clock') { + oldMode = ''; + mode = 'clock'; + } else + if (mode == 'clock') { + mode = 'status'; + oldMode = 'clock'; + statusMode = 5; // battery + } else { + evolution = !evolution; + tool = -1; + } + drawScene(); + } else { + button(3); + } + } else if (s.x < w4) { + button(1); + } else { + button(2); + } +}); + diff --git a/apps/tabanchi/app.png b/apps/tabanchi/app.png new file mode 100644 index 000000000..7e653301d Binary files /dev/null and b/apps/tabanchi/app.png differ diff --git a/apps/tabanchi/metadata.json b/apps/tabanchi/metadata.json new file mode 100644 index 000000000..23de01869 --- /dev/null +++ b/apps/tabanchi/metadata.json @@ -0,0 +1,31 @@ +{ + "id": "tabanchi", + "name": "Tabanchi", + "shortName": "Tabanchi", + "version": "0.0.1", + "type": "app", + "description": "Tamagotchi WatchApp", + "icon": "app.png", + "allow_emulator": true, + "tags": "watch, pet", + "supports": [ + "BANGLEJS2" + ], + "readme": "README.md", + "storage": [ + { + "name": "tabanchi.app.js", + "url": "app.js" + }, + { + "name": "tabanchi.img", + "url": "app-icon.js", + "evaluate": true + } + ], + "screenshots": [ + { + "url": "screenshot.jpg" + } + ] +} diff --git a/apps/tabanchi/screenshot.jpg b/apps/tabanchi/screenshot.jpg new file mode 100644 index 000000000..fcd97df84 Binary files /dev/null and b/apps/tabanchi/screenshot.jpg differ diff --git a/apps/terminalclock/ChangeLog b/apps/terminalclock/ChangeLog index 4e53f6f8b..b752c829d 100644 --- a/apps/terminalclock/ChangeLog +++ b/apps/terminalclock/ChangeLog @@ -2,3 +2,4 @@ 0.02: Rename "Activity" in "Motion" and display the true values for it 0.03: Add Banglejs 1 compatibility 0.04: Fix settings bug +0.05: Add altitude display (only Bangle.js 2) diff --git a/apps/terminalclock/README.md b/apps/terminalclock/README.md index 5a54583d2..c7452397d 100644 --- a/apps/terminalclock/README.md +++ b/apps/terminalclock/README.md @@ -4,6 +4,7 @@ A clock displayed as a terminal cli. It can display : - time - date +- altitude - hrm - motion - steps diff --git a/apps/terminalclock/app.js b/apps/terminalclock/app.js index d219b84d8..61861f745 100644 --- a/apps/terminalclock/app.js +++ b/apps/terminalclock/app.js @@ -1,6 +1,7 @@ var locale = require("locale"); var fontColor = g.theme.dark ? "#0f0" : "#000"; var heartRate = 0; +var altitude = -9001; // handling the differents versions of the Banglejs smartwatch if (process.env.HWVERSION == 1){ @@ -26,13 +27,13 @@ function setFontSize(pos){ } function clearField(pos){ - var yStartPos = Bangle.appRect.y + - paddingY * (pos - 1) + - font6x8At4Size * Math.min(1, pos-1) + + var yStartPos = Bangle.appRect.y + + paddingY * (pos - 1) + + font6x8At4Size * Math.min(1, pos-1) + font6x8At2Size * Math.max(0, pos-2); - var yEndPos = Bangle.appRect.y + - paddingY * (pos - 1) + - font6x8At4Size * Math.min(1, pos) + + var yEndPos = Bangle.appRect.y + + paddingY * (pos - 1) + + font6x8At4Size * Math.min(1, pos) + font6x8At2Size * Math.max(0, pos-1); g.clearRect(Bangle.appRect.x, yStartPos, Bangle.appRect.x2, yEndPos); } @@ -44,9 +45,9 @@ function clearWatchIfNeeded(now){ function drawLine(line, pos){ setFontSize(pos); - var yPos = Bangle.appRect.y + - paddingY * (pos - 1) + - font6x8At4Size * Math.min(1, pos-1) + + var yPos = Bangle.appRect.y + + paddingY * (pos - 1) + + font6x8At4Size * Math.min(1, pos-1) + font6x8At2Size * Math.max(0, pos-2); g.drawString(line, 5, yPos, true); } @@ -84,6 +85,14 @@ function drawHRM(pos){ drawLine(">HR: unknown", pos); } +function drawAltitude(pos){ + clearField(pos); + if(altitude > 0) + drawLine(">Alt: " + altitude.toFixed(1) + "m", pos); + else + drawLine(">Alt: unknown", pos); +} + function drawActivity(pos){ clearField(pos); var health = Bangle.getHealthStatus('last'); @@ -104,6 +113,10 @@ function draw(){ drawDate(now, curPos); curPos++; } + if(settings.showAltitude){ + drawAltitude(curPos); + curPos++; + } if(settings.showHRM){ drawHRM(curPos); curPos++; @@ -124,6 +137,18 @@ Bangle.on('HRM',function(hrmInfo) { heartRate = hrmInfo.bpm; }); +var MEDIANLENGTH = 20; +var avr = [], median; +Bangle.on('pressure', function(e) { + while (avr.length>MEDIANLENGTH) avr.pop(); + avr.unshift(e.altitude); + median = avr.slice().sort(); + if (median.length>10) { + var mid = median.length>>1; + altitude = E.sum(median.slice(mid-4,mid+5)) / 9; + } +}); + // Clear the screen once, at startup g.clear(); @@ -135,7 +160,13 @@ var settings = Object.assign({ showHRM: true, showActivity: true, showStepCount: true, + showAltitude: process.env.HWVERSION != 1 ? true : false, }, require('Storage').readJSON("terminalclock.json", true) || {}); + +if(settings.showAltitude && process.env.HWVERSION != 1){ + Bangle.setBarometerPower(true, "app"); +} + // Show launcher when middle button pressed Bangle.setUI("clock"); // Load widgets diff --git a/apps/terminalclock/metadata.json b/apps/terminalclock/metadata.json index a34602913..7bc00bca4 100644 --- a/apps/terminalclock/metadata.json +++ b/apps/terminalclock/metadata.json @@ -3,7 +3,7 @@ "name": "Terminal Clock", "shortName":"Terminal Clock", "description": "A terminal cli like clock displaying multiple sensor data", - "version":"0.04", + "version":"0.05", "icon": "app.png", "type": "clock", "tags": "clock", diff --git a/apps/terminalclock/settings.js b/apps/terminalclock/settings.js index 6b686058b..4b09aad6a 100644 --- a/apps/terminalclock/settings.js +++ b/apps/terminalclock/settings.js @@ -4,6 +4,7 @@ var settings = Object.assign({ HRMinConfidence: 50, showDate: true, + showAltitude: process.env.HWVERSION != 1 ? true : false, showHRM: true, showActivity: true, showStepCount: true, @@ -14,7 +15,7 @@ } // Show the menu - E.showMenu({ + var menu = { "" : { "title" : "Terminal Clock" }, "< Back" : () => back(), 'HR confidence': { @@ -33,6 +34,14 @@ writeSettings(); } }, + 'Show Altitude': { + value: settings.showAltitude, + format: v => v?"Yes":"No", + onchange: v => { + settings.showAltitude = v; + writeSettings(); + } + }, 'Show HRM': { value: settings.showHRM, format: v => v?"Yes":"No", @@ -57,5 +66,9 @@ writeSettings(); } } - }); + } + if (process.env.HWVERSION == 1) { + delete menu['Show Altitude'] + } + E.showMenu(menu); }) diff --git a/apps/widgps/ChangeLog b/apps/widgps/ChangeLog index f68fc701c..0eb9e5692 100644 --- a/apps/widgps/ChangeLog +++ b/apps/widgps/ChangeLog @@ -3,3 +3,4 @@ 0.03: Fix positioning 0.04: Show GPS fix status 0.05: Don't poll for GPS status, override setGPSPower handler (fix #1456) +0.06: Periodically update so the always on display does show current GPS fix diff --git a/apps/widgps/metadata.json b/apps/widgps/metadata.json index 39bff2fad..b135c77bd 100644 --- a/apps/widgps/metadata.json +++ b/apps/widgps/metadata.json @@ -1,7 +1,7 @@ { "id": "widgps", "name": "GPS Widget", - "version": "0.05", + "version": "0.06", "description": "Tiny widget to show the power and fix status of the GPS", "icon": "widget.png", "type": "widget", diff --git a/apps/widgps/widget.js b/apps/widgps/widget.js index bfdb89d33..206096013 100644 --- a/apps/widgps/widget.js +++ b/apps/widgps/widget.js @@ -1,4 +1,6 @@ (function(){ + var interval; + // override setGPSPower so we know if GPS is on or off var oldSetGPSPower = Bangle.setGPSPower; Bangle.setGPSPower = function(on,id) { @@ -19,6 +21,16 @@ } else { g.setColor("#888"); // off = grey } + + // check if we need to update the widget periodically + if (Bangle.isGPSOn() && interval === undefined) { + interval = setInterval(function() { + WIDGETS.gps.draw(WIDGETS.gps); + }, 10*1000); // update every 10 seconds to show gps fix/no fix + } else if (!Bangle.isGPSOn() && interval !== undefined) { + clearInterval(interval); + interval = undefined; + } g.drawImage(atob("GBiBAAAAAAAAAAAAAA//8B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+B//+BgYGBgYGBgYGBgYGBgYGBgYGB//+A//8AAAAAAAAAAAAA=="), this.x, 2+this.y); }}; })(); diff --git a/apps/widslimbat/metadata.json b/apps/widslimbat/metadata.json new file mode 100644 index 000000000..a83046e90 --- /dev/null +++ b/apps/widslimbat/metadata.json @@ -0,0 +1,13 @@ +{ "id": "widslimbat", + "name": "Slim battery widget with cells", + "shortName":"Slim battery with cells", + "version":"0.01", + "description": "A small (13px wide) battery widget with cells", + "icon": "widget.png", + "type": "widget", + "tags": "widget", + "supports" : ["BANGLEJS2"], + "storage": [ + {"name":"widslimbat.wid.js","url":"widget.js"} + ] +} diff --git a/apps/widslimbat/widget.js b/apps/widslimbat/widget.js new file mode 100644 index 000000000..4a8bb3b5d --- /dev/null +++ b/apps/widslimbat/widget.js @@ -0,0 +1,55 @@ +(() => { + const intervalLow = 60000; // update time when not charging + const intervalHigh = 2000; // update time when charging + const outline = atob("CRSBAD4AP/AYDAYDAYDAYDAYDAYDAYDAYD/w"); + + let COLORS = { + 'black': g.theme.dark ? "#fff" : "#000", + 'charging': "#0f0", + 'low': "#f00", + }; + + function draw() { + var i; + var oCol = COLORS.low; + var cCol = COLORS.low; + var nCells = 0; + + const bat = E.getBattery(); + if (bat>5) { + oCol = COLORS.black; + nCells = 1 + Math.floor((bat-6)/19); + } + if (nCells>1) + cCol = COLORS.black; + if (Bangle.isCharging()) + oCol = COLORS.charging; + g.reset(); + g.setColor(oCol).drawImage(outline,this.x+2,this.y+2); + for (i=0;iWIDGETS["widslimbat"].draw(),intervalLow); + + WIDGETS["widslimbat"]={ + area:"tr", + width:13, + draw:draw + }; +})(); diff --git a/apps/widslimbat/widget.png b/apps/widslimbat/widget.png new file mode 100644 index 000000000..a9c7d416d Binary files /dev/null and b/apps/widslimbat/widget.png differ diff --git a/modules/Layout.js b/modules/Layout.js index c978c611b..019d63815 100644 --- a/modules/Layout.js +++ b/modules/Layout.js @@ -51,7 +51,8 @@ options is an object containing: * `label` - the text on the button * `cb` - a callback function * `cbl` - a callback function for long presses -* `back` - a callback function, passed as `back` into Bangle.setUI +* `back` - a callback function, passed as `back` into Bangle.setUI (which usually adds an icon in the top left) + If automatic lazy rendering is enabled, calls to `layout.render()` will attempt to automatically determine what objects have changed or moved, clear their previous locations, and re-render just those objects. Once `layout.update()` is called, the following fields are added diff --git a/package.json b/package.json index 32c96e3ea..e11e79ae5 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,13 @@ "description": "Bangle.js App Loader (and Apps)", "author": "Gordon Williams (http://espruino.com)", "version": "0.0.1", + "license": "MIT", + "repository": "https://github.com/espruino/BangleApps", "devDependencies": { - "eslint": "7.1.0" + "eslint": "^8.14.0", + "eslint-config-airbnb-base": "^15.0.0", + "eslint-plugin-import": "^2.26.0", + "npm-watch": "^0.11.0" }, "scripts": { "lint-apps": "eslint ./apps --ext .js", @@ -18,8 +23,5 @@ }, "dependencies": { "acorn": "^7.2.0" - }, - "devDpendencies": { - "npm-watch": "^0.11.0" } }