From 681bd419457b4b43fb4dba0fa32fdfda1ef17871 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 16 Nov 2023 14:59:32 +0000
Subject: [PATCH] Rename 'Wake on BTN1/Touch' to 'Wake on Button/Tap' on
 Bangle.js 2

---
 apps/setting/ChangeLog     |  1 +
 apps/setting/README.md     |  2 +-
 apps/setting/metadata.json |  2 +-
 apps/setting/settings.js   | 42 +++++++++++++++++++++++++++-----------
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 50ffea933..b56a1ced5 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -75,4 +75,5 @@ of 'Select Clock'
 0.65: Prepend 'LCD->Calibration' touch listener and stop event propagation.
 0.66: Fix LCD calibration bug where it would come on again after the
 	calibration was done.
+0.67: Rename 'Wake on BTN1/Touch' to 'Wake on Button/Tap' on Bangle.js 2
 
diff --git a/apps/setting/README.md b/apps/setting/README.md
index 18aa8af46..81a37adfe 100644
--- a/apps/setting/README.md
+++ b/apps/setting/README.md
@@ -32,7 +32,7 @@ This is Bangle.js's settings menu
 * **Rotation** allows you to rotate (or mirror) what's displayed on the screen, eg. for left-handed wearers (needs 2v16 or 2v15 cutting edge firmware to work reliably)
 * **Wake on X** should the given activity wake up the Bangle.js LCD?
   * On Bangle.js 2 when locked the touchscreen is turned off to save power. Because of this,
-    `Wake on Touch` actually uses the accelerometer, and you need to actually tap the display to wake Bangle.js.
+    `Wake on Touch` actually uses the accelerometer, and you need to actually tap the display to wake Bangle.js (we recently renamed the menu item to `Wake on Tap`).
 * **Twist X** these options adjust the sensitivity of `Wake on Twist` to ensure Bangle.js wakes up with just the right amount of wrist movement.
 * **Calibrate** on Bangle.js 2, pop up a screen allowing you to calibrate the touchscreen (calibration only works on 2v16 or 2v15 cutting edge builds)
 
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index 412bad6f6..79148c450 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.66",
+  "version": "0.67",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index 6ecd8c808..8922388dd 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -448,17 +448,35 @@ function showLCDMenu() {
         g.setRotation(settings.rotate&3,settings.rotate>>2).clear();
         Bangle.drawWidgets();
       }
+    }
+  });
+
+  if (BANGLEJS2)
+    Object.assign(lcdMenu, {
+      /*LANG*/'Wake on Button': {
+        value: settings.options.wakeOnBTN1,
+        onchange: () => {
+          settings.options.wakeOnBTN1 = !settings.options.wakeOnBTN1;
+          updateOptions();
+        }
+      }
     },
-    /*LANG*/'Wake on BTN1': {
+    /*LANG*/'Wake on Tap': {
+      value: settings.options.wakeOnTouch,
+      onchange: () => {
+        settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
+        updateOptions();
+      }
+    });
+  else
+    Object.assign(lcdMenu, {
+     /*LANG*/'Wake on BTN1': {
       value: settings.options.wakeOnBTN1,
       onchange: () => {
         settings.options.wakeOnBTN1 = !settings.options.wakeOnBTN1;
         updateOptions();
       }
-    }
-  });
-  if (!BANGLEJS2)
-    Object.assign(lcdMenu, {
+    },
     /*LANG*/'Wake on BTN2': {
       value: settings.options.wakeOnBTN2,
       onchange: () => {
@@ -472,6 +490,13 @@ function showLCDMenu() {
         settings.options.wakeOnBTN3 = !settings.options.wakeOnBTN3;
         updateOptions();
       }
+    },
+    /*LANG*/'Wake on Touch': {
+      value: settings.options.wakeOnTouch,
+      onchange: () => {
+        settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
+        updateOptions();
+      }
     }});
   Object.assign(lcdMenu, {
     /*LANG*/'Wake on FaceUp': {
@@ -481,13 +506,6 @@ function showLCDMenu() {
         updateOptions();
       }
     },
-    /*LANG*/'Wake on Touch': {
-      value: settings.options.wakeOnTouch,
-      onchange: () => {
-        settings.options.wakeOnTouch = !settings.options.wakeOnTouch;
-        updateOptions();
-      }
-    },
     /*LANG*/'Wake on Twist': {
       value: settings.options.wakeOnTwist,
       onchange: () => {