Merge remote-tracking branch 'RKBoss6/master' into app-loader

Author: thyttan

apps/bigclkinfo/README.md

@@ -12,6 +12,8 @@ Interact with it like one big clock info, which it is!
 
 ## Settings
 
+Change the background from `Settings -> Apps -> Backgrounds`
+
 TBA: Should the app be treated as a clock face app?
 TBA: Should the app remember last open clock info menu position between launches?
 

apps/bigclkinfo/app.js

@@ -10,18 +10,24 @@ if (isClock) {
 // once at the start
 let background = require("clockbg");
 let clock_info = require("clock_info");
+const R = Bangle.appRect;
+let txtg = Graphics.createArrayBuffer(R.w>>1, 32, 2);
+txtg.transparent = 0;
+txtg.palette = new Uint16Array([0,g.theme.bg,g.theme.bg,g.theme.fg]);
 
 // Load the clock infos
 let clockInfoItems = clock_info.load();
-if (clockInfoItems[0].items[6]) { // TODO: Should maybe be more robust against changes to clock info, i.e. search for "clock" among items.
-  let clockItem = clockInfoItems[0].items.pop();
-  clockInfoItems[0].items.unshift(clockItem);
+let clockInfoClockIdx = clockInfoItems[0].items.findIndex(c => c.name=="Clock");
+if (clockInfoClockIdx>=0) { // pull the clock to the front
+  let clockInfoClock = clockInfoItems[0].items[clockInfoClockIdx];
+  clockInfoItems[0].items.splice(clockInfoClockIdx,1); // remove
+  clockInfoItems[0].items.unshift(clockInfoClock); // add to front
 }
 // Add the
 let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
   app: "bigclkinfo",
   // Add the dimensions we're rendering to here - these are used to detect taps on the clock info area
-  x : 0, y: 0, w: Bangle.appRect.w, h: Bangle.appRect.h,  // You can add other information here you want to be passed into 'options' in 'draw'
+  x : 0, y: 0, w: R.w, h: R.h,  // You can add other information here you want to be passed into 'options' in 'draw'
   // This function draws the info
   draw : (itm, info, options) => {
     // itm: the item containing name/hasRange/etc
@@ -36,17 +42,32 @@ let clockInfoMenu = clock_info.addInteractive(clockInfoItems, {
     var midx = options.x+options.w/2;
     let scale = 4;
     if (info.img) clock_info.drawBorderedImage(info.img, midx-12*scale,options.y+10, {scale:scale}); // draw the image
-    let foundFontText = g.findFont(info.text, {
-      w : options.w-9,    // optional: width available (default = screen width)
-      h : options.h*2/5,    // optional: height available (default = screen height)
+    let foundFontText = txtg.findFont(info.text, {
+      w : txtg.getWidth()-4,    // optional: width available (default = screen width)
+      h : txtg.getHeight()-4,    // optional: height available (default = screen height)
       min : 10,   // optional: min font height
-      max : 60,   // optional: max font height
+      max : 24,   // optional: max font height
       wrap : true, // optional: allow word wrap?
       trim : true // optional: trim to the specified height, add '...'
     }); // TODO: g.findFont returns max size 28px. Would be nice with bigger font if there's room.
     //print(foundFontText);
-    g.setFont(foundFontText.font).setFontAlign(0,1).drawString(foundFontText.text, midx,options.y+165); // draw the text
+    txtg.clear(1);
+    txtg.setFont(foundFontText.font).setFontAlign(0,1);
+    txtg.drawString(foundFontText.text, txtg.getWidth()/2, txtg.getHeight()-2); 
+    txtg.filter([ // a gaussian filter
+        0, 1, 1, 1, 0,
+        1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1,
+        0, 1, 1, 1, 0,
+    ], { w:5, h:5, div:1, max:1, filter:"max" });
+    g.drawImage(txtg, 0, R.h - txtg.getHeight()*2-4, {scale:2});
   }
 });
 
+Bangle.on("lock", function(locked) {
+  // ensure that when unlocked, we automaticlly focus the clockinfo
+  if (!locked && !clockInfoMenu.focus)
+    Bangle.emit("touch",0,{x:100,y:100});
+});
 E.prependListener("kill", ()=>{clockInfoMenu.menuA = 0; clockInfoMenu.menuB = 0;}) // reset to initial menu state to prepare for next launch.

apps/bigclkinfo/metadata.json

@@ -5,6 +5,7 @@
   "author": "thyttan",
   "description": "One single big clock info. Full screen.",
   "icon": "icon.png",
+  "screenshots" : [ { "url":"screenshot.png" }],
   "type": "clock",
   "tags": "clock,clkinfo,clk_info",
   "supports" : ["BANGLEJS2"],
@@ -14,7 +15,6 @@
     "clkinfoclk":"app",
     "clockbg":"module"
   },
-
   "storage": [
     {"name":"bigclkinfo.app.js","url":"app.js"},
     {"name":"bigclkinfo.img","url":"app-icon.js","evaluate":true}

apps/bigclkinfo/screenshot.png

@@ -21,4 +21,5 @@
       Tapping Altitude now updates the reading
 0.20: Altitude ClockInfo now uses the distance units set in locale.
 0.21: Add haptics when changing infos and a setting to toggle it on or off
-0.22: Tapping on step counter now disable step counting on 2v29+ firmwares
+0.22: Tapping on step counter now disable step counting on 2v29+ firmwares
+0.23: Use filter function for better image borders if it exists (2v22)

apps/clock_info/ChangeLog

@@ -234,7 +234,7 @@ clockInfoMenu is the 'options' parameter, with the following added:
 * `menuB` : int - index in 'menu[menuA].items' of showing clockInfo item
 * `remove` : function - remove this clockInfo item
 * `redraw` : function - force a redraw
-* `focus` : function - bool to show if menu is focused or not
+* `focus` : bool to show if menu is focused or not
 
 You can have more than one clock_info at once as well, for instance:
 
@@ -452,10 +452,19 @@ exports.drawBorderedImage = function(img,x,y,options) {
   if (!gfx) {
     gfx = exports.imgGfxB = Graphics.createArrayBuffer(28, 28, 2, {msb:true});
     gfx.transparent = 3;
-    gfx.palette = new Uint16Array([g.theme.bg, g.theme.fg, g.theme.bg/*border*/, g.toColor("#888")]);
+    gfx.palette = new Uint16Array([g.theme.bg, g.theme.bg/*border*/, g.theme.fg, g.toColor("#888")]);
+  }
+  if (gfx.filter) { // if firmware supports it (2v22+) use filter which can give a much better border
+    gfx.clear(1).setColor(2).drawImage(img, 2,2); // main image
+    gfx.filter([ // a gaussian filter
+      1,1,1,
+      1,1,1,
+      1,1,1,
+    ], { w:3, h:3, div:1, max:1,filter:"max" });
+  } else {
+    gfx.clear(1).setColor(1).drawImage(img, 1,1).drawImage(img, 3,1).drawImage(img, 1,3).drawImage(img, 3,3); // border
+    gfx.setColor(2).drawImage(img, 2,2); // main image
   }
-  gfx.clear(1).setColor(2).drawImage(img, 1,1).drawImage(img, 3,1).drawImage(img, 1,3).drawImage(img, 3,3); // border
-  gfx.setColor(1).drawImage(img, 2,2); // main image
   gfx.floodFill(27,27,3); // flood fill edge to transparent
   var o = ((options && options.scale) || 1)*2;
   return g.drawImage(gfx, x-o,y-o,options);
@@ -480,4 +489,4 @@ items.forEach((itm,i) => {
   itm.show();
   draw();
 });
-*/
+*/

apps/clock_info/lib.js

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

apps/clock_info/metadata.json

@@ -3,3 +3,4 @@
 0.03: Convert Yes/No On/Off in settings to checkboxes
 0.04: Catch and discard swipe events on fw2v19 and up (as well as some cutting
 	edge 2v18 ones), allowing compatability with the Back Swipe app.
+0.05: Ensure we can't drag the cursor to a column on the right that doesn't exist

apps/kbtouch/ChangeLog

@@ -33,8 +33,6 @@ var KEYIMGL = Graphics.createImage(`
    #
    #
    #
-   #
-   #
 `);KEYIMGL.transparent=0;
 var KEYIMGR = Graphics.createImage(`
 
@@ -53,22 +51,14 @@ var KEYIMGR = Graphics.createImage(`
   #
   #
   #
+  #
+  #
+  #
 #####
  ###
   #
+`);KEYIMGR.transparent=0;
 
-#`);KEYIMGR.transparent=0;
-/* If a char in the keymap is >=128,
-subtract 128 and look in this array for
-multi-character key codes*/
-var KEYEXTRA = [
-  String.fromCharCode(27,91,68), // 0x80 left
-  String.fromCharCode(27,91,67), // 0x81 right
-  String.fromCharCode(27,91,65), // 0x82 up
-  String.fromCharCode(27,91,66), // 0x83 down
-  String.fromCharCode(27,91,53,126), // 0x84 page up
-  String.fromCharCode(27,91,54,126), // 0x85 page down
-];
 
 var settings = Object.assign({
   // default values
@@ -83,7 +73,7 @@ var settings = Object.assign({
 const R = Bangle.appRect;
 var kbx = 0, kby = 0, kbdx = 0, kbdy = 0, kbShift = false, flashToggle = false;
 const PX=12, PY=16, DRAGSCALE=settings.speedScaling;
-var xoff = 3, yoff = g.getHeight()-PY*(4+5*settings.offsetKeyboard);
+var xoff = 4, yoff = g.getHeight()-PY*(4+5*settings.offsetKeyboard);
 
 function draw() {
   "ram";
@@ -120,7 +110,7 @@ function draw() {
         kby = Math.max(Math.min(Math.floor((e.y-120) / (8*2)) , 3) , 0);
       //print(e.y, kby, e.x, kbx);
       }
-      
+
       if (!settings.oneToOne) {
         kbdx += e.dx;
         kbdy += e.dy;
@@ -129,7 +119,7 @@ function draw() {
         kbdy -= dy*DRAGSCALE;
         if (dx || dy) {
           if (settings.loopAround) {
-            kbx = (kbx+dx+15)%15;
+            kbx = (kbx+dx+14)%14;
             kby = (kby+dy+4)%4;
           } else {
               kbx = Math.max(Math.min((kbx+dx),13),0);
@@ -138,7 +128,7 @@ function draw() {
         }
       }
       draw();
-      
+
       if (!e.b && e.y>Bangle.appRect.y && settings.oneToOne /*&& settings.releaseToSelect*/) {
         var map = kbShift ? KEYMAPUPPER : KEYMAPLOWER;
         var ch = map[kby][kbx];

apps/kbtouch/lib.js

@@ -1,6 +1,6 @@
 { "id": "kbtouch",
   "name": "Touch keyboard",
-  "version":"0.04",
+  "version":"0.05",
   "description": "A library for text input via onscreen keyboard",
   "icon": "app.png",
   "type":"textinput",