From d9a9bae5eea9450acccae6f9a65b502311d478e9 Mon Sep 17 00:00:00 2001
From: Marco Heiming <myx00r@googlemail.com>
Date: Fri, 10 Apr 2020 17:42:14 +0200
Subject: [PATCH] Move LCD Brightness menu into more general LCD menu & unify
 writings

---
 apps.json                |  2 +-
 apps/setting/ChangeLog   |  1 +
 apps/setting/settings.js | 40 ++++++++++++++++++++--------------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/apps.json b/apps.json
index d85739aad..a8390b927 100644
--- a/apps.json
+++ b/apps.json
@@ -119,7 +119,7 @@
   { "id": "setting",
     "name": "Settings",
     "icon": "settings.png",
-    "version":"0.12",
+    "version":"0.13",
     "description": "A menu for setting up Bangle.js",
     "tags": "tool,system",
     "storage": [
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 22277968c..c3109dda6 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -12,3 +12,4 @@
 0.12: Fix memory leak (#206)
       Bring App settings nearer the top
       Move LCD Timeout to wakeup menu
+0.13: Move LCD Brightness menu into more general LCD menu
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index ac7692610..c6be52191 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -89,17 +89,6 @@ function showMainMenu() {
         updateSettings();
       }
     },
-    'LCD Brightness': {
-      value: settings.brightness,
-      min: 0.1,
-      max: 1,
-      step: 0.1,
-      onchange: v => {
-        settings.brightness = v || 1;
-        updateSettings();
-        Bangle.setLCDBrightness(settings.brightness);
-      }
-    },
     'Beep': {
       value: 0 | beepV.indexOf(settings.beep),
       min: 0, max: 2,
@@ -134,7 +123,7 @@ function showMainMenu() {
       }
     },
     'Set Time': ()=>showSetTimeMenu(),
-    'LCD Wake-Up': ()=>showWakeUpMenu(),
+    'LCD': ()=>showLCDMenu(),
     'Reset Settings': ()=>showResetMenu(),
     'Turn Off': ()=>Bangle.off(),
     '< Back': ()=>load()
@@ -142,10 +131,21 @@ function showMainMenu() {
   return E.showMenu(mainmenu);
 }
 
-function showWakeUpMenu() {
-  const wakeUpMenu = {
-    '': { 'title': 'LCD Wake-Up' },
+function showLCDMenu() {
+  const lcdMenu = {
+    '': { 'title': 'LCD' },
     '< Back': ()=>showMainMenu(),
+    'LCD Brightness': {
+      value: settings.brightness,
+      min: 0.1,
+      max: 1,
+      step: 0.1,
+      onchange: v => {
+        settings.brightness = v || 1;
+        updateSettings();
+        Bangle.setLCDBrightness(settings.brightness);
+      }
+    },
     'LCD Timeout': {
       value: settings.timeout,
       min: 0,
@@ -157,7 +157,7 @@ function showWakeUpMenu() {
         Bangle.setLCDTimeout(settings.timeout);
       }
     },
-    'Wake On BTN1': {
+    'Wake on BTN1': {
       value: settings.options.wakeOnBTN1,
       format: boolFormat,
       onchange: () => {
@@ -165,7 +165,7 @@ function showWakeUpMenu() {
         updateOptions();
       }
     },
-    'Wake On BTN2': {
+    'Wake on BTN2': {
       value: settings.options.wakeOnBTN2,
       format: boolFormat,
       onchange: () => {
@@ -173,7 +173,7 @@ function showWakeUpMenu() {
         updateOptions();
       }
     },
-    'Wake On BTN3': {
+    'Wake on BTN3': {
       value: settings.options.wakeOnBTN3,
       format: boolFormat,
       onchange: () => {
@@ -197,7 +197,7 @@ function showWakeUpMenu() {
         updateOptions();
       }
     },
-    'Wake On Twist': {
+    'Wake on Twist': {
       value: settings.options.wakeOnTwist,
       format: boolFormat,
       onchange: () => {
@@ -236,7 +236,7 @@ function showWakeUpMenu() {
       }
     }
   }
-  return E.showMenu(wakeUpMenu)
+  return E.showMenu(lcdMenu)
 }
 
 function showLocaleMenu() {