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

Author: thyttan

apps/clkinfodice/ChangeLog

@@ -0,0 +1 @@
+0.01: New Clock Info!

apps/clkinfodice/clkinfo.js

@@ -0,0 +1,26 @@
+(function() {
+  let random = Math.randInt(6);
+  return {
+    name: "Bangle",
+    items: [
+      { name : "Dice",
+        get : function() {
+          return {
+            text : (random+1).toString(),
+            img : [
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAwAMAwAMAwAMAwYMAwYMAwAMAwAMAwAMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzAMAzAMAwAMAwAMAwAMAwAMAwDMAwDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzAMAzAMAwAMAwYMAwYMAwAMAwDMAwDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzDMAzDMAwAMAwAMAwAMAwAMAzDMAzDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzDMAzDMAwAMAwYMAwYMAwAMAzDMAzDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA=="),
+              atob("GBiBAAAAAAAAAAAAAAAAAA//8A//8AwAMAwAMAzDMAzDMAwAMAzDMAzDMAwAMAzDMAzDMAwAMAwAMA//8A//8AAAAAAAAAAAAAAAAA==")
+            ][random]
+          };
+        },
+        show : function() { random = Math.randInt(6); },
+        hide : function() {},
+        run : function() { random = Math.randInt(6); this.emit("redraw"); }
+      }
+    ]
+  };
+})

apps/clkinfodice/icon.png

@@ -0,0 +1,13 @@
+{ "id": "clkinfodice",
+  "name": "Dice Clockinfo",
+  "version":"0.01",
+  "author": "gfwilliams",
+  "description": "A ClockInfo that shows a random dice face. Tap to roll.",
+  "icon": "icon.png",
+  "type": "clkinfo",
+  "tags": "clkinfo,gaming,game",
+  "supports" : ["BANGLEJS2"],
+  "storage": [
+    {"name":"clkinfodice.clkinfo.js","url":"clkinfo.js"}
+  ]
+}

apps/clkinfodice/metadata.json

@@ -1,6 +1,6 @@
 # Thyttan's Default Config
 
-A different default set of apps and configurations. Brings many quality of life improvements. Opinionated based on the creators taste. Read more below before installing.
+A different default set of apps and configurations. Makes many quality of life changes. Opinionated based on the creators taste. Read more below before installing.
 
 ## Usage
 

apps/confthyttan/README.md

@@ -2,7 +2,7 @@
   "name": "Thyttan's Default Config",
   "version":"0.08",
   "author": "thyttan",
-  "description": "A different default set of apps and configurations. Brings many quality of life improvements. Opinionated based on the creators taste. Read more below before installing.",
+  "description": "A different default set of apps and configurations. Makes many quality of life changes. Opinionated based on the creators taste. Read more below before installing.",
   "icon": "app.png",
   "type": "defaultconfig",
   "tags": "system,configuration,config,anotherconfig,thyttan,defaultconfig",

apps/confthyttan/metadata.json

@@ -4,7 +4,7 @@
   "version": "0.05",
   "description": "Land a rocket booster by tilting the watch",
   "icon": "f9lander.png",
-  "screenshots" : [ { "url":"f9lander_screenshot1.png" }, { "url":"f9lander_screenshot2.png" }, { "url":"f9lander_screenshot3.png" },{ "url":"f9Lander_screenshot4.png" }],
+  "screenshots" : [ { "url":"f9lander_screenshot1.png" }, { "url":"f9lander_screenshot2.png" }, { "url":"f9lander_screenshot3.png" },{ "url":"f9lander_screenshot4.png" }],
   "readme": "README.md",
   "tags": "game",
   "supports" : ["BANGLEJS", "BANGLEJS2"],

apps/f9lander/f9Lander_screenshot4.png

@@ -0,0 +1,5 @@
+# Mouse
+
+Connect to a computer, drag the screen to move your mouse. Tap or press the BangleJS2's button to left-click.
+
+Note that HID must be enabled in settings for bluetooth devices to recognise the bangle as a mouse.