Merge pull request #1591 from Ronin0000/master

Fix Crow Clock For Dark Mode and Fix Desktop Launcher Bangle.js 1 not showing white images.
pull/1603/head
Gordon Williams 2022-03-21 08:59:02 +00:00 committed by GitHub
commit e6c4891317
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 6 deletions

View File

@ -1,2 +1,3 @@
0.01: New App! 0.01: New App!
0.02: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up". 0.02: Removed "wake LCD on face-up"-feature: A watch-face should not set things like "wake LCD on face-up".
0.03: Fix the clock for dark mode.

View File

@ -76,7 +76,7 @@ function draw_clock(){
// g.drawLine(clock_center.x - radius, clock_center.y, clock_center.x + radius, clock_center.y); // g.drawLine(clock_center.x - radius, clock_center.y, clock_center.x + radius, clock_center.y);
// g.drawLine(clock_center.x, clock_center.y - radius, clock_center.x, clock_center.y + radius); // g.drawLine(clock_center.x, clock_center.y - radius, clock_center.x, clock_center.y + radius);
g.setColor(g.theme.fg); g.setColor(g.theme.dark ? g.theme.bg : g.theme.fg);
let ticks = [0, 90, 180, 270]; let ticks = [0, 90, 180, 270];
ticks.forEach((item)=>{ ticks.forEach((item)=>{
let agl = item+180; let agl = item+180;
@ -92,13 +92,13 @@ function draw_clock(){
let minute_agl = minute_angle(date); let minute_agl = minute_angle(date);
g.drawImage(hour_hand, hour_pos_x(hour_agl), hour_pos_y(hour_agl), {rotate:hour_agl*p180}); // g.drawImage(hour_hand, hour_pos_x(hour_agl), hour_pos_y(hour_agl), {rotate:hour_agl*p180}); //
g.drawImage(minute_hand, minute_pos_x(minute_agl), minute_pos_y(minute_agl), {rotate:minute_agl*p180}); // g.drawImage(minute_hand, minute_pos_x(minute_agl), minute_pos_y(minute_agl), {rotate:minute_agl*p180}); //
g.setColor(g.theme.fg); g.setColor(g.theme.dark ? g.theme.bg : g.theme.fg);
g.fillCircle(clock_center.x, clock_center.y, 6); g.fillCircle(clock_center.x, clock_center.y, 6);
g.setColor(g.theme.bg); g.setColor(g.theme.dark ? g.theme.fg : g.theme.bg);
g.fillCircle(clock_center.x, clock_center.y, 3); g.fillCircle(clock_center.x, clock_center.y, 3);
// draw minute ticks. Takes long time to draw! // draw minute ticks. Takes long time to draw!
g.setColor(g.theme.fg); g.setColor(g.theme.dark ? g.theme.bg : g.theme.fg);
for (var i=0; i<60; i++){ for (var i=0; i<60; i++){
let agl = i*6+180; let agl = i*6+180;
g.drawImage(tick1.asImage(), rotate_around_x(big_wheel_x(i*6), agl, tick1), rotate_around_y(big_wheel_y(i*6), agl, tick1), {rotate:agl*p180}); g.drawImage(tick1.asImage(), rotate_around_x(big_wheel_x(i*6), agl, tick1), rotate_around_y(big_wheel_y(i*6), agl, tick1), {rotate:agl*p180});

View File

@ -1,7 +1,7 @@
{ {
"id": "crowclk", "id": "crowclk",
"name": "Crow Clock", "name": "Crow Clock",
"version": "0.02", "version": "0.03",
"description": "A simple clock based on Bold Clock that has MST3K's Crow T. Robot for a face", "description": "A simple clock based on Bold Clock that has MST3K's Crow T. Robot for a face",
"icon": "crow_clock.png", "icon": "crow_clock.png",
"screenshots": [{"url":"screenshot_crow.png"}], "screenshots": [{"url":"screenshot_crow.png"}],

View File

@ -8,3 +8,4 @@
0.08: Optimize line wrapping for Bangle 2 0.08: Optimize line wrapping for Bangle 2
0.09: fix the trasparent widget bar if there are no widgets for Bangle 2 0.09: fix the trasparent widget bar if there are no widgets for Bangle 2
0.10: added "one click exit" setting for Bangle 2 0.10: added "one click exit" setting for Bangle 2
0.11: Fix bangle.js 1 white icons not displaying

View File

@ -48,6 +48,7 @@ function draw_icon(p,n,selected) {
var x = (n%3)*80; var x = (n%3)*80;
var y = n>2?130:40; 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); (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}); g.drawImage(s.read(apps[p*6+n].icon),x+10,y+10,{scale:1.25});
g.setColor(-1).setFontAlign(0,-1,0).setFont("6x8",1); g.setColor(-1).setFontAlign(0,-1,0).setFont("6x8",1);
var txt = apps[p*6+n].name.split(" "); var txt = apps[p*6+n].name.split(" ");

View File

@ -1,7 +1,7 @@
{ {
"id": "dtlaunch", "id": "dtlaunch",
"name": "Desktop Launcher", "name": "Desktop Launcher",
"version": "0.10", "version": "0.11",
"description": "Desktop style App Launcher with six (four for Bangle 2) apps per page - fast access if you have lots of apps installed.", "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"}], "screenshots": [{"url":"shot1.png"},{"url":"shot2.png"},{"url":"shot3.png"}],
"icon": "icon.png", "icon": "icon.png",