From a159a1795ef742208f495047f011d839956bf7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomek=20W=C3=B3jcik?= Date: Thu, 27 Aug 2015 22:33:22 +0100 Subject: [PATCH] XEN style! :D --- appinfo.in.json | 23 ++++++++--- config/index.html | 46 +++++++++++++++------- resources/background.png | Bin 4854 -> 0 bytes resources/background_wide.png | Bin 4831 -> 0 bytes resources/bkg_classic_narrow.png | Bin 0 -> 2023 bytes resources/bkg_classic_wide.png | Bin 0 -> 2006 bytes resources/{xen.png => bkg_xen_narrow.png} | Bin 2035 -> 2035 bytes resources/bkg_xen_wide.png | Bin 0 -> 2017 bytes src/intuiclock.c | 35 +++++++++++++--- src/js/pebble-js-app.js | 6 ++- 10 files changed, 83 insertions(+), 27 deletions(-) delete mode 100644 resources/background.png delete mode 100644 resources/background_wide.png create mode 100644 resources/bkg_classic_narrow.png create mode 100644 resources/bkg_classic_wide.png rename resources/{xen.png => bkg_xen_narrow.png} (88%) create mode 100644 resources/bkg_xen_wide.png diff --git a/appinfo.in.json b/appinfo.in.json index 6a05235..f921b53 100644 --- a/appinfo.in.json +++ b/appinfo.in.json @@ -3,7 +3,7 @@ "shortName": null, "longName": null, "companyName": null, - "versionLabel": null, + "versionLabel": "1.2", "sdkVersion": "3", "targetPlatforms": ["basalt"], "watchapp": { @@ -13,13 +13,23 @@ "media": [ { "type": "png", - "name": "IMG_BACKGROUND", - "file": "xen.png" + "name": "IMG_BKG_CLASSIC_NARROW", + "file": "bkg_classic_narrow.png" }, { "type": "png", - "name": "IMG_BACKGROUND_WIDE", - "file": "background_wide.png" + "name": "IMG_BKG_CLASSIC_WIDE", + "file": "bkg_classic_wide.png" + }, + { + "type": "png", + "name": "IMG_BKG_XEN_NARROW", + "file": "bkg_xen_narrow.png" + }, + { + "type": "png", + "name": "IMG_BKG_XEN_WIDE", + "file": "bkg_xen_wide.png" }, { "type": "png", @@ -40,6 +50,7 @@ "KEY_SECONDS_HAND": 0, "KEY_BATTERY_INDICATOR": 1, "KEY_DATE_FORMAT": 2, - "KEY_WIDE_LAYOUT": 3 + "KEY_WIDE_LAYOUT": 3, + "KEY_XEN_STYLE": 4 } } diff --git a/config/index.html b/config/index.html index f970449..4e1e5d5 100644 --- a/config/index.html +++ b/config/index.html @@ -11,20 +11,12 @@
-
Features
+
Time & Date
- - + + +
+
+
@@ -50,13 +60,15 @@ var input_seconds_hand = document.getElementById('input-seconds-hand'), input_battery_indicator = document.getElementById('input-battery-indicator'), input_date_format = document.getElementById('input-date-format'), - input_wide_layout = document.getElementById('input-wide-layout'); + input_wide_layout = document.getElementById('input-wide-layout'), + input_xen_style = document.getElementById('input-xen-style'); var options = { 'seconds_hand': input_seconds_hand.checked, 'battery_indicator': input_battery_indicator.checked, 'date_format': input_date_format.value, - 'wide_layout': input_wide_layout.checked + 'wide_layout': input_wide_layout.checked, + 'xen_style': input_xen_style.checked }; // Save for next launch @@ -64,8 +76,9 @@ localStorage['battery_indicator'] = options['battery_indicator']; localStorage['date_format'] = options['date_format']; localStorage['wide_layout'] = options['wide_layout']; + localStorage['xen_style'] = options['xen_style']; - console.log('Got options: ' + JSON.stringify(options)); + // console.log('Got options: ' + JSON.stringify(options)); return options; } @@ -85,7 +98,7 @@ var button_submit = document.getElementById('button-submit'); button_submit.addEventListener('click', function() { - console.log('Submit'); + // console.log('Submit'); // Set the return URL depending on the runtime environment var return_to = getQueryParam('return_to', 'pebblejs://close#'); @@ -96,7 +109,8 @@ var input_seconds_hand = document.getElementById('input-seconds-hand'), input_battery_indicator = document.getElementById('input-battery-indicator'), input_date_format = document.getElementById('input-date-format'), - input_wide_layout = document.getElementById('input-wide-layout'); + input_wide_layout = document.getElementById('input-wide-layout'), + input_xen_style = document.getElementById('input-xen-style'); if (localStorage['seconds_hand']) { input_seconds_hand.checked = JSON.parse(localStorage['seconds_hand']); @@ -113,6 +127,10 @@ if (localStorage['wide_layout']) { input_wide_layout.checked = JSON.parse(localStorage['wide_layout']); } + + if (localStorage['xen_style']) { + input_xen_style.checked = JSON.parse(localStorage['xen_style']); + } })(); diff --git a/resources/background.png b/resources/background.png deleted file mode 100644 index 95bb76fffb5a1b7c2570b15c68701fca54e6cae1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4854 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 z zSqx(ge6nBe-k-#rWn|X=uzNM0I7a#Pi$so3(2-n!_+fMub)@85FPY}LwVzp))s@S` zh_oux!zPcig*NQ9Zd$orrG$x8U{+w;Uc^o8EMrUdXS3ZP`>pQ>&TU(6wKtzJsJQkA zftyz*Sb^oU=D_v1yDU1K=!aMP{OtjEri;>Bfy+0OxMd`!vLpWDH}D&)T}(bFz6MV= zQWkYHb1`RI)^@U+J7+##`_V2wqETMpF7>iXqvyeR+4xh%I>l`zl+t+2Wz3R)%}L+C z;h3~3On3+PZT)%bWO+`I54O$Da;W#8|POPlYd%Wu-Uk+#64fJ`~F;+;@An1Ol#B))%1=qzu#s++1H7UqH<{5qI8kR*%8$c-MG$?ZInP7ma2DT_dU^sZ68#!qe7o16=6g zyr`z=vjxN=3bQ?9MJ zs@i_(Kjw@92L}h94MA1tgLCw86FEIRj&M$lOy4V4uqWk8Y*ekp0>Uftde@=mcm>*1 zIB%C*PP`_(>j^75&(3VA*T`&oSG?MZ*nqnSk^|}CpQpH;w159%ekr?XwZJ(EdvRzlq!1&PSK-+I~>G;53@8*58d5o zG`U|oqQ4BX=+b~j2ax!8A=FcEkG{a5>lxV&ieN9KR~mYkJDB+7>dNrz+QNd-p@dR8 zDK0I`t2nC{6*#D-5p+jzbkX|#`Bt}_xP*tx!%^U=?ghckMBY9kCjZL*es;sKrOL0O zH*Qr`JYke)a|j&am1`LH#J|QW>@0H_zB~Plk!~aUToCzW1*%Q6`P&xMBd%#&9dD;nJiT`)*ajN{MzT)-9JPG=KO7@SNB>%MR&*LG=Z$VvQDxHfnZ;W_G_<$C(T_ zPeRngaORynvei0^aQK?yyv5&+HXj^5{>l+2Rfocv_gt7Or(1zCriyB+Rno(wk3XVN zIwo{0>5m$&9&$dSbG=WG&6ON@*6hZt`}R*E(sQK34{o_S8ReF{;UPX7YQg~7R3T4R z;_OEJ^iV$d2o(bk12)u5JRM#F>jc{IPJ}_Jfn^SE*{$@^IlddC z^{!sjz&(OgEk-<%8>(Vet#x0pkfEAonXH)OO|k<$T%=Dtx*;Q^0vqNKb?4sS_fGs- z%fx5$D9>^t5pvCPq8fE0&}(oZQZw~0ynz<^aaHdQ**n)7ZMqjU%)=nZ8l&+6#F3;OK%9R~d&dezFSrDXd`yj@ML5V$^kODW#~~z zn9hDL#P>0;I>kaUik!DU zlwz~=$TVZ28B?4HhyQ^_rXhH-wAaM1^!tK3?fx|nwM1i|iY$#Wb3WVjxQU+PpkvXKaV2Q0(ap$s)&cr{aaOCJpBt>7J) zkau>k8bvjSIJkyfVjsa-nRP!P<&|1a89T-u=a|;te@gb<=33@En^u7GiFVTlLPRc& zXe=D_c)EiNICO?|C{O2a)63NlcUEK&jKm_v5sL~-BZ%&}QzyOeYPv~uLLb1apDh<8 zo#;!SAAUg1!JtSg-SMt;(S^8+D7)J5Q8^Q^_3WmX8))gClz6&@sZmeW} zFZ{h2VIOg#zyl^=WAOx54R=?Mkr;+Z=!xELVKjSDC75R0#{Y2(|GVZn|j=AS1ep?ruWntjjcr5j%QC9cVdoi=N zVyVFsg?dhz!ytPkK`i2NM&BEBKOI*abxySp)U-Vdjg1TiY_cb>R-pwpBL=OJ?{eA4 z?A}GQa|9f$Km&%J?SBD)~30HCw;%Naw zy)$*@R;C^DY@Mq=P}VMY>U&M2u0JMBI{v%hcd=n3E1po)(L5)3O6;DuhTZ92{e~0h+et46m1a@Oi{L>f>Ag&`=aL4VF-85L>CazQb zh>Zrj<-%TUHre03e`+%)u8GfgB|~;`8{0d*xje;dEY1g{|65lkP{AtWNrdouV RyI(Q@Dlm10N;&h;{{WJbJ(B!;4l9`wc5;%gp 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 literal 0 HcmV?d00001 diff --git a/resources/xen.png b/resources/bkg_xen_narrow.png similarity index 88% rename from resources/xen.png rename to resources/bkg_xen_narrow.png index 143bc7a8b23111d5764cc2965cbd5a7fbc79d780..10baceef9dcc7b71e6c611478f12e4fc3083efba 100644 GIT binary patch delta 52 zcmey&|CxV76cdk`nTe%|qp_)pse!@dG$sR>fC)%o^CBh@MwSnPF?pMJFfD1@q^CBh@MwakX?h`lfVzy)f0FXou A^8f$< diff --git a/resources/bkg_xen_wide.png b/resources/bkg_xen_wide.png new file mode 100644 index 0000000000000000000000000000000000000000..392df4c79b57f227e86c3f7a9c4c050239ef8787 GIT binary patch literal 2017 zcmbVNeN+=y7LT?-ii8cjsF9+CP^~GDOg_m(g62~qA0i+{s682yfdrW(P6m>o9z1ji zexQ|Nt5jPRg#{rRE3%7NIiyDv#Dlxm)*{sQ*e+72+FGI3Dt!@f_YY71*f}%v-n(<} z@80`+zjtPPTIxz#U|1l9LZN9BRq0^d1D;0eZ1CPnyUzu~0z#clWLWYEJA$JWxxtc$ zGPM{|fTp8}!MU*qji*pvGMX~8iR_eQsosKd5T6gnfmuN`g%ZEqVMX*CP=c9<7MRR3 z*1e8S7Sm*qvECG=Kq*!wYBVL5;%G)`YNoz)gB~`pmM1Xd9Z~>*p#;KoU`1w|)FER% z!Glr$67gP|Zl<<}EI3)y6cPyyX-$YsU^H0YZ?7e81$KR&1#oEaP(j)45l`zVx`|DsjN zGaUnCL$l0BA$kSUI6fN=hi6yzhFto#^yLqB^p0NmW~;32)NomPed8+Q?VgLte^vbE z{CHXV>hsyB#D9_YukcmgB>1)D88OwZD~ZKGwMF)0oQ%Y{&A}7SH6q@dyPYgLOJD zJZs|Qjgk--B%;OOj<2!x5$|}i$cpQS4))bu`^BAseR_wP)My3N7C2sQdx@7hn^I^VkRaqocydjv*R zW-o2gt$lUzQ~!BQZi$GD9IJC*(ZlC!)C2frz-hVCeOLgD(ir*MsifCJtM(@@+Gh;L4ma25(#WRJHn=G9ySIe2 z8>>!*Q8UU2Rn;FT(}X>f6Q%&T0IN6-T`-_0rcynF9KV=t(2^{5MScc|vqwhx{YJPtk^ z&D`{biexX678&9m9j}Z3N>;qSuI4>f%O})B5A4nryKXxkj;_yDcf)1c^3#PkKT7_# zddEmnWb%`}cgk}7xnyJvjV~K^-~06`^xo!GM76uWFK1zxpzQAgFTJ6AUG=@Bl?<=q zqoHBHr|(W`LvpFg8>WJxuPevCv@ARwaY4Pu>6lAaK;(rpt*O84%*pFsQ)Y`b&OxX< zjVAG#{UK|P&oN8aZOo=B_tVcLV)>s3d5Uw_0-5l!p`UJkvC@?=ARYKdri~0joLxVT z!_`<;2pQQDzKkYk_(g?Qr9pw3DdwjrI-(=X*8sApen-J9B(Q zA1!<+19Is++Ta@57uHi_x-)xTIC4EOY9jNWZ70x4AmR{HuDM3Z@Fs?VW*Ax%s5Od> zf&8xtx7<2(Zi$z!IdSn^<~GlNyd8bTe#raZpQOA**>a41wmqg|tM8|)Ri~;>D0Jn2 E0P1xTEC2ui literal 0 HcmV?d00001 diff --git a/src/intuiclock.c b/src/intuiclock.c index b534b7b..b43cc58 100644 --- a/src/intuiclock.c +++ b/src/intuiclock.c @@ -40,6 +40,7 @@ static bool hide_seconds_hand = false; static bool hide_battery_indicator = false; static char date_format[2]; static bool use_wide_layout = false; +static bool use_xen_style = false; static const GPathInfo MINUTE_HAND_POINTS = { 4, @@ -71,6 +72,7 @@ static const GPathInfo HOUR_HAND_POINTS = { #define KEY_BATTERY_INDICATOR 1 #define KEY_DATE_FORMAT 2 #define KEY_WIDE_LAYOUT 3 +#define KEY_XEN_STYLE 4 static void update_date_text_layer() { static char date_text[DATE_TEXT_SIZE]; @@ -205,17 +207,27 @@ static void update_geometry() { } if (use_wide_layout == false) { - s_background_bitmap = gbitmap_create_with_resource(RESOURCE_ID_IMG_BACKGROUND); + if (use_xen_style == false) { + s_background_bitmap = gbitmap_create_with_resource(RESOURCE_ID_IMG_BKG_CLASSIC_NARROW); + } else { + s_background_bitmap = gbitmap_create_with_resource(RESOURCE_ID_IMG_BKG_XEN_NARROW); + } + layer_set_frame(text_layer_get_layer(s_title_layer), GRect(36, 2, 46, 18)); layer_set_frame(text_layer_get_layer(s_date_layer), GRect(17, 130, 109, 16)); - layer_set_frame(text_layer_get_layer(s_ampm_layer), GRect(107, 26, 16, 16)); + layer_set_frame(text_layer_get_layer(s_ampm_layer), GRect(108, 26, 16, 16)); layer_set_frame(bitmap_layer_get_layer(s_battery_icon_layer), GRect(20, 26, 16, 7)); layer_set_frame(s_battery_indicator_layer, GRect(21, 27, 13, 5)); } else { - s_background_bitmap = gbitmap_create_with_resource(RESOURCE_ID_IMG_BACKGROUND_WIDE); + if (use_xen_style == false) { + s_background_bitmap = gbitmap_create_with_resource(RESOURCE_ID_IMG_BKG_CLASSIC_WIDE); + } else { + s_background_bitmap = gbitmap_create_with_resource(RESOURCE_ID_IMG_BKG_XEN_WIDE); + } + layer_set_frame(text_layer_get_layer(s_title_layer), GRect(24, 2, 71, 18)); layer_set_frame(text_layer_get_layer(s_date_layer), GRect(4, 130, 136, 16)); - layer_set_frame(text_layer_get_layer(s_ampm_layer), GRect(122, 25, 16, 16)); + layer_set_frame(text_layer_get_layer(s_ampm_layer), GRect(123, 25, 16, 16)); layer_set_frame(bitmap_layer_get_layer(s_battery_icon_layer), GRect(7, 26, 16, 7)); layer_set_frame(s_battery_indicator_layer, GRect(8, 27, 13, 5)); } @@ -264,6 +276,18 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) { } persist_write_bool(KEY_WIDE_LAYOUT, use_wide_layout); + + // Handling xen_style setting. + Tuple *xen_style_t = dict_find(iter, KEY_XEN_STYLE); + if (xen_style_t && xen_style_t->value->int32 > 0) { + use_xen_style = true; + } else { + use_xen_style = false; + } + + persist_write_bool(KEY_XEN_STYLE, use_xen_style); + + // Updating geometry according to settings. update_geometry(); } @@ -322,8 +346,9 @@ static void main_window_load(Window *window) { layer_set_update_proc(s_battery_indicator_layer, s_battery_indicator_layer_update); layer_add_child(window_layer, s_battery_indicator_layer); - // Update geometry according to wide_layout setting. + // Update geometry according to wide_layout and xen_style settings. use_wide_layout = persist_read_bool(KEY_WIDE_LAYOUT); + use_xen_style = persist_read_bool(KEY_XEN_STYLE); update_geometry(); // Read date_format setting from persistent storage. diff --git a/src/js/pebble-js-app.js b/src/js/pebble-js-app.js index dabb4a5..d68e5df 100644 --- a/src/js/pebble-js-app.js +++ b/src/js/pebble-js-app.js @@ -24,19 +24,21 @@ // }); Pebble.addEventListener('showConfiguration', function(e) { - Pebble.openURL('http://127.0.0.1/u/bilbo/pebble/iclock/index.html'); + Pebble.openURL('http://192.168.1.113/u/bilbo/pebble/iclock/index.html'); + // Pebble.openURL('http://127.0.0.1/u/bilbo/pebble/iclock/index.html'); // Pebble.openURL('https://pconf.bthlabs.pl/intuiclock/index.html'); }); Pebble.addEventListener('webviewclosed', function(e) { var config_data = JSON.parse(decodeURIComponent(e.response)); - // console.log('Configuration page returned: ' + JSON.stringify(config_data)); + console.log('Configuration page returned: ' + JSON.stringify(config_data)); var dict = {}; dict['KEY_SECONDS_HAND'] = config_data['seconds_hand']; dict['KEY_BATTERY_INDICATOR'] = config_data['battery_indicator']; dict['KEY_DATE_FORMAT'] = config_data['date_format']; dict['KEY_WIDE_LAYOUT'] = config_data['wide_layout']; + dict['KEY_XEN_STYLE'] = config_data['xen_style']; Pebble.sendAppMessage(dict, function() { // console.log('Send successful!');