From ffe6a65134eee862f13b5821f8e33d58c21b4606 Mon Sep 17 00:00:00 2001 From: kevdliu <1766838+kevdliu@users.noreply.github.com> Date: Wed, 14 Jun 2023 19:17:57 -0400 Subject: [PATCH] address comments --- apps/folderlaunch/app.js | 8 +------- apps/folderlaunch/app.ts | 7 +------ apps/folderlaunch/settings.js | 9 ++------- apps/folderlaunch/settings.ts | 13 ++++--------- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/apps/folderlaunch/app.js b/apps/folderlaunch/app.js index d04dfb8d1..438b9e06d 100644 --- a/apps/folderlaunch/app.js +++ b/apps/folderlaunch/app.js @@ -189,13 +189,7 @@ render_1(); } }; - var buzz_1 = function (length, strength) { - if (length === void 0) { length = undefined; } - if (strength === void 0) { strength = undefined; } - if (!config_1.disableVibration) { - Bangle.buzz(length, strength); - } - }; + var buzz_1 = config_1.disableVibration ? function () { } : Bangle.buzz; Bangle.loadWidgets(); Bangle.drawWidgets(); Bangle.setUI({ diff --git a/apps/folderlaunch/app.ts b/apps/folderlaunch/app.ts index fdc353da8..993570e59 100644 --- a/apps/folderlaunch/app.ts +++ b/apps/folderlaunch/app.ts @@ -255,12 +255,7 @@ /** * Vibrate the watch if vibration is enabled */ - let buzz = (length: number | undefined = undefined, strength: number | undefined = undefined) => { - if (!config.disableVibration) { - Bangle.buzz(length, strength); - } - } - + let buzz = config.disableVibration ? () => {} : Bangle.buzz; Bangle.loadWidgets(); Bangle.drawWidgets(); diff --git a/apps/folderlaunch/settings.js b/apps/folderlaunch/settings.js index 7e9cbd57f..b589bb3f7 100644 --- a/apps/folderlaunch/settings.js +++ b/apps/folderlaunch/settings.js @@ -23,7 +23,6 @@ var appInfo = storage.readJSON(app_1 + '.info', false); menu[appInfo.name] = { value: config.hidden.includes(app_1), - format: function (value) { return (value ? 'Yes' : 'No'); }, onchange: eval("(value) => { onchange(value, \"".concat(app_1, "\"); }")) }; } @@ -180,16 +179,14 @@ } }, 'Show clocks': { - value: config.showClocks, - format: function (value) { return (value ? 'Yes' : 'No'); }, + value: !!config.showClocks, onchange: function (value) { config.showClocks = value; changed = true; } }, 'Show launchers': { - value: config.showLaunchers, - format: function (value) { return (value ? 'Yes' : 'No'); }, + value: !!config.showLaunchers, onchange: function (value) { config.showLaunchers = value; changed = true; @@ -197,7 +194,6 @@ }, 'Disable vibration': { value: !!config.disableVibration, - format: function (value) { return (value ? 'Yes' : 'No'); }, onchange: function (value) { config.disableVibration = value; changed = true; @@ -220,7 +216,6 @@ }, 'Show icons?': { value: config.display.icon, - format: function (value) { return (value ? 'Yes' : 'No'); }, onchange: function (value) { config.display.icon = value; changed = true; diff --git a/apps/folderlaunch/settings.ts b/apps/folderlaunch/settings.ts index 632cd4e83..665267b93 100644 --- a/apps/folderlaunch/settings.ts +++ b/apps/folderlaunch/settings.ts @@ -27,7 +27,6 @@ let appInfo = storage.readJSON(app + '.info', false) as AppInfo; menu[appInfo.name] = { value: config.hidden.includes(app), - format: (value: boolean) => (value ? 'Yes' : 'No'), onchange: eval(`(value) => { onchange(value, "${app}"); }`) } } @@ -196,24 +195,21 @@ } }, 'Show clocks': { - value: config.showClocks, - format: value => (value ? 'Yes' : 'No'), - onchange: value => { + value: !!config.showClocks, + onchange: (value: boolean) => { config.showClocks = value; changed = true; } }, 'Show launchers': { - value: config.showLaunchers, - format: value => (value ? 'Yes' : 'No'), - onchange: value => { + value: !!config.showLaunchers, + onchange: (value: boolean) => { config.showLaunchers = value; changed = true; } }, 'Disable vibration': { value: !!config.disableVibration, - format: (value: boolean) => (value ? 'Yes' : 'No'), onchange: (value: boolean) => { config.disableVibration = value; changed = true; @@ -236,7 +232,6 @@ }, 'Show icons?': { value: config.display.icon, - format: value => (value ? 'Yes' : 'No'), onchange: value => { config.display.icon = value; changed = true;