From 2216f3fb19dfd68c824d3b306722a6a2e564c3db Mon Sep 17 00:00:00 2001 From: Bruce Blore Date: Sat, 5 Nov 2022 21:05:47 -0700 Subject: [PATCH] Renamed bgtimer to keytimer --- apps/bgtimer/boot.js | 11 ----------- apps/infoclk/app.js | 2 +- apps/infoclk/settings.js | 2 +- apps/{bgtimer => keytimer}/app.js | 8 ++++---- apps/keytimer/boot.js | 11 +++++++++++ apps/{bgtimer => keytimer}/common.js | 2 +- apps/{bgtimer => keytimer}/icon.js | 0 apps/{bgtimer => keytimer}/icon.png | Bin apps/{bgtimer => keytimer}/img/pause.png | Bin apps/{bgtimer => keytimer}/img/play.png | Bin apps/{bgtimer => keytimer}/img/reset.png | Bin apps/{bgtimer => keytimer}/keypad.js | 2 +- apps/{bgtimer => keytimer}/metadata.json | 18 +++++++++--------- apps/{bgtimer => keytimer}/ring.js | 2 +- apps/{bgtimer => keytimer}/timerview.js | 4 ++-- 15 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 apps/bgtimer/boot.js rename apps/{bgtimer => keytimer}/app.js (79%) create mode 100644 apps/keytimer/boot.js rename apps/{bgtimer => keytimer}/common.js (98%) rename apps/{bgtimer => keytimer}/icon.js (100%) rename apps/{bgtimer => keytimer}/icon.png (100%) rename apps/{bgtimer => keytimer}/img/pause.png (100%) rename apps/{bgtimer => keytimer}/img/play.png (100%) rename apps/{bgtimer => keytimer}/img/reset.png (100%) rename apps/{bgtimer => keytimer}/keypad.js (98%) rename apps/{bgtimer => keytimer}/metadata.json (64%) rename apps/{bgtimer => keytimer}/ring.js (88%) rename apps/{bgtimer => keytimer}/timerview.js (96%) diff --git a/apps/bgtimer/boot.js b/apps/bgtimer/boot.js deleted file mode 100644 index 67840b3ce..000000000 --- a/apps/bgtimer/boot.js +++ /dev/null @@ -1,11 +0,0 @@ -const BGTIMER_common = require("bgtimer-com.js"); - -//Only start the timeout if the timer is running -if (BGTIMER_common.state.running) { - setTimeout(() => { - //Check now to avoid race condition - if (Bangle.BGTIMER_ACTIVE === undefined) { - load('bgtimer-ring.js'); - } - }, BGTIMER_common.getTimeLeft()); -} \ No newline at end of file diff --git a/apps/infoclk/app.js b/apps/infoclk/app.js index 6bc626018..3d51191df 100644 --- a/apps/infoclk/app.js +++ b/apps/infoclk/app.js @@ -40,7 +40,7 @@ let config = Object.assign({ // false = no shortcut // '#LAUNCHER' = open the launcher // any other string = name of app to open - 'stlap', 'bgtimer', 'pomoplus', 'alarm', + 'stlap', 'keytimer', 'pomoplus', 'alarm', 'rpnsci', 'calendar', 'torch', 'weather' ], diff --git a/apps/infoclk/settings.js b/apps/infoclk/settings.js index d12225f99..0bc3d4b15 100644 --- a/apps/infoclk/settings.js +++ b/apps/infoclk/settings.js @@ -37,7 +37,7 @@ // false = no shortcut // '#LAUNCHER' = open the launcher // any other string = name of app to open - 'stlap', 'bgtimer', 'pomoplus', 'alarm', + 'stlap', 'keytimer', 'pomoplus', 'alarm', 'rpnsci', 'calendar', 'torch', 'weather' ], diff --git a/apps/bgtimer/app.js b/apps/keytimer/app.js similarity index 79% rename from apps/bgtimer/app.js rename to apps/keytimer/app.js index 66f22a7a2..7d235f9a8 100644 --- a/apps/bgtimer/app.js +++ b/apps/keytimer/app.js @@ -1,9 +1,9 @@ -Bangle.BGTIMER_ACTIVE = true; -const common = require("bgtimer-com.js"); +Bangle.keytimer_ACTIVE = true; +const common = require("keytimer-com.js"); const storage = require("Storage"); -const keypad = require("bgtimer-keys.js"); -const timerView = require("bgtimer-tview.js"); +const keypad = require("keytimer-keys.js"); +const timerView = require("keytimer-tview.js"); Bangle.loadWidgets(); Bangle.drawWidgets(); diff --git a/apps/keytimer/boot.js b/apps/keytimer/boot.js new file mode 100644 index 000000000..f202bcbdf --- /dev/null +++ b/apps/keytimer/boot.js @@ -0,0 +1,11 @@ +const keytimer_common = require("keytimer-com.js"); + +//Only start the timeout if the timer is running +if (keytimer_common.state.running) { + setTimeout(() => { + //Check now to avoid race condition + if (Bangle.keytimer_ACTIVE === undefined) { + load('keytimer-ring.js'); + } + }, keytimer_common.getTimeLeft()); +} \ No newline at end of file diff --git a/apps/bgtimer/common.js b/apps/keytimer/common.js similarity index 98% rename from apps/bgtimer/common.js rename to apps/keytimer/common.js index 67a6660d3..8c702de66 100644 --- a/apps/bgtimer/common.js +++ b/apps/keytimer/common.js @@ -1,7 +1,7 @@ const storage = require("Storage"); const heatshrink = require("heatshrink"); -exports.STATE_PATH = "bgtimer.state.json"; +exports.STATE_PATH = "keytimer.state.json"; exports.BUTTON_ICONS = { play: heatshrink.decompress(atob("jEYwMAkAGBnACBnwCBn+AAQPgAQPwAQP8AQP/AQXAAQPwAQP8AQP+AQgICBwQUCEAn4FggyBHAQ+CIgQ")), diff --git a/apps/bgtimer/icon.js b/apps/keytimer/icon.js similarity index 100% rename from apps/bgtimer/icon.js rename to apps/keytimer/icon.js diff --git a/apps/bgtimer/icon.png b/apps/keytimer/icon.png similarity index 100% rename from apps/bgtimer/icon.png rename to apps/keytimer/icon.png diff --git a/apps/bgtimer/img/pause.png b/apps/keytimer/img/pause.png similarity index 100% rename from apps/bgtimer/img/pause.png rename to apps/keytimer/img/pause.png diff --git a/apps/bgtimer/img/play.png b/apps/keytimer/img/play.png similarity index 100% rename from apps/bgtimer/img/play.png rename to apps/keytimer/img/play.png diff --git a/apps/bgtimer/img/reset.png b/apps/keytimer/img/reset.png similarity index 100% rename from apps/bgtimer/img/reset.png rename to apps/keytimer/img/reset.png diff --git a/apps/bgtimer/keypad.js b/apps/keytimer/keypad.js similarity index 98% rename from apps/bgtimer/keypad.js rename to apps/keytimer/keypad.js index d08df1e3f..a5edeb2f2 100644 --- a/apps/bgtimer/keypad.js +++ b/apps/keytimer/keypad.js @@ -58,7 +58,7 @@ let StartButton = { common.state.wasRunning = true; common.state.running = true; feedback(true); - require('bgtimer-tview.js').show(common); + require('keytimer-tview.js').show(common); } }; diff --git a/apps/bgtimer/metadata.json b/apps/keytimer/metadata.json similarity index 64% rename from apps/bgtimer/metadata.json rename to apps/keytimer/metadata.json index 3f63d0ec5..a982594f1 100644 --- a/apps/bgtimer/metadata.json +++ b/apps/keytimer/metadata.json @@ -1,6 +1,6 @@ { - "id": "bgtimer", - "name": "Timer", + "id": "keytimer", + "name": "Keypad Timer", "version": "0.02", "description": "A timer with a keypad that runs in the background", "icon": "icon.png", @@ -12,32 +12,32 @@ "allow_emulator": true, "storage": [ { - "name": "bgtimer.app.js", + "name": "keytimer.app.js", "url": "app.js" }, { - "name": "bgtimer.img", + "name": "keytimer.img", "url": "icon.js", "evaluate": true }, { - "name": "bgtimer.boot.js", + "name": "keytimer.boot.js", "url": "boot.js" }, { - "name": "bgtimer-com.js", + "name": "keytimer-com.js", "url": "common.js" }, { - "name": "bgtimer-ring.js", + "name": "keytimer-ring.js", "url": "ring.js" }, { - "name": "bgtimer-keys.js", + "name": "keytimer-keys.js", "url": "keypad.js" }, { - "name": "bgtimer-tview.js", + "name": "keytimer-tview.js", "url": "timerview.js" } ] diff --git a/apps/bgtimer/ring.js b/apps/keytimer/ring.js similarity index 88% rename from apps/bgtimer/ring.js rename to apps/keytimer/ring.js index 9df5cb4bd..c42c11394 100644 --- a/apps/bgtimer/ring.js +++ b/apps/keytimer/ring.js @@ -1,4 +1,4 @@ -const common = require('bgtimer-com.js'); +const common = require('keytimer-com.js'); Bangle.loadWidgets() Bangle.drawWidgets() diff --git a/apps/bgtimer/timerview.js b/apps/keytimer/timerview.js similarity index 96% rename from apps/bgtimer/timerview.js rename to apps/keytimer/timerview.js index 4c9f7acd3..48c896ba0 100644 --- a/apps/bgtimer/timerview.js +++ b/apps/keytimer/timerview.js @@ -39,7 +39,7 @@ function drawTimer() { else return `${parseInt(minutes)}:${pad(seconds)}`; })(), g.getWidth() / 2, g.getHeight() / 2) - if (timeLeft <= 0) load('bgtimer-ring.js'); + if (timeLeft <= 0) load('keytimer-ring.js'); } let timerInterval; @@ -81,7 +81,7 @@ exports.touch = (button, xy) => { common.state.setTime = setTime; common.state.inputString = inputString; clearTimerInterval(); - require('bgtimer-keys.js').show(common); + require('keytimer-keys.js').show(common); } else { if (common.state.running) { //Record the exact moment that we paused