From 2e27562c340951484f3e3a2c0a44030aabd72ec3 Mon Sep 17 00:00:00 2001 From: David Peer Date: Mon, 30 Jan 2023 17:56:24 +0100 Subject: [PATCH] Minor changes --- apps/happyclk/ChangeLog | 2 +- apps/happyclk/README.md | 4 ++++ apps/happyclk/happyclk.app.js | 22 +++++++++++++++------- apps/happyclk/happyclk.settings.js | 15 +++++++++++++-- apps/happyclk/screenshot_5.png | Bin 2508 -> 2498 bytes 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/apps/happyclk/ChangeLog b/apps/happyclk/ChangeLog index 768ae2c2f..e87114779 100644 --- a/apps/happyclk/ChangeLog +++ b/apps/happyclk/ChangeLog @@ -1,2 +1,2 @@ 0.01: New app! -0.02: Added settings for different styles. \ No newline at end of file +0.02: Added settings to show/hide widgets and settings for different styles. \ No newline at end of file diff --git a/apps/happyclk/README.md b/apps/happyclk/README.md index 3540b5aca..2311add6a 100644 --- a/apps/happyclk/README.md +++ b/apps/happyclk/README.md @@ -14,6 +14,10 @@ Here you can see an example of a locked bangle with a low battery: ![](screenshot_3.png) +## Settings +- Screen: Normal (widgets shown), Full (widgets are hidden). +- Theme: Select your custom theme, independent of system settings. + ## Creator - [David Peer](https://github.com/peerdavid). diff --git a/apps/happyclk/happyclk.app.js b/apps/happyclk/happyclk.app.js index 5eac225e9..b43ce2efa 100644 --- a/apps/happyclk/happyclk.app.js +++ b/apps/happyclk/happyclk.app.js @@ -10,7 +10,8 @@ const storage = require('Storage'); const SETTINGS_FILE = "happyclk.setting.json"; let settings = { - color: "Dark" + color: "Dark", + screen: "Full" }; let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings; @@ -174,6 +175,8 @@ let drawSmile = function(isLocked){ } let drawEyeBrow = function(){ + if(settings.screen != "Full") return; + g.setColor(colors.fg); var w = 6; for(var i = 0; i < w; i++){ @@ -183,6 +186,15 @@ let drawEyeBrow = function(){ } +let drawWidgets = function(){ + if (settings.screen == "Full") { + require('widget_utils').hide(); + } else { + Bangle.drawWidgets(); + } +} + + let draw = function(){ // Queue draw in one minute @@ -199,6 +211,8 @@ let drawHelper = function(isLocked){ drawEyes(); drawEyeBrow(); drawSmile(isLocked); + + drawWidgets(); } @@ -237,12 +251,6 @@ let queueDraw = function() { // Show launcher when middle button pressed Bangle.setUI("clock"); Bangle.loadWidgets(); -/* - * we are not drawing the widgets as we are taking over the whole screen - * so we will blank out the draw() functions of each widget and change the - * area to the top bar doesn't get cleared. - */ -require('widget_utils').hide(); // Clear the screen once, at startup and draw clock g.setTheme({bg:colors.bg,fg:colors.fg,dark:false}); diff --git a/apps/happyclk/happyclk.settings.js b/apps/happyclk/happyclk.settings.js index d4843514c..d047a8d4a 100644 --- a/apps/happyclk/happyclk.settings.js +++ b/apps/happyclk/happyclk.settings.js @@ -4,7 +4,8 @@ // initialize with default settings... const storage = require('Storage') let settings = { - color: "Dark" + color: "Dark", + screen: "Full" }; let saved_settings = storage.readJSON(SETTINGS_FILE, 1) || settings; for (const key in saved_settings) { @@ -16,9 +17,19 @@ } var colorOptions = ["Dark", "Black", "White", "Blue", "Green", "Red", "Purple", "Yellow"]; + var screenOptions = ["Normal", "Full"]; E.showMenu({ '': { 'title': 'Happy Clock' }, '< Back': back, + 'Screen': { + value: 0 | screenOptions.indexOf(settings.screen), + min: 0, max: screenOptions.length-1, + format: v => screenOptions[v], + onchange: v => { + settings.screen = screenOptions[v]; + save(); + }, + }, 'Theme': { value: 0 | colorOptions.indexOf(settings.color), min: 0, max: colorOptions.length-1, @@ -27,6 +38,6 @@ settings.color = colorOptions[v]; save(); }, - } + }, }); }) diff --git a/apps/happyclk/screenshot_5.png b/apps/happyclk/screenshot_5.png index 1a711096e59d0bd0d8d342d4b59e400d23b88ade..401bb0c515e83c2fe3145b609d0d9497a4d8220f 100644 GIT binary patch delta 2475 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 delta 2485 zcmV;m2}<_D6U-BkF@J_hL_t(|UhSRPcH-mL$P@t#+4**=$IW+rQ0RRjTN-F?>OWTLW17I*vS^)rD+CDTM0E2@|+4e(wf#nFOYcaaBwt6YB;+}6H^0&Ly6Rba~24+-4X9=if; z-I;7g@7f;E$K5Uf?`kCaZLa_Tw$~VUFjN2l8;Xld+kYznfbBKL9Sju!z=q=D()J1f zV0(>m2SWt_u%WoPw7mjL04&*9KP25@PkIMkN&>7ghRT8!fZkD;G5}kc(}KDZ%)9H7 z9$-&{u0Ur78M^$ql@?&BK~Dv359Uo2m!>Kf_2VL=og{u6^-ME7~%VIbcz)|2{fyf3jN0(P0ya)AJx2OT024Ko03v;L>Yk}-( z7Nv_7xROB~nZ_vq?wJ$;F2_6%h$(m@w4q824_(gwgae!%-b1WA<1Ed}u1l6OD-_`D zCPgK26EaD>IKY*r$X2y+HceAX+yPu! z7tbw6H-J}4nVBiP8ob{1a45i)Q>F*8B!vO6aut0nrk~F*`72Apd#;?mBim}L!t0sB zE`JHUx>0wAaZ-47T|8=G04$tMdWTCFb60>@Dyc?hCW$5H0I!}h+FE!QU93|W0855D z<5+GA?~uM8DGY!aP)ZH~z@KVaJa+#Z9M-!KyG)hRg&Y!C5)18PO%r%Gc)1Yori*1A z41nhZ!P`}+GGeFnwXTB!FaS1Cz^@Jlz<&nzA%Ov~0akvO1i%2;k2Zrl0bl@ZfR*1R z0Wbjeqs`z>02lxpVC8p7Pk`xf$}xXimL;s!(>Uxxu;iB=ra-+Zm|KJciy zvmge*e&quIK4}ersT|dRUOIt2%81eQowY*ermwaR&eBgQ%2Hh<*EcUA0C3w5X&qb< zV9WG%DIr<_zy9B1+LnyonTs2ZQGWn<#I2umT@u(jg)=0RcAE5tcvfg|(9;ZR&UMen zgaSM(g`)u;F$w@nk$pej4PeU@&IB;$JJGI|c|p8d`nr}7mbGvsz$58b?{04Oh1Xh$H7R9bl=q8Iv%$X8->P)@n}H$#wo2i<+KVzN z3%n!sFx5w|&n*Tu)%K7QqGi^(u^O<>=Tm8{xxQDzR4gST;C0`HkdzbL)i^amXMOGk zZ*OpG2HmXwx31%@%e5V$34iR7#4`+xGAVma9Hq? z$$KgE+2RaIoB`exB?M*G)jkjNdiAp>ywnWkp~Yv=+$T+hF6jWK44b*gyRXOF(?FC# zoB{3ua)#OH*0U@ngtVlXk<8Ri#c_`e@Nx#X1<2WEqm+xdUR~OH=zk%pWwpm<0#`G@ zH9&I)btYX>>_Tt=^8`7QL6kPT>rw__PAy28-TS-}w5@(vz?@x|k^pO_)6bfD1os-} zYJkoTY`Ge^1}bP}lmbg6aFlqsZ@dBkINk%aU_b!?JRlxUjaL8w$9sSl3@8AA2gJjv z@d^Oocn{Em0R;f?fPZ*6HC_P#9Pa^IFrWYc9uN1;FpWnI`Q5j^9~qP@=`v4G13aD|0+2*4;Ea({u^Y7GFsQKt8YhDhK% zU{~20a!p{)Uì!(?Q47mZ!f%mWu5XV9cfG_$>;046F;C;0wbD+2+um<4l!o^}{ zbN7l{n;`%nBbozt=FxA1QQTE4?hd&FdWb<6QpFYER+<80dq8`4s0yzu zz?@Qm12X42v41$!yL-jb;ZWHnfhCp#Vu@Pg$5u{Xw*;2T42Y$Q>5i`sZ(4xA8%F%> z7WRvE(Ed%m4SlPXXz5Cbvn_yl4ANB>Zf}fa{gomrDX!*JOAb3U=_{{LI;361wd6+{ z(_nIrSP9fF(N=uVX8lGY{YPu1pd9D*arp1|HcjKA&6FU<%w-XPa_Q;;0>o9YNk1 z-Yo#ulz$Wz5{nD&>JM|4tbu1GamMmO0`BVYZj-=oMZa*n?QSqc)XGwDcYt?GfVJCg zt@_&5{Sopz3r+0_$|cSxFQCz)6fiGjs|7V4ZF_D~SRCIEfKxhE4$h ztkVr=B~btXCouxe&?x|bb-LlKBnklFBu1baIt2i*PB)yDL;(Pt#0WG)rvL!f>4vkC zC@uhilNf