Add config support with hourly vs daily statistics toggle, Fix issue 1

Author: lankavitharana

ClockClassic/app/index.js

@@ -1,20 +1,10 @@
 import clock from "clock";
 import document from "document";
 import * as health from "user-activity";
-import {HeartRateSensor} from "heart-rate";
-import {display} from "display";
-import {vibration} from "haptics";
-import {peerSocket} from "messaging";
-import {units} from "user-settings";
-import * as fs from "fs";
 import {battery} from "power";
-import {decode} from "cbor";
-import {inbox} from "file-transfer";
-
-const THEMES = {
-  white: ["FFFFFF", "FFFFFF", "FFFFFF"]
-};
-let weekNames = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"];
+import * as messaging from "messaging";
+import document from "document";
+import * as simpleSettings from "./simple/device-settings";
 
 var myDate = $("mydate");
 var myTime = $("mytime");
@@ -25,6 +15,8 @@ var mySteps = $("mysteps");
 var batColor = $("batColor");
 var batText = $("batText");
 var myCal = $("mycal");
+var hourlyStats = false
+
 
 function $(s) {
   return document.getElementById(s);
@@ -53,7 +45,7 @@ function formatAMPM(date) {
   var ampm = hours >= 12 ? 'pm' : 'am';
   hours = hours % 12;
   hours = hours ? hours : 12; // the hour '0' should be '12'
-  minutes = minutes < 10 ? '0'+minutes : minutes;
+  minutes = minutes < 10 ? '0' + minutes : minutes;
   var strTime = hours + ':' + minutes + ' ' + ampm;
   return strTime;
 }
@@ -62,7 +54,21 @@ function numberWithCommas(x) {
     return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
 
-function updateSteps() {
+function updateSteps(mins) {
+  if(hourlyStats) {
+    const minuteRecords = health.minuteHistory.query({ limit: mins });
+    let stepsThisHour = 0;
+    let caloriesThisHour = 0;
+    
+    minuteRecords.forEach((minute, index) => {
+      stepsThisHour += (minute.steps || 0);
+      caloriesThisHour += (minute.calories || 0);
+    });
+    mySteps.text = numberWithCommas(stepsThisHour);
+    myCal.text = numberWithCommas(caloriesThisHour);;
+    return;
+  }
+  
   let today = health.today.adjusted;
   mySteps.text = numberWithCommas(today.steps);
   myCal.text = numberWithCommas(today.calories);;
@@ -73,14 +79,14 @@ function onTick() {
   myDate.text = formatDate(now);
   myTime.text = formatAMPM(now);
 
-  updateSteps();
-
   let hours = now.getHours() % 12;
   let mins = now.getMinutes();
   let secs = now.getSeconds();
-  myHours.groupTransform.rotate.angle = (hours + mins/60)*30;
-  myMins.groupTransform.rotate.angle = mins*6;
-  mySecs.groupTransform.rotate.angle = secs*6;
+  myHours.groupTransform.rotate.angle = (hours + mins / 60) * 30;
+  myMins.groupTransform.rotate.angle = mins * 6;
+  mySecs.groupTransform.rotate.angle = secs * 6;
+  
+  updateSteps(mins);
 
   let chrg = battery.chargeLevel;
 
@@ -94,10 +100,17 @@ function onTick() {
     batColor.style.fill = "#58aae2";
   }
 
-  batColor.width = Math.ceil((36 * chrg)/100);
+  batColor.width = Math.ceil((36 * chrg) / 100);
 }
 
+function settingsCallback(data) {
+  if (!data) {
+    return;
+  }
+  hourlyStats = data.hourlyStats;
+}
+simpleSettings.initialize(settingsCallback);
 
 
 clock.granularity = "seconds";
-clock.ontick = onTick;
+clock.addEventListener("tick", onTick);

ClockClassic/app/simple/device-settings.js

@@ -0,0 +1,34 @@
+import { me } from "appbit";
+import { me as device } from "device";
+import * as fs from "fs";
+import * as messaging from "messaging";
+
+const SETTINGS_TYPE = "cbor";
+const SETTINGS_FILE = "settings.cbor";
+
+let settings, onsettingschange;
+
+export function initialize(callback) {
+  settings = loadSettings();
+  onsettingschange = callback;
+  onsettingschange(settings);
+}
+
+messaging.peerSocket.addEventListener("message", function(evt) {
+  settings[evt.data.key] = evt.data.value;
+  onsettingschange(settings);
+})
+
+me.addEventListener("unload", saveSettings);
+
+function loadSettings() {
+  try {
+    return fs.readFileSync(SETTINGS_FILE, SETTINGS_TYPE);
+  } catch (ex) {
+    return {};
+  }
+}
+
+function saveSettings() {
+  fs.writeFileSync(SETTINGS_FILE, settings, SETTINGS_TYPE);
+}

ClockClassic/companion/index.js

@@ -0,0 +1,3 @@
+import * as simpleSettings from "./simple/companion-settings";
+
+simpleSettings.initialize();

ClockClassic/companion/simple/companion-settings.js

@@ -0,0 +1,27 @@
+import * as messaging from "messaging";
+import { settingsStorage } from "settings";
+
+export function initialize() {
+  settingsStorage.addEventListener("change", evt => {
+    if (evt.oldValue !== evt.newValue) {
+      sendValue(evt.key, evt.newValue);
+    }
+  });
+}
+
+function sendValue(key, val) {
+  if (val) {
+    sendSettingData({
+      key: key,
+      value: JSON.parse(val)
+    });
+  }
+}
+
+function sendSettingData(data) {
+  if (messaging.peerSocket.readyState === messaging.peerSocket.OPEN) {
+    messaging.peerSocket.send(data);
+  } else {
+    console.log("No peerSocket connection");
+  }
+}

ClockClassic/package.json

@@ -1,4 +1,7 @@
 {
+  "devDependencies": {
+    "@fitbit/sdk": "~4.2.0"
+  },
   "fitbit": {
     "appUUID": "5cd3d22e-5ff8-47dd-9cae-7d8ffa0d82dc",
     "appType": "clockface",
@@ -11,16 +14,16 @@
       "access_exercise"
     ],
     "buildTargets": [
+      "meson",
+      "gemini",
+      "mira",
       "higgs"
     ],
     "i18n": {
-      "en": {
+      "en-US": {
         "name": "ClockClassic"
       }
     },
     "defaultLanguage": "en-US"
-  },
-  "devDependencies": {
-    "@fitbit/sdk": "~4.1.0"
   }
 }

ClockClassic/settings/index.jsx

@@ -0,0 +1,15 @@
+function ClockSettings(props) {
+  return (
+    <Page>
+      <Section
+        title={<Text bold align="center">Clock Settings</Text>}>
+        <Toggle
+          settingsKey="hourlyStats"
+          label="Hourly Stats"
+        />
+      </Section>
+    </Page>
+  );
+}
+
+registerSettingsPage(ClockSettings);