diff --git a/apps/clockcal/ChangeLog b/apps/clockcal/ChangeLog
index 5657bf26d..0f501f1fb 100644
--- a/apps/clockcal/ChangeLog
+++ b/apps/clockcal/ChangeLog
@@ -5,4 +5,5 @@
0.05: Improved colors (connected vs disconnected)
0.06: Tell clock widgets to hide.
0.07: Convert Yes/No On/Off in settings to checkboxes
-0.08: Fixed typo in settings.js for DRAGDOWN to make option work
\ No newline at end of file
+0.08: Fixed typo in settings.js for DRAGDOWN to make option work
+0.09: You can now back out of the calendar using the button
\ No newline at end of file
diff --git a/apps/clockcal/README.md b/apps/clockcal/README.md
index d30205be0..bc05081ad 100644
--- a/apps/clockcal/README.md
+++ b/apps/clockcal/README.md
@@ -7,23 +7,24 @@ I know that it seems redundant because there already **is** a *time&cal*-app, bu
|:--:|:-|
||locked: triggers only one minimal update/min|
||unlocked: smaller clock, but with seconds|
-||swipe up for big calendar, (up down to scroll, left/right to exit)|
+||swipe up for big calendar
⬆️/⬇️ to scroll
⬅️/➡️ to exit|
## Configurable Features
- Number of calendar rows (weeks)
-- Buzz on connect/disconnect (I know, this should be an extra widget, but for now, it is included)
+- Buzz on connect/disconnect (feel free to disable and use a widget)
- Clock Mode (24h/12h). (No am/pm indicator)
- First day of the week
- Red Saturday/Sunday
- Swipe/Drag gestures to launch features or apps.
-## Auto detects your message/music apps:
-- swiping down will search your files for an app with the string "message" in its filename and launch it. (configurable)
-- swiping right will search your files for an app with the string "music" in its filename and launch it. (configurable)
+## Integrated swipe launcher: (Configure in Settings)
+- ⬇️ (down) will search your files for an app with the string "**message**"
+- ➡️ (right) will search your files for an app with the string "**music**"
+- ⬅️ (left) will search your files for an app with the string "**agenda**"
+- ⬆️ (up) will show the **internal full calendar**
## Feedback
-The clock works for me in a 24h/MondayFirst/WeekendFree environment but is not well-tested with other settings.
-So if something isn't working, please tell me: https://github.com/foostuff/BangleApps/issues
+If something isn't working, please tell me: https://github.com/Stuff-etc/BangleApps/issues (I moved my github repo)
## Planned features:
- Internal lightweight music control, because switching apps has a loading time.
diff --git a/apps/clockcal/app.js b/apps/clockcal/app.js
index 9db81c7ca..2ffdde504 100644
--- a/apps/clockcal/app.js
+++ b/apps/clockcal/app.js
@@ -233,6 +233,12 @@ function action(a) {
load(l[0]);
} else E.showAlert("Message app not found", "Not found").then(drawWatch);
break;
+ case "[AI:agenda]":
+ l = require("Storage").list(RegExp("agenda.*app.js"));
+ if (l.length > 0) {
+ load(l[0]);
+ } else E.showAlert("Agenda app not found", "Not found").then(drawWatch);
+ break;
default:
l = require("Storage").list(RegExp(a + ".app.js"));
if (l.length > 0) {
diff --git a/apps/clockcal/metadata.json b/apps/clockcal/metadata.json
index 998115827..60e55ceb7 100644
--- a/apps/clockcal/metadata.json
+++ b/apps/clockcal/metadata.json
@@ -1,7 +1,7 @@
{
"id": "clockcal",
"name": "Clock & Calendar",
- "version": "0.08",
+ "version": "0.09",
"description": "Clock with Calendar",
"readme":"README.md",
"icon": "app.png",
diff --git a/apps/clockcal/settings.js b/apps/clockcal/settings.js
index a406f3cf7..19059861a 100644
--- a/apps/clockcal/settings.js
+++ b/apps/clockcal/settings.js
@@ -9,12 +9,12 @@
REDSAT: true, // Use red color for saturday?
DRAGDOWN: "[AI:messg]",
DRAGRIGHT: "[AI:music]",
- DRAGLEFT: "[ignore]",
+ DRAGLEFT: "[AI:agenda]",
DRAGUP: "[calend.]"
};
settings = Object.assign(defaults, require('Storage').readJSON(FILE, true) || {});
- actions = ["[ignore]","[calend.]","[AI:music]","[AI:messg]"];
+ actions = ["[ignore]","[calend.]","[AI:music]","[AI:messg]","[AI:agenda]"];
require("Storage").list(RegExp(".app.js")).forEach(element => actions.push(element.replace(".app.js","")));
function writeSettings() {