diff --git a/apps/cc_abstract/README.md b/apps/cc_abstract/README.md index b328251b5..db8416c74 100644 --- a/apps/cc_abstract/README.md +++ b/apps/cc_abstract/README.md @@ -4,14 +4,10 @@ * 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) -![logo](cc_clock24_screen.png) +![logo](screenshot1.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 diff --git a/apps/cc_abstract/app.js b/apps/cc_abstract/app.js index b18f2ed4b..931d986a2 100644 --- a/apps/cc_abstract/app.js +++ b/apps/cc_abstract/app.js @@ -1,10 +1,7 @@ // ----- const ----- const defaultSettings = { - loadWidgets : false, - textAboveHands : false, - shortHrHand : false, - show24HourMode : false + loadWidgets: false }; const settings = Object.assign(defaultSettings, require('Storage').readJSON('cc_abstract.json', 1) || {}); diff --git a/apps/cc_abstract/app_icon.js b/apps/cc_abstract/app_icon.js index b213fe5c8..12223c5ae 100644 --- a/apps/cc_abstract/app_icon.js +++ b/apps/cc_abstract/app_icon.js @@ -1 +1 @@ -require("heatshrink").decompress(atob("mEwgIEBoUAiAKCgUCBQUEColEAYUQhAmKCwgeCAAcCgEDjwEBkEAg8TBocNgYFDh8GAYMDxkPjEA8EAwkHJgIcBAoPfAoYWCBYYFIgfvAoX4FYRJEAp9gAomYNAOAArPwAogAC4AFiRoIFJLgIFJuADCg//Q4U//4FDj4FEAAV4Aoi0CSxBsCA==")) \ No newline at end of file +require("heatshrink").decompress(atob("mEw4X/AoOuuf3gswwgcQgILKgfAHydQAgcFBYvQAgcHM60CBZUKoALKC5UoBZUgAgdwBo8NNIxtKAH4AfgWAAwkMTAiNEnkcCwgLEigWEgOQFpLIJYwOgBZFgb5VgCxMAlSLsfZdwBY8NcP4ALKokHBZRpCACMB4ALVAAwA=")) \ No newline at end of file diff --git a/apps/cc_abstract/app_icon.png b/apps/cc_abstract/app_icon.png new file mode 100644 index 000000000..19ebfab39 Binary files /dev/null and b/apps/cc_abstract/app_icon.png differ diff --git a/apps/cc_abstract/cc_abstract_screen.png b/apps/cc_abstract/cc_abstract_screen.png deleted file mode 100644 index 1f0e5b089..000000000 Binary files a/apps/cc_abstract/cc_abstract_screen.png and /dev/null differ diff --git a/apps/cc_abstract/metadata.json b/apps/cc_abstract/metadata.json index 11f46806d..86bc959e2 100644 --- a/apps/cc_abstract/metadata.json +++ b/apps/cc_abstract/metadata.json @@ -1,18 +1,17 @@ { "id": "cc_abstract", "name": "CC Abstract", - "shortName":"CC-Abstract", - "version":"0.01", + "shortName": "CC-Abstract", + "version": "0.01", "description": "analog clock abstract face", - "icon": "cc_abstract_icon.png", + "icon": "app_icon.png", "type": "clock", - "tags": "clock", + "tags": "clock,abstract", "supports" : ["BANGLEJS2"], - "screenshots": [{"url":"cc_abstract_screen.png"}], + "screenshots": [{"url":"screenshot1.png"}, {"url":"screenshot2.png"}], "readme": "README.md", "storage": [ - {"name":"cc_abstract.app.js","url":"app.js"}, - {"name":"cc_abstract.settings.js","url":"settings.js"}, - {"name":"cc_abstract.img","url":"app_icon.js","evaluate":true} + {"name": "cc_abstract.app.js", "url": "app.js"}, + {"name": "cc_abstract.img", "url": "app_icon.js", "evaluate": true} ], "data": [{"name":"cc_abstract.json"}] } diff --git a/apps/cc_abstract/screenshot1.png b/apps/cc_abstract/screenshot1.png new file mode 100644 index 000000000..ffa76b602 Binary files /dev/null and b/apps/cc_abstract/screenshot1.png differ diff --git a/apps/cc_abstract/screenshot2.png b/apps/cc_abstract/screenshot2.png new file mode 100644 index 000000000..a6a49d143 Binary files /dev/null and b/apps/cc_abstract/screenshot2.png differ diff --git a/apps/cc_abstract/settings.js b/apps/cc_abstract/settings.js deleted file mode 100644 index 4aa19215d..000000000 --- a/apps/cc_abstract/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); -})