Merge remote-tracking branch 'RKBoss6/Theme-Changes' into app-loader

Author: thyttan

apps/setting/ChangeLog

@@ -88,3 +88,4 @@ of 'Select Clock'
 0.77: Save altitude calibration when user exits via reset
 0.78: Fix menu scroll restore on BangleJS1
 0.79: Ensure that tapping on pressure/altitude doesn't cause a menu to display temporarily
+0.80: Add new theme colors (Indigo, Grey, Orange, Purple, Navy, Dark Green)

apps/setting/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.79",
+  "version": "0.80",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",

apps/setting/settings.js

@@ -326,20 +326,24 @@ function showThemeMenu(pop) {
       upd(th);
     }
     let rgb = {};
-    rgb[/*LANG*/'black'] = "#000";
-    rgb[/*LANG*/'white'] = "#fff";
-    rgb[/*LANG*/'red'] = "#f00";
-    rgb[/*LANG*/'green'] = "#0f0";
-    rgb[/*LANG*/'blue'] = "#00f";
-    rgb[/*LANG*/'cyan'] = "#0ff";
-    rgb[/*LANG*/'magenta'] = "#f0f";
-    rgb[/*LANG*/'yellow'] = "#ff0";
-    if (!BANGLEJS2) {
-      // these would cause dithering, which is not great for e.g. text
-      rgb[/*LANG*/'orange'] = "#ff7f00";
-      rgb[/*LANG*/'purple'] = "#7f00ff";
-      rgb[/*LANG*/'grey'] = "#7f7f7f";
-    }
+    rgb[/*LANG*/'Black'] = "#000";
+    rgb[/*LANG*/'White'] = "#fff";
+    rgb[/*LANG*/'Red'] = "#f00";
+    rgb[/*LANG*/'Green'] = "#0f0";
+    rgb[/*LANG*/'Blue'] = "#00f";
+    rgb[/*LANG*/'Cyan'] = "#0ff";
+    rgb[/*LANG*/'Magenta'] = "#f0f";
+    rgb[/*LANG*/'Yellow'] = "#ff0";
+    
+    // These would cause dithering, which is not great for e.g. text
+    rgb[/*LANG*/'Orange'] = "#ff7f00";
+    rgb[/*LANG*/'Purple'] = "#7f00ff";
+    rgb[/*LANG*/'Grey'] = "#7f7f7f";
+    rgb[/*LANG*/'Maroon'] = "#3e1363";
+    rgb[/*LANG*/'Indigo'] = "#3e1363";
+    rgb[/*LANG*/'Dark Green'] = "#0e5c13";
+    rgb[/*LANG*/'Navy'] = "#121e75";
+    
     let colors = [], names = [];
     for(const c in rgb) {
       names.push(c);
@@ -1077,4 +1081,4 @@ function showAltitude() {
 }
 
 // Show the main menu
-pushMenu(mainMenu());
+pushMenu(mainMenu());