From f16bc390b6c9c5d22cace47858e2b6ff74ea6ae8 Mon Sep 17 00:00:00 2001 From: Andrew <45957548+midnight4577@users.noreply.github.com> Date: Sun, 30 Jan 2022 09:47:51 -0800 Subject: [PATCH] Formating --- apps/aptsciclk/app.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/apps/aptsciclk/app.js b/apps/aptsciclk/app.js index 6dbad3654..ba80a9749 100644 --- a/apps/aptsciclk/app.js +++ b/apps/aptsciclk/app.js @@ -6,7 +6,7 @@ const font = "6x8"; const xyCenter = g.getWidth() / 2; const yposTime = xyCenter*0.73; -const yposDate = xyCenter*1.44; +const yposDate = xyCenter*0.48; const yposYear = xyCenter*1.8; const buttonTolerance = 20; @@ -96,20 +96,20 @@ function getImg(img){ buffer : require("heatshrink").decompress(atob("AA+IAAeAIv5UTK34APhABBKwpeBJX5VLJgJWGAwKv/ABL8EKomABIYA/KpJWHAoRW/KpZQCfwJSCAgRW/KphWFBgZW/KphNCAgSxEKP4ADJAatFKwWAL4oA/KpALGXQhS/Ko4MIwAOMAHREOKv5ZVVgcAh///4LDAwQAB+AIHCQYHMDQQYBDwQEGDIoaGTx4MCwAiCJgYhFBIYIHLw4HFBARjGESJUDehZVFVhJNLRI5VGDIIdEAgwiL+DzDJAJVJB4IMBCoKsHAYpFCDgr2IApYEIBpJFCKpqsCHgQbFIhBVHBhJoGTwyBRKp5mBDoY6GKoYqEXYg7JApKeHQJysEKpRmBDoasHQBAACM4qMGEAr0JAgZjGFYhVPgGAEIpVEAAaAEA4oyEW4qyKFZBoFKoisDJIJWLfIp3IQBJeJfgysMERpVCwEIVpijFBA6ZJdA4JHJYgEKQIx1EVgRVBVhj5IEIyZHHYoUGNw4MCQIwIKAARVDxBVRQo6ZJHZZoGU4yBGBAiBGVgRZBVhYlIfJBoFHZZoHfJRwGBAQrEVISvCKpwrEUZAqFVhzYKB4yKGQIpVDAYJVKEoYFDBIpVIb4ysMIgoPHOgoRFhGAVwKsLAFzQHACBVCVhQA/KpawBCJa76IhRWDVxIODAwTaFAocP///dhALGBQYJBCIYQBDYgKEBBAEDVgeIAgKgFBYZVEEYY+CH4YDBBgYFBBYoFEOYhmEDYgFFLIwEDKw2AKwhTFBoSsHIgglFAQo/HKIoDECBBZGc46eEAYa2EKox2Ga5LjLDoq8FKAgVDBAv/EghWGVgRWJKoaOFD4IgCViAWFVjKTGJIZOFKpKOHAQj3JAogCFPApcGKQziGLopKCU4hWFKojsEHYrXFCAJFId45CEDYh4EB4Y1DCYSzFJQT+FgAGCKooA/AAZMBfopWDKv5WLVgxT/AB+AKopW/ACBU/ABwA==")) } } - + else if (img == "apetureLaboratoriesLight"){ return { width : 173, height : 43, bpp : 4, transparent : 1, buffer : require("heatshrink").decompress(atob("iIAGxAADwINHAH5ULK34APjABBKwpeBJX5VLJgJWGAwKv/ABL8EKomBBIYA/KpJWHAoRW/KpZQCfwJSCAgRW/KphWFBgZW/KphNCAgSxEKP4ADJAatFKwWBL4oA/KpALGXQhS/Ko4MIwIOMAHREOKv5ZVVgcRiEAgALDAwQABgIIHCQYHMDQQYBDwQEGDIoaGTx4MCwIiCJgYhFBIYIHLw4HFBARjGESJUDehZVFVhJNLRI5VGDIIdEAgwiLgLzDJAJVJB4IMBCoKsHAYpFCDgr2IApYEIBpJFCKpqsCHgQbFIhBVHBhJoGTwyBRKp5mBDoY6GKoYqEXYg7JApKeHQJysEKpRmBDoasHQBAACM4qMGEAr0JAgZjGFYhVPiOBEIpVEAAaAEA4oyEW4qyKFZBoFKoisDJIJWLfIp3IQBJeJfgysMERpVCwMYVpijFBA6ZJdA4JHJYgEKQIx1EVgRVBVhj5IEIyZHHYoUGNw4MCQIwIKAARVDxBVRQo6ZJHZZoGU4yBGBAiBGVgRZBVhYlIfJBoFHZZoHfJRwGBAQrEVISvCKpwrEUZAqFVhzYKB4yKGQIpVDAYJVKEoYFDBIpVIb4ysMIgoPHOgoRFjGBVwKsLAFzQHACBVCVhQA/KpawBCJa76IhRWDVxIODAwTaFAocQgEAdhALGBQYJBCIYQBDYgKEBBAEDVgeIAgKgFBYZVEEYY+CH4YDBBgYFBBYoFEOYhmEDYgFFLIwEDKw2BKwhTFBoSsHIgglFAQo/HKIoDECBBZGc46eEAYa2EKox2Ga5LjLDoq8FKAgVDBAsAEghWGVgRWJKoaOFD4IgCViAWFVjKTGJIZOFKpKOHAQj3JAogCFPApcGKQziGLopKCU4hWFKojsEHYrXFCAJFId45CEDYh4EB4Y1DCYSzFJQT+FiIGCKooA/AAZMBfopWDKv5WLVgxT/AB+BKopW/ACBU/ABsQA=")) -} + } } - + else if (img == "apetureWatch"){ return { width : 176, height : 176, bpp : 4, transparent : 2, - buffer : require("heatshrink").decompress(atob("kQA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A+/4A/AH4A/AH4A/AD0RkQASkMSCqgrqiJX/K/5X/K/5XR7vQgAAHgMQBRAAKgMRCqgrJhGIK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K7Uv///+RX/K6ZWBAAJXDAA3/+Pd6IMIAG0YxADBj5XD+ISIBwRX/K4pWDAAIMCXQQABl4LC7vQbabxLiIVUFZMIxBJBK4siK4wLDK/5XSBYhX/K6MvBIQDBK/5XD+RXMBAQQCK/5XDKAJXKVwRWBAoJX/K4j3CUohXDL4YACK/5XF+SuEK4yuCK/5XHWAZOCK4cvKwhX/K45MFK4YAGK/5XGLApX/K6X/K5svK/5XIWAZXJ/5X/K6svK/5XPAoauDK/5XJ/5XDj5eEVwRX/K5y2FVwRX/K4/yK44GDVwRX/K50fWAi9DK/5XGUYRQCiKwCAwKuDK/5XGJgZXGMQJWDK/5XGKQKkCK4arEK/5XIVQRQDK/5XQKwIABJYXyK4IGDAAReBK/5XDVwSwFK44QBK/5XJLAoFEX4UvK/5XDI4QADK4gFDM4RX/K5aqCK4oMDK/5XEUARYE+JXCLoINEK/5XLkURK4QAGK/5XEfIhX/K/5Xr+RX/K/5Xu/5X/K/5WKAAJXfl5XB+RX/K6ywFK9XxK4XwK7xWCK58vK7sP/5XDGoJXw/5Xc//4xBXEHIKyPK5/yK5svK7kPxAyBK4oHBK7xOFK5AQBK7UP/GPD4JWCiMfK4IJBK7iuFK4QAFj5XC6IMHACH4VooADK4QKHACEYK4QSOK7ilBJYcc5kM5gMCdQRXaOZK3FkRXC6DbTAAf4UYInB5gABK4PM4KBD+AcLFZUIK4JNGkRXIAAJXYh6GDKwRXDLASwCK7HyK9auDjhXH5iwPK5hMIK8iuBKwhXFLAJX/AA0PxCuBKAhXG4KwCK/6uEx/xK5qwNK/KuBjhXL5kRWAJXrABUhiQMKK4RPFK4/BK4PyFaxXql+I+JXPiP//5X/K4WP+McJ4roBLAxX/K5vAAQhX/ABBDBiJXFVgawFiMf//yK/4gBAAKuHWA/BCYQhIK8uIwQCOK5CqFAohXxlGIxACMCAJX/K7cAAAZXFBQkBK/6v/ABOIwQCOK/4AMFZRXI4AEIV+wrO///iMcVRC0FiMf//yQaZXZlABCFZ0v//xK4qrCVwpXB/+PbahX15kAgCuFK/5XIiJOF5hWG4MR/BXvkWIwQrQ///K58f/HyK94rSK4UcK5kRj+IK8I1BADhXE+KwGK4vBiP4x5XhEJQASl4DDWARXMj/4NwZX/WAkcK5TiBxA0Dby5XrWAJYEK4kRVwOPGgY4TFwhXol6wCiJXH4KuCSwhX/WAxYDK4RWBVwxX/WBERjhXCAoKuHK/6wGxGBKQQADBIKuFK/6wGxBOBKocf//4x6uFK/4HG/BXB+KtDA4JWGK/4AGU4RXDKwQwHK/4JH/6vEVo5X/BZRXDFpRX/ABEhK4QOKK/5X/K8BYCBpZX/K/5XVfYQAWK6gedK/5XiBhchiINLK6gJIK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5Xv/4AYV/4AXK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K6v/ADCv/ABMhiKv/K/5X/K/5X/K/5X/K/5X6/4AdiIAYFzwA=")) + buffer : require("heatshrink").decompress(atob("kQA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A+/4A/AH4A/AH4A/AD0RkQASkMSCqgrqiJX/K/5X/K/5XR7vQgAAHgMQBRAAKgMRCqgrJhGIK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K7Uv///+RX/K6ZWBAAJXDAA3/+Pd6IMIAG0YxADBj5XD+ISIBwRX/K4pWDAAIMCXQQABl4LC7vQbabxLiIVUFZMIxBJBK4siK4wLDK/5XSBYhX/K6MvBIQDBK/5XD+RXMBAQQCK/5XDKAJXKVwRWBAoJX/K4j3CUohXDL4YACK/5XF+SuEK4yuCK/5XHWAZOCK4cvKwhX/K45MFK4YAGK/5XGLApX/K6X/K5svK/5XIWAZXJ/5X/K6svK/5XPAoauDK/5XJ/5XDj5eEVwRX/K5y2FVwRX/K4/yK44GDVwRX/K50fWAi9DK/5XGUYRQCiKwCAwKuDK/5XGJgZXGMQJWDK/5XGKQKkCK4arEK/5XIVQRQDK/5XQKwIABJYXyK4IGDAAReBK/5XDVwSwFK44QBK/5XJLAoFEX4UvK/5XDI4QADK4gFDM4RX/K5aqCK4oMDK/5XEUARYE+JXCLoINEK/5XLkURK4QAGK/5XEfIhX/K/5Xr+RX/K/5Xu/5X/K/5WKAAJXfl5XB+RX/K6ywFK9XxK4XwK7xWCK58vK7sP/5XDGoJXw/5Xc//4xBXEHIKyPK5/yK5svK7kPxAyBK4oHBK7xOFK5AQBK7UP/GPD4JWCiMfK4IJBK7iuFK4QAFj5XC6IMHACH4VooADK4QKHACEYK4QSOK7ilBJYcc5kM5gMCdQRXaOZK3FkRXC6DbTAAf4UYInB5gABK4PM4KBD+AcLFZUIK4JNGkRXIAAJXYh6GDKwRXDLASwCK7HyK9auDjhXH5iwPK5hMIK8iuBKwhXFLAJX/AA0PxCuBKAhXG4KwCK/6uEx/xK5qwNK/KuBjhXL5kRWAJXrABUhiQMKK4RPFK4/BK4PyFaxXql+I+JXPiP//5X/K4WP+McJ4roBLAxX/K5vAAQhX/ABBDBiJXFVgawFiMf//yK/4gBAAKuHWA/BCYQhIK8uIwQCOK5CqFAohXxlGIxACMCAJX/K7cAAAZXFBQkBK/6v/ABOIwQCOK/4AMFZRXI4AEIV+wrO///iMcVRC0FiMf//yQaZXZlABCFZ0v//xK4qrCVwpXB/+PbahX15kAgCuFK/5XIiJOF5hWG4MR/BXvkWIwQrQ///K58f/HyK94rSK4UcK5kRj+IK8I1BADhXE+KwGK4vBiP4x5XhEJQASl4DDWARXMj/4NwZX/WAkcK5TiBxA0LK/awBLAhXEiKuBx5X/K4svWAURK4/BVwX/ERZX5WAhYDK4RWBVxxX7WAkRjhXCAoKuPK/awCxGBKQQADBIKuNK/iwBxBOBKocf//4x6uNK/gHB/BXB+KtDA4JWOK/siU4RXDKwQwPK/oJB/6vEVp5X/AARXDFqRX/IAJXCESRX/K/5XYLAQiTK/5X/K5r7CAGpX/K+zxMiIiTkMSCqZX/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K9//ADA4HV/4APK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K6v/ADCv/ABMhiIiTK/5X/K/5X/K/5X/K/5X/K83/ADsRAG4A=")) } } @@ -117,7 +117,7 @@ else if (img == "apetureLaboratoriesLight"){ return { width : 176, height : 176, bpp : 4, transparent : 2, - buffer : require("heatshrink").decompress(atob("kQA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A+gAA/AH4A/AH4A/AD0RkQASkMSCqgrqiJX/K/5X/K/5XR7vf/4AH+MfBRAAK+MRCqgrJ/GIK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K7UggEAgRX/K6ZWBAAJXDAA0AgPd6IMIAG0YxADBiBXDgISIBwRX/K4pWDAAIMCXQQABkALC7vfbabxLiIVUFZP4xBJBK4siK4wLDK/5XSBYhX/K6MgBIQDBK/5XDgRXMBAQQCK/5XDKAJXKVwRWBAoJX/K4j3CUohXDL4YACK/5XFgSuEK4yuCK/5XHWAZOCK4cgKwhX/K45MFK4YAGK/5XGLApX/K6UAK5sgK/5XIWAZXJgBX/K6sgK/5XPAoauDK/5XJgBXDiBeEVwRX/K5y2FVwRX/K48CK44GDVwRX/K50QWAi9DK/5XGUYRQCiKwCAwKuDK/5XGJgZXGMQJWDK/5XGKQKkCK4arEK/5XIVQRQDK/5XQKwIABJYUCK4IGDAAReBK/5XDVwSwFK44QBK/5XJLAoFEX4UgK/5XDI4QADK4gFDM4RX/K5aqCK4oMDK/5XEUARYEgJXCLoINEK/5XLkURK4QAGK/5XEfIhX/K/5XrgRX/K/5XugBX/K/5WKAAJXfkBXBgRXvgJXCh5XhWApXoF4KvD+EALKBXMKwRXPkBXcgAUCK4QFB+BYPK78AK7ZWBGYJXExBYQK58CK5sgK7fwJ4JQBK4pYCK7pOFK5AQBK7UP/GPAgJWCiMfK4IJBWBpXOVwpXCAAsQK4XRBg4APgAwBVogADK4XwgInWjBXCCRxXbiD9BKwcc5kM5gNCS4XwK7JyJW4siK4XfbaZGD/CjBE4PMAAJXB5nBiIaC+AdLFZTWBgBNGkRXIAAJXYh6uDKwRXDLAQRDK68CK9SuEjhXH5iwPK5hMIK8UP/APBKwhXFLAKwNK/OIVwJQEK43BDgRX/AAXw/GP+JXNWAXwK/5XDVwMcK5fMiIdBK9YAKkMSBZMPK4RPFK4/BJIUCFagAJK8WI+JXPiJX/K4mP+McJ4sAgBYGK/5XN4ACEK/4AHkBDBiJXFVgawFiMf//wK/4gBAAKuHWA/BCYQhIK8uIwQCOK5CqFAohXxlGIxACMCAJX/K7cAAAZXFBQkBK/6v/ABOIwQCOK/4AMFZRXI4AEIV+wrNkH//8RjiqIWgsRj//+CDTK7MoAIQrOh//+JXFVYSuFK4P/x8CK/5XJ5kAgCuFK/5XIiJOF5hWG4MR/BXvkWIwRXR/5XPj/4/5XvFaMgK4UcK5kRj+I+ArVK5UAADpXE+KwGK4vBiP4x5XhaBIATkADCh6wCK5kf/H/GpRX7+McK5UR/+IK4beWK9MgK4KwBLAhXEiKuBx/wCwQ4TFwZXoWAkRK4/BVwxX/WA5YDK4RWBVwxX/K4ywBiMcK4QFBVwZX/FA8AK4OIwJSCAAYJBVwIzEK/4ADh5NBJwJVDj///GP/4yFK/4GEJwJXB+KtDA4P/+ATFK/4AEgCnCK4ZWDGIxX/LA//V4hWIK/5YIgBXD+EAF5BX/ABEBK4QtKK/4AIkJXCBxRX/LBYNLK/5X/K6r7CACxXUDzpX/K8QMLkMRBpZXUBJBX/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K98AADCv/AC5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5XVgAAYV/4AJkMRV/5X/K/5X/K/5X/K/5X/K/UAADsRADAueA==")) + buffer : require("heatshrink").decompress(atob("kQA/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A/AH4A+gAA/AH4A/AH4A/AD0RkQASkMSCqgrqiJX/K/5X/K/5XR7vf/4AH+MfBRAAK+MRCqgrJ/GIK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K7UggEAgRX/K6ZWBAAJXDAA0AgPd6IMIAG0YxADBiBXDgISIBwRX/K4pWDAAIMCXQQABkALC7vfbabxLiIVUFZP4xBJBK4siK4wLDK/5XSBYhX/K6MgBIQDBK/5XDgRXMBAQQCK/5XDKAJXKVwRWBAoJX/K4j3CUohXDL4YACK/5XFgSuEK4yuCK/5XHWAZOCK4cgKwhX/K45MFK4YAGK/5XGLApX/K6UAK5sgK/5XIWAZXJgBX/K6sgK/5XPAoauDK/5XJgBXDiBeEVwRX/K5y2FVwRX/K48CK44GDVwRX/K50QWAi9DK/5XGUYRQCiKwCAwKuDK/5XGJgZXGMQJWDK/5XGKQKkCK4arEK/5XIVQRQDK/5XQKwIABJYUCK4IGDAAReBK/5XDVwSwFK44QBK/5XJLAoFEX4UgK/5XDI4QADK4gFDM4RX/K5aqCK4oMDK/5XEUARYEgJXCLoINEK/5XLkURK4QAGK/5XEfIhX/K/5XrgRX/K/5XugBX/K/5WKAAJXfkBXBgRXvgJXCh5XhWApXoF4KvD+EALKBXMKwRXPkBXcgAUCK4QFB+BYPK78AK7ZWBGYJXExBYQK58CK5sgK7fwJ4JQBK4pYCK7pOFK5AQBK7UP/GPAgJWCiMfK4IJBWBpXOVwpXCAAsQK4XRBg4APgAwBVogADK4XwgInWjBXCCRxXbiD9BKwcc5kM5gNCS4XwK7JyJW4siK4XfbaZGD/CjBE4PMAAJXB5nBiIaC+AdLFZTWBgBNGkRXIAAJXYh6uDKwRXDLAQRDK68CK9SuEjhXH5iwPK5hMIK8UP/APBKwhXFLAKwNK/OIVwJQEK43BDgRX/AAXw/GP+JXNWAXwK/5XDVwMcK5fMiIdBK9YAKkMSBZMPK4RPFK4/BJIUCFagAJK8WI+JXPiJX/K4mP+McJ4sAgBYGK/5XN4ACEK/4AHkBDBiJXFVgawFiMf//wK/4gBAAKuHWA/BCYQhIK8uIwQCOK5CqFAohXxlGIxACMCAJX/K7cAAAZXFBQkBK/6v/ABOIwQCOK/4AMFZRXI4AEIV+wrNkH//8RjiqIWgsRj//+CDTK7MoAIQrOh//+JXFVYSuFK4P/x8CK/5XJ5kAgCuFK/5XIiJOF5hWG4MR/BXvkWIwRXR/5XPj/4/5XvFaMgK4UcK5kRj+I+ArVK5UAADpXE+KwGK4vBiP4x5XhaBIATkADCh6wCK5kf/H/GpRX7+McK5UR/+IK/5XEkBXBWAJYEK4kRVwOP+AiKK/CwEiJXH4KuOK/SwELAZXCKwKuOK/ywBiMcK4QFBVwZX/K40igBXBxGBKQQADBIKuBGZhX6kUPJoJOBKocf//4x//GRpX7kBOBK4PxVoYHB//wERpX7kUAU4RXDKwYxOK/hYC/6vEKyBX+LAMAK4fwgAvQK/wABgJXCFqRX/IAJXCESRX/LAYiTK/5X/K5r7CAGpX/K+zxMiIiTkMSCqZX/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K98AADA4HV/4APK/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K/5X/K6sAADCv/ABMhiIiTK/5X/K/5X/K/5X/K/5X/K80AADsRAG4A==")) } } } @@ -208,10 +208,7 @@ function draw() { // draw Day, name of month, Date var date = [da[0], da[1], da[2]].join(" "); g.setFont(font, dateFontSize); - - g.drawString(String(da[0]), xyCenter*1.55, yposDate, true); - g.drawString(String(da[1]), xyCenter*1.55, yposDate+20*1, true); - g.drawString(String(da[2]), xyCenter*1.55, yposDate+20*2, true); + g.drawString(String(date), xyCenter, yposDate, false); // draw year