From 8a86f2e9a24bf8fe14f4f506f0885996018d7d94 Mon Sep 17 00:00:00 2001 From: thyttan <97237430+thyttan@users.noreply.github.com> Date: Sun, 10 Apr 2022 12:52:07 +0200 Subject: [PATCH 1/6] [dtlaunch, b2] Change swipe direction to UpDown Change swipe directions to move between pages from LeftRight to UpDown, as to match the page indicators. Implemented like 'natural scrolling'. Also added function showClock() which is called on 'left-to-right' swipe. Here I imagine the clock to be to the left of the launcher, if you do that then this also follows the natural scrolling principle. --- apps/dtlaunch/app-b2.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/dtlaunch/app-b2.js b/apps/dtlaunch/app-b2.js index e0f7f825f..7202e4f33 100644 --- a/apps/dtlaunch/app-b2.js +++ b/apps/dtlaunch/app-b2.js @@ -85,18 +85,25 @@ function drawPage(p){ g.flip(); } -Bangle.on("swipe",(dir)=>{ +Bangle.on("swipe",(dirLeftRight, dirUpDown)=>{ selected = 0; oldselected=-1; - if (dir<0){ + if (dirUpDown==-1){ ++page; if (page>maxPage) page=0; drawPage(page); - } else { + } else if (dirUpDown==1){ --page; if (page<0) page=maxPage; drawPage(page); - } + } + if (dirLeftRight==1) showClock(); }); +function showClock(){ + var app = require("Storage").readJSON('setting.json', 1).clock; + if (app) load(app); + else E.showMessage("clock\nnot found"); +} + function isTouched(p,n){ if (n<0 || n>3) return false; var x1 = (n%2)*72+XOFF; var y1 = n>1?72+YOFF:YOFF; From d801605eaa572d11780fc1cc96d8faf070aac378 Mon Sep 17 00:00:00 2001 From: thyttan <97237430+thyttan@users.noreply.github.com> Date: Sun, 10 Apr 2022 22:43:54 +0200 Subject: [PATCH 2/6] Update ChangeLog --- apps/dtlaunch/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog index da07af798..f0ea9dbd7 100644 --- a/apps/dtlaunch/ChangeLog +++ b/apps/dtlaunch/ChangeLog @@ -9,3 +9,4 @@ 0.09: fix the trasparent widget bar if there are no widgets for Bangle 2 0.10: added "one click exit" setting for Bangle 2 0.11: Fix bangle.js 1 white icons not displaying +0.12: Change to swiping up/down to move between pages. Swiping left-to-right now loads the clock. From 8cfd1ec887eae4913b282819d7a28e102d5b1a16 Mon Sep 17 00:00:00 2001 From: thyttan <97237430+thyttan@users.noreply.github.com> Date: Sun, 10 Apr 2022 22:45:59 +0200 Subject: [PATCH 3/6] Update ChangeLog --- apps/dtlaunch/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog index f0ea9dbd7..cd69dbf6e 100644 --- a/apps/dtlaunch/ChangeLog +++ b/apps/dtlaunch/ChangeLog @@ -9,4 +9,4 @@ 0.09: fix the trasparent widget bar if there are no widgets for Bangle 2 0.10: added "one click exit" setting for Bangle 2 0.11: Fix bangle.js 1 white icons not displaying -0.12: Change to swiping up/down to move between pages. Swiping left-to-right now loads the clock. +0.12: Change to swiping up/down to move between pages to match page indicator. Swiping from left to right now loads the clock. From 772ab88a0e961dfb3f543f120237595c594bda8d Mon Sep 17 00:00:00 2001 From: thyttan <97237430+thyttan@users.noreply.github.com> Date: Sun, 10 Apr 2022 22:46:43 +0200 Subject: [PATCH 4/6] Update ChangeLog --- apps/dtlaunch/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog index cd69dbf6e..1b7fe0539 100644 --- a/apps/dtlaunch/ChangeLog +++ b/apps/dtlaunch/ChangeLog @@ -9,4 +9,4 @@ 0.09: fix the trasparent widget bar if there are no widgets for Bangle 2 0.10: added "one click exit" setting for Bangle 2 0.11: Fix bangle.js 1 white icons not displaying -0.12: Change to swiping up/down to move between pages to match page indicator. Swiping from left to right now loads the clock. +0.12: Change to swiping up/down to move between pages as to match page indicator. Swiping from left to right now loads the clock. From 33baed5d2b4af927f02d0d9cfef6f7b3197e27eb Mon Sep 17 00:00:00 2001 From: thyttan <97237430+thyttan@users.noreply.github.com> Date: Sun, 10 Apr 2022 22:48:13 +0200 Subject: [PATCH 5/6] Update ChangeLog --- apps/dtlaunch/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog index 1b7fe0539..66fda2f29 100644 --- a/apps/dtlaunch/ChangeLog +++ b/apps/dtlaunch/ChangeLog @@ -9,4 +9,4 @@ 0.09: fix the trasparent widget bar if there are no widgets for Bangle 2 0.10: added "one click exit" setting for Bangle 2 0.11: Fix bangle.js 1 white icons not displaying -0.12: Change to swiping up/down to move between pages as to match page indicator. Swiping from left to right now loads the clock. +0.12: On Bangle 2 change to swiping up/down to move between pages as to match page indicator. Swiping from left to right now loads the clock. From 78a1c14564431ae8a5d63ae95a69851987b38d9a Mon Sep 17 00:00:00 2001 From: thyttan <97237430+thyttan@users.noreply.github.com> Date: Sun, 10 Apr 2022 22:48:50 +0200 Subject: [PATCH 6/6] Update metadata.json --- apps/dtlaunch/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dtlaunch/metadata.json b/apps/dtlaunch/metadata.json index b3f94442f..a5391cef0 100644 --- a/apps/dtlaunch/metadata.json +++ b/apps/dtlaunch/metadata.json @@ -1,7 +1,7 @@ { "id": "dtlaunch", "name": "Desktop Launcher", - "version": "0.11", + "version": "0.12", "description": "Desktop style App Launcher with six (four for Bangle 2) apps per page - fast access if you have lots of apps installed.", "screenshots": [{"url":"shot1.png"},{"url":"shot2.png"},{"url":"shot3.png"}], "icon": "icon.png",