From d420f928203d0efbe7ce5f2eac7d5427320d0d6c Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Mon, 21 Feb 2022 16:44:35 +0100 Subject: [PATCH 01/17] Update 7x7dotsclock.app.js Fix Message indicator position, Fix Date visibility --- apps/7x7dotsclock/7x7dotsclock.app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js index 3f2e9b9b1..15259ea8f 100644 --- a/apps/7x7dotsclock/7x7dotsclock.app.js +++ b/apps/7x7dotsclock/7x7dotsclock.app.js @@ -278,7 +278,7 @@ function drawWidgeds() { var x1M = 100; var y1M = y1B; - var x2M = x1M + 30; + var x2M = x1M + 25; var y2M = y2B; if (messages.some(m=>m.new)) { @@ -295,6 +295,7 @@ function drawWidgeds() { print(strDow[dow] + ' ' + day + '.' + month + ' ' + year); + g.setColor(g.theme.fg); g.setFontAlign(-1, -1,0); g.setFont("Vector", 20); g.drawString(strDow[dow] + ' ' + day, 0, 0, true); From 25e700e577df1f0796feedbb02995720cfd5a302 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:07:32 +0100 Subject: [PATCH 02/17] Update 7x7dotsclock.app.js respect theme colors --- apps/7x7dotsclock/7x7dotsclock.app.js | 32 +++++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js index 15259ea8f..1f846a340 100644 --- a/apps/7x7dotsclock/7x7dotsclock.app.js +++ b/apps/7x7dotsclock/7x7dotsclock.app.js @@ -13,9 +13,8 @@ var Xs = 0, Ys = 30,Xe = 175, Ye=175; var SegH = (Ye-Ys)/2,SegW = (Xe-Xs)/2; var Dx = SegW/14, Dy = SegH/16; -const hColor = [1,1,1]; + const mColor = [0.3,0.3,1]; -const bColor = [0.2,0.2,0.2]; const Font = [ [ @@ -114,16 +113,21 @@ const Font = [ var dho = -1, eho = -1, dmo = -1, emo = -1; -function drawHSeg(x1,y1,x2,y2,Num,dColor,Size) { - g.setColor(0,0,0); +function drawHSeg(x1,y1,x2,y2,Num,Color,Size) { + //g.setColor(0,0,0); + g.setColor(g.theme.bg); g.fillRect(x1, y1, x2, y2); for (let i = 1; i < 8; i++) { for (let j = 1; j < 8; j++) { if (Font[Num][j-1][i-1] == 1) { - g.setColor(dColor[0],dColor[1],dColor[2]); + if (Color == "fg") { + g.setColor(g.theme.fg); + } else { + g.setColor(mColor[0],mColor[1],mColor[2]); + } g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,Size); } else { - g.setColor(bColor[0],bColor[1],bColor[2]); + g.setColor(g.theme.fg); g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,1); } } @@ -131,11 +135,15 @@ function drawHSeg(x1,y1,x2,y2,Num,dColor,Size) { } -function drawSSeg(x1,y1,x2,y2,Num,dColor,Size) { +function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { for (let i = 1; i < 8; i++) { for (let j = 1; j < 8; j++) { if (Font[Num][j-1][i-1] == 1) { - g.setColor(dColor[0],dColor[1],dColor[2]); + if (Color == "fg") { + g.setColor(g.theme.fg); + } else { + g.setColor(mColor[0],mColor[1],mColor[2]); + } g.fillCircle(x1+(i-1)*(x2-x1)/7,y1+(j-1)*(y2-y1)/7,Size); } } @@ -185,25 +193,25 @@ function draw() { g.reset(); if (dh != dho) { g.setColor(1,1,1); - drawHSeg(Xs, Ys, Xs+SegW, Ys+SegH,dh,hColor,4); + drawHSeg(Xs, Ys, Xs+SegW, Ys+SegH,dh,"fg",4); dho = dh; } if (eh != eho) { g.setColor(1,1,1); - drawHSeg(Xs+SegW+Dx, Ys, Xs+SegW*2, Ys+SegH,eh,hColor,4); + drawHSeg(Xs+SegW+Dx, Ys, Xs+SegW*2, Ys+SegH,eh,"fg",4); eho = eh; } if (dm != dmo) { g.setColor(0.3,0.3,1); - drawHSeg(Xs, Ys+SegH+Dy, Xs+SegW, Ys+SegH*2,dm,mColor,4); + drawHSeg(Xs, Ys+SegH+Dy, Xs+SegW, Ys+SegH*2,dm,"",4); dmo = dm; } if (em != emo) { g.setColor(0.3,0.3,1); - drawHSeg(Xs+SegW+Dx, Ys+SegH+Dy, Xs+SegW*2, Ys+SegH*2,em,mColor,4); + drawHSeg(Xs+SegW+Dx, Ys+SegH+Dy, Xs+SegW*2, Ys+SegH*2,em,"",4); emo = em; } From 81b0097fa9672a1ffec0281c5e6e657dcb2672bf Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:35:32 +0100 Subject: [PATCH 03/17] Update 7x7dotsclock.app.js --- apps/7x7dotsclock/7x7dotsclock.app.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js index 1f846a340..c6daee542 100644 --- a/apps/7x7dotsclock/7x7dotsclock.app.js +++ b/apps/7x7dotsclock/7x7dotsclock.app.js @@ -15,6 +15,7 @@ var Dx = SegW/14, Dy = SegH/16; const mColor = [0.3,0.3,1]; +const bColor = [0.3,0.3,0.3]; const Font = [ [ @@ -123,11 +124,11 @@ function drawHSeg(x1,y1,x2,y2,Num,Color,Size) { if (Color == "fg") { g.setColor(g.theme.fg); } else { - g.setColor(mColor[0],mColor[1],mColor[2]); + g.setColor(mColor[0],mColor[1],mColor[2]); } g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,Size); } else { - g.setColor(g.theme.fg); + g.setColor(bColor[0],bColor[1],bColor[2]); g.fillCircle(x1+Dx+(i-1)*(x2-x1)/7,y1+Dy+(j-1)*(y2-y1)/7,1); } } @@ -142,7 +143,7 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { if (Color == "fg") { g.setColor(g.theme.fg); } else { - g.setColor(mColor[0],mColor[1],mColor[2]); + g.setColor(g.theme.fgH); } g.fillCircle(x1+(i-1)*(x2-x1)/7,y1+(j-1)*(y2-y1)/7,Size); } @@ -152,7 +153,7 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { function ShowSecons() { - g.setColor(1,1,1); + g.setColor(g.theme.bgH); g.fillRect((Xe-Xs) / 2 - 14 + Xs -3, (Ye-Ys) / 2 - 7 + Ys -3, (Xe-Xs) / 2 + 14 + Xs +1, @@ -163,13 +164,13 @@ function ShowSecons() { (Ye-Ys) / 2 - 7 + Ys , (Xe-Xs) / 2 + Xs -1, (Ye-Ys) / 2 + 7 + Ys, - ds,mColor,1); + ds,"",1); drawSSeg( (Xe-Xs) / 2 + Xs +1, (Ye-Ys) / 2 - 7 + Ys, (Xe-Xs) / 2 + 14 + Xs +1, (Ye-Ys) / 2 + 7 + Ys, - es,mColor,1); + es,"",1); } From 6110724f025cddb27f283493d7e2828d6aaa84b1 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:44:08 +0100 Subject: [PATCH 04/17] Update 7x7dotsclock.settings.js better menu naming --- apps/7x7dotsclock/7x7dotsclock.settings.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.settings.js b/apps/7x7dotsclock/7x7dotsclock.settings.js index 42473ec17..c2b5d6c2b 100644 --- a/apps/7x7dotsclock/7x7dotsclock.settings.js +++ b/apps/7x7dotsclock/7x7dotsclock.settings.js @@ -7,10 +7,10 @@ function showMainMenu() { const mainMenu = { "": {"title": "7x7 Dots Clock Settings"}, "< Back": ()=>load(), - "sw-up": ()=>showSelAppMenu("swupApp"), - "sw-down": ()=>showSelAppMenu("swdownApp"), - "sw-left": ()=>showSelAppMenu("swleftApp"), - "sw-right": ()=>showSelAppMenu("swrightApp") + "swipe-up": ()=>showSelAppMenu("swupApp"), + "swipe-down": ()=>showSelAppMenu("swdownApp"), + "swipe-left": ()=>showSelAppMenu("swleftApp"), + "swipe-right": ()=>showSelAppMenu("swrightApp") }; From 3a608bf1f52e69859ae02f5e8938adc52e4bc4d6 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:47:03 +0100 Subject: [PATCH 05/17] Update README.md theme infos --- apps/7x7dotsclock/README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/7x7dotsclock/README.md b/apps/7x7dotsclock/README.md index 7f899ff0f..76684bc1a 100644 --- a/apps/7x7dotsclock/README.md +++ b/apps/7x7dotsclock/README.md @@ -2,16 +2,14 @@ ![](dotsfontclock.png) -looks best with dark theme so far - * A Clock with big numbers made of 7x7 dots * system widgeds ar not (yet) supported * when screen is locked it shows hours and minutes in full screen mode +* respects theme colors ![](dotsfontclock-scr1.png) -* when screen is unlocked it shows additional info: bluetooth, battery, new message, date and seconds -* you can configure a app per swipe direction -* when swiping the configured apps are launced +* when screen is unlocked it shows additional info: bluetooth, battery, new message state, date and seconds +* you can configure an app per swipe direction +* when swiping the configured apps are launched * button press opens launcher - From 849c439e11c13d26043bed2d20a1570edcac98f8 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:54:53 +0100 Subject: [PATCH 06/17] Update metadata.json Allow emulator --- apps/7x7dotsclock/metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/7x7dotsclock/metadata.json b/apps/7x7dotsclock/metadata.json index 7b2c52512..6bdeaa6b8 100644 --- a/apps/7x7dotsclock/metadata.json +++ b/apps/7x7dotsclock/metadata.json @@ -6,7 +6,8 @@ "icon": "dotsfontclock.png", "tags": "clock", "type": "clock", - "supports" : ["BANGLEJS2"], + "supports" : ["BANGLEJS2"], + "allow_emulator": true, "readme": "README.md", "storage": [ {"name":"7x7dotsclock.app.js","url":"7x7dotsclock.app.js"}, From 7af6dcd91460f8c2433a5e5707502046fd7fc365 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Mon, 21 Feb 2022 17:56:41 +0100 Subject: [PATCH 07/17] Update metadata.json --- apps/7x7dotsclock/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/7x7dotsclock/metadata.json b/apps/7x7dotsclock/metadata.json index 6bdeaa6b8..9f997e10d 100644 --- a/apps/7x7dotsclock/metadata.json +++ b/apps/7x7dotsclock/metadata.json @@ -1,7 +1,7 @@ { "id": "7x7dotsclock", "name": "7x7 Dots Clock", "shortName":"7x7 Dots Clock", - "version":"0.01", + "version":"0.02", "description": "A clock with a big 7x7 dots Font", "icon": "dotsfontclock.png", "tags": "clock", From c2f55bde72903d8d40bbf35de00cee65cce3455f Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Tue, 22 Feb 2022 11:44:50 +0100 Subject: [PATCH 08/17] Update 7x7dotsclock.settings.js Color Settings of Minutes and Seconds --- apps/7x7dotsclock/7x7dotsclock.settings.js | 51 ++++++++++++++++------ 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.settings.js b/apps/7x7dotsclock/7x7dotsclock.settings.js index c2b5d6c2b..fe9fbc022 100644 --- a/apps/7x7dotsclock/7x7dotsclock.settings.js +++ b/apps/7x7dotsclock/7x7dotsclock.settings.js @@ -1,21 +1,8 @@ (function(back) { -let settings = Object.assign({ swupApp: "",swdownApp: "", swleftApp: "", swrightApp: ""}, require("Storage").readJSON("7x7dotsclock.json", true) || {}); +let settings = Object.assign({ swupApp: "",swdownApp: "", swleftApp: "", swrightApp: "",ColorMinutes: ""}, require("Storage").readJSON("7x7dotsclock.json", true) || {}); -function showMainMenu() { - const mainMenu = { - "": {"title": "7x7 Dots Clock Settings"}, - "< Back": ()=>load(), - "swipe-up": ()=>showSelAppMenu("swupApp"), - "swipe-down": ()=>showSelAppMenu("swdownApp"), - "swipe-left": ()=>showSelAppMenu("swleftApp"), - "swipe-right": ()=>showSelAppMenu("swrightApp") - - }; - - E.showMenu(mainMenu); -} function setSetting(key,value) { print("call " + key + " = " + value); @@ -26,6 +13,42 @@ function setSetting(key,value) { } + // Helper method which uses int-based menu item for set of string values + function stringItems(key, startvalue, values) { + return { + value: (startvalue === undefined ? 0 : values.indexOf(startvalue)), + format: v => values[v], + min: 0, + max: values.length - 1, + wrap: true, + step: 1, + onchange: v => { + setSetting(key,values[v]); + } + }; + } + + // Helper method which breaks string set settings down to local settings object + function stringInSettings(name, values) { + return stringItems(name,settings[name], values); + } + +function showMainMenu() { + const mainMenu = { + "": {"title": "7x7 Dots Clock Settings"}, + "< Back": ()=>load(), + "Minutes": stringInSettings("ColorMinutes", ["blue","pink","green"]), + "swipe-up": ()=>showSelAppMenu("swupApp"), + "swipe-down": ()=>showSelAppMenu("swdownApp"), + "swipe-left": ()=>showSelAppMenu("swleftApp"), + "swipe-right": ()=>showSelAppMenu("swrightApp") + + }; + + E.showMenu(mainMenu); +} + + function showSelAppMenu(key) { var Apps = require("Storage").list(/\.info$/) .map(app => {var a=storage.readJSON(app, 1);return ( From 3b3c01677abb0584a63cb6937a695b5e8f4b084b Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Tue, 22 Feb 2022 11:46:08 +0100 Subject: [PATCH 09/17] Update 7x7dotsclock.app.js Color Settings of Minutes and Seconds --- apps/7x7dotsclock/7x7dotsclock.app.js | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js index c6daee542..ce2b3011d 100644 --- a/apps/7x7dotsclock/7x7dotsclock.app.js +++ b/apps/7x7dotsclock/7x7dotsclock.app.js @@ -5,7 +5,7 @@ by Peter Kuppelwieser */ -let settings = Object.assign({ swupApp: "",swdownApp: "", swleftApp: "", swrightApp: ""}, require("Storage").readJSON("7x7dotsclock.json", true) || {}); +let settings = Object.assign({ swupApp: "",swdownApp: "", swleftApp: "", swrightApp: "", ColorMinutes: ""}, require("Storage").readJSON("7x7dotsclock.json", true) || {}); // position on screen var Xs = 0, Ys = 30,Xe = 175, Ye=175; @@ -13,8 +13,19 @@ var Xs = 0, Ys = 30,Xe = 175, Ye=175; var SegH = (Ye-Ys)/2,SegW = (Xe-Xs)/2; var Dx = SegW/14, Dy = SegH/16; - -const mColor = [0.3,0.3,1]; +switch(ColorMinutes) { + case "blue": + var mColor = [0.3,0.3,1]; + break; + case "pink": + var mColor = [1,0.3,1]; + break; + case "green": + var mColor = [0.3,1,0.3]; + break; + default: + var mColor = [0.3,0.3,1]; +} const bColor = [0.3,0.3,0.3]; const Font = [ @@ -141,9 +152,9 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { for (let j = 1; j < 8; j++) { if (Font[Num][j-1][i-1] == 1) { if (Color == "fg") { - g.setColor(g.theme.fg); + g.setColor(mColor[0],mColor[1],mColor[2]); } else { - g.setColor(g.theme.fgH); + g.setColor(g.theme.fg); } g.fillCircle(x1+(i-1)*(x2-x1)/7,y1+(j-1)*(y2-y1)/7,Size); } @@ -153,7 +164,7 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { function ShowSecons() { - g.setColor(g.theme.bgH); + g.setColor(g.theme.fg); g.fillRect((Xe-Xs) / 2 - 14 + Xs -3, (Ye-Ys) / 2 - 7 + Ys -3, (Xe-Xs) / 2 + 14 + Xs +1, @@ -164,13 +175,13 @@ function ShowSecons() { (Ye-Ys) / 2 - 7 + Ys , (Xe-Xs) / 2 + Xs -1, (Ye-Ys) / 2 + 7 + Ys, - ds,"",1); + ds,"fg",1); drawSSeg( (Xe-Xs) / 2 + Xs +1, (Ye-Ys) / 2 - 7 + Ys, (Xe-Xs) / 2 + 14 + Xs +1, (Ye-Ys) / 2 + 7 + Ys, - es,"",1); + es,"fg",1); } From aa86b3ffdb63f59d9b0823360855e8c40f86d02a Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Wed, 23 Feb 2022 10:44:16 +0100 Subject: [PATCH 10/17] Update 7x7dotsclock.app.js Add color yellow for minutes and seconds Better color contrast for seconds --- apps/7x7dotsclock/7x7dotsclock.app.js | 57 ++++++++++++++++----------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js index ce2b3011d..53b4c1bd6 100644 --- a/apps/7x7dotsclock/7x7dotsclock.app.js +++ b/apps/7x7dotsclock/7x7dotsclock.app.js @@ -13,18 +13,26 @@ var Xs = 0, Ys = 30,Xe = 175, Ye=175; var SegH = (Ye-Ys)/2,SegW = (Xe-Xs)/2; var Dx = SegW/14, Dy = SegH/16; -switch(ColorMinutes) { - case "blue": - var mColor = [0.3,0.3,1]; - break; - case "pink": - var mColor = [1,0.3,1]; - break; - case "green": - var mColor = [0.3,1,0.3]; - break; - default: - var mColor = [0.3,0.3,1]; +switch(settings.ColorMinutes) { +case "blue": + var mColor = [0.3,0.3,1]; + var sColor = [0,0,1]; + break; +case "pink": + var mColor = [1,0.3,1]; + var sColor = [1,0,1]; + break; +case "green": + var mColor = [0.3,1,0.3]; + var sColor = [0,1,0]; + break; +case "yellow": + var mColor = [1,1,0.3]; + var sColor = [1,1,0]; + break; +default: + var sColor = [0,0,1]; + var mColor = [0.3,0.3,1]; } const bColor = [0.3,0.3,0.3]; @@ -152,9 +160,10 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { for (let j = 1; j < 8; j++) { if (Font[Num][j-1][i-1] == 1) { if (Color == "fg") { - g.setColor(mColor[0],mColor[1],mColor[2]); + g.setColor(sColor[0],sColor[1],sColor[2]); } else { g.setColor(g.theme.fg); + //g.setColor(0.7,0.7,0.7); } g.fillCircle(x1+(i-1)*(x2-x1)/7,y1+(j-1)*(y2-y1)/7,Size); } @@ -164,23 +173,25 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { function ShowSecons() { + //g.setColor(bColor[0],bColor[1],bColor[2]); + //g.setColor(0.7,0.7,0.7); g.setColor(g.theme.fg); - g.fillRect((Xe-Xs) / 2 - 14 + Xs -3, - (Ye-Ys) / 2 - 7 + Ys -3, - (Xe-Xs) / 2 + 14 + Xs +1, - (Ye-Ys) / 2 + 7 + Ys +1); + g.fillRect((Xe-Xs) / 2 - 14 + Xs -4, + (Ye-Ys) / 2 - 7 + Ys -4, + (Xe-Xs) / 2 + 14 + Xs +4, + (Ye-Ys) / 2 + 7 + Ys +4); drawSSeg( (Xe-Xs) / 2 - 14 + Xs -1, - (Ye-Ys) / 2 - 7 + Ys , + (Ye-Ys) / 2 - 7 + Ys +1, (Xe-Xs) / 2 + Xs -1, - (Ye-Ys) / 2 + 7 + Ys, + (Ye-Ys) / 2 + 7 + Ys +1, ds,"fg",1); - drawSSeg( (Xe-Xs) / 2 + Xs +1, - (Ye-Ys) / 2 - 7 + Ys, - (Xe-Xs) / 2 + 14 + Xs +1, - (Ye-Ys) / 2 + 7 + Ys, + drawSSeg( (Xe-Xs) / 2 + Xs +2, + (Ye-Ys) / 2 - 7 + Ys +1, + (Xe-Xs) / 2 + 14 + Xs +2, + (Ye-Ys) / 2 + 7 + Ys +1, es,"fg",1); } From 66e1fa4e2f45c5fb8a2606f0d34036793af5cfa4 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Wed, 23 Feb 2022 10:45:35 +0100 Subject: [PATCH 11/17] Update README.md --- apps/7x7dotsclock/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/7x7dotsclock/README.md b/apps/7x7dotsclock/README.md index 76684bc1a..28fcac1b1 100644 --- a/apps/7x7dotsclock/README.md +++ b/apps/7x7dotsclock/README.md @@ -5,7 +5,7 @@ * A Clock with big numbers made of 7x7 dots * system widgeds ar not (yet) supported * when screen is locked it shows hours and minutes in full screen mode -* respects theme colors +* adjustable color for minutes and seconds ![](dotsfontclock-scr1.png) From b21da11e6c01d6b998d1388339764e53b62e580d Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:21:10 +0100 Subject: [PATCH 12/17] Add files via upload --- apps/7x7dotsclock/dotsfontclock-scr1.png | Bin 3874 -> 3737 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/7x7dotsclock/dotsfontclock-scr1.png b/apps/7x7dotsclock/dotsfontclock-scr1.png index dc86396c0606f0a4c5ea4895bc17543f2e51024a..5ab2e48639a4b5dcffbeb59e83b7819f89c4228d 100644 GIT binary patch delta 3724 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 Y?43dq;SVfZ;Q#;t07*qoM6N<$f-v!GOaK4? From 0a9516dee03586a53fc63580ec08fecf56a6409f Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:21:54 +0100 Subject: [PATCH 13/17] Add files via upload --- apps/7x7dotsclock/dotsfontclock-scr2.png | Bin 0 -> 3386 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/7x7dotsclock/dotsfontclock-scr2.png diff --git a/apps/7x7dotsclock/dotsfontclock-scr2.png b/apps/7x7dotsclock/dotsfontclock-scr2.png new file mode 100644 index 0000000000000000000000000000000000000000..f301bb50c7217253516345c09a3482f7e745455c GIT binary patch literal 3386 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 Date: Wed, 23 Feb 2022 11:24:30 +0100 Subject: [PATCH 14/17] Update metadata.json Added screenshots --- apps/7x7dotsclock/metadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/7x7dotsclock/metadata.json b/apps/7x7dotsclock/metadata.json index 9f997e10d..41f0836d3 100644 --- a/apps/7x7dotsclock/metadata.json +++ b/apps/7x7dotsclock/metadata.json @@ -14,5 +14,6 @@ {"name":"7x7dotsclock.settings.js","url":"7x7dotsclock.settings.js"}, {"name":"7x7dotsclock.img","url":"7x7dotsclock.img.js","evaluate":true} ], - "data": [{"name":"7x7dotsclock.json"}] + "data": [{"name":"7x7dotsclock.json"}], + "screenshots": [{"url":"dotsfontclock.png"},{"url":"dotsfontclock-scr1.png"},{"url":"dotsfontclock-scr2.png"}] } From 040d765d946f245fa4bdb62f073c2f8da23b7545 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:28:56 +0100 Subject: [PATCH 15/17] Update 7x7dotsclock.settings.js add yellow color --- apps/7x7dotsclock/7x7dotsclock.settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.settings.js b/apps/7x7dotsclock/7x7dotsclock.settings.js index fe9fbc022..34935d668 100644 --- a/apps/7x7dotsclock/7x7dotsclock.settings.js +++ b/apps/7x7dotsclock/7x7dotsclock.settings.js @@ -37,7 +37,7 @@ function showMainMenu() { const mainMenu = { "": {"title": "7x7 Dots Clock Settings"}, "< Back": ()=>load(), - "Minutes": stringInSettings("ColorMinutes", ["blue","pink","green"]), + "Minutes": stringInSettings("ColorMinutes", ["blue","pink","green","yellow"]), "swipe-up": ()=>showSelAppMenu("swupApp"), "swipe-down": ()=>showSelAppMenu("swdownApp"), "swipe-left": ()=>showSelAppMenu("swleftApp"), From ca1b94fa8948df9cfb788a147a3ff9ed6a88ebe6 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:30:38 +0100 Subject: [PATCH 16/17] Update ChangeLog --- apps/7x7dotsclock/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/7x7dotsclock/ChangeLog b/apps/7x7dotsclock/ChangeLog index 50c5eca4a..d2c98a472 100644 --- a/apps/7x7dotsclock/ChangeLog +++ b/apps/7x7dotsclock/ChangeLog @@ -1 +1,2 @@ 0.01: Initial version for upload +0.02: better theme support, configurable colors, small improvements From d79915d67e068bad2e7e2e864367b0edba564313 Mon Sep 17 00:00:00 2001 From: pkkpp <52079346+pkkpp@users.noreply.github.com> Date: Wed, 23 Feb 2022 11:49:19 +0100 Subject: [PATCH 17/17] Update 7x7dotsclock.app.js --- apps/7x7dotsclock/7x7dotsclock.app.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/7x7dotsclock/7x7dotsclock.app.js b/apps/7x7dotsclock/7x7dotsclock.app.js index 53b4c1bd6..aa174b2d2 100644 --- a/apps/7x7dotsclock/7x7dotsclock.app.js +++ b/apps/7x7dotsclock/7x7dotsclock.app.js @@ -17,22 +17,27 @@ switch(settings.ColorMinutes) { case "blue": var mColor = [0.3,0.3,1]; var sColor = [0,0,1]; + var sbColor = [1,1,1]; break; case "pink": var mColor = [1,0.3,1]; var sColor = [1,0,1]; + var sbColor = [1,1,1]; break; case "green": var mColor = [0.3,1,0.3]; var sColor = [0,1,0]; + var sbColor = [1,1,1]; break; case "yellow": var mColor = [1,1,0.3]; var sColor = [1,1,0]; + var sbColor = [0,0,0]; break; default: var sColor = [0,0,1]; var mColor = [0.3,0.3,1]; + var sbColor = [1,1,1]; } const bColor = [0.3,0.3,0.3]; @@ -134,7 +139,8 @@ var dho = -1, eho = -1, dmo = -1, emo = -1; function drawHSeg(x1,y1,x2,y2,Num,Color,Size) { - //g.setColor(0,0,0); + + g.setColor(g.theme.bg); g.fillRect(x1, y1, x2, y2); for (let i = 1; i < 8; i++) { @@ -172,10 +178,10 @@ function drawSSeg(x1,y1,x2,y2,Num,Color,Size) { } -function ShowSecons() { - //g.setColor(bColor[0],bColor[1],bColor[2]); - //g.setColor(0.7,0.7,0.7); - g.setColor(g.theme.fg); +function ShowSeconds() { + + g.setColor(sbColor[0],sbColor[1],sbColor[2]); + g.fillRect((Xe-Xs) / 2 - 14 + Xs -4, (Ye-Ys) / 2 - 7 + Ys -4, (Xe-Xs) / 2 + 14 + Xs +4, @@ -238,7 +244,7 @@ function draw() { emo = em; } - if (!Bangle.isLocked()) ShowSecons(); + if (!Bangle.isLocked()) ShowSeconds(); }