FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

imageclock - Use new widget_utils slideOn()

pull/2305/head
Martin Boonk 2022-11-21 00:32:40 +01:00
parent c20a594987
commit 7988e258ce
1 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
apps/imageclock/app.js
View File

@ -3,8 +3,6 @@ let s = {};
s.udi = []; s.udi = [];
// locked draw intervals // locked draw intervals
s.ldi = []; s.ldi = [];
// show widget state
s.sw = false;
// full draw // full draw
s.fd = true; s.fd = true;
// performance log // performance log
@ -616,9 +614,6 @@ s.pl = {};
promise.then(()=>{ promise.then(()=>{
let currentDrawingTime = Date.now(); let currentDrawingTime = Date.now();
if (s.sw){
restoreWidgetDraw();
}
lastDrawTime = Date.now() - start; lastDrawTime = Date.now() - start;
isDrawing=false; isDrawing=false;
s.fd=false; s.fd=false;
@ -631,8 +626,9 @@ s.pl = {};
let orig = Bangle.drawWidgets; let orig = Bangle.drawWidgets;
Bangle.drawWidgets = ()=>{}; Bangle.drawWidgets = ()=>{};
Bangle.loadWidgets(); Bangle.loadWidgets();
clearWidgetsDraw();
Bangle.drawWidgets = orig; Bangle.drawWidgets = orig;
require("widget_utils").swipeOn();
Bangle.drawWidgets();
} }
}).catch((e)=>{ }).catch((e)=>{
print("Error during drawing", e); print("Error during drawing", e);
@ -767,36 +763,6 @@ s.pl = {};
} }
}; };
let showWidgetsChanged = false;
let restoreWidgetDraw = function(){
require("widget_utils").show();
Bangle.drawWidgets();
};
let handleSwipe = function(lr, ud){
if (!s.sw && ud == 1){
//print("Enable widgets");
restoreWidgetDraw();
showWidgetsChanged = true;
}
if (s.sw && ud == -1){
//print("Disable widgets");
clearWidgetsDraw();
s.fd = true;
showWidgetsChanged = true;
}
if (showWidgetsChanged){
showWidgetsChanged = false;
//print("Draw after widget change");
s.sw = ud == 1;
initialDraw();
}
};
Bangle.on('swipe', handleSwipe);
if (!events || events.includes("pressure")){ if (!events || events.includes("pressure")){
Bangle.on('pressure', handlePressure); Bangle.on('pressure', handlePressure);
try{ try{
@ -816,15 +782,6 @@ s.pl = {};
Bangle.on('charging', handleCharging); Bangle.on('charging', handleCharging);
} }
let originalWidgetDraw = {};
let originalWidgetArea = {};
let clearWidgetsDraw = function(){
//print("Clear widget draw calls");
require("widget_utils").hide();
}
if (global.WIDGETS) clearWidgetsDraw();
handleLock(Bangle.isLocked(), true); handleLock(Bangle.isLocked(), true);
let setUi = function(){ let setUi = function(){
@ -836,7 +793,6 @@ s.pl = {};
Bangle.setHRMPower(0, "imageclock"); Bangle.setHRMPower(0, "imageclock");
Bangle.setBarometerPower(0, 'imageclock'); Bangle.setBarometerPower(0, 'imageclock');
Bangle.removeListener('swipe', handleSwipe);
Bangle.removeListener('lock', handleLock); Bangle.removeListener('lock', handleLock);
Bangle.removeListener('charging', handleCharging); Bangle.removeListener('charging', handleCharging);
Bangle.removeListener('HRM', handleHrm); Bangle.removeListener('HRM', handleHrm);
@ -859,9 +815,8 @@ s.pl = {};
if (settings.perflog){ if (settings.perflog){
delete Bangle.resetPerfLog; delete Bangle.resetPerfLog;
} }
cleanupDelays(); cleanupDelays();
restoreWidgetDraw(); require("widget_utils").show();
} }
}); });
} }