From d1534bdcbf2281343f023d4c8aada9169283ac84 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 26 Nov 2021 15:05:05 +0000
Subject: [PATCH 01/41] comment

---
 modules/Settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Settings.js b/modules/Settings.js
index 8d7fba653..0828b4655 100644
--- a/modules/Settings.js
+++ b/modules/Settings.js
@@ -7,7 +7,7 @@ Usage:
 // read a single app setting
 value = require('Settings').get(appid, key, default);
 // omit key to read all app settings
-value = require('Settings').get();
+value = require('Settings').get(appid);
 // write a single app setting
 require('Settings').set(appid, key, value)
 // omit key and pass an object as values to overwrite all settings

From 6220a88d29ace89e386ae3d7630c112bc8905b73 Mon Sep 17 00:00:00 2001
From: Richard de Boer <git@tubul.net>
Date: Fri, 26 Nov 2021 21:29:58 +0100
Subject: [PATCH 02/41] locale: Apply 12hour setting to time

Fixes #892
---
 apps.json               | 2 +-
 apps/locale/ChangeLog   | 1 +
 apps/locale/locale.html | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index a7a74f4cb..2935a118b 100644
--- a/apps.json
+++ b/apps.json
@@ -170,7 +170,7 @@
   {
     "id": "locale",
     "name": "Languages",
-    "version": "0.09",
+    "version": "0.10",
     "description": "Translations for different countries",
     "icon": "locale.png",
     "type": "locale",
diff --git a/apps/locale/ChangeLog b/apps/locale/ChangeLog
index 3d64cf8d7..288dc6dde 100644
--- a/apps/locale/ChangeLog
+++ b/apps/locale/ChangeLog
@@ -9,3 +9,4 @@
 0.07: Improve handling of non-ASCII characters (fix #469)
 0.08: Added Mavigation units and en_NAV
 0.09: Added New Zealand en_NZ
+0.10: Apply 12hour setting to time
diff --git a/apps/locale/locale.html b/apps/locale/locale.html
index 3d806b44b..25acb2fff 100644
--- a/apps/locale/locale.html
+++ b/apps/locale/locale.html
@@ -146,7 +146,7 @@ exports = { name : "en_GB", currencySym:"£",
           "%-m": "d.getMonth()+1",
           "%d":  "('0'+d.getDate()).slice(-2)",
           "%-d": "d.getDate()",
-          "%HH": "('0'+d.getHours()).slice(-2)",
+          "%HH": "('0'+getHours(d)).slice(-2)",
           "%MM": "('0'+d.getMinutes()).slice(-2)",
           "%SS": "('0'+d.getSeconds()).slice(-2)",
           "%A":  "day.split(',')[d.getDay()]",
@@ -178,6 +178,13 @@ var month = ${js(locale.month + ',' + locale.abmonth)};
 function round(n) {
   return n < 10 ? Math.round(n * 10) / 10 : Math.round(n);
 }
+var is12;
+function getHours(d) {
+  var h = d.getHours();
+  if (is12==undefined) is12 = (require('Storage',1).readJSON('setting.json')||{})["12hour"];
+  if (!is12) return h;
+  return (h%12==0) ? 12 : h%12;
+}
 exports = {
   name: ${js(locale.lang)},
   currencySym: ${js(locale.currency_symbol)},

From dabaa06efbe3698e11afad390bb06d3e48c93f12 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 11:33:19 -0800
Subject: [PATCH 03/41] Create app.js

---
 apps/93dub/app.js | 170 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 apps/93dub/app.js

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
new file mode 100644
index 000000000..48365c646
--- /dev/null
+++ b/apps/93dub/app.js
@@ -0,0 +1,170 @@
+/*The following code was made by Brandon Abbott and used many portions from Espruino documentation, example watchfaces, and the waveclk app (Gordon Williams). It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources. Time and date keeping functions, and AFAIK the battery display works too. I cut off the top of the original background with a black rectangle to make room for the widgets. It is not pixel perfect. I am using the MIT license for this work.
+MIT License
+Copyright (c) 2021 Brandon Abbott
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+// define background
+var imgBg = require("heatshrink").decompress(atob("yGogIqn4EwhgR/AAMN4Hw7k3hk8BQeAgEEgQGCh/h/H+n+MvwRKh1zjnnnPM48A69z1foxPfnXgCIMMmf84cw5n/gMZylsxGKmlDkARD8ARC/EAyMUlARBilCCIQ1Bhg1C4cAqIRILIP8LIV/CIVowtSmgRDPoP4PoU+gORieo8Uh686I4bmQCMYAig//AB3AIuYAUpGcxeAMxE8+lEgEB5GixIdIgmiwlHCwPI0H5CJXiw/ACIOmEZI1BwQRBGpskCIIFBp2eCJUi+MEVP4AJh//ABngCIM/CJv4CIN4GRs8AQImCABcOdIPDGpqzBgePCJvjCIMfCJvzwEDNZ3xwEHCJ35wEGCJ/Ag1/UJwRQ/gR/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4Rhn4RN/HAg4RO/PAgcfCJvxwEDz4RN+eAgOPCJvDgEB4YRNg8AgHgAQIALjwCBvARNvgCBPp3wCIMPCJvAGRoA/AA8Bi+l4gROykYw4ROq4RBPxsBqgRQmkkGp8X0mERFUfcgeACJcgAgdABYsHDof/oHx49/wEvBQh9GCIfAFAgAHoHz51/8ARP+IRO+4RLpMR73woH27n/8Eh8+ZmaBEqsoyGICIfAkMUktJEYgRBzgRBv34UAMhi8RkIRFnGQGoN8/H34FB8kJiIREkVEyGQkF8/Pj4GBkg1GCIOexEQvHx8fBgMXzMxPpEICIXCfZkEAYwAJgbiC/ARMAH4ABA=="));
+
+/*
+I took the number bitmaps, added two columns to each digit (for spacing), and combined them for the Espruino Bitmap Font Generator. Here's the commands I used for processing the original 26 by 41 px font:
+mogrify -gravity east -extent 28x41 *.png
+montage num_[0-9].png -geometry +0+0 numcat.png
+I then put numcat.png into the generator. 
+*/
+
+// define fonts
+// reg number first char 48 28 by 41
+var fontNum = atob("AAAAAAAAAAAAAA//8D//g//8P/+I//8//44//w//j4//A/+P4/8A/4/4AAAAD/4AAAAP/wAAAAf/gAAAA//AAAAB/+AAAAD/8AAAAH/4AAAAP/wAAAAf/gAAAA//AAAAB/+AAAAD/8AAAAH/wAAAAH/H/gH/H8f/gf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wB/4AP/4H/4A//4f/4D//5//4P//h//4//+B//4AAAAAAAAAAAAAAAAAf/+AAAB//4gAAD//jgAAD/+PgABj/4/gAHj/j/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8f88AAfx/8wAAfH/8AAAcf/8AAAR//4AAAH//gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAA4AAAAAD4AAYAAP4AD8AA/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAHgAH/H/GH/H8f/gf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAP//AAAAP//AAAAP//AAAAP/8AAAAP/2AAAAP/eAAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAB/7x/4AH/7H/4Af/4f/4B//5//4H//h//4f/+B//4AAAAAAAAAAAAAD//wAAAD//wAAAj//gAADj/+AAAPj/5gAA/j/ngAD/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8AA8f8fwAAx/8fAAAH/8cAAAf/8QAAA//8AAAA//8AAAAAAAAAAAAAA//8D//g//8P/+I//8//44//0//j4//Y/+P4/94/4/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAPwAH/AAPH/H8AAMf/HwAAB//HAAAH//EAAAH//AAAAH//AAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAGAAAAAAOAAAAAAeAAAAAA+AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB8AAAAADx/4B/4HH/4H/4Mf/4f/4R//5//4H//h//4f/+B//4AAAAAAAAAAAAAD//wP/+D//w//4j//z//jj//T/+Pj/9j/4/j/3j/j/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8f+8f8fx/+x/8fH/+H/8cf/+f/8R//4f/8H//gf/8AAAAAAAAAAAAAA//8AAAA//8AAAI//8AAA4//0AAD4//YAAP4/94AA/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAPwAH/H/vH/H8f/sf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+// tiny font for percentage first char 48 6 by 8 
+var fontTiny = atob("AH6BgYF+ACFB/wEBAGGDhYlxAEKBkZFuAAx0hP8EAPqRkZGOAH6RkZFOAICHmKDAAG6RkZFuAHKJiYl+AAAAAAAAAAAAAAAA");
+// date font first char 48 12 by 15
+var fontDate = atob("AAAAAfv149wAeADwAeADwAeADvHr9+AAAAAAAAAAAAAAAAAAAAAAAAAPHn9/AAAAAAP0A9wweGDwweGDwweGDvAL8AAAAAAAAAAAgwOGDwweGDwweGDvHp98AAAAA/gB6AAwAGAAwAGAAwAGAPHj9/AAAAAfgF6BwweGDwweGDwweGDgHoB+AAAAAfv169wweGDwweGDwweGDgHoB+AAAAAAAAAAgAGAAwAGAAwAGAAvHh9/AAAAAfv169wweGDwweGDwweGDvHr9+AAAAAfgF6BwweGDwweGDwweGDvHr9+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+
+// define days of the week images
+var imgMon = E.toArrayBuffer(atob("Ig8BgHwfD5AvB8HD8z8wMPzPzMQzM/M/DMz8z8c7f7f7z////3Oz+3+PzPzPw/M/M/D8z8z8PzPzPw/vB8/n/8H3/A=="));
+var imgTue = E.toArrayBuffer(atob("Ig8BwDv9wDAOfmgf/5+Z///n5n/5+fmf/n5+Z//fv9oH////Af37/b/+fn5n/5+fmf/n5+Z/+fn5n/5/g+gfn+D8AA=="));
+var imgWed = E.toArrayBuffer(atob("Ig8Bf7gHgM/NA9Az8z/z8PzP/Pw/M/8/D8z/z8c7QPf7z+A//3O3/3+MzP/PwzM/8/D8z/z8PzP/PxAtA9A4B4B4DA=="));
+var imgThu = E.toArrayBuffer(atob("Ig8BgHf7f6Ac/M/P/z8z8//PzPzz8/M/PPz8z8+/QLf7/+A///v3+3+8/PzPzz8/M/PPz8z88/PzPzz8/vB/P3/8HA=="));
+var imgFri = E.toArrayBuffer(atob("Ig8B/wDwP7+geg/P5/5+c/n/n5z+f+fnP5/5+c/oHoF7/AfAf/7/7/+/n/k/z+f+R/P5/5j8/n/nHz+/++PP7//8+A=="));
+var imgSat = E.toArrayBuffer(atob("Ig8B4DwDwDgOgXAJ/5+f/n/n5/+f+fn55/5+fnoHoF/fAfAf//+b/f3/5n5+f/mfn5/+Z+fn//n5+eAef358B7//nA=="));
+var imgSun = E.toArrayBuffer(atob("Ig8BwHf7D7Ac/MHD/z8wMP/PzMQ/8/M/D/z8z8QPf7f6A/////83+3+/zPzPz/M/M/P8z8z8//PzPwA/B8/oD8H3/A=="));
+
+
+
+// define icons
+var imgSep = E.toArrayBuffer(atob("BhsBAAAAAA///////////////AAAAAAA"));
+var imgBattery = E.toArrayBuffer(atob("EAkBAAF//X/8f/x//H/8f/x//QAB"));
+var imgBattery_Charge = E.toArrayBuffer(atob("EAkBAAF//UEERwRf9EHEQQR//QAB"));
+var imgPercent = E.toArrayBuffer(atob("BwcBuq7ffbqugA=="));
+var img24hr = E.toArrayBuffer(atob("EwgBj7vO53na73tcDtu9uDev7vA93g=="));
+var imgPM = E.toArrayBuffer(atob("EwgB+HOfdnPu1X3ar4dV9+q+/bfftg=="));
+
+//vars
+var separator = true;
+var is24hr = true; //assumed true until can find API to check
+var leadingZero = true;
+
+//the following 2 sections are used from waveclk to schedule minutely updates
+// timeout used to update every minute
+var drawTimeout;
+
+// schedule a draw for the next minute
+function queueDraw() {
+  if (drawTimeout) clearTimeout(drawTimeout);
+  drawTimeout = setTimeout(function() {
+    drawTimeout = undefined;
+    draw();
+  }, 60000 - (Date.now() % 60000));
+}
+
+// set background
+g.setBgColor(0,0,0);
+g.setColor(1,1,1);
+g.clear();
+g.drawImage(imgBg,g.getWidth()/2 - 144/2 ,0);
+// this covers the part of the background with branding, makes room for widgets
+g.setColor(0,0,0);
+g.fillRect(0,0,g.getWidth(),30);
+
+function draw(){
+var date = new Date();
+var h = date.getHours(), m = date.getMinutes();
+var d = date.getDate(), w = date.getDay();
+g.reset();
+g.setBgColor(0,0,0);
+g.setColor(1,1,1);
+// draw battery indicator
+var batPercent = E.getBattery();
+if (Bangle.isCharging()) {selBattery = imgBattery_Charge;}
+else {selBattery=imgBattery;}
+g.drawImage(selBattery,127,42);
+if (batPercent != null) {
+g.drawImage(imgPercent, 118,43);
+
+}
+
+//draw 24 hr indicator and 12 hr specific behavior
+if (is24hr){
+g.drawImage(img24hr,32, 70);
+if (leadingZero){
+                   h = ("0"+h).substr(-2);}}
+else if (h > 12) {g.drawImage(imgPM,40, 70);
+                 h = h - 12;
+                  if (leadingZero){
+                   h = ("0"+h).substr(-2);}
+                    else
+                   {h = " " + h;}
+                 }
+
+//draw separator
+if (separator){
+g.drawImage(imgSep, 85,96);}
+
+//draw day of week
+var imgW = null;
+if (w == 0) {imgW = imgSun;}
+if (w == 1) {imgW = imgMon;}
+if (w == 2) {imgW = imgTue;}
+if (w == 3) {imgW = imgWed;}
+if (w == 4) {imgW = imgThr;}
+if (w == 5) {imgW = imgFri;}
+if (w == 6) {imgW = imgSat;}
+g.drawImage(imgW, 85, 66);
+
+
+// draw nums
+// draw time
+g.setColor(0,0,0);
+g.setBgColor(1,1,1);
+g.setFontCustom(fontNum, 48, 28, 41);
+if (h<10) {
+  if (leadingZero) {
+    h = ("0"+h).substr(-2);
+    }
+  else {h = " " + h;}
+}
+g.drawString(h, 25, 88, true);
+g.drawString(("0"+m).substr(-2), 92, 88, true);
+// draw date
+g.setFontCustom(fontDate, 48, 12, 15);
+g.drawString(("0"+d).substr(-2), 123,66, true);
+// draw battery
+g.setFontCustom(fontTiny, 48, 6, 8);
+if (batPercent < 10) {batPercent = " " + batPercent;} //makes sure zero is next to percent sign
+if (batPercent < 100) {g.drawString(batPercent, 105, 42, true);}
+  else {g.drawString(batPercent, 99, 42, true);}
+queueDraw();
+}
+
+
+draw();
+
+//the following section is also from waveclk
+Bangle.on('lcdPower',on=>{
+  if (on) {
+    draw(); // draw immediately, queue redraw
+  } else { // stop draw timer
+    if (drawTimeout) clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+});
+
+Bangle.setUI("clock");
+Bangle.loadWidgets();
+Bangle.drawWidgets();

From 7d646945df493e7c95a51c7ce6e7224662150090 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 11:37:56 -0800
Subject: [PATCH 04/41] Update apps.json

---
 apps.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps.json b/apps.json
index a7a74f4cb..8830449ca 100644
--- a/apps.json
+++ b/apps.json
@@ -4456,5 +4456,15 @@
     "storage": [
       {"name":"timecal.app.js","url":"timecal.app.js"}
     ]
+  },
+  { "id": "93dub",
+   "name": "93 Dub",
+   "shortName":"93 Dub",
+   "version":"0.01",
+   "description": "Fan recreation of 91 Dub app for the Pebble smartwatch",
+   "tags": "",
+   "storage": [
+     {"name":"93dub.app.js","url":"app.js"},
+   ]
   }
 ]

From 33b3e918693959e9828cafa1354b6df3a5a5c90d Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 11:40:13 -0800
Subject: [PATCH 05/41] Update apps.json

---
 apps.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps.json b/apps.json
index 8830449ca..88184fdad 100644
--- a/apps.json
+++ b/apps.json
@@ -4463,6 +4463,8 @@
    "version":"0.01",
    "description": "Fan recreation of 91 Dub app for the Pebble smartwatch",
    "tags": "",
+   "type": "clock",
+   "supports":["BANGLEJS2"],
    "storage": [
      {"name":"93dub.app.js","url":"app.js"},
    ]

From 228a3664c7ab9774a8dad99f05fc1bf3c5570e61 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 11:41:39 -0800
Subject: [PATCH 06/41] Update apps.json

---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 88184fdad..681767f81 100644
--- a/apps.json
+++ b/apps.json
@@ -4468,5 +4468,5 @@
    "storage": [
      {"name":"93dub.app.js","url":"app.js"},
    ]
-  }
+  },
 ]

From 56f3044e5e5fedbbddffc9810e24135cca7acfbf Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 12:02:34 -0800
Subject: [PATCH 07/41] Update app.js

background needed redraw after notification

background redraw broke widgets, so temp fix
---
 apps/93dub/app.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index 48365c646..63309c0b3 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -1,14 +1,19 @@
 /*The following code was made by Brandon Abbott and used many portions from Espruino documentation, example watchfaces, and the waveclk app (Gordon Williams). It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources. Time and date keeping functions, and AFAIK the battery display works too. I cut off the top of the original background with a black rectangle to make room for the widgets. It is not pixel perfect. I am using the MIT license for this work.
+
 MIT License
+
 Copyright (c) 2021 Brandon Abbott
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
+
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -25,6 +30,7 @@ var imgBg = require("heatshrink").decompress(atob("yGogIqn4EwhgR/AAMN4Hw7k3hk8BQ
 I took the number bitmaps, added two columns to each digit (for spacing), and combined them for the Espruino Bitmap Font Generator. Here's the commands I used for processing the original 26 by 41 px font:
 mogrify -gravity east -extent 28x41 *.png
 montage num_[0-9].png -geometry +0+0 numcat.png
+
 I then put numcat.png into the generator. 
 */
 
@@ -73,6 +79,7 @@ function queueDraw() {
   }, 60000 - (Date.now() % 60000));
 }
 
