Merge pull request #3404 from aGoodUsername/master

fuzzyw: add toggle for animation + minor bug fixes

apps/fuzzyw/ChangeLog

@@ -2,3 +2,4 @@
 0.02: Move translations to locale module (removed watch settings, now pick language in Bangle App Loader, More..., Settings)
 0.03: Change for fast loading, use widget_utils to hide widgets 
 0.04: Add animation when display changes
+0.05: Add toggle for animation + minor bug fixes

apps/fuzzyw/README.md

@@ -11,6 +11,7 @@ Translations are supported to get the time in the language of your choice! To ch
 *  nn_NO - Norwegian Nynorsk (thank you zerodogg)
 *  sv_SE - Swedish
 *  de_DE - German
+*  da_DK - Danish
 
 Most translations are taken from the original Fuzzy Text International code.
 

apps/fuzzyw/fuzzyw.app.js

@@ -40,9 +40,10 @@ let animInterval;
   let time_string = "";
   let time_string_old = "";
   let time_string_old_wrapped = "";
+  let settings = {};
 
   let loadSettings = function() {
-  settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false};
+    settings = require("Storage").readJSON(SETTINGS_FILE,1)|| {'showWidgets': false, 'animate': true};
   };
 
   let queueDraw = function(seconds) {
@@ -57,7 +58,8 @@ let queueDraw = function(seconds) {
   let getTimeString = function(date) {
     let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300);
     let hour = date.getHours() + Math.floor(segment/12);
-  f_string = fuzzy_string.minutes[segment % 12];
+    // add "" to load into RAM due to 2v21 firmware .replace on flashstring issue
+    let f_string = ""+fuzzy_string.minutes[segment % 12]; 
     if (f_string.includes('$1')) {
       f_string = f_string.replace('$1', fuzzy_string.hours[(hour) % 12]);
     } else {
@@ -71,7 +73,11 @@ let draw = function() {
     //print(time_string);
     if (time_string != time_string_old) {
       g.setFont('Vector', R.h/text_scale).setFontAlign(0, 0);
+      if (settings.animate) {
         animate(3);
+      } else {
+        quickDraw();
+      }
     }
     queueDraw(timeout);
   };
@@ -79,13 +85,14 @@ let draw = function() {
   let animate = function(step) {
     if (animInterval) clearInterval(animInterval);
     let time_string_new_wrapped = g.wrapString(time_string, R.w).join("\n");
-  slideX = 0;
+    let slideX = 0;
+    //don't let pulling the drawer change y
+    let text_y = R.y + R.h/2;
     animInterval = setInterval(function() {
-    let time_start = getTime()
       //blank old time
       g.setColor(g.theme.bg);
-    g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, R.y + R.h/2);
-    g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, R.y + R.h/2);
+      g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, text_y);
+      g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, text_y);
       g.setColor(g.theme.fg);
       slideX += step;
       let stop = false;
@@ -94,18 +101,27 @@ let animate = function(step) {
         stop = true;
       }
       //draw shifted new time
-    g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, R.y + R.h/2);
-    g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, R.y + R.h/2);
+      g.drawString(time_string_old_wrapped, R.x + R.w/2 + slideX, text_y);
+      g.drawString(time_string_new_wrapped, R.x - R.w/2 + slideX, text_y);
       if (stop) {
         time_string_old = time_string;
         clearInterval(animInterval);
         animInterval=undefined;
         time_string_old_wrapped = time_string_new_wrapped;
       }
-    print(Math.round((getTime() - time_start)*1000))
+      //print(Math.round((getTime() - time_start)*1000));
     }, 30);
   };
 
+  let quickDraw = function() {
+    let time_string_new_wrapped = g.wrapString(time_string, R.w).join("\n");
+    g.setColor(g.theme.bg);
+    g.drawString(time_string_old_wrapped, R.x + R.w/2, R.y + R.h/2);
+    g.setColor(g.theme.fg);
+    g.drawString(time_string_new_wrapped, R.x + R.w/2, R.y + R.h/2);
+    time_string_old_wrapped = time_string_new_wrapped;
+  };
+
   g.clear();
   loadSettings();
 
@@ -138,6 +154,6 @@ if (settings.showWidgets) {
     require("widget_utils").swipeOn(); // hide widgets, make them visible with a swipe
   }
 
-R = Bangle.appRect;
+  let R = Bangle.appRect;
   draw();
 }

apps/fuzzyw/fuzzyw.settings.js

@@ -1,32 +1,39 @@
 (function(back) {
-  const SETTINGS_FILE = "fuzzy.settings.json";
+  const SETTINGS_FILE = "fuzzyw.settings.json";
 
   // initialize with default settings...
-  let s = {'showWidgets': false}
+  let s = {'showWidgets': false, 'animate': true};
 
   // ...and overwrite them with any saved values
   // This way saved values are preserved if a new version adds more settings
-  const storage = require('Storage')
+  const storage = require('Storage');
   let settings = storage.readJSON(SETTINGS_FILE, 1) || s;
-  const saved = settings || {}
+  const saved = settings || {};
   for (const key in saved) {
-    s[key] = saved[key]
+    s[key] = saved[key];
   }
 
   function save() {
-    settings = s
-    storage.write(SETTINGS_FILE, settings)
+    settings = s;
+    storage.write(SETTINGS_FILE, settings);
   }
 
   E.showMenu({
     '': { 'title': 'Fuzzy Word Clock' },
     '< Back': back,
     'Show Widgets': {
-      value: settings.showWidgets,
+      value: s.showWidgets,
       onchange: () => {
-        settings.showWidgets = !settings.showWidgets;
+        s.showWidgets = !s.showWidgets;
         save();
       }
     },
+    'Animate': {
+      value: s.animate,
+      onchange: () => {
+        s.animate = !s.animate;
+        save();
+      }
+    }
   });
 })

apps/fuzzyw/metadata.json

@@ -2,7 +2,7 @@
   "id":"fuzzyw",
   "name":"Fuzzy Text Clock",
   "shortName": "Fuzzy Text",
-  "version": "0.04",
+  "version": "0.05",
   "description": "An imprecise clock for when you're not in a rush",
   "readme": "README.md",
   "icon":"fuzzyw.png",