diff --git a/apps/cc_astro/ChangeLog b/apps/cc_astro/ChangeLog index 507df8921..1678d5285 100644 --- a/apps/cc_astro/ChangeLog +++ b/apps/cc_astro/ChangeLog @@ -1 +1 @@ -0.01: copied from cc_abstract (V0.01) +0.01: First functional release diff --git a/apps/cc_astro/README.md b/apps/cc_astro/README.md index b328251b5..87e7d03eb 100644 --- a/apps/cc_astro/README.md +++ b/apps/cc_astro/README.md @@ -1,17 +1,10 @@ -# Analog Clock With Abstract Face +# Astronomy Clock ## Features -* inspired from the abstract face of the google smartwatch -* second hand (only on unlocked screen) -* date -* battery percentage (showing charge status with color) -* turned off or swipeable widgets (choose in settings) +* shows earth as hour and venus as minute hand +* shows mercury as second hand only on unlocked screen +* you will be enabled, to recognize the time from the planet positions +* if battery is low, the sun will become a red giant -![logo](cc_clock24_screen.png) - -## Settings - -* whether to load widgets, or not; if widgets are loaded, they are swipeable from the top; if not, NO ACTIONS of widgets are available -* date and battery can be printed both below hands (as if hands were physical) and above (more readable) -* hour hand can be made slighly shorter to improve readability when minute hand is behind a number +![logo](screenshot1.png) diff --git a/apps/cc_astro/app.js b/apps/cc_astro/app.js index 3e437bd30..09bb21069 100644 --- a/apps/cc_astro/app.js +++ b/apps/cc_astro/app.js @@ -1,14 +1,5 @@ // ----- const ----- -const defaultSettings = { - loadWidgets : false, - textAboveHands : false, - shortHrHand : false, - show24HourMode : false -}; - -const settings = Object.assign(defaultSettings, require('Storage').readJSON('cc_abstract.json', 1) || {}); - const center = { "x": g.getWidth()/2, "y": g.getHeight()/2 @@ -18,7 +9,7 @@ const parameters = { "earthOrbitRadius": 80, "venusOrbitRadius": 60, "mercuryOrbitRadius": 40, - "earthRadius": 8, + "earthRadius": 6, "venusRadius": 6, "mercuryRadius": 4, "sunRadius": 12, @@ -184,15 +175,6 @@ Bangle.setUI({ } }); -// Load widgets if needed, and make them show swipeable -if (settings.loadWidgets) { - Bangle.loadWidgets(); - require("widget_utils").swipeOn(); -} -else if (global.WIDGETS) { - require("widget_utils").hide(); -} - // Stop updates when LCD is off, restart when on Bangle.on('lcdPower', updateState); Bangle.on('lock', updateState); diff --git a/apps/cc_astro/app_icon.js b/apps/cc_astro/app_icon.js index b213fe5c8..5c8e704bf 100644 --- a/apps/cc_astro/app_icon.js +++ b/apps/cc_astro/app_icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEwgIEBoUAiAKCgUCBQUEColEAYUQhAmKCwgeCAAcCgEDjwEBkEAg8TBocNgYFDh8GAYMDxkPjEA8EAwkHJgIcBAoPfAoYWCBYYFIgfvAoX4FYRJEAp9gAomYNAOAArPwAogAC4AFiRoIFJLgIFJuADCg//Q4U//4FDj4FEAAV4Aoi0CSxBsCA==")) \ No newline at end of file +require("heatshrink").decompress(atob("mEwxH+If4AxlYALFkQOaFqITlDQ5FpJDgZUCY2s1mBeJB5bCI1W64ABDhAyKGB4PHwIvCRSgwNCw4HBwOBqxJVGBguHdrTOSCJLtMGA4QXFgYAFJywuPayIgTUyIwWFzIcPCTBhQAogLFAowuVJqRecEiQKQAAUqv1+qhgSAhQvMqnSAAWoF7iOMFwYABMI1KpQvflQvFvwMEku53MlF/6PVlS/GFwYqVd5heFd6wvNSQQABBQ4vaGBQAIlYkVF7IFiFyCuMFJgwORopMOGDIuHEJkHjkjjkHHpQxIBJBeNisjAAMcLJYnBAArDTAAReBAATsUFykAhwuCirsTFyowCisVCg4xQYZwWRC5jDQDKbpGeJapSLBYqDB5rYaDCQZWIyxHYDaaXMGKjHOFrjtKeRwA/AE4A=")) \ No newline at end of file diff --git a/apps/cc_astro/app_icon.png b/apps/cc_astro/app_icon.png new file mode 100644 index 000000000..a00a36b9c Binary files /dev/null and b/apps/cc_astro/app_icon.png differ diff --git a/apps/cc_astro/cc_astro_icon.png b/apps/cc_astro/cc_astro_icon.png deleted file mode 100644 index cded02071..000000000 Binary files a/apps/cc_astro/cc_astro_icon.png and /dev/null differ diff --git a/apps/cc_astro/cc_astro_screen.png b/apps/cc_astro/cc_astro_screen.png deleted file mode 100644 index 1f0e5b089..000000000 Binary files a/apps/cc_astro/cc_astro_screen.png and /dev/null differ diff --git a/apps/cc_astro/metadata.json b/apps/cc_astro/metadata.json index 2c053d2c6..54f3fd869 100644 --- a/apps/cc_astro/metadata.json +++ b/apps/cc_astro/metadata.json @@ -1,18 +1,21 @@ { "id": "cc_astro", "name": "CC Astro", - "shortName":"CC-Astro", - "version":"0.01", - "description": "astronomy clock face", - "icon": "cc_astro_icon.png", + "shortName": "CC-Astro", + "version": "0.01", + "description": "A clock with planets as clock hands", + "icon": "app_icon.png", "type": "clock", - "tags": "clock", + "tags": "clock,astro,planets,earth,venus,mercury,sun", "supports" : ["BANGLEJS2"], - "screenshots": [{"url":"cc_astro_screen.png"}], + "screenshots": [ + {"url":"screenshot1.png"}, + {"url":"screenshot2.png"}, + {"url":"screenshot3.png"} + ], "readme": "README.md", "storage": [ - {"name":"cc_astro.app.js","url":"app.js"}, - {"name":"cc_astro.settings.js","url":"settings.js"}, - {"name":"cc_astro.img","url":"app_icon.js","evaluate":true} + {"name": "cc_astro.app.js", "url": "app.js"}, + {"name": "cc_astro.img", "url": "app_icon.js", "evaluate":true} ], "data": [{"name":"cc_astro.json"}] } diff --git a/apps/cc_astro/screenshot1.png b/apps/cc_astro/screenshot1.png new file mode 100644 index 000000000..e93e44ce0 Binary files /dev/null and b/apps/cc_astro/screenshot1.png differ diff --git a/apps/cc_astro/screenshot2.png b/apps/cc_astro/screenshot2.png new file mode 100644 index 000000000..ec56c599e Binary files /dev/null and b/apps/cc_astro/screenshot2.png differ diff --git a/apps/cc_astro/screenshot3.png b/apps/cc_astro/screenshot3.png new file mode 100644 index 000000000..ce43bc54f Binary files /dev/null and b/apps/cc_astro/screenshot3.png differ diff --git a/apps/cc_astro/settings.js b/apps/cc_astro/settings.js deleted file mode 100644 index 4aa19215d..000000000 --- a/apps/cc_astro/settings.js +++ /dev/null @@ -1,33 +0,0 @@ -(function(back) { - const defaultSettings = { - loadWidgets : false, - textAboveHands : false, - shortHrHand : false, - show24HourMode : false - } - let settings = Object.assign(defaultSettings, require('Storage').readJSON('cc_clock24.json',1) || {}); - - const save = () => require('Storage').write('cc_clock24.json', settings); - - const appMenu = { - '': {title: 'cc_clock24'}, '< Back': back, - /*LANG*/'Load widgets': { - value : !!settings.loadWidgets, - onchange : v => { settings.loadWidgets=v; save();} - }, - /*LANG*/'Text above hands': { - value : !!settings.textAboveHands, - onchange : v => { settings.textAboveHands=v; save();} - }, - /*LANG*/'Short hour hand': { - value : !!settings.shortHrHand, - onchange : v => { settings.shortHrHand=v; save();} - }, - /*LANG*/'Show 24 hour mode': { - value : !!settings.show24HourMode, - onchange : v => { settings.show24HourMode=v; save();} - }, - }; - - E.showMenu(appMenu); -})