From 6c4e59d5957f13d5db66046d99e32b3631ddb962 Mon Sep 17 00:00:00 2001
From: hughbarney <hughbarney@googlemail.com>
Date: Sun, 2 Jan 2022 16:40:49 +0000
Subject: [PATCH] Settings, moved Turn Off into Utils

---
 apps.json                | 2 +-
 apps/setting/ChangeLog   | 1 +
 apps/setting/settings.js | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps.json b/apps.json
index 427b86fbb..26ed3d4b1 100644
--- a/apps.json
+++ b/apps.json
@@ -167,7 +167,7 @@
   {
     "id": "setting",
     "name": "Settings",
-    "version": "0.38",
+    "version": "0.39",
     "description": "A menu for setting up Bangle.js",
     "icon": "settings.png",
     "tags": "tool,system",
diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index 143144d51..449091bca 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -41,3 +41,4 @@
 0.36: Added 'Utils' menu with helpful utilities for restoring Bangle.js
 0.37: Going into passkey menu now saves settings with passkey
 0.38: Restructed menus as per forum discussion
+0.39: Moved off into Utils, put System after Apps
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index 1a9463858..9934a1765 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -66,11 +66,10 @@ function showMainMenu() {
     '': { 'title': 'Settings' },
     '< Back': ()=>load(),
     /*LANG*/'Apps': ()=>showAppSettingsMenu(),
-    /*LANG*/'Bluetooth': ()=>showBLEMenu(),
     /*LANG*/'System': ()=>showSystemMenu(),
+    /*LANG*/'Bluetooth': ()=>showBLEMenu(),
     /*LANG*/'Alerts': ()=>showAlertsMenu(),
-    /*LANG*/'Utils': ()=>showUtilMenu(),
-    /*LANG*/'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() }
+    /*LANG*/'Utils': ()=>showUtilMenu()
   };
 
   return E.showMenu(mainmenu);
@@ -535,7 +534,8 @@ function showUtilMenu() {
           setTimeout(showMainMenu, 50);
         } else showUtilMenu();
       });
-    }
+    },
+    /*LANG*/'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() }
   };
   if (Bangle.factoryReset) {
     menu['Factory Reset'] = ()=>{