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

Fixes default settings not being used

master
stweedo 2023-05-11 04:03:49 -05:00 committed by GitHub
parent 123cd79a5d
commit 482af03edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/shadowclk/app.js
View File

@ -32,7 +32,7 @@ Graphics.prototype.setFontRighteous = function() {
// Load and set default appSettings // Load and set default appSettings
let teletextColors = ["#000", "#f00", "#0f0", "#ff0", "#00f", "#f0f", "#0ff", "#fff"]; let teletextColors = ["#000", "#f00", "#0f0", "#ff0", "#00f", "#f0f", "#0ff", "#fff"];
let appSettings = Object.assign({ let defaultAppSettings = Object.assign({
color: teletextColors[6], color: teletextColors[6],
theme: 'light', theme: 'light',
enableSuffix: true, enableSuffix: true,
@ -48,7 +48,7 @@ let appSettings = Object.assign({
var y = g.getHeight() / 2; var y = g.getHeight() / 2;
g.reset().clearRect(Bangle.appRect); g.reset().clearRect(Bangle.appRect);
var date = new Date(); var date = new Date();
var appSettings = require("Storage").readJSON("shadowclk.json", 1) || {}; var appSettings = require("Storage").readJSON("shadowclk.json", 1) || defaultAppSettings;
var settings = require("Storage").readJSON("setting.json", 1) || {}; var settings = require("Storage").readJSON("setting.json", 1) || {};
var is12HourFormat = settings["12hour"]; var is12HourFormat = settings["12hour"];
var hour = date.getHours(); var hour = date.getHours();
@ -56,8 +56,11 @@ let appSettings = Object.assign({
// Handle 12-hour format // Handle 12-hour format
if (is12HourFormat) { if (is12HourFormat) {
hour = hour % 12 || 12; // Convert 0 to 12 for 12-hour format hour = hour % 12 || 12; // Convert 0 to 12 for 12-hour format
} else if (appSettings.enableLeadingZero) { } else {
hour = hour.toString().padStart(2, '0'); // If the leading zero option is enabled and hour is less than 10, add leading zero
if (appSettings.enableLeadingZero && hour < 10) {
hour = '0' + hour;
}
} }
var timeStr = hour + ':' + minutes; var timeStr = hour + ':' + minutes;
// Handle midnight in 12-hour format specifically // Handle midnight in 12-hour format specifically
@ -68,7 +71,7 @@ let appSettings = Object.assign({
var color = appSettings.color; var color = appSettings.color;
g.setFontAlign(0, 0).setFont("LondrinaSolid").setColor(color).drawString(timeStr, x - 1, y); g.setFontAlign(0, 0).setFont("LondrinaSolid").setColor(color).drawString(timeStr, x - 1, y);
g.reset().setFontAlign(0, 0).setFont("LondrinaShadow").drawString(timeStr, x - 1, y); g.reset().setFontAlign(0, 0).setFont("LondrinaShadow").drawString(timeStr, x - 1, y);
// Get full date and handle formatting // Get full date and format it
var locale = require("locale"); var locale = require("locale");
var dayOfMonth = date.getDate(); var dayOfMonth = date.getDate();
var month = locale.month(date, 1).slice(0, 1).toUpperCase() + locale.month(date, 1).slice(1).toLowerCase(); var month = locale.month(date, 1).slice(0, 1).toUpperCase() + locale.month(date, 1).slice(1).toLowerCase();
@ -87,12 +90,16 @@ let appSettings = Object.assign({
} }
dayOfMonthStr += suffix; dayOfMonthStr += suffix;
} }
// Combine and print date string
var dayOfWeek = locale.dow(date, 0).slice(0, 1).toUpperCase() + locale.dow(date, 0).slice(1).toLowerCase(); var dayOfWeek = locale.dow(date, 0).slice(0, 1).toUpperCase() + locale.dow(date, 0).slice(1).toLowerCase();
var dateStr = month + " " + dayOfMonthStr + ", " + year + "\n" + dayOfWeek; var dateStr = month + " " + dayOfMonthStr + ", " + year + "\n" + dayOfWeek;
g.setFontAlign(0, 0).setFont("Righteous").drawString(dateStr, x, y + 56); g.setFontAlign(0, 0).setFont("Righteous").drawString(dateStr, x, y + 56);
// Time interval set to redraw every 60 seconds // Time interval set to redraw every 60 seconds
if (drawTimeout) clearTimeout(drawTimeout); if (drawTimeout) clearTimeout(drawTimeout);
drawTimeout = setTimeout(draw, 60000 - (Date.now() % 60000)); drawTimeout = setTimeout(() => {
drawTimeout = undefined;
draw();
}, 60000 - (Date.now() % 60000));
} }
Bangle.setUI({ Bangle.setUI({
mode: "clock", mode: "clock",