+function drawBackground() {
 // set background
 g.setBgColor(0,0,0);
 g.setColor(1,1,1);
@@ -81,8 +88,11 @@ g.drawImage(imgBg,g.getWidth()/2 - 144/2 ,0);
 // this covers the part of the background with branding, makes room for widgets
 g.setColor(0,0,0);
 g.fillRect(0,0,g.getWidth(),30);
+g.reset();
+}
 
 function draw(){
+drawBackground();
 var date = new Date();
 var h = date.getHours(), m = date.getMinutes();
 var d = date.getDate(), w = date.getDay();
@@ -149,6 +159,8 @@ g.setFontCustom(fontTiny, 48, 6, 8);
 if (batPercent < 10) {batPercent = " " + batPercent;} //makes sure zero is next to percent sign
 if (batPercent < 100) {g.drawString(batPercent, 105, 42, true);}
   else {g.drawString(batPercent, 99, 42, true);}
+// widget redraw
+Bangle.drawWidgets();
 queueDraw();
 }
 

From 0d6bfc7c13f024f36e9703dbb4b88289756621f5 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 20:59:32 -0800
Subject: [PATCH 08/41] Update app.js

redid background, adjusted graphics to look nice on bangle 2
---
 apps/93dub/app.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index 63309c0b3..fb485d72a 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -24,7 +24,7 @@ SOFTWARE.
 */
 
 // define background
