bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reducing number of possible colours

master
deirdreobyrne 2022-06-06 23:04:55 +01:00
parent 45c830d216
commit f79f76056b
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/widmp/settings.js
View File

@ -13,6 +13,7 @@
function writeSettingsCustom() { function writeSettingsCustom() {
settings.default_colour = false; settings.default_colour = false;
mainmenu["Default"].value = false;
writeSettings(); writeSettings();
} }
@ -40,7 +41,7 @@
"red": { "red": {
value: 0|settings.red, value: 0|settings.red,
min: 0, min: 0,
max: 7, max: 4,
onchange: v => { onchange: v => {
settings.red = v; settings.red = v;
writeSettingsCustom(); writeSettingsCustom();
@ -49,7 +50,7 @@
"green": { "green": {
value: 0|settings.green, value: 0|settings.green,
min: 0, min: 0,
max: 7, max: 4,
onchange: v => { onchange: v => {
settings.green = v; settings.green = v;
writeSettingsCustom(); writeSettingsCustom();
@ -58,7 +59,7 @@
"blue": { "blue": {
value: 0|settings.blue, value: 0|settings.blue,
min: 0, min: 0,
max: 7, max: 4,
onchange: v => { onchange: v => {
settings.blue = v; settings.blue = v;
writeSettingsCustom(); writeSettingsCustom();

28
apps/widmp/widget.js
View File

@ -41,14 +41,14 @@
} }
} }
function setMoonColour() { function setMoonColour(g) {
var settings = Object.assign({ var settings = Object.assign({
default_colour: true, default_colour: true,
red: 0, red: 0,
green: 0, green: 0,
blue: 0, blue: 0,
}, require('Storage').readJSON("widmp.json", true) || {}); }, require('Storage').readJSON("widmp.json", true) || {});
if (settings.default_colour) { if (settings.default_colour) {
if (g.theme.dark) { if (g.theme.dark) {
g.setColor(0xffff); // white g.setColor(0xffff); // white
} else { } else {
@ -56,19 +56,9 @@
// 0000010000011111 // 0000010000011111
g.setColor(0x41f); // blue-ish g.setColor(0x41f); // blue-ish
} }
} else { } else {
// 1111110000000000 g.setColor(settings.red/4, settings.green/4, settings.blue/4);
// 5432109876543210 }
// rrrrrggggggbbbbb
// RxxRxGxxGxxBxxBx
let r = settings.red;
let g = settings.green;
let b = settings.blue;
r = (r << 13) | ((r & 3) << 11);
g = (g << 8) | (g << 5);
b = (b << 2) | (b & 3);
g.setColor(r | g | b);
}
} }
@ -96,7 +86,7 @@
var tmp=leftFactor; leftFactor=rightFactor; rightFactor=tmp; var tmp=leftFactor; leftFactor=rightFactor; rightFactor=tmp;
} }
setMoonColour(); setMoonColour(g);
drawMoonPhase(CenterX,CenterY, Radius, leftFactor,rightFactor); drawMoonPhase(CenterX,CenterY, Radius, leftFactor,rightFactor);
} }