From b236327c18a34acd8b568626c25c298f006d09c5 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 19 Nov 2021 10:53:22 +0000
Subject: [PATCH] Merge branch 'master' of
 https://github.com/Vingelar/BangleApps into Vingelar-master

# Conflicts:
#	apps.json
---
 apps.json                                     |  19 ++++++++++++++++--
 .../Background176_center.png                  | Bin
 .../Background240_center.png                  | Bin
 apps/{TheBinWatch => binwatch}/ChangeLog      |   0
 apps/{TheBinWatch => binwatch}/README.md      |   0
 apps/{TheBinWatch => binwatch}/app-icon.js    |   0
 apps/{TheBinWatch => binwatch}/app.js         |   0
 apps/{TheBinWatch => binwatch}/app.png        | Bin
 apps/{TheBinWatch => binwatch}/bt-icon.png    | Bin
 9 files changed, 17 insertions(+), 2 deletions(-)
 rename apps/{TheBinWatch => binwatch}/Background176_center.png (100%)
 rename apps/{TheBinWatch => binwatch}/Background240_center.png (100%)
 rename apps/{TheBinWatch => binwatch}/ChangeLog (100%)
 rename apps/{TheBinWatch => binwatch}/README.md (100%)
 rename apps/{TheBinWatch => binwatch}/app-icon.js (100%)
 rename apps/{TheBinWatch => binwatch}/app.js (100%)
 rename apps/{TheBinWatch => binwatch}/app.png (100%)
 rename apps/{TheBinWatch => binwatch}/bt-icon.png (100%)

diff --git a/apps.json b/apps.json
index 148833678..72ab25b1b 100644
--- a/apps.json
+++ b/apps.json
@@ -1420,12 +1420,12 @@
   {
     "id": "pomodo",
     "name": "Pomodoro",
-    "version": "0.01",
+    "version": "0.02",
     "description": "A simple pomodoro timer.",
     "icon": "pomodoro.png",
     "type": "app",
     "tags": "pomodoro,cooking,tools",
-    "supports": ["BANGLEJS"],
+    "supports": ["BANGLEJS", "BANGLEJS2"],
     "allow_emulator": true,
     "storage": [
       {"name":"pomodo.app.js","url":"pomodoro.js"},
@@ -4292,5 +4292,20 @@
       {"name":"lcars.app.js","url":"lcars.app.js"},
       {"name":"lcars.img","url":"lcars.icon.js","evaluate":true}
     ]
+  },
+  { "id": "binwatch",
+    "name": "Binary Watch",
+    "shortName":"BinWatch",
+    "icon": "app.png",
+    "version":"0.02",
+    "supports": ["BANGLEJS","BANGLEJS2"],
+    "allow_emulator":true,
+    "description": "Famous binary watch",
+    "tags": "clock",
+    "type": "clock",
+    "storage": [
+      {"name":"binwatch.app.js","url":"app.js"},
+      {"name":"binwatch.img","url":"app-icon.js","evaluate":true}
+    ]
   }
 ]
diff --git a/apps/TheBinWatch/Background176_center.png b/apps/binwatch/Background176_center.png
similarity index 100%
rename from apps/TheBinWatch/Background176_center.png
rename to apps/binwatch/Background176_center.png
diff --git a/apps/TheBinWatch/Background240_center.png b/apps/binwatch/Background240_center.png
similarity index 100%
rename from apps/TheBinWatch/Background240_center.png
rename to apps/binwatch/Background240_center.png
diff --git a/apps/TheBinWatch/ChangeLog b/apps/binwatch/ChangeLog
similarity index 100%
rename from apps/TheBinWatch/ChangeLog
rename to apps/binwatch/ChangeLog
diff --git a/apps/TheBinWatch/README.md b/apps/binwatch/README.md
similarity index 100%
rename from apps/TheBinWatch/README.md
rename to apps/binwatch/README.md
diff --git a/apps/TheBinWatch/app-icon.js b/apps/binwatch/app-icon.js
similarity index 100%
rename from apps/TheBinWatch/app-icon.js
rename to apps/binwatch/app-icon.js
diff --git a/apps/TheBinWatch/app.js b/apps/binwatch/app.js
similarity index 100%
rename from apps/TheBinWatch/app.js
rename to apps/binwatch/app.js
diff --git a/apps/TheBinWatch/app.png b/apps/binwatch/app.png
similarity index 100%
rename from apps/TheBinWatch/app.png
rename to apps/binwatch/app.png
diff --git a/apps/TheBinWatch/bt-icon.png b/apps/binwatch/bt-icon.png
similarity index 100%
rename from apps/TheBinWatch/bt-icon.png
rename to apps/binwatch/bt-icon.png