From d7f5f710b271a2f3797d8f724f6be15d04e8a1d0 Mon Sep 17 00:00:00 2001 From: dapgo Date: Wed, 8 Mar 2023 11:27:31 +0100 Subject: [PATCH] fix and improvements for dtlaunch fix and improvements for dtlaunch --- apps/dtlaunch/ChangeLog | 1 + apps/dtlaunch/README.md | 10 +++++++++ apps/dtlaunch/app-b1.js | 39 ++++++++++++++++++++++++++++++------ apps/dtlaunch/metadata.json | 2 +- apps/dtlaunch/sshot_e1.png | Bin 0 -> 5096 bytes 5 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 apps/dtlaunch/sshot_e1.png diff --git a/apps/dtlaunch/ChangeLog b/apps/dtlaunch/ChangeLog index e0bd76eb0..1155647ab 100644 --- a/apps/dtlaunch/ChangeLog +++ b/apps/dtlaunch/ChangeLog @@ -27,4 +27,5 @@ widgets would still be loaded when they weren't supposed to. immediately follows the correct theme. 0.22: Bangle 2: Change to not automatically marking the first app on a page when moving pages. Add caching for faster startups. +0.23: Bangle 1: Fix issue with missing icons, added touch screen interactions diff --git a/apps/dtlaunch/README.md b/apps/dtlaunch/README.md index 1835bc842..ff562d9db 100644 --- a/apps/dtlaunch/README.md +++ b/apps/dtlaunch/README.md @@ -6,6 +6,10 @@ Bangle 1: In the picture above, the Settings app is selected. + +![](sshot_e1.png) + + Bangle 2: ![shot1](https://user-images.githubusercontent.com/89286474/146471756-ec6d16de-6916-4fde-b991-ba88c2c8fa1a.png) @@ -25,6 +29,12 @@ Bangle 2: **Swipe Right** - move to previous page of app icons +**Touch Left(1) area** - "Back" to Clock + +**Touch Right(2) area** - move forward through app icons + +**Touch Middle(1+2) area** - run the selected app + ## Controls- Bangle 2 **Touch** - icon to select, second touch launches app diff --git a/apps/dtlaunch/app-b1.js b/apps/dtlaunch/app-b1.js index ed9cc778e..c7e78d671 100644 --- a/apps/dtlaunch/app-b1.js +++ b/apps/dtlaunch/app-b1.js @@ -13,13 +13,13 @@ function wdog(handle,timeout){ wdog.timeout = timeout; } if(wdog.timer){ - clearTimeout(wdog.timer) + clearTimeout(wdog.timer); } - wdog.timer = setTimeout(wdog.handle,wdog.timeout) + wdog.timer = setTimeout(wdog.handle,wdog.timeout); } // reset after two minutes of inactivity -wdog(load,120000) +wdog(load,120000); var s = require("Storage"); var apps = s.list(/\.info$/).map(app=>{ @@ -49,7 +49,13 @@ function draw_icon(p,n,selected) { var y = n>2?130:40; (selected?g.setColor(0.3,0.3,0.3):g.setColor(0,0,0)).fillRect(x,y,x+79,y+89); g.setColor(g.theme.fg); - g.drawImage(s.read(apps[p*6+n].icon),x+10,y+10,{scale:1.25}); + //bad g.drawImage(s.read(apps[p*6+n].icon),x+10,y+10,{scale:1.25}); + if ((apps[p*6+n].icon)){ + if (s.read(apps[p*6+n].icon)) //ensure that graph exist + g.drawImage(s.read(apps[p*6+n].icon),x+10,y+10,{scale:1.25}); + else console.log("icon file NOT exist :"+apps[p*6+n].icon); + } + else console.log("icon property NOT exist"); g.setColor(-1).setFontAlign(0,-1,0).setFont("6x8",1); var txt = apps[p*6+n].name.split(" "); for (var i = 0; i < txt.length; i++) { @@ -65,10 +71,31 @@ function drawPage(p){ if (!apps[p*6+i]) return i; draw_icon(p,i,selected==i); } -} + } + + // case was not working +Bangle.on("touch", function(tzone){ + //(tzone)=>{ + //console.log("tzone"+tzone); + switch(tzone){ + case 1: //left managed by + console.log("1, left or back to clock?"); + load();//clock + //nextapp(-1); + break; + case 2: // right + nextapp(1); + break; + case 3: //center 1+2 no for emul + doselect(); + break; + default: + console.log("no match"); + } + }); Bangle.on("swipe",(dir)=>{ - wdog() + wdog(); selected = 0; oldselected=-1; if (dir<0){ diff --git a/apps/dtlaunch/metadata.json b/apps/dtlaunch/metadata.json index b19d59e49..4262ebc26 100644 --- a/apps/dtlaunch/metadata.json +++ b/apps/dtlaunch/metadata.json @@ -1,7 +1,7 @@ { "id": "dtlaunch", "name": "Desktop Launcher", - "version": "0.22", + "version": "0.23", "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", diff --git a/apps/dtlaunch/sshot_e1.png b/apps/dtlaunch/sshot_e1.png new file mode 100644 index 0000000000000000000000000000000000000000..69f708c33617749a1d128cbe374f8cd816fa736f GIT binary patch literal 5096 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