From f08be44691c4337f71526d11789438cbf6699b89 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Sun, 27 Nov 2016 05:14:27 +0100 Subject: [PATCH] cleanup and menu icon --- package.json | 12 ++++++++++-- resources/images/menuicon~bw.png | Bin 0 -> 207 bytes resources/images/menuicon~color.png | Bin 0 -> 291 bytes src/c/squared.c | 6 +++--- src/pkjs/{pebble-app.js => app.js} | 0 5 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 resources/images/menuicon~bw.png create mode 100644 resources/images/menuicon~color.png rename src/pkjs/{pebble-app.js => app.js} (100%) diff --git a/package.json b/package.json index 9435aa7..8df3b19 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "health" ], "displayName": "Squared 4.0", - "enableMultiJS": false, + "enableMultiJS": true, "messageKeys": { "background_color": 4, "backlight": 17, @@ -39,7 +39,15 @@ }, "projectType": "native", "resources": { - "media": [] + "media": [ + { + "file": "images/menuicon.png", + "menuIcon": true, + "name": "MENU_ICON", + "targetPlatforms": null, + "type": "bitmap" + } + ] }, "sdkVersion": "3", "targetPlatforms": [ diff --git a/resources/images/menuicon~bw.png b/resources/images/menuicon~bw.png new file mode 100644 index 0000000000000000000000000000000000000000..2a8ee73afa57302959706937d456da1a2a47da70 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0y~yV2}i14mJh`h9fUqlNlHo7>k44ofy`glX=O&z|i68 z;uzw=`*unrSAznN%k~%l>nlxPIBCpTXTu}plxy|9%uiJC_Wp&rlCS<2?0Y1z*-Rl+ zbj{a|+cVCoI)*4zZ+<>WVZESZ+YIkXod%2A=6Zjs^xczk+e?bP0l+eTg05=a(NB{r; literal 0 HcmV?d00001 diff --git a/resources/images/menuicon~color.png b/resources/images/menuicon~color.png new file mode 100644 index 0000000000000000000000000000000000000000..132ff97a4c17be77a08381b8f26f0171074d7289 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0y~yV2}i14mJh`h9fUqlNlHo7>k44ofy`glX=O&z;M^o z#WBQ#_im`8P_qILkKg=`uf1XSI$S5^MDq!~p3!{9LWMDLIV}K9 zbXdwBFa5)xlWm^2!t=~}`F~aRA<8`Wyo5IxNqIc{#`N~rCzi}v%6m7ieDd4mYDYfT zdnNsfTZIi~5_&!hIvE9)9XXTwa4~E4f~OAZ%YwwVJv+p5-mChVZT!WkDsi>tCYr1c v9WF1orgZE3Pv92LNV2?L|9po*CG(4oafU6oLuWEDFfe$!`njxgN@xNAy~KAk literal 0 HcmV?d00001 diff --git a/src/c/squared.c b/src/c/squared.c index c0188e3..051f6c0 100644 --- a/src/c/squared.c +++ b/src/c/squared.c @@ -1706,9 +1706,9 @@ static void init() { .quick_start = false, .leading_zero = false, .background_color = 0b11000000, - .number_base_color = 0b11001010, - .number_variation = true, - .ornament_base_color = 0b11100010, + .number_base_color = 0b11111111, + .number_variation = false, + .ornament_base_color = 0b11001010, .ornament_variation = true, .invert = false, .monochrome = true, diff --git a/src/pkjs/pebble-app.js b/src/pkjs/app.js similarity index 100% rename from src/pkjs/pebble-app.js rename to src/pkjs/app.js