-var imgBg = require("heatshrink").decompress(atob("yGogIqn4EwhgR/AAMN4Hw7k3hk8BQeAgEEgQGCh/h/H+n+MvwRKh1zjnnnPM48A69z1foxPfnXgCIMMmf84cw5n/gMZylsxGKmlDkARD8ARC/EAyMUlARBilCCIQ1Bhg1C4cAqIRILIP8LIV/CIVowtSmgRDPoP4PoU+gORieo8Uh686I4bmQCMYAig//AB3AIuYAUpGcxeAMxE8+lEgEB5GixIdIgmiwlHCwPI0H5CJXiw/ACIOmEZI1BwQRBGpskCIIFBp2eCJUi+MEVP4AJh//ABngCIM/CJv4CIN4GRs8AQImCABcOdIPDGpqzBgePCJvjCIMfCJvzwEDNZ3xwEHCJ35wEGCJ/Ag1/UJwRQ/gR/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4R/CP4Rhn4RN/HAg4RO/PAgcfCJvxwEDz4RN+eAgOPCJvDgEB4YRNg8AgHgAQIALjwCBvARNvgCBPp3wCIMPCJvAGRoA/AA8Bi+l4gROykYw4ROq4RBPxsBqgRQmkkGp8X0mERFUfcgeACJcgAgdABYsHDof/oHx49/wEvBQh9GCIfAFAgAHoHz51/8ARP+IRO+4RLpMR73woH27n/8Eh8+ZmaBEqsoyGICIfAkMUktJEYgRBzgRBv34UAMhi8RkIRFnGQGoN8/H34FB8kJiIREkVEyGQkF8/Pj4GBkg1GCIOexEQvHx8fBgMXzMxPpEICIXCfZkEAYwAJgbiC/ARMAH4ABA=="));
+var imgBg = require("heatshrink").decompress(atob("2GwgJC/AH4A/AH4A/AH4A/AH4A/ACcGAhAV/Cp3gvdug+Gj0AgeABYMBAQMIggVEg/w/9/h/Gn8As3ACpk559zznmseAs0B13nq/Rie+uodCIIUZw9hzFmv+AgcCmco7MRilow1ACpN8gFhwMilFRCoMowgVEIIVhIINhwFg4GiCpfw/dhx/mn4uBCoXRhWktAVFTIVhw9mj8YseDkUnqPEoeuugVEAAlgSgICBACAVC8AUQCQQVSAEsD/4ASeYgA/ACkHNiK5Cj4VR/AVBng+RCQVwCqMOAQPhIKOHgEB44VR8YVBx4VR+eAgOfCqPxwEDCqX5CoKvS/PAgc/YqQVU/gV/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/CsMfCqP4CoOfCqP54EBx4VR+OAgPPCqPzwEA44VR4cAgHhCqMHCoNwAQIAPjwCBngVRvgCBV6XwCoMHCqPAHyIA/AEigEf4IAOkAEDoAPJWAtA+PHv+Al6uPCofAGAgALoHz51/8AVT+IVS+4VPpMR73woH27n/8Eh8+ZmadIqsoyGICofAkMUktJFZAVBzgVBv34YgMhi8RkIVJnGQIIN8/H34FB8kJiIVIkVEyGQkF8/Pj4GBkhBKCoOexEQvHx8fBgMXzMxTJkICoXCVx8AggDGABsD/4AB/AVQAH4APA"));
 
 /*
 I took the number bitmaps, added two columns to each digit (for spacing), and combined them for the Espruino Bitmap Font Generator. Here's the commands I used for processing the original 26 by 41 px font:
@@ -84,10 +84,7 @@ function drawBackground() {
 g.setBgColor(0,0,0);
 g.setColor(1,1,1);
 g.clear();
-g.drawImage(imgBg,g.getWidth()/2 - 144/2 ,0);
-// this covers the part of the background with branding, makes room for widgets
-g.setColor(0,0,0);
-g.fillRect(0,0,g.getWidth(),30);
+g.drawImage(imgBg,0,0);
 g.reset();
 }
 
@@ -103,15 +100,15 @@ g.setColor(1,1,1);
 var batPercent = E.getBattery();
 if (Bangle.isCharging()) {selBattery = imgBattery_Charge;}
 else {selBattery=imgBattery;}
-g.drawImage(selBattery,127,42);
+g.drawImage(selBattery,127,59);
 if (batPercent != null) {
-g.drawImage(imgPercent, 118,43);
+g.drawImage(imgPercent, 118,60);
 
 }
 
 //draw 24 hr indicator and 12 hr specific behavior
 if (is24hr){
-g.drawImage(img24hr,32, 70);
+g.drawImage(img24hr,32, 82);
 if (leadingZero){
                    h = ("0"+h).substr(-2);}}
 else if (h > 12) {g.drawImage(imgPM,40, 70);
@@ -124,7 +121,7 @@ else if (h > 12) {g.drawImage(imgPM,40, 70);
 
 //draw separator
 if (separator){
-g.drawImage(imgSep, 85,96);}
+g.drawImage(imgSep, 85,108);}
 
 //draw day of week
 var imgW = null;
@@ -135,7 +132,7 @@ if (w == 3) {imgW = imgWed;}
 if (w == 4) {imgW = imgThr;}
 if (w == 5) {imgW = imgFri;}
 if (w == 6) {imgW = imgSat;}
-g.drawImage(imgW, 85, 66);
+g.drawImage(imgW, 85, 78);
 
 
 // draw nums
@@ -149,16 +146,16 @@ if (h<10) {
     }
   else {h = " " + h;}
 }
-g.drawString(h, 25, 88, true);
-g.drawString(("0"+m).substr(-2), 92, 88, true);
+g.drawString(h, 25, 100, true);
+g.drawString(("0"+m).substr(-2), 92, 100, true);
 // draw date
 g.setFontCustom(fontDate, 48, 12, 15);
-g.drawString(("0"+d).substr(-2), 123,66, true);
+g.drawString(("0"+d).substr(-2), 123,78, true);
 // draw battery
 g.setFontCustom(fontTiny, 48, 6, 8);
 if (batPercent < 10) {batPercent = " " + batPercent;} //makes sure zero is next to percent sign
-if (batPercent < 100) {g.drawString(batPercent, 105, 42, true);}
-  else {g.drawString(batPercent, 99, 42, true);}
+if (batPercent < 100) {g.drawString(batPercent, 105, 59, true);}
+  else {g.drawString(batPercent, 99, 59, true);}
 // widget redraw
 Bangle.drawWidgets();
 queueDraw();

From c0e5d4432eb48ae7c83d1c62f28a8b8abdc1438b Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:19:34 -0800
Subject: [PATCH 09/41] Create app-icon.js

added icon
---
 apps/93dub/app-icon.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 apps/93dub/app-icon.js

diff --git a/apps/93dub/app-icon.js b/apps/93dub/app-icon.js
new file mode 100644
index 000000000..771a64556
--- /dev/null
+++ b/apps/93dub/app-icon.js
@@ -0,0 +1 @@
+E.toArrayBuffer(atob("AAAAAAAAAAAAAAAAAgBAAAAAA39zmsbAA/f6vbtgA3X2o0aAAAAAAAAAH//////4AAAAAAAAAAAAAAAAD//////wEAAAAAAIF//////oF//////oF//////oF//////oF//////oF//////oF///4iPoF///9rfoF/x/+jfoF/x/4rfoF//////oF//////oF//////oF//////oF/cP4YfoF/fv/ffoF/fufffoF/fufffoF/cP4ffoF/fv/ffoF/fv/ffoF/fufffoF/cOYffoF//////oF//////oF//////oEAAAAAAID//////wAAAAAAAAAAAAAAAAAf+id/+AAAC2dAAAAACcZAAAAACcVAAAAAAAAAAAAAAAAAAA"))

From 2d21ce74459871c238dc12d2ed04c212bd1d814e Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:21:29 -0800
Subject: [PATCH 10/41] Add files via upload

---
 apps/93dub/app.png | Bin 0 -> 650 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/93dub/app.png

diff --git a/apps/93dub/app.png b/apps/93dub/app.png
new file mode 100644
index 0000000000000000000000000000000000000000..59950c8959c296dabb9cf98ef9721cba82763012
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001xm001xu00000a%rYp0003aX+uL$Nkc;*
zaB^>EX>4Tx04R~2kiAO7U=)U*RIB38q&P^246X$iJGoSaAXJF4g3&2WQY<DhBq_x^
z@J{q%ItYSy;0-7^`+m{E!7Ls)oQK0X?|Z%vT6Pkq<>DTsSyeb*-@o*)?BzGs=+MTZ
z9fW1xcijPv@%gGb#Y@*{HP8JSOHo{gs&i!)=0ye8fw(uTa>GitZin8H_(5z(X%>l}
z#Jf=%88*9KnoPqVO>@n9oL!uozOsYE38%Q&jF>VZp`xprsdG$^eN~5ofO|?p)r45R
znPw_(M5UA*4n;$eu4(Ywsr_8JjHEG<mT|Zvm8S8-{O|YL$638;ZO`+d2<p~?vNayV
z`y*`lu=xzD*9~4Pzu(p{)2nCx`Nl7eOi(xc$+bKH000SaNLh0L04^f{04^f|c%?sf
z00007bV*G`2jvSK1q(C1t%H#O000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dak
zSAh-}0002hNkl<ZNXOk(+YW^w3~SB)|Cf6n7|IY(OuXbQQHXBr(y{>$iJIG%Fl*5j
zDS+@7MS=c1sV?Qg^i@b&5CuviM0ahgE7k9O^tN0Q9;dm__+B9<V&XZdBBnNB!T{V^
z`3D0VS4H_b<v~y)d0F<#fGqhX?)f(Iz!sIQd$;rDQ~dgM98!x}V@}&Db8B#(VXIi$
zWmM98xWw29j}3M?+=W9oX&ZFI;~cbMq!KQ@z@>>ceyJHhFdsrx^j@TOI0j9t!}DR=
kje2Q0^&!ql94NdZKiy|bRt}#=Pyhe`07*qoM6N<$f{COZCjbBd

literal 0
HcmV?d00001


From b49223d5b95c3802ca5b9a7e2478a227ad888652 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:24:09 -0800
Subject: [PATCH 11/41] Update apps.json

---
 apps.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 681767f81..9905a2352 100644
--- a/apps.json
+++ b/apps.json
@@ -4460,13 +4460,15 @@
   { "id": "93dub",
    "name": "93 Dub",
    "shortName":"93 Dub",
+   "icon": "icon.png",
    "version":"0.01",
-   "description": "Fan recreation of 91 Dub app for the Pebble smartwatch",
+   "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch",
    "tags": "",
    "type": "clock",
    "supports":["BANGLEJS2"],
    "storage": [
      {"name":"93dub.app.js","url":"app.js"},
+     {"name":"93dub.img","url":"app-icon.js","evaluate":true}
    ]
   },
 ]

From 251ceb9dd1ee7064f86c4056a280169f299311d9 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:27:35 -0800
Subject: [PATCH 12/41] Update apps.json

oops comma
---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 9905a2352..93785f0d4 100644
--- a/apps.json
+++ b/apps.json
@@ -4470,5 +4470,5 @@
      {"name":"93dub.app.js","url":"app.js"},
      {"name":"93dub.img","url":"app-icon.js","evaluate":true}
    ]
-  },
+  }
 ]

From 4294a27279f7482cb9abe10fe22d254f2a9a7073 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:31:41 -0800
Subject: [PATCH 13/41] Update apps.json

apps.json updates
---
 apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps.json b/apps.json
index 93785f0d4..554d18e11 100644
--- a/apps.json
+++ b/apps.json
@@ -4462,8 +4462,8 @@
    "shortName":"93 Dub",
    "icon": "icon.png",
    "version":"0.01",
-   "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch",
-   "tags": "",
+   "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
+   "tags": "clock",
    "type": "clock",
    "supports":["BANGLEJS2"],
    "storage": [

From 8a3f9f848a4dc98f0f1108c46e406ba8007aa45b Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:36:48 -0800
Subject: [PATCH 14/41] Update app.js

stripped license and info block of text since it's already enclosed in an MIT-licensed repo
---
 apps/93dub/app.js | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index fb485d72a..f89d26188 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -1,28 +1,3 @@
-/*The following code was made by Brandon Abbott and used many portions from Espruino documentation, example watchfaces, and the waveclk app (Gordon Williams). It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources. Time and date keeping functions, and AFAIK the battery display works too. I cut off the top of the original background with a black rectangle to make room for the widgets. It is not pixel perfect. I am using the MIT license for this work.
-
-MIT License
-
-Copyright (c) 2021 Brandon Abbott
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
 // define background
 var imgBg = require("heatshrink").decompress(atob("2GwgJC/AH4A/AH4A/AH4A/AH4A/ACcGAhAV/Cp3gvdug+Gj0AgeABYMBAQMIggVEg/w/9/h/Gn8As3ACpk559zznmseAs0B13nq/Rie+uodCIIUZw9hzFmv+AgcCmco7MRilow1ACpN8gFhwMilFRCoMowgVEIIVhIINhwFg4GiCpfw/dhx/mn4uBCoXRhWktAVFTIVhw9mj8YseDkUnqPEoeuugVEAAlgSgICBACAVC8AUQCQQVSAEsD/4ASeYgA/ACkHNiK5Cj4VR/AVBng+RCQVwCqMOAQPhIKOHgEB44VR8YVBx4VR+eAgOfCqPxwEDCqX5CoKvS/PAgc/YqQVU/gV/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/CsMfCqP4CoOfCqP54EBx4VR+OAgPPCqPzwEA44VR4cAgHhCqMHCoNwAQIAPjwCBngVRvgCBV6XwCoMHCqPAHyIA/AEigEf4IAOkAEDoAPJWAtA+PHv+Al6uPCofAGAgALoHz51/8AVT+IVS+4VPpMR73woH27n/8Eh8+ZmadIqsoyGICofAkMUktJFZAVBzgVBv34YgMhi8RkIVJnGQIIN8/H34FB8kJiIVIkVEyGQkF8/Pj4GBkhBKCoOexEQvHx8fBgMXzMxTJkICoXCVx8AggDGABsD/4AB/AVQAH4APA"));
 

From 82e515e0e5c05cd89f871f33fb24654e1e26d5b0 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:39:55 -0800
Subject: [PATCH 15/41] Create README.md

added dub93's readme
---
 apps/93dub/README.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 apps/93dub/README.md

diff --git a/apps/93dub/README.md b/apps/93dub/README.md
new file mode 100644
index 000000000..1732757a7
--- /dev/null
+++ b/apps/93dub/README.md
@@ -0,0 +1,5 @@
+# 93 Dub
+
+![icon](app.png)
+
+93 Dub was made by Brandon Abbott and used many portions from Espruino documentation, example watchfaces, and the waveclk app (Gordon Williams). It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources and adapted for Bangle.js 2's screen. Time, date and the battery display works. It is not pixel perfect to the original.

From 0d5892769d6862ed8a56dcfcf3fd960893cec688 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:42:19 -0800
Subject: [PATCH 16/41] Add files via upload

add screenshot for 93dub
---
 apps/93dub/screenshot.png | Bin 0 -> 3675 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/93dub/screenshot.png

diff --git a/apps/93dub/screenshot.png b/apps/93dub/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..de25e4d2c173d0661775c3dd47f8a0713d5b1d62
GIT binary patch
literal 3675
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

literal 0
HcmV?d00001


From 3d03895b9dc97c6f7bb20f68e64619612b89cf85 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:44:49 -0800
Subject: [PATCH 17/41] Update README.md

---
 apps/93dub/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/93dub/README.md b/apps/93dub/README.md
index 1732757a7..1f2d25b75 100644
--- a/apps/93dub/README.md
+++ b/apps/93dub/README.md
@@ -1,5 +1,5 @@
 # 93 Dub
 
-![icon](app.png)
+![](screenshot.png)
 
 93 Dub was made by Brandon Abbott and used many portions from Espruino documentation, example watchfaces, and the waveclk app (Gordon Williams). It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources and adapted for Bangle.js 2's screen. Time, date and the battery display works. It is not pixel perfect to the original.

From 4a3e1bbe28e3180ab04685646a4e41de07993cf4 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 21:52:13 -0800
Subject: [PATCH 18/41] Update app.js

12 hr/24 hr specific behavior now from settings instead of hardcoded
---
 apps/93dub/app.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index f89d26188..fc52b8829 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -1,3 +1,6 @@
+// get 12 hour status, code from barclock
+const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"];
+
 // define background
 var imgBg = require("heatshrink").decompress(atob("2GwgJC/AH4A/AH4A/AH4A/AH4A/ACcGAhAV/Cp3gvdug+Gj0AgeABYMBAQMIggVEg/w/9/h/Gn8As3ACpk559zznmseAs0B13nq/Rie+uodCIIUZw9hzFmv+AgcCmco7MRilow1ACpN8gFhwMilFRCoMowgVEIIVhIINhwFg4GiCpfw/dhx/mn4uBCoXRhWktAVFTIVhw9mj8YseDkUnqPEoeuugVEAAlgSgICBACAVC8AUQCQQVSAEsD/4ASeYgA/ACkHNiK5Cj4VR/AVBng+RCQVwCqMOAQPhIKOHgEB44VR8YVBx4VR+eAgOfCqPxwEDCqX5CoKvS/PAgc/YqQVU/gV/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/CsMfCqP4CoOfCqP54EBx4VR+OAgPPCqPzwEA44VR4cAgHhCqMHCoNwAQIAPjwCBngVRvgCBV6XwCoMHCqPAHyIA/AEigEf4IAOkAEDoAPJWAtA+PHv+Al6uPCofAGAgALoHz51/8AVT+IVS+4VPpMR73woH27n/8Eh8+ZmadIqsoyGICofAkMUktJFZAVBzgVBv34YgMhi8RkIVJnGQIIN8/H34FB8kJiIVIkVEyGQkF8/Pj4GBkhBKCoOexEQvHx8fBgMXzMxTJkICoXCVx8AggDGABsD/4AB/AVQAH4APA"));
 
@@ -38,7 +41,7 @@ var imgPM = E.toArrayBuffer(atob("EwgB+HOfdnPu1X3ar4dV9+q+/bfftg=="));
 
 //vars
 var separator = true;
-var is24hr = true; //assumed true until can find API to check
+var is24hr = !is12Hour;
 var leadingZero = true;
 
 //the following 2 sections are used from waveclk to schedule minutely updates

From 6fd7a0eb633ac47eea07c2befe8f0a96bda19a02 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:11:06 -0800
Subject: [PATCH 19/41] Update app.js

battery icon actually works now
---
 apps/93dub/app.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index fc52b8829..a0def3c51 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -77,11 +77,14 @@ g.setColor(1,1,1);
 // draw battery indicator
 var batPercent = E.getBattery();
 if (Bangle.isCharging()) {selBattery = imgBattery_Charge;}
-else {selBattery=imgBattery;}
+else {
+selBattery=imgBattery;
+g.setColor(0,0,0);
+g.fillRect(129,61,(129 + batPercent / 10),65);
+g.setColor(1,1,1);}
 g.drawImage(selBattery,127,59);
 if (batPercent != null) {
 g.drawImage(imgPercent, 118,60);
-
 }
 
 //draw 24 hr indicator and 12 hr specific behavior

From 9e897dfd50c2ff4cc6c012724305e5e079b02dab Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:13:21 -0800
Subject: [PATCH 20/41] Update app.js

removed other nonfunctional comment block
---
 apps/93dub/app.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index a0def3c51..43ca5a5ea 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -4,14 +4,6 @@ const is12Hour = (require("Storage").readJSON("setting.json", 1) || {})["12hour"
 // define background
 var imgBg = require("heatshrink").decompress(atob("2GwgJC/AH4A/AH4A/AH4A/AH4A/ACcGAhAV/Cp3gvdug+Gj0AgeABYMBAQMIggVEg/w/9/h/Gn8As3ACpk559zznmseAs0B13nq/Rie+uodCIIUZw9hzFmv+AgcCmco7MRilow1ACpN8gFhwMilFRCoMowgVEIIVhIINhwFg4GiCpfw/dhx/mn4uBCoXRhWktAVFTIVhw9mj8YseDkUnqPEoeuugVEAAlgSgICBACAVC8AUQCQQVSAEsD/4ASeYgA/ACkHNiK5Cj4VR/AVBng+RCQVwCqMOAQPhIKOHgEB44VR8YVBx4VR+eAgOfCqPxwEDCqX5CoKvS/PAgc/YqQVU/gV/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/Cv4V/CsMfCqP4CoOfCqP54EBx4VR+OAgPPCqPzwEA44VR4cAgHhCqMHCoNwAQIAPjwCBngVRvgCBV6XwCoMHCqPAHyIA/AEigEf4IAOkAEDoAPJWAtA+PHv+Al6uPCofAGAgALoHz51/8AVT+IVS+4VPpMR73woH27n/8Eh8+ZmadIqsoyGICofAkMUktJFZAVBzgVBv34YgMhi8RkIVJnGQIIN8/H34FB8kJiIVIkVEyGQkF8/Pj4GBkhBKCoOexEQvHx8fBgMXzMxTJkICoXCVx8AggDGABsD/4AB/AVQAH4APA"));
 
-/*
-I took the number bitmaps, added two columns to each digit (for spacing), and combined them for the Espruino Bitmap Font Generator. Here's the commands I used for processing the original 26 by 41 px font:
-mogrify -gravity east -extent 28x41 *.png
-montage num_[0-9].png -geometry +0+0 numcat.png
-
-I then put numcat.png into the generator. 
-*/
-
 // define fonts
 // reg number first char 48 28 by 41
 var fontNum = atob("AAAAAAAAAAAAAA//8D//g//8P/+I//8//44//w//j4//A/+P4/8A/4/4AAAAD/4AAAAP/wAAAAf/gAAAA//AAAAB/+AAAAD/8AAAAH/4AAAAP/wAAAAf/gAAAA//AAAAB/+AAAAD/8AAAAH/wAAAAH/H/gH/H8f/gf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wB/4AP/4H/4A//4f/4D//5//4P//h//4//+B//4AAAAAAAAAAAAAAAAAf/+AAAB//4gAAD//jgAAD/+PgABj/4/gAHj/j/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8f88AAfx/8wAAfH/8AAAcf/8AAAR//4AAAH//gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAA4AAAAAD4AAYAAP4AD8AA/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAHgAH/H/GH/H8f/gf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAP//AAAAP//AAAAP//AAAAP/8AAAAP/2AAAAP/eAAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAB/7x/4AH/7H/4Af/4f/4B//5//4H//h//4f/+B//4AAAAAAAAAAAAAD//wAAAD//wAAAj//gAADj/+AAAPj/5gAA/j/ngAD/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8AA8f8fwAAx/8fAAAH/8cAAAf/8QAAA//8AAAA//8AAAAAAAAAAAAAA//8D//g//8P/+I//8//44//0//j4//Y/+P4/94/4/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAPwAH/AAPH/H8AAMf/HwAAB//HAAAH//EAAAH//AAAAH//AAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAGAAAAAAOAAAAAAeAAAAAA+AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB+AAAAAD8AAAAAH4AAAAAPwAAAAAfgAAAAA/AAAAAB8AAAAADx/4B/4HH/4H/4Mf/4f/4R//5//4H//h//4f/+B//4AAAAAAAAAAAAAD//wP/+D//w//4j//z//jj//T/+Pj/9j/4/j/3j/j/gAfgAP/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/AA/AAf8f+8f8fx/+x/8fH/+H/8cf/+f/8R//4f/8H//gf/8AAAAAAAAAAAAAA//8AAAA//8AAAI//8AAA4//0AAD4//YAAP4/94AA/4AH4AD/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/4APwAP/wAfgAf/gA/AA//AB+AB/+AD8AD/8AH4AH/wAPwAH/H/vH/H8f/sf/Hx//h//HH//n//Ef/+H//B//4H//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");

