Merge remote-tracking branch 'upstream/master' into spotrem

Author: thyttan

apps/banglexercise/ChangeLog

@@ -5,3 +5,4 @@
 0.03: Add software back button on main menu
 0.04: Minor code improvements
 0.05: Minor code improvements
+0.06: Fix grammar, add international language support

apps/banglexercise/app.js

@@ -24,7 +24,7 @@ let exerciseType = {
 // add new exercises here:
 const exerciseTypes = [{
     "id": "pushup",
-    "name": "push ups",
+    "name": /*LANG*/"Push-ups",
     "useYaxis": true,
     "useZaxis": false,
     "threshold": 2500,
@@ -34,7 +34,7 @@ const exerciseTypes = [{
   },
   {
     "id": "curl",
-    "name": "curls",
+    "name": /*LANG*/"Curls",
     "useYaxis": true,
     "useZaxis": false,
     "threshold": 2500,
@@ -44,7 +44,7 @@ const exerciseTypes = [{
   },
   {
     "id": "situp",
-    "name": "sit ups",
+    "name": /*LANG*/"Sit-ups",
     "useYaxis": false,
     "useZaxis": true,
     "threshold": 3500,
@@ -88,7 +88,7 @@ function showMainMenu() {
     menu["--------"] = {
       value: ""
     };
-    menu["Last:"] = {
+    menu[/*LANG*/"Last:"] = {
       value: exerciseCounter + " " + exerciseType.name
     };
   }
@@ -189,10 +189,10 @@ function isValidExercise(slope, t) {
       if (p1 > 0 && p2 < 0) {
         if (lastZeroPassCameFromPositive == false) {
           lastExerciseHalfCompletionTime = t;
-          console.log(t, exerciseName + " half complete...");
+          console.log(t, exerciseName + /*LANG*/" half complete...");
 
           layout.progress.label = "½";
-          layout.recording.label = "TRAINING";
+          layout.recording.label = /*LANG*/"TRAINING";
           g.clear();
           layout.render();
         }
@@ -204,7 +204,7 @@ function isValidExercise(slope, t) {
         if (lastZeroPassCameFromPositive == true) {
           const tDiffLastExercise = t - lastExerciseCompletionTime;
           const tDiffStart = t - tStart;
-          console.log(t, exerciseName + " maybe complete?", Math.round(tDiffLastExercise), Math.round(tDiffStart));
+          console.log(t, exerciseName + /*LANG*/" maybe complete?", Math.round(tDiffLastExercise), Math.round(tDiffStart));
 
           // check minimal time between exercises:
           if ((lastExerciseCompletionTime <= 0 && tDiffStart >= thresholdMinTime) || tDiffLastExercise >= thresholdMinTime) {
@@ -222,34 +222,34 @@ function isValidExercise(slope, t) {
 
                 layout.count.label = exerciseCounter;
                 layout.progress.label = "";
-                layout.recording.label = "Good!";
+                layout.recording.label =/*LANG*/"Good!";
 
                 g.clear();
                 layout.render();
 
                 if (settings.buzz)
                   Bangle.buzz(200, 0.5);
               } else {
-                console.log(t, exerciseName + " too quick for duration time threshold!"); // thresholdMinDurationTime
+                console.log(t, exerciseName + /*LANG*/" too quick for duration time threshold!"); // thresholdMinDurationTime
                 lastExerciseCompletionTime = t;
 
-                layout.recording.label = "Go slower!";
+                layout.recording.label = /*LANG*/"Go slower!";
                 g.clear();
                 layout.render();
               }
             } else {
-              console.log(t, exerciseName + " top slow for time threshold!"); // thresholdMaxTime
+              console.log(t, exerciseName + /*LANG*/" top slow for time threshold!"); // thresholdMaxTime
               lastExerciseCompletionTime = t;
 
-              layout.recording.label = "Go faster!";
+              layout.recording.label = /*LANG*/"Go faster!";
               g.clear();
               layout.render();
             }
           } else {
-            console.log(t, exerciseName + " too quick for time threshold!"); // thresholdMinTime
+            console.log(t, exerciseName + /*LANG*/" too quick for time threshold!"); // thresholdMinTime
             lastExerciseCompletionTime = t;
 
-            layout.recording.label = "Go slower!";
+            layout.recording.label = /*LANG*/"Go slower!";
             g.clear();
             layout.render();
           }
@@ -337,15 +337,15 @@ function startTraining() {
         type: "txt",
         id: "recording",
         font: "6x8:2",
-        label: "TRAINING",
+        label: /*LANG*/"TRAINING",
         bgCol: "#f00",
         pad: 5,
         fillx: 1
       },
     ]
   }, {
     btns: [{
-      label: "STOP",
+      label: /*LANG*/"STOP",
       cb: () => {
         stopTraining();
       }

apps/banglexercise/metadata.json

@@ -1,12 +1,12 @@
 { "id": "banglexercise",
   "name": "BanglExercise",
   "shortName":"BanglExercise",
-  "version": "0.05",
-  "description": "Can automatically track exercises while wearing the Bangle.js watch.",
+  "version": "0.06",
+  "description": "Automatically tracks exercises while wearing the Bangle.js watch.",
   "icon": "app.png",
   "screenshots": [{"url":"screenshot.png"}],
   "type": "app",
-  "tags": "sport",
+  "tags": "health",
   "supports" : ["BANGLEJS2"],
   "allow_emulator":true,
   "readme": "README.md",

apps/clock_info/ChangeLog

@@ -18,4 +18,5 @@
 0.17: Fix BLE icon alignment and border on some clocks
 0.18: Tweak BLE icon to add gap and ensure middle of B isn't filled
 0.19: Fix Altitude ClockInfo after BLE added
-      Tapping Altitude now updates the reading
+      Tapping Altitude now updates the reading
+0.20: Altitude ClockInfo now uses the distance units set in locale.

apps/clock_info/lib.js

@@ -49,7 +49,8 @@ exports.load = function() {
     try {
       Bangle.getPressure().then(data=>{
         if (!data) return;
-        alt = Math.round(data.altitude) + "m";
+
+        alt =require("locale").distance(data.altitude);
         bangleItems.find(i=>i.name=="Altitude").emit("redraw");
       });
     } catch (e) {

apps/clock_info/metadata.json

@@ -1,7 +1,7 @@
 { "id": "clock_info",
   "name": "Clock Info Module",
   "shortName": "Clock Info",
-  "version":"0.19",
+  "version":"0.20",
   "description": "A library used by clocks to provide extra information on the clock face (Altitude, BPM, etc)",
   "icon": "app.png",
   "type": "module",

apps/flux/ChangeLog

@@ -0,0 +1 @@
+0.01: New App!

apps/flux/README.md

@@ -0,0 +1,35 @@
+# Flux Watchface
+
+This app slightly resembles Apples "Flux" watchface.
+
+## Usage
+
+Install it and set it as your default clock.
+It currently has no widget support. In the future, widgets will be a toggle in the settings.
+You can change the colors in the settings.
+
+## Features
+
+- Customizeable themes (4 color inputs)
+- Random number alignment (every minute or on reload)
+- 24h clock (12h not yet supported)
+- Power-saving mode
+- Color filling effect in 2 directions (`Left > Right` and `Right > Left` are currently unsupported.)
+- 12 different colors
+
+## Controls
+
+BTN to go to launcher. No other mappings.
+
+## Requests
+
+If you have a feature request or a bug, please message me at [[email protected]](mailto:[email protected] "Click to send an email").
+
+## Creator
+
+Yanis Ocaña, sossinay
+[pixelnet.ocaña.ch](https://pixelnet.ocaña.ch)
+
+## Known issues
+- When loading the app in the first 2 seconds of a minute, the numbers fly in from a seemingly random position
+- `Left > Right` and `Right > Left` are currently unsupported