Merge pull request #6 from aidanblack/Arabic-Numerals

Add option for Arabic numerals
aidanblack · Aug 18, 2022 · 18140a0 · 18140a0
2 parents ed21b9f + 01a54ff
commit 18140a0
Show file tree

Hide file tree

Showing 8 changed files with 7,325 additions and 1,307 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ debug.log
 build/app.fba
 node_modules/
 companion/weather.js
+build/app.fba
diff --git a/app/face.js b/app/face.js
@@ -1,5 +1,6 @@
 import { display } from "display";
 import document from "document";
+import { boolean } from "fp-ts";
 
 class Face {
     settings;
@@ -15,12 +16,25 @@ class Face {
     }
 
     updateDisplay() {
+        // Which clock face is active?
+        var roman = true;
+        if(this.settings.arabicNumerals) {
+            document.getElementById("numbers").style.visibility = "visible";
+            document.getElementById("numerals").style.visibility = "hidden";
+            roman = false;
+        }
+        else {
+            document.getElementById("numbers").style.visibility = "hidden";
+            document.getElementById("numerals").style.visibility = "visible";
+        }
+
         // Is AOD inactive and the display is on?
         if (!display.aodActive && display.on) {
             document.getElementsByClassName("tertiary").forEach((item, index) => {
                 item.style.visibility = "visible";
             });
-            document.getElementById("numbers").style.visibility = "visible";
+            if(roman) document.getElementById("numerals").style.visibility = "visible";
+            else document.getElementById("numbers").style.visibility = "visible";
             document.getElementById("seconds").style.visibility = "visible";
             document.getElementById("steps").style.visibility = "visible";
             document.getElementById("distance").style.visibility = "visible";
@@ -30,6 +44,7 @@ class Face {
             document.getElementsByClassName("tertiary").forEach((item, index) => {
                 item.style.visibility = "hidden";
             });
+            document.getElementById("numerals").style.visibility = "hidden";
             document.getElementById("numbers").style.visibility = "hidden";
             document.getElementById("seconds").style.visibility = "hidden";
             document.getElementById("steps").style.visibility = "hidden";
@@ -41,42 +56,51 @@ class Face {
         if (!this.settings.hideDate) {
             this.dateBox.style.visibility = "visible";
             document.getElementById("iii").style.visibility = "hidden";
+            document.getElementById("3").style.visibility = "hidden";
         }
         else if (this.settings.hideDate && !display.aodActive && display.on) {
             this.dateBox.style.visibility = "hidden";
-            document.getElementById("iii").style.visibility = "visible";
+            document.getElementById("iii").style.visibility = "inherit";
+            document.getElementById("3").style.visibility = "inherit";
         }
         else {
             this.dateBox.style.visibility = "hidden";
             document.getElementById("iii").style.visibility = "hidden";
+            document.getElementById("3").style.visibility = "hidden";
         }
 
         // Weather
         if (!this.settings.hideWeather && !display.aodActive && display.on) {
             document.getElementById("weatherBox").style.visibility = "visible";
             document.getElementById("ix").style.visibility = "hidden";
+            document.getElementById("9").style.visibility = "hidden";
         }
         else if (this.settings.hideWeather && !display.aodActive && display.on) {
             document.getElementById("weatherBox").style.visibility = "hidden";
-            document.getElementById("ix").style.visibility = "visible";
+            if(roman) document.getElementById("ix").style.visibility = "inherit";
+            else document.getElementById("9").style.visibility = "inherit";
         }
         else {
             document.getElementById("weatherBox").style.visibility = "hidden";
             document.getElementById("ix").style.visibility = "hidden";
+            document.getElementById("9").style.visibility = "hidden";
         }
 
         // Heart Rate
         if (!this.settings.hideHeartRate && !display.aodActive && display.on) {
             document.getElementById("heartrateBox").style.visibility = "visible";
             document.getElementById("vi").style.visibility = "hidden";
+            document.getElementById("6").style.visibility = "hidden";
         }
         else if (this.settings.hideHeartRate && !display.aodActive && display.on) {
             document.getElementById("heartrateBox").style.visibility = "hidden";
-            document.getElementById("vi").style.visibility = "visible";
+            if(roman) document.getElementById("vi").style.visibility = "inherit";
+            else document.getElementById("6").style.visibility = "inherit";
         }
         else {
             document.getElementById("heartrateBox").style.visibility = "hidden";
             document.getElementById("vi").style.visibility = "hidden";
+            document.getElementById("6").style.visibility = "hidden";
         }
         if (!this.settings.hideHeartRate && !display.aodActive && display.on && this.body.present) {
             document.getElementById("bpm").style.visibility = "visible";

diff --git a/app/index.js b/app/index.js
@@ -15,7 +15,7 @@ import Goals from "./goals";
 // ***** Settings *****
 console.log("set up settings");
 
-const settings;
+var settings;
 
 function settingsCallback(data) {
   settings = data;
@@ -54,7 +54,7 @@ console.log("initialize body and heart rate");
 
 const heartRate = document.getElementById("heartRate");
 const body = null;
-const hrm;
+var hrm;
 
 function processHeartRate() {
   if (!settings.hideHeartRate && display.on) {

diff --git a/build/app.fba b/build/app.fba