From b28986c249a952edaac1b5e4b624ab357dcb81c3 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:19:09 -0800
Subject: [PATCH 21/41] Delete app.png

---
 apps/93dub/app.png | Bin 650 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 apps/93dub/app.png

diff --git a/apps/93dub/app.png b/apps/93dub/app.png
deleted file mode 100644
index 59950c8959c296dabb9cf98ef9721cba82763012..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001xm001xu00000a%rYp0003aX+uL$Nkc;*
zaB^>EX>4Tx04R~2kiAO7U=)U*RIB38q&P^246X$iJGoSaAXJF4g3&2WQY<DhBq_x^
z@J{q%ItYSy;0-7^`+m{E!7Ls)oQK0X?|Z%vT6Pkq<>DTsSyeb*-@o*)?BzGs=+MTZ
z9fW1xcijPv@%gGb#Y@*{HP8JSOHo{gs&i!)=0ye8fw(uTa>GitZin8H_(5z(X%>l}
z#Jf=%88*9KnoPqVO>@n9oL!uozOsYE38%Q&jF>VZp`xprsdG$^eN~5ofO|?p)r45R
znPw_(M5UA*4n;$eu4(Ywsr_8JjHEG<mT|Zvm8S8-{O|YL$638;ZO`+d2<p~?vNayV
z`y*`lu=xzD*9~4Pzu(p{)2nCx`Nl7eOi(xc$+bKH000SaNLh0L04^f{04^f|c%?sf
z00007bV*G`2jvSK1q(C1t%H#O000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dak
zSAh-}0002hNkl<ZNXOk(+YW^w3~SB)|Cf6n7|IY(OuXbQQHXBr(y{>$iJIG%Fl*5j
zDS+@7MS=c1sV?Qg^i@b&5CuviM0ahgE7k9O^tN0Q9;dm__+B9<V&XZdBBnNB!T{V^
z`3D0VS4H_b<v~y)d0F<#fGqhX?)f(Iz!sIQd$;rDQ~dgM98!x}V@}&Db8B#(VXIi$
zWmM98xWw29j}3M?+=W9oX&ZFI;~cbMq!KQ@z@>>ceyJHhFdsrx^j@TOI0j9t!}DR=
kje2Q0^&!ql94NdZKiy|bRt}#=Pyhe`07*qoM6N<$f{COZCjbBd


From 47c8edba4f040716d5860b56588a98687914ac36 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:19:25 -0800
Subject: [PATCH 22/41] Add files via upload

---
 apps/93dub/93dub.png | Bin 0 -> 650 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/93dub/93dub.png

diff --git a/apps/93dub/93dub.png b/apps/93dub/93dub.png
new file mode 100644
index 0000000000000000000000000000000000000000..59950c8959c296dabb9cf98ef9721cba82763012
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001xm001xu00000a%rYp0003aX+uL$Nkc;*
zaB^>EX>4Tx04R~2kiAO7U=)U*RIB38q&P^246X$iJGoSaAXJF4g3&2WQY<DhBq_x^
z@J{q%ItYSy;0-7^`+m{E!7Ls)oQK0X?|Z%vT6Pkq<>DTsSyeb*-@o*)?BzGs=+MTZ
z9fW1xcijPv@%gGb#Y@*{HP8JSOHo{gs&i!)=0ye8fw(uTa>GitZin8H_(5z(X%>l}
z#Jf=%88*9KnoPqVO>@n9oL!uozOsYE38%Q&jF>VZp`xprsdG$^eN~5ofO|?p)r45R
znPw_(M5UA*4n;$eu4(Ywsr_8JjHEG<mT|Zvm8S8-{O|YL$638;ZO`+d2<p~?vNayV
z`y*`lu=xzD*9~4Pzu(p{)2nCx`Nl7eOi(xc$+bKH000SaNLh0L04^f{04^f|c%?sf
z00007bV*G`2jvSK1q(C1t%H#O000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dak
zSAh-}0002hNkl<ZNXOk(+YW^w3~SB)|Cf6n7|IY(OuXbQQHXBr(y{>$iJIG%Fl*5j
zDS+@7MS=c1sV?Qg^i@b&5CuviM0ahgE7k9O^tN0Q9;dm__+B9<V&XZdBBnNB!T{V^
z`3D0VS4H_b<v~y)d0F<#fGqhX?)f(Iz!sIQd$;rDQ~dgM98!x}V@}&Db8B#(VXIi$
zWmM98xWw29j}3M?+=W9oX&ZFI;~cbMq!KQ@z@>>ceyJHhFdsrx^j@TOI0j9t!}DR=
kje2Q0^&!ql94NdZKiy|bRt}#=Pyhe`07*qoM6N<$f{COZCjbBd

literal 0
HcmV?d00001


From da41d04d2681afd5bafe9f39660ca6c8a15a787a Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:20:21 -0800
Subject: [PATCH 23/41] Update apps.json

---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 554d18e11..9ee92bfaf 100644
--- a/apps.json
+++ b/apps.json
@@ -4460,7 +4460,7 @@
   { "id": "93dub",
    "name": "93 Dub",
    "shortName":"93 Dub",
-   "icon": "icon.png",
+   "icon": "93dub.png",
    "version":"0.01",
    "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
    "tags": "clock",

From 6eb7a844d6839456c13a4402c5212b9bb9dbd3ad Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:26:36 -0800
Subject: [PATCH 24/41] Update app.js

fix battery graphics
---
 apps/93dub/app.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index 43ca5a5ea..718c75e9a 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -68,13 +68,14 @@ g.setBgColor(0,0,0);
 g.setColor(1,1,1);
 // draw battery indicator
 var batPercent = E.getBattery();
-if (Bangle.isCharging()) {selBattery = imgBattery_Charge;}
+if (Bangle.isCharging()) {
+g.drawImage(imgBattery_Charge,127,59);
+}
 else {
-selBattery=imgBattery;
+g.drawImage(imgBattery,127,59);
 g.setColor(0,0,0);
 g.fillRect(129,61,(129 + batPercent / 10),65);
 g.setColor(1,1,1);}
-g.drawImage(selBattery,127,59);
 if (batPercent != null) {
 g.drawImage(imgPercent, 118,60);
 }

From d87930e4d37ea5248b7de93825735967e75030b3 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:27:51 -0800
Subject: [PATCH 25/41] Update apps.json

---
 apps.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps.json b/apps.json
index 9ee92bfaf..ba97bfeb4 100644
--- a/apps.json
+++ b/apps.json
@@ -4466,6 +4466,8 @@
    "tags": "clock",
    "type": "clock",
    "supports":["BANGLEJS2"],
+   "readme": "README.md",
+   "allow_emulator": true,
    "storage": [
      {"name":"93dub.app.js","url":"app.js"},
      {"name":"93dub.img","url":"app-icon.js","evaluate":true}

From 40d19aad2e4d672171b4feeee6b9c6f4cdbb11a1 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 22:29:57 -0800
Subject: [PATCH 26/41] Update apps.json

added screenshot to app store listing
---
 apps.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps.json b/apps.json
index ba97bfeb4..508bd253a 100644
--- a/apps.json
+++ b/apps.json
@@ -4461,6 +4461,7 @@
    "name": "93 Dub",
    "shortName":"93 Dub",
    "icon": "93dub.png",
+   "screenshots": [{"url":"screenshot.png"}],
    "version":"0.01",
    "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
    "tags": "clock",

From 89e88e717211d8c80b0e258114be7498722aa783 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sat, 27 Nov 2021 23:39:51 -0800
Subject: [PATCH 27/41] Update app-icon.js

hopefully fix launcher icon
---
 apps/93dub/app-icon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/93dub/app-icon.js b/apps/93dub/app-icon.js
index 771a64556..39d11fd6a 100644
--- a/apps/93dub/app-icon.js
+++ b/apps/93dub/app-icon.js
@@ -1 +1 @@
-E.toArrayBuffer(atob("AAAAAAAAAAAAAAAAAgBAAAAAA39zmsbAA/f6vbtgA3X2o0aAAAAAAAAAH//////4AAAAAAAAAAAAAAAAD//////wEAAAAAAIF//////oF//////oF//////oF//////oF//////oF//////oF///4iPoF///9rfoF/x/+jfoF/x/4rfoF//////oF//////oF//////oF//////oF/cP4YfoF/fv/ffoF/fufffoF/fufffoF/cP4ffoF/fv/ffoF/fv/ffoF/fufffoF/cOYffoF//////oF//////oF//////oEAAAAAAID//////wAAAAAAAAAAAAAAAAAf+id/+AAAC2dAAAAACcZAAAAACcVAAAAAAAAAAAAAAAAAAA"))
+require("heatshrink").decompress(atob("mEwwkBG2XwAgcPC6P/h//AAIDBA4Pwh/w+AGBAgIDBC4oVDAAITBCAIIBAYIBBAgIvHh4YCFgQPBAoIvCCwoAWIQYAQGLgAWI6bQVdQiiDOyAX/C/7+IAIYvSh4RBAYIXLAwJAHC6ZFCF5yn/C7wDBBAJ3EVAKBDC5QLBYAoLFC5nwCgoXlL44vSL653sL4QXBL6DvXC9YCBACIXCZ4YAQFaYAgPAhqCa4SDFLoZpICYIXDQKLyCDIQXVAAKI0AAYA=="))

From 426ec0350fff5ce87dd2e8a6096c80f2f0e1b448 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:10:47 -0800
Subject: [PATCH 28/41] Update README.md

added credits
---
 apps/93dub/README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/93dub/README.md b/apps/93dub/README.md
index 1f2d25b75..fd24d54d8 100644
--- a/apps/93dub/README.md
+++ b/apps/93dub/README.md
@@ -2,4 +2,10 @@
 
 ![](screenshot.png)
 
-93 Dub was made by Brandon Abbott and used many portions from Espruino documentation, example watchfaces, and the waveclk app (Gordon Williams). It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources and adapted for Bangle.js 2's screen. Time, date and the battery display works. It is not pixel perfect to the original.
+Uses many portions from Espruino documentation, example watchfaces, and the waveclk app. It also sourced from Jon Barlow's 91 Dub v2.0 source code and resources and adapted for Bangle.js 2's screen. Time, date and the battery display works. It is not pixel perfect to the original.
+
+Contributors:
+Leer10
+Orviwan (original watchface and assets)
+Gordon Williams (Bangle.js, watchapps for reference code and documentation)
+DiscoMinotaur (adjustments)

From c3fac095b83c9936dedef8dad70578b4593923db Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:19:21 -0800
Subject: [PATCH 29/41] Update app.js

add discominotaur's adjustments (cause a battery on the watchface isn't useful when the widget does the work anyways) maybe i'll do it as a setting later
---
 apps/93dub/app.js | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index 718c75e9a..516360043 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -25,8 +25,6 @@ var imgSun = E.toArrayBuffer(atob("Ig8BwHf7D7Ac/MHD/z8wMP/PzMQ/8/M/D/z8z8QPf7f6A
 
 // define icons
 var imgSep = E.toArrayBuffer(atob("BhsBAAAAAA///////////////AAAAAAA"));
-var imgBattery = E.toArrayBuffer(atob("EAkBAAF//X/8f/x//H/8f/x//QAB"));
-var imgBattery_Charge = E.toArrayBuffer(atob("EAkBAAF//UEERwRf9EHEQQR//QAB"));
 var imgPercent = E.toArrayBuffer(atob("BwcBuq7ffbqugA=="));
 var img24hr = E.toArrayBuffer(atob("EwgBj7vO53na73tcDtu9uDev7vA93g=="));
 var imgPM = E.toArrayBuffer(atob("EwgB+HOfdnPu1X3ar4dV9+q+/bfftg=="));
@@ -66,23 +64,10 @@ var d = date.getDate(), w = date.getDay();
 g.reset();
 g.setBgColor(0,0,0);
 g.setColor(1,1,1);
-// draw battery indicator
-var batPercent = E.getBattery();
-if (Bangle.isCharging()) {
-g.drawImage(imgBattery_Charge,127,59);
-}
-else {
-g.drawImage(imgBattery,127,59);
-g.setColor(0,0,0);
-g.fillRect(129,61,(129 + batPercent / 10),65);
-g.setColor(1,1,1);}
-if (batPercent != null) {
-g.drawImage(imgPercent, 118,60);
-}
 
 //draw 24 hr indicator and 12 hr specific behavior
 if (is24hr){
-g.drawImage(img24hr,32, 82);
+g.drawImage(img24hr,32, 65);
 if (leadingZero){
                    h = ("0"+h).substr(-2);}}
 else if (h > 12) {g.drawImage(imgPM,40, 70);
@@ -95,7 +80,7 @@ else if (h > 12) {g.drawImage(imgPM,40, 70);
 
 //draw separator
 if (separator){
-g.drawImage(imgSep, 85,108);}
+g.drawImage(imgSep, 85,98);}
 
 //draw day of week
 var imgW = null;
@@ -106,7 +91,7 @@ if (w == 3) {imgW = imgWed;}
 if (w == 4) {imgW = imgThr;}
 if (w == 5) {imgW = imgFri;}
 if (w == 6) {imgW = imgSat;}
-g.drawImage(imgW, 85, 78);
+g.drawImage(imgW, 85, 63);
 
 
 // draw nums
@@ -120,16 +105,12 @@ if (h<10) {
     }
   else {h = " " + h;}
 }
-g.drawString(h, 25, 100, true);
-g.drawString(("0"+m).substr(-2), 92, 100, true);
+g.drawString(h, 25, 90, true);
+g.drawString(("0"+m).substr(-2), 92, 90, true);
 // draw date
 g.setFontCustom(fontDate, 48, 12, 15);
-g.drawString(("0"+d).substr(-2), 123,78, true);
-// draw battery
-g.setFontCustom(fontTiny, 48, 6, 8);
-if (batPercent < 10) {batPercent = " " + batPercent;} //makes sure zero is next to percent sign
-if (batPercent < 100) {g.drawString(batPercent, 105, 59, true);}
-  else {g.drawString(batPercent, 99, 59, true);}
+g.drawString(("0"+d).substr(-2), 123,63, true);
+
 // widget redraw
 Bangle.drawWidgets();
 queueDraw();

From b25ad7573e19ccf6f617381e5ac78260ddeef36a Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:21:57 -0800
Subject: [PATCH 30/41] Delete screenshot.png

---
 apps/93dub/screenshot.png | Bin 3675 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 apps/93dub/screenshot.png

diff --git a/apps/93dub/screenshot.png b/apps/93dub/screenshot.png
deleted file mode 100644
index de25e4d2c173d0661775c3dd47f8a0713d5b1d62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3675
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


From b2cb4e7c0a84a49abfa0e04d16e2471b829d5b40 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:22:04 -0800
Subject: [PATCH 31/41] Add files via upload

---
 apps/93dub/screenshot.png | Bin 0 -> 3297 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/93dub/screenshot.png

diff --git a/apps/93dub/screenshot.png b/apps/93dub/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..197c52c018739e13eb44b17b4273cc21d7e1d9f3
GIT binary patch
literal 3297
zcma)9`8yQ+*Z$0Ci0u1VQ-mgj><y8uQL>Nh`!XR65yskLOSUMIb)-S|y~#rqWy@eJ
zP2tHlwrrWf*Yo}b?+@pk>zwPHAMWd1_gS9YHq~cg5?}%VuoxQX-Z`-~|H*0k6J6aj
z?*ITZ&QMp|BFur3KZW5JJAEVL_;?Xxa>tql0!i4!9E>Q>ofT<hR?m4D_3$C>FF{nQ
zrULpJgpKxnq{zX*#?P~~zjZ{|?w>!}-}cM*XH^-1V8e97BnOBtMTyWHfiE5AYoUE{
z)UzKF1$A@8h2D%9(E!2ReFlO+yF^u8kLu&<?Ki<O8Dz^GQ5d;b6yn0`#5g1?$=QuH
zY=eGq;kD${Fq-r~>eRqUd=PMgxBx#-=l<*|FyL+j+9iVCnEKOQ&T%%=iLb3GeUAra
z>=C?yM3@lo{fNMJ0fGgx@xs5mRd!Qe4q=c@O?H3Afcz(d5d_CaoqUf!<dg+_*pODa
zh!Iy|gku*L>|T77G4{OCX*V)5rqscoA)q7Q!@k>4DIms1BT5f9DAeNvRQ%nBI-FLN
z^XPFH+Q86j`L}2w(vtoL@>W>u{CCe(7eTDrUwr7VniR~1_8)C#!h>hU`-T@DHN@i>
ze0FAbZYPdOkrEI?Fw<tfe6G)}kBv9@F7TNZ?k(pnbRss#ro4#^q&lHTGippikjoCz
zd30>yU#-D<_kwS-2qzC9Jo(iX+zAD$j;`C!Z~&Nc^OgPKF@S_+b?6&*jve;1QPq%u
z9OUv~!2oPzIcs?if&EuD4r<SXu`3$dBnES%Qw5li{4a-8@0It~`qpn_mh2JZ=v%RA
z?$eXqNX_Krm_LIqqazo5Rx3b|DQb2bH(2Q`^4@x{A98i8PpU!Eq!U+YOL4=xz4!KZ
z6^<jy3OlXgSyu*)vKMM?y9aTiLi6~Wj@@X;G!ua3n_8_Mry<pMp*IgzC`}VZu9-)J
zJ0B;%(<-Xp3M3<Y%^}&f=rclw?5yGlRg?xLCa0jkrqNQrF0)6UQAd5)Hxf_aoso&G
z_akm*&=w(<>I@(wnV2D8pVw+x8R0x9J9vd|+&b|zR;jr~w^UmM7I={mLR@W`H_pA$
z7HmgtaA2%wp8nEEygA_R#tH>AuESt#Y3mamo2E)%t%LQ}d{6mL+A?G9DEx2flv>EY
z%U;rSLAjazv-mB&mtG;FGFpv&gpqUc>bHD{IIuEG^_b7)8HQi>@vnodUlHd=3Ai-h
zBvo0pFe668>+41L?Xblj)|tXGXLfh5TOXn-hNsxRW$+kCi&=49<#Lj?t1kOkaU{fY
z**Z^`USTS#q`I7>E<iSqOAI`;1|TjG&%+KOu9>2dKB^z`p(9W@Jgn_@*H6(ip0rwj
z@V*Y(N6^q`>zr#Ei;L;tS^Pq<Ayb66Ej!j*GM1qH<SK!KI@%W2kDfm?|68nE!|?W&
zJJcqk)<;R6JlM$;W@`?)2iG-xFDHd~Ad7T7+{a~cnP4TtAZtcHwR-v1U~%kNyua+L
z^AdUr#*l-&oa_V>_zOjKU+m(ZAFSPWV*4^1&=kxY(<|@r^9|?iqIS*uoFlxB<k`sN
z@S)e+o#BhONA6{EfUt2X(Y2<AWI%WnSF^GKHmcI&emF7#GVGccx+_Rj(!0g)ug-AV
z*n^!E_it60I0DsAXZx!RXonNh+Bi>TJKYa8QNoEoZeeR2l4BU#8rkI-vHL{JswlO7
zx~QCY;nU+$QoiO|hTh%8zU^T}&Gm07#94s>+zZ1)Tgeythzfkjz$k=B&fGl(**H!%
z;le75T_J#)vfCl;umH6(ZHK2vQwjlAdZ!4iSa0)Io1e>-Rutu-kco;}W?VzGAg+n(
zE2Ge&(WS*(iTF<F5o2|bZ5v5$ccCZpA`67+)HUzX@VbR#x!bC|fx<1x2rgA;2^$%0
zN<bwwlc+rAQ<_?$nD6$SA3itf!QuJ2plysGuyZ%y%IT6yb3|LCj~o6&IwD><s(%v=
z{#D3o{HG?I@eRzY{?j&b;O>J>+5pq0S9G38?{@-{Ze~*mywgX&WPZoC(9R2N(xd@V
z300P`$4Nn_adw%>$z1Qz)kkTt<4L2nB2q~X_(U}2OQtLFFxZ&7Xn)p?`~-|Y3%utQ
zI<y?r+{jTACYjrGh@*ip3+-20mJo2&GAdZ}EdU~x?7weW0&pu!G(YVk!0PjK|201u
zJ?0Dgzl%@WX9f#AvN#$47JrBT;-LSJ@`p<gDPp+}D)0R5wn>AU>nQB`g705gSsO%I
zHZO&pZ}`CJbZ=<#V=@zpyL(&EdvZ=LBi%<U?^G3CGyU0RL1z?uZEV>NLb!ZGlQIil
zjCO`HkHkN_u)pnJoWi=T_L?=7nr9q*Rx$QdO3zz1hIK(;OtL%7CfR4iwB$-hrb;pW
zdRI8S>Y8vZRz;AUy=(QOn%<`MU43V{5>ueZP*JSI6kNEPo*yYP_JarB%s@_mSF)qR
zMDF|RPtBeY1@~x0i?f%US@IfYPS+6e&9m=)I^EMa03BJ59<uSf&MaLrUU}56x8YKu
z@ZK)E!4v(P60Mum*NJMAFyo?!^TSn@Hr;OB0nAuPKxD<^)+@RWU+Vu$K5+TJWKoH3
ze^_HDS9wg4@E(*KJvgNW=n2<zECEfl&`+ic7gIVGuwpvhmuiF=(o@`;3T0HJ(h<7O
zt;N_u&FBo&RqjV#{w1jL=6qz`^wlTJ>jGHsAskkT{rpBY*-X$3;!DB%a8>S7C<!WK
z<I9!AwToEeA@LU?^5@8<?A52_5^U(ix59>1NFMfUhSp{HP_g#d9ftyMt#mT)6oUHi
zm|D?c2z=rqNlFU7p{M<7>80fl9A+G{+LFAZb5m4E6qZQuUBW7|<9_OD+AcAw3aaWW
zCiX;lSTtW(5mK+y(~vY&<ZeC1Inzo1Z93^YRJk@Fd}^J;K!)pqZjvt~iuy^%EjqnX
zf&AUigBpE<F<s^yi_3qJD-#N-o>Vq0R}n9~-oTFWx}}N7i95!=FQ`i|Gm;%GKIiFn
z66kf^?vGXS%En|XGhRQfm`l+DtY^leuM-PxNwy?$X0ZXc#$%v*$pTEY=I_@hkp}4r
zKvf%Z?6wvH1$!6ARR_Z->+9?44f%CmeD*tr1lZtcw!NHpt4zKxs5mdqoFO?lR)Kwv
z-)Q!tgJR5LoK68@5UORAWR((0t78}Ho`j%3dcvw3<)QvdauEX~&FAWyMVy#61wUqj
zZKx1r-H2V^JKBWNjP5!EI-#Oz#vppIC4Hj`Di795mwr6pPSy@uUg9`3Oww!!dZW#)
zJ9~7#UMkWdH>M-DdPq}Xb~0Dh$Q%fjim%=@J7H(KaK4^2z!qo5=S!ckQo6QyR0;+H
zGN0Ed-Z&xi4NR~=DFCT=I5A~X09)RdYFf+<2xdlI-?&f6%RM>loeBL3v{Jve_KHX_
zt**WSdnK=f`|S^vNs9C7<yE`Sm>sH0K<`UIvie-ACbjjs>V`WSc6D+O(W03Zb47gZ
zfn_F#FI`PrXu)bFH2G4y1}k-6t|PAmd5<(e2>y8?q&Ds5Mz9i0^%~OuEe`myS6?_y
zo3w_Y3VbHVEp)im!jsn#5?7;7Hj=%2%sA}w*KU7S_Q;uHEYEb&<BIsgEoaGJB89U8
z6@1fT*dGGi2Qkn*s6E_9@#)-cvdjqzJEP*)CujnmzPo&o4F&r$rNg(LLP7KMkg=Jp
zS)Onv`6T$saR=QZv|W@!P?cZ)=Ehoob$d0j5EsnZj@NiLf{Zu_GGXiQmS*>D^q`a2
z@rS#ntxJPFRfRvVtP&&W$eybxY<j{29kB7iy0jf`1C5x6FY|T-evo9?DM@DsY4iw?
zIYZ|Jgy;iSmZb4V=#GK}=2bcI94WEo)pLhbxWHE(UYkp4G2w~<?`?Up5)rAHY)JUT
zeI6Wz7-f!ZafM0ZHTPWkLO<OB;|O%C#<esaMijw#D9ArM%!ka3RWfKc{AA+gZJjXs
zWYl6*k+p;0xEFG>E|Gg4rHSvHH=>taxeqs1Z(4JV%X#@2|M{~$WBq5p+_Un1J*Y`0
zC&p(7CRUUV<dX0u{8345kpCbGRQ0nWx<^j=X0hWDPfK##YkPmG+(R>BJ0?G(6oWzv
zBx)?IR*F*kk2p)RNq4`rqyCn-n;Tb@?I2Sfk`v}Y86m9psmf^9*}ZE%kcm5_A$u0t
ze?}`|IWbG;SV8a2nsL0rBtqa0ixbQ2c!F*HKkf<}Mh63lo|t1qkIo+$IKyO%VY?C-
zk!FXH2uHuhhyYEQqMQ^4;K;i%ns^3#D{0Yv4noL*(dvI5!E^`Ky93uHRZd<PV0gn+
Jw@Sw;_J1Gs64?L%

literal 0
HcmV?d00001


From 36aead94e7683da9aaf46601e28267ccf386a8aa Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:23:24 -0800
Subject: [PATCH 32/41] Create ChangeLog

---
 apps/93dub/ChangeLog | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 apps/93dub/ChangeLog

diff --git a/apps/93dub/ChangeLog b/apps/93dub/ChangeLog
new file mode 100644
index 000000000..617319f8a
--- /dev/null
+++ b/apps/93dub/ChangeLog
@@ -0,0 +1 @@
+0.01 Added DiscoMinotaur's adjustments

From b9b7cfb50cfc62401a768653d9b4fd910256840c Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:23:49 -0800
Subject: [PATCH 33/41] Delete screenshot.png

---
 apps/93dub/screenshot.png | Bin 3297 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 apps/93dub/screenshot.png

diff --git a/apps/93dub/screenshot.png b/apps/93dub/screenshot.png
deleted file mode 100644
index 197c52c018739e13eb44b17b4273cc21d7e1d9f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3297
zcma)9`8yQ+*Z$0Ci0u1VQ-mgj><y8uQL>Nh`!XR65yskLOSUMIb)-S|y~#rqWy@eJ
zP2tHlwrrWf*Yo}b?+@pk>zwPHAMWd1_gS9YHq~cg5?}%VuoxQX-Z`-~|H*0k6J6aj
z?*ITZ&QMp|BFur3KZW5JJAEVL_;?Xxa>tql0!i4!9E>Q>ofT<hR?m4D_3$C>FF{nQ
zrULpJgpKxnq{zX*#?P~~zjZ{|?w>!}-}cM*XH^-1V8e97BnOBtMTyWHfiE5AYoUE{
z)UzKF1$A@8h2D%9(E!2ReFlO+yF^u8kLu&<?Ki<O8Dz^GQ5d;b6yn0`#5g1?$=QuH
zY=eGq;kD${Fq-r~>eRqUd=PMgxBx#-=l<*|FyL+j+9iVCnEKOQ&T%%=iLb3GeUAra
z>=C?yM3@lo{fNMJ0fGgx@xs5mRd!Qe4q=c@O?H3Afcz(d5d_CaoqUf!<dg+_*pODa
zh!Iy|gku*L>|T77G4{OCX*V)5rqscoA)q7Q!@k>4DIms1BT5f9DAeNvRQ%nBI-FLN
z^XPFH+Q86j`L}2w(vtoL@>W>u{CCe(7eTDrUwr7VniR~1_8)C#!h>hU`-T@DHN@i>
ze0FAbZYPdOkrEI?Fw<tfe6G)}kBv9@F7TNZ?k(pnbRss#ro4#^q&lHTGippikjoCz
zd30>yU#-D<_kwS-2qzC9Jo(iX+zAD$j;`C!Z~&Nc^OgPKF@S_+b?6&*jve;1QPq%u
z9OUv~!2oPzIcs?if&EuD4r<SXu`3$dBnES%Qw5li{4a-8@0It~`qpn_mh2JZ=v%RA
z?$eXqNX_Krm_LIqqazo5Rx3b|DQb2bH(2Q`^4@x{A98i8PpU!Eq!U+YOL4=xz4!KZ
z6^<jy3OlXgSyu*)vKMM?y9aTiLi6~Wj@@X;G!ua3n_8_Mry<pMp*IgzC`}VZu9-)J
zJ0B;%(<-Xp3M3<Y%^}&f=rclw?5yGlRg?xLCa0jkrqNQrF0)6UQAd5)Hxf_aoso&G
z_akm*&=w(<>I@(wnV2D8pVw+x8R0x9J9vd|+&b|zR;jr~w^UmM7I={mLR@W`H_pA$
z7HmgtaA2%wp8nEEygA_R#tH>AuESt#Y3mamo2E)%t%LQ}d{6mL+A?G9DEx2flv>EY
z%U;rSLAjazv-mB&mtG;FGFpv&gpqUc>bHD{IIuEG^_b7)8HQi>@vnodUlHd=3Ai-h
zBvo0pFe668>+41L?Xblj)|tXGXLfh5TOXn-hNsxRW$+kCi&=49<#Lj?t1kOkaU{fY
z**Z^`USTS#q`I7>E<iSqOAI`;1|TjG&%+KOu9>2dKB^z`p(9W@Jgn_@*H6(ip0rwj
z@V*Y(N6^q`>zr#Ei;L;tS^Pq<Ayb66Ej!j*GM1qH<SK!KI@%W2kDfm?|68nE!|?W&
zJJcqk)<;R6JlM$;W@`?)2iG-xFDHd~Ad7T7+{a~cnP4TtAZtcHwR-v1U~%kNyua+L
z^AdUr#*l-&oa_V>_zOjKU+m(ZAFSPWV*4^1&=kxY(<|@r^9|?iqIS*uoFlxB<k`sN
z@S)e+o#BhONA6{EfUt2X(Y2<AWI%WnSF^GKHmcI&emF7#GVGccx+_Rj(!0g)ug-AV
z*n^!E_it60I0DsAXZx!RXonNh+Bi>TJKYa8QNoEoZeeR2l4BU#8rkI-vHL{JswlO7
zx~QCY;nU+$QoiO|hTh%8zU^T}&Gm07#94s>+zZ1)Tgeythzfkjz$k=B&fGl(**H!%
z;le75T_J#)vfCl;umH6(ZHK2vQwjlAdZ!4iSa0)Io1e>-Rutu-kco;}W?VzGAg+n(
zE2Ge&(WS*(iTF<F5o2|bZ5v5$ccCZpA`67+)HUzX@VbR#x!bC|fx<1x2rgA;2^$%0
zN<bwwlc+rAQ<_?$nD6$SA3itf!QuJ2plysGuyZ%y%IT6yb3|LCj~o6&IwD><s(%v=
z{#D3o{HG?I@eRzY{?j&b;O>J>+5pq0S9G38?{@-{Ze~*mywgX&WPZoC(9R2N(xd@V
z300P`$4Nn_adw%>$z1Qz)kkTt<4L2nB2q~X_(U}2OQtLFFxZ&7Xn)p?`~-|Y3%utQ
zI<y?r+{jTACYjrGh@*ip3+-20mJo2&GAdZ}EdU~x?7weW0&pu!G(YVk!0PjK|201u
zJ?0Dgzl%@WX9f#AvN#$47JrBT;-LSJ@`p<gDPp+}D)0R5wn>AU>nQB`g705gSsO%I
zHZO&pZ}`CJbZ=<#V=@zpyL(&EdvZ=LBi%<U?^G3CGyU0RL1z?uZEV>NLb!ZGlQIil
zjCO`HkHkN_u)pnJoWi=T_L?=7nr9q*Rx$QdO3zz1hIK(;OtL%7CfR4iwB$-hrb;pW
zdRI8S>Y8vZRz;AUy=(QOn%<`MU43V{5>ueZP*JSI6kNEPo*yYP_JarB%s@_mSF)qR
zMDF|RPtBeY1@~x0i?f%US@IfYPS+6e&9m=)I^EMa03BJ59<uSf&MaLrUU}56x8YKu
z@ZK)E!4v(P60Mum*NJMAFyo?!^TSn@Hr;OB0nAuPKxD<^)+@RWU+Vu$K5+TJWKoH3
ze^_HDS9wg4@E(*KJvgNW=n2<zECEfl&`+ic7gIVGuwpvhmuiF=(o@`;3T0HJ(h<7O
zt;N_u&FBo&RqjV#{w1jL=6qz`^wlTJ>jGHsAskkT{rpBY*-X$3;!DB%a8>S7C<!WK
z<I9!AwToEeA@LU?^5@8<?A52_5^U(ix59>1NFMfUhSp{HP_g#d9ftyMt#mT)6oUHi
zm|D?c2z=rqNlFU7p{M<7>80fl9A+G{+LFAZb5m4E6qZQuUBW7|<9_OD+AcAw3aaWW
zCiX;lSTtW(5mK+y(~vY&<ZeC1Inzo1Z93^YRJk@Fd}^J;K!)pqZjvt~iuy^%EjqnX
zf&AUigBpE<F<s^yi_3qJD-#N-o>Vq0R}n9~-oTFWx}}N7i95!=FQ`i|Gm;%GKIiFn
z66kf^?vGXS%En|XGhRQfm`l+DtY^leuM-PxNwy?$X0ZXc#$%v*$pTEY=I_@hkp}4r
zKvf%Z?6wvH1$!6ARR_Z->+9?44f%CmeD*tr1lZtcw!NHpt4zKxs5mdqoFO?lR)Kwv
z-)Q!tgJR5LoK68@5UORAWR((0t78}Ho`j%3dcvw3<)QvdauEX~&FAWyMVy#61wUqj
zZKx1r-H2V^JKBWNjP5!EI-#Oz#vppIC4Hj`Di795mwr6pPSy@uUg9`3Oww!!dZW#)
zJ9~7#UMkWdH>M-DdPq}Xb~0Dh$Q%fjim%=@J7H(KaK4^2z!qo5=S!ckQo6QyR0;+H
zGN0Ed-Z&xi4NR~=DFCT=I5A~X09)RdYFf+<2xdlI-?&f6%RM>loeBL3v{Jve_KHX_
zt**WSdnK=f`|S^vNs9C7<yE`Sm>sH0K<`UIvie-ACbjjs>V`WSc6D+O(W03Zb47gZ
zfn_F#FI`PrXu)bFH2G4y1}k-6t|PAmd5<(e2>y8?q&Ds5Mz9i0^%~OuEe`myS6?_y
zo3w_Y3VbHVEp)im!jsn#5?7;7Hj=%2%sA}w*KU7S_Q;uHEYEb&<BIsgEoaGJB89U8
z6@1fT*dGGi2Qkn*s6E_9@#)-cvdjqzJEP*)CujnmzPo&o4F&r$rNg(LLP7KMkg=Jp
zS)Onv`6T$saR=QZv|W@!P?cZ)=Ehoob$d0j5EsnZj@NiLf{Zu_GGXiQmS*>D^q`a2
z@rS#ntxJPFRfRvVtP&&W$eybxY<j{29kB7iy0jf`1C5x6FY|T-evo9?DM@DsY4iw?
zIYZ|Jgy;iSmZb4V=#GK}=2bcI94WEo)pLhbxWHE(UYkp4G2w~<?`?Up5)rAHY)JUT
zeI6Wz7-f!ZafM0ZHTPWkLO<OB;|O%C#<esaMijw#D9ArM%!ka3RWfKc{AA+gZJjXs
zWYl6*k+p;0xEFG>E|Gg4rHSvHH=>taxeqs1Z(4JV%X#@2|M{~$WBq5p+_Un1J*Y`0
zC&p(7CRUUV<dX0u{8345kpCbGRQ0nWx<^j=X0hWDPfK##YkPmG+(R>BJ0?G(6oWzv
zBx)?IR*F*kk2p)RNq4`rqyCn-n;Tb@?I2Sfk`v}Y86m9psmf^9*}ZE%kcm5_A$u0t
ze?}`|IWbG;SV8a2nsL0rBtqa0ixbQ2c!F*HKkf<}Mh63lo|t1qkIo+$IKyO%VY?C-
zk!FXH2uHuhhyYEQqMQ^4;K;i%ns^3#D{0Yv4noL*(dvI5!E^`Ky93uHRZd<PV0gn+
Jw@Sw;_J1Gs64?L%


From 438885ae922f25a3927bc5b785f2bba64d6272ee Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:24:18 -0800
Subject: [PATCH 34/41] Add files via upload

---
 apps/93dub/screenshot.png | Bin 0 -> 3297 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/93dub/screenshot.png

diff --git a/apps/93dub/screenshot.png b/apps/93dub/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..197c52c018739e13eb44b17b4273cc21d7e1d9f3
GIT binary patch
literal 3297
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
Jw@Sw;_J1Gs64?L%

literal 0
HcmV?d00001


From 656ca2ecaa8288bfc69c9f3a1ebbbdf2b1c56f36 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:25:23 -0800
Subject: [PATCH 35/41] Update apps.json

added new version in json
---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 508bd253a..3fefba71e 100644
--- a/apps.json
+++ b/apps.json
@@ -4462,7 +4462,7 @@
    "shortName":"93 Dub",
    "icon": "93dub.png",
    "screenshots": [{"url":"screenshot.png"}],
-   "version":"0.01",
+   "version":"0.02",
    "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
    "tags": "clock",
    "type": "clock",

From bb537b1738573c756207cb883c4ed8fd95256bb0 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:27:14 -0800
Subject: [PATCH 36/41] Update ChangeLog

---
 apps/93dub/ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/93dub/ChangeLog b/apps/93dub/ChangeLog
index 617319f8a..c9e9949ed 100644
--- a/apps/93dub/ChangeLog
+++ b/apps/93dub/ChangeLog
@@ -1 +1,2 @@
-0.01 Added DiscoMinotaur's adjustments
+0.01 Initial version for upload
+0.02 DiscoMinotaur's adjustments (removed battery and adjusted spacing)

From f423a6b91bbd698e72fa6a7cc002b068f506e291 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:54:17 -0800
Subject: [PATCH 37/41] Update app.js

---
 apps/93dub/app.js | 123 ++++++++++++++++++++++++----------------------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/apps/93dub/app.js b/apps/93dub/app.js
index 516360043..92544304c 100644
--- a/apps/93dub/app.js
+++ b/apps/93dub/app.js
@@ -48,72 +48,75 @@ function queueDraw() {
 }
 
 function drawBackground() {
-// set background
-g.setBgColor(0,0,0);
-g.setColor(1,1,1);
-g.clear();
-g.drawImage(imgBg,0,0);
-g.reset();
+  g.setBgColor(0,0,0);
+  g.setColor(1,1,1);
+  g.clear();
+  g.drawImage(imgBg,0,0);
+  g.reset();
 }
 
 function draw(){
-drawBackground();
-var date = new Date();
-var h = date.getHours(), m = date.getMinutes();
-var d = date.getDate(), w = date.getDay();
-g.reset();
-g.setBgColor(0,0,0);
-g.setColor(1,1,1);
+  drawBackground();
+  var date = new Date();
+  var h = date.getHours(), m = date.getMinutes();
+  var d = date.getDate(), w = date.getDay();
+  g.reset();
+  g.setBgColor(0,0,0);
+  g.setColor(1,1,1);
 
-//draw 24 hr indicator and 12 hr specific behavior
-if (is24hr){
-g.drawImage(img24hr,32, 65);
-if (leadingZero){
-                   h = ("0"+h).substr(-2);}}
-else if (h > 12) {g.drawImage(imgPM,40, 70);
-                 h = h - 12;
-                  if (leadingZero){
-                   h = ("0"+h).substr(-2);}
-                    else
-                   {h = " " + h;}
-                 }
-
-//draw separator
-if (separator){
-g.drawImage(imgSep, 85,98);}
-
-//draw day of week
-var imgW = null;
-if (w == 0) {imgW = imgSun;}
-if (w == 1) {imgW = imgMon;}
-if (w == 2) {imgW = imgTue;}
-if (w == 3) {imgW = imgWed;}
-if (w == 4) {imgW = imgThr;}
-if (w == 5) {imgW = imgFri;}
-if (w == 6) {imgW = imgSat;}
-g.drawImage(imgW, 85, 63);
-
-
-// draw nums
-// draw time
-g.setColor(0,0,0);
-g.setBgColor(1,1,1);
-g.setFontCustom(fontNum, 48, 28, 41);
-if (h<10) {
-  if (leadingZero) {
-    h = ("0"+h).substr(-2);
+  //draw 24 hr indicator and 12 hr specific behavior
+  if (is24hr){
+    g.drawImage(img24hr,32, 65);
+    if (leadingZero){
+      h = ("0"+h).substr(-2);
+      }
+  } else if (h > 12) {
+    g.drawImage(imgPM,40, 70);
+    h = h - 12;
+    if (leadingZero){
+      h = ("0"+h).substr(-2);
+    } else {
+      h = " " + h;
     }
-  else {h = " " + h;}
-}
-g.drawString(h, 25, 90, true);
-g.drawString(("0"+m).substr(-2), 92, 90, true);
-// draw date
-g.setFontCustom(fontDate, 48, 12, 15);
-g.drawString(("0"+d).substr(-2), 123,63, true);
+  }
 
-// widget redraw
-Bangle.drawWidgets();
-queueDraw();
+  //draw separator
+  if (separator){
+  g.drawImage(imgSep, 85,98);}
+
+  //draw day of week
+  var imgW = null;
+  if (w == 0) {imgW = imgSun;}
+  if (w == 1) {imgW = imgMon;}
+  if (w == 2) {imgW = imgTue;}
+  if (w == 3) {imgW = imgWed;}
+  if (w == 4) {imgW = imgThr;}
+  if (w == 5) {imgW = imgFri;}
+  if (w == 6) {imgW = imgSat;}
+  g.drawImage(imgW, 85, 63);
+
+
+  // draw nums
+  // draw time
+  g.setColor(0,0,0);
+  g.setBgColor(1,1,1);
+  g.setFontCustom(fontNum, 48, 28, 41);
+  if (h<10) {
+    if (leadingZero) {
+      h = ("0"+h).substr(-2);
+    } else {
+      h = " " + h;
+    }
+  }
+  g.drawString(h, 25, 90, true);
+  g.drawString(("0"+m).substr(-2), 92, 90, true);
+  // draw date
+  g.setFontCustom(fontDate, 48, 12, 15);
+  g.drawString(("0"+d).substr(-2), 123,63, true);
+
+  // widget redraw
+  Bangle.drawWidgets();
+  queueDraw();
 }
 
 

From 590f022a91c430a832df0d9c64d9cde837b82cdf Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:55:32 -0800
Subject: [PATCH 38/41] Update ChangeLog

---
 apps/93dub/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/93dub/ChangeLog b/apps/93dub/ChangeLog
index c9e9949ed..375e60d49 100644
--- a/apps/93dub/ChangeLog
+++ b/apps/93dub/ChangeLog
@@ -1,2 +1,3 @@
 0.01 Initial version for upload
 0.02 DiscoMinotaur's adjustments (removed battery and adjusted spacing)
+0.03 Style cleanup

From ada93e894d76497dd48956020cd3dc3649441dbf Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:55:46 -0800
Subject: [PATCH 39/41] Update ChangeLog

---
 apps/93dub/ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/93dub/ChangeLog b/apps/93dub/ChangeLog
index 375e60d49..e7423b2c9 100644
--- a/apps/93dub/ChangeLog
+++ b/apps/93dub/ChangeLog
@@ -1,3 +1,3 @@
 0.01 Initial version for upload
 0.02 DiscoMinotaur's adjustments (removed battery and adjusted spacing)
-0.03 Style cleanup
+0.03 Code style cleanup

From 050b9c2b807c5e66405a8549bbfa47e4a1421f33 Mon Sep 17 00:00:00 2001
From: leer10 <brandon.abbott@charter.net>
Date: Sun, 28 Nov 2021 14:56:18 -0800
Subject: [PATCH 40/41] Update apps.json

---
 apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps.json b/apps.json
index 3fefba71e..af798e293 100644
--- a/apps.json
+++ b/apps.json
@@ -4462,7 +4462,7 @@
    "shortName":"93 Dub",
    "icon": "93dub.png",
    "screenshots": [{"url":"screenshot.png"}],
-   "version":"0.02",
+   "version":"0.03",
    "description": "Fan recreation of orviwan's 91 Dub app for the Pebble smartwatch. Uses assets from his 91-Dub-v2.0 repo",
    "tags": "clock",
    "type": "clock",

From d4f1e7d3cb2d79bb69405e46300afcf2eedaf4c7 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Mon, 29 Nov 2021 09:52:47 +0000
Subject: [PATCH 41/41] minor fixes for #952

---
 apps/locale/locale.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/locale/locale.html b/apps/locale/locale.html
index 25acb2fff..90a2e8d40 100644
--- a/apps/locale/locale.html
+++ b/apps/locale/locale.html
@@ -181,7 +181,7 @@ function round(n) {
 var is12;
 function getHours(d) {
   var h = d.getHours();
-  if (is12==undefined) is12 = (require('Storage',1).readJSON('setting.json')||{})["12hour"];
+  if (is12===undefined) is12 = (require('Storage').readJSON('setting.json',1)||{})["12hour"];
   if (!is12) return h;
   return (h%12==0) ? 12 : h%12;
 }