From ee73adae39718e266f0ec09652bdeb5c01fb73b4 Mon Sep 17 00:00:00 2001 From: Martin Donnelly Date: Wed, 1 Jun 2016 16:03:59 +0100 Subject: [PATCH] Last before splitting app up --- .gitignore | 1 + config.xml | 35 +++ custom.scss | 15 + .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.2.1/taskArtifacts/fileHashes.bin | Bin 147035 -> 147259 bytes .../2.2.1/taskArtifacts/fileSnapshots.bin | Bin 8339777 -> 9999847 bytes .../2.2.1/taskArtifacts/taskArtifacts.bin | Bin 55150 -> 55150 bytes platforms/android/assets/www/css/app.css | 91 ++---- .../android/assets/www/css/mui.custom.css | 24 +- platforms/android/assets/www/index.html | 191 ++++++------- .../js/device/CC2650/cc2650_accelerometer.js | 19 +- .../www/js/device/CC2650/cc2650_barometer.js | 23 +- .../www/js/device/CC2650/cc2650_luxometer.js | 17 +- platforms/android/assets/www/js/index.js | 265 ++++++++++-------- .../android/assets/www/js/standards/button.js | 11 +- .../assets/www/js/standards/capability.js | 36 ++- platforms/android/res/drawable-hdpi/icon.png | Bin 6080 -> 2599 bytes platforms/android/res/drawable-ldpi/icon.png | Bin 3096 -> 462 bytes platforms/android/res/drawable-mdpi/icon.png | Bin 4090 -> 1782 bytes platforms/android/res/drawable-xhdpi/icon.png | Bin 7685 -> 3354 bytes platforms/android/res/xml/config.xml | 6 + res/android/android-chrome-36x36.png | Bin 0 -> 462 bytes res/android/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2599 bytes res/android/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1782 bytes res/android/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 3354 bytes res/android/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 5405 bytes res/android/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 7422 bytes res/ios/Default-568h@2x~iphone.png | Bin 0 -> 28850 bytes res/ios/Default-667h.png | Bin 0 -> 37433 bytes res/ios/Default-736h.png | Bin 0 -> 57448 bytes res/ios/Default-Portrait@2x~ipad.png | Bin 0 -> 61322 bytes res/ios/Default-Portrait~ipad.png | Bin 0 -> 23280 bytes res/ios/Default@2x~iphone.png | Bin 0 -> 23174 bytes res/ios/Default~iphone.png | Bin 0 -> 8892 bytes res/ios/icon-60.png | Bin 0 -> 534 bytes res/ios/icon-60@2x.png | Bin 0 -> 809 bytes res/ios/icon-60@3x.png | Bin 0 -> 1050 bytes res/ios/icon-72.png | Bin 0 -> 618 bytes res/ios/icon-72@2x.png | Bin 0 -> 912 bytes res/ios/icon-76.png | Bin 0 -> 633 bytes res/ios/icon-76@2x.png | Bin 0 -> 944 bytes res/ios/icon.png | Bin 0 -> 556 bytes res/ios/icon@2x.png | Bin 0 -> 782 bytes www/css/app.css | 91 ++---- www/css/mui.custom.css | 24 +- www/index.html | 191 ++++++------- www/js/device/CC2650/cc2650_accelerometer.js | 19 +- www/js/device/CC2650/cc2650_barometer.js | 23 +- www/js/device/CC2650/cc2650_humidity.js | 25 +- www/js/device/CC2650/cc2650_luxometer.js | 17 +- www/js/device/CC2650/cc2650_thermopile.js | 34 +-- www/js/index.js | 265 ++++++++++-------- www/js/mandecoder.js | 16 +- www/js/standards/battery.js | 2 +- www/js/standards/button.js | 11 +- www/js/standards/capability.js | 36 ++- www/js/standards/gadget.js | 15 + 57 files changed, 801 insertions(+), 702 deletions(-) create mode 100644 custom.scss create mode 100644 res/android/android-chrome-36x36.png create mode 100644 res/android/mipmap-hdpi/ic_launcher.png create mode 100644 res/android/mipmap-mdpi/ic_launcher.png create mode 100644 res/android/mipmap-xhdpi/ic_launcher.png create mode 100644 res/android/mipmap-xxhdpi/ic_launcher.png create mode 100644 res/android/mipmap-xxxhdpi/ic_launcher.png create mode 100644 res/ios/Default-568h@2x~iphone.png create mode 100644 res/ios/Default-667h.png create mode 100644 res/ios/Default-736h.png create mode 100644 res/ios/Default-Portrait@2x~ipad.png create mode 100644 res/ios/Default-Portrait~ipad.png create mode 100644 res/ios/Default@2x~iphone.png create mode 100644 res/ios/Default~iphone.png create mode 100644 res/ios/icon-60.png create mode 100644 res/ios/icon-60@2x.png create mode 100644 res/ios/icon-60@3x.png create mode 100644 res/ios/icon-72.png create mode 100644 res/ios/icon-72@2x.png create mode 100644 res/ios/icon-76.png create mode 100644 res/ios/icon-76@2x.png create mode 100644 res/ios/icon.png create mode 100644 res/ios/icon@2x.png create mode 100644 www/js/standards/gadget.js diff --git a/.gitignore b/.gitignore index 3b6a41e..9902c78 100644 --- a/.gitignore +++ b/.gitignore @@ -178,3 +178,4 @@ xcuserdata *.xcuserstate dist +www/libs diff --git a/config.xml b/config.xml index ade9ca1..3715337 100644 --- a/config.xml +++ b/config.xml @@ -18,10 +18,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/custom.scss b/custom.scss new file mode 100644 index 0000000..6097b2f --- /dev/null +++ b/custom.scss @@ -0,0 +1,15 @@ +@import "www/libs/mui/src/sass/mui/colors"; + + +$mui-body-bg-color: mui-color('grey', '100'); +//$mui-accent-color: #bad649; +$mui-accent-color: #004c6d; +$mui-btn-accent-font-color: #004c6d; +//$mui-accent-color-dark: mui-color('green', 'A100'); +$mui-accent-color-dark: #004c6d; +$mui-accent-color-light: mui-color('green', 'A400'); +$mui-tab-font-color: rgba(255, 255, 255, 0.87); +$mui-appbar-bg-color: #004c6d; + +// import MUI SASS +@import "www/libs/mui/src/sass/mui"; diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index d1aafe0baedc3b0b87def59386b5d618ca2b725e..f6b810db6b3229773ba54e480366ff7388a89565 100644 GIT binary patch literal 17 WcmZQx&{6#8*tO}73?RVFWDNj5@dY&i literal 17 WcmZQx&{6#8*tO}73?RT{qX+;$NCi{? diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index cd8f206108f6af318a8d2a32fdd59d10dbad0a48..193f5c41bb5d607343adb4db6c4eee3b1ebaa26c 100644 GIT binary patch delta 17926 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 diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index 6fc3a0ba7acc7499361fb86db5d205fd85cda49e..0a3f892c5bbdcb6c5d6cd1db11789cf7afd5f880 100644 GIT binary patch delta 20293 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 delta 5621 zcmds)2~-o;8pkt}gs=za|r7 zw`T-mmx#ycZ-@W%g-;%kX ze}`9|-pq7=qs*s+$@F%G9Bj~(l% znR7U0!`6rRbB!OQs}41i+=#Ug>CN09bW>WcaR{$b%ru`}f~=xM{y}|O!GB3x2z%OO zOm7z)Uy;_vI!SGR)$#7LcDMJP@WWxjtexu{ODlwybcxV}qKBDi@7=%BguOue`Op3Y zoo6-nixC4^8#R9lZ6lIWs;9or=UVQFSffF~Pqe#8N~egzsM7W{?TgZD?b^acW%HPkqH%{=yFg(`hl!=s z72AZ{lJDm)V~vZPBy=`-_;LGW_Z02uxvY^4tmyL4pvuwm-STP?YY)Btf>t*zw0Yj- zM~~z!y~i5);r3mV-<)q9oYv-YkhP0@iRcPbDJ?V;QkukbVSV0(jqC+MY6NX#CZ+V( zyq>dpboQ65k@IFK?QSNgubX94w$JHrjy^sc!d{p@CYla2kD=?$MY`$>oBF=EQ^4A_ z&P37b7IHelLPj645YkN+LTWm>f=>sUK~21yI0 za#|r3(iPI)ynbgk$I&fPL*CD&9iOoSVjbDY24InbpQ8_7jYN@r)H4;1JgbvL3NMd% z(jHv3_TJB_)nDJWRMatE4?WzLiW&&62$!V`PC6*}+Y@-dJ^8g%ogWJiHI}1;!YQrc zi0YvggUVEcDb#R=a6}54&_=nN2|ki7)8S(oO+@kxt;41URXTDw)B+%$f#4!N9m)~O z>`6nUm`qaGb%Vw!0?8`f^-y`*iZwWEJh}U2U(|l`p9Yx*WT@Y`r?v@K_cA*(%<$f6 z@<_f{kziQiKJI76^ks_Uu{`8)inL*z@#x$(BecVhYss&Li?t{*Rd7*6_1~w`$m492 zUQID9x}VW=CUfJH=hs%De1C2d743X6dy|)>y>CjAd=L4y424JYC-4N?F*ni50B(ha z$)5B_$C^qO$Y<^K$nsR_F?TyWH2#J;7pg)Q8;B!F@%=JN=_Kc3Cpqt=97mkhnM(@S zPY&55bE;@Fx#AKpsP_wGZmig~EfW!W+LownkI({_?dI(&74n+AOKm#bqQ+0mcli8P zi4`;PszefusuiRN%f^vG`}LRH%X+$r&OG8v1$Z!B*Gnu6@qKRifz@d6|;L^ zt7=_-?3W$O_>AMUV_)fg6hXeJ0!x$?z&+t;rTB;Bz|!zA*Q2w7zxL2)carIUX{$0x z*X;h$n==L&4Ju)r=p4V>%ljt8v@4w&e;k_ZG+pOS4lg;H&Oy%1 zRCF1yUMTpC_++x$J~$bPcB)7r6D9_P@QY9}RD#*N)@hPobTs^QgV`G|rB6>bp_P!( zfI6T7$*sv<{o(Twb;|_i=It9bJ!qmu-1T'%lhw0W{_QR$QRNk?3U*sKnLPRQXr z3c?#dC>z+;Rm*!7&Ri&v5ueP2umj({vsXBU!*&=O`U&+LjWgm^=qSk>gYtP@g-EBEu@g;T0t_d ztE`HQ&%7Y^rn_P;QwYuKU!mVQCA2jeBxwxD{3f;vN+WA(03CenG z5Q#2LS5T-m*)Rmj6Bk%vQ(Kb=0lF0$M|p9XbL|7q%G5qgyI?hOX2 zgVebvwX+&ZUpVLeUF1#Eaa)MXFGzB_l+CC%RAy8g?aQb(7XB}Vbvu&y6=ipPS@x>- z%r%u+FPX4qgtc#|No!smBZ!nK>*vNcPyM?H+u*U(sZ&@bge)M0&=px*{~t<0;mGkF zDH;dzR}Og-wC{0s@ZUw!eOS6~?62Dk$rfG6MucmuxztasbOe;g9$88v*<(M z`tOYL2z=a4Q9_{lK;8yCEF*HgdS{~=V1j7;WPC(C4?~aooJ3W1L$h#UW7u?xZEsl5 z%vMHXnbD#e66ZdS%GSityM7{(`x(QHxUeniQ4e0KP0?z!vwT<@R_KfwO(>I1!f~?6 z^tXf5Tyj9doGu9)c7~Wb;@a{E*u3n#`BJq{s25;)gWtV12L{X-D!{E|AA5st9R#UL z6W0{av4l4yY3AB3@Ql2y*J$8udg=q`_o}_-F?v;zSng?VN#MFtsX4K!di56Eu%VAV ziOZZ~7HQ*-J(6SOd+8=|5r{_N*4PC-!TFb=hc)oc(74g+`=t4yTE(G?I3Dir)2mY+ z9}=s2%rhl$!V7DX6=@Jrd{a_PV5&X6Knu(6Nva55=(PJCsNq!q1;wvD#uNIY8-+>m z_mUVkkJ0JB(MtEDet^r{M!+U=*GF5by%X%?&hVEK%<;%RGtN4HI z#B{%Rdh3THf6Ks3?Lea0b+rfz${=k5C_Zw;(-Jp5l8~&0?EKUU_P(_H*2Om zYsADasUy57>UZNWUaYUj$@#vvwC4IF+e1>JXTy${g%|{lSfWQcM>g82npXUfr*+r5 z|A6BTxWU}Fk&9boTX>K`Oku-N*oxT1bfj>0QK}suXWmU#^ul2e($7%1wl3v4rRlPD z`*J3KyoTUk+EabJK2dj}bYz%zD;mr`qLwh_w6idDUoU>}yES@;l??xIjem3G1abGj zVSl)g9UsBLUjJHZ7WTyOUUBN(5qWKa8?vy6N7|U*IoxVfkoi+_`=1?;w}!B_{zL!W RUW)$kR9*7%h8^nQ{|g>TDpCLd diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index a84d429bdf3ee59c6ca42a98f9913e0976b05fee..6a9e6d306b15683ad2aa149a547dfd1dec96f7cb 100644 GIT binary patch delta 418 zcmaF2j``g><_%Np1m1l9dtig0%liqNQ?(E3DQ(zPuF5E|TB_2UnSFn1oXGM{ zNSbM~Vnh7odG$Jzzf2PseBSeS=bQ$~Yh}M~_nb^*cHc3Xv0P=d!}J!W&D_)9Fiy^# zcXsoUnPA367TYOu?voFeNo)?AKaop7Z_A|WJ)RHcnmH}1T2qy7Z9cyxhE<^J?Mr9F zCn?dzx(#i%1=rp|MCJY-dFP(IPeD`Uex8!PIY=~tRpsoS^&Dr685p=v0r4RaW?nh3 zoMDEgdfPNnd$V_IKIZP3JTY8ha@@Yxo8xw$XA=A+W9C^Qv;2Y5291;u_uyG*(u$q? jCah(yPxWiL9%FxTtqiL4<_%Np1Sb8T++RGygX_++2v3K;OS?9et1=42#=khuttHi<;M(m(M(Vu^+#B z1D3t>znX8BTX2$bGiyt$fWV4VFXlKe4SFgw&Gr5gvsFtcH%{mk*lN>}pw(?zcye-< zr{$4=Ibgx75dqeht=KnQ;+OZaJ$`i-P;eqk$t|wt$%+lmlh@4>n|!vxX!4h7;+v1m ze8V`oF5v9u+Br~0W+jlZVfI-L1|Z-l`nzxP!7_=>Ve=<)2^6eksCcAP#ah((;;~Uu z$ED5Zx5Tgt7^|G#x~ScBs)R^YV~)32Aw;xqPsr8x!XLlr9J#oE?N@IjplAZC%Jc&9 zt!IoG7`RUX@gWdq?%uv-$NHHsIJ3Ria4h6{wPVlZiQx*HQ-&r}oIPLYmTDD31wPK@a4Z0E)CYF$Y> Ik0lEN0LW_BIRF3v diff --git a/platforms/android/assets/www/css/app.css b/platforms/android/assets/www/css/app.css index 190097b..8c9a060 100644 --- a/platforms/android/assets/www/css/app.css +++ b/platforms/android/assets/www/css/app.css @@ -1,16 +1,9 @@ body { font-family: Ubuntu, "Helvetica Neue", Helvetica, arial, sans-serif; - background-color: #004c6d; - } - -#weatherIcon { - margin-left:25%; - margin-right:25%; - height:70px; - width:70px; } + #lightR, #projR { color: red !important; } #lightG, #projG { color: green !important; } @@ -23,21 +16,7 @@ body { float: right; } -/*.lightBG { - background-color: rgba(255, 255, 0, 0.3); - } -.heatingBG { - background-color: rgba(255, 0, 255, 0.3); - } - -.projectorBG { - background-color: rgba(0, 255, 255, 0.3); - }*/ - -.mui-panel { - background-color: #015579; - } .h105 { height: 100px; @@ -47,9 +26,6 @@ body { overflow: hidden; } -.mui--text-title { - color: #ffffff; - } .item_content { height: 100px; @@ -212,50 +188,6 @@ body { } } -.material-icons { - color: #e5f7fd; - } - -.material-icons.md-18 { font-size: 18px; } - -.material-icons.md-24 { font-size: 24px; } - -.material-icons.md-36 { font-size: 36px; } - -.material-icons.md-48 { font-size: 48px; } - -.material-icons.md-100 { font-size: 100px; } - -/* Rules for using icons as black on a light background. */ -.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); } - -.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); } - -/* Rules for using icons as white on a dark background. */ -.material-icons.md-light { color: rgba(255, 255, 255, 1); } - -.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); } - -.material-icons.md-bulb { - content: "" - } - -/* -fan : toys - - - - -bulb : lightbulb_outline - - -calendar: event_note - - -projector: cast - - -*/ .md-display { opacity: 1; @@ -305,3 +237,24 @@ projector: cast 85% { opacity: 1; } 100% { transform: scale(1); filter: blur(5px); opacity: 0; } } + + +header { + position: fixed; + top: 0; + z-index: 1; + right:0; + transition: left .2s; + width:100%; + } + +.mui-tabs__bar > li.tabOnWhite > a + + { +color:#78909C; + } + +.mui-tabs__bar > li.mui--is-active.tabOnWhite > a +{ + color:#2196F3; + } diff --git a/platforms/android/assets/www/css/mui.custom.css b/platforms/android/assets/www/css/mui.custom.css index 79597a4..17b163f 100644 --- a/platforms/android/assets/www/css/mui.custom.css +++ b/platforms/android/assets/www/css/mui.custom.css @@ -379,7 +379,7 @@ body { font-weight: 400; line-height: 1.429; color: rgba(0, 0, 0, 0.87); - background-color: #FFF; } + background-color: #F5F5F5; } input, button, @@ -497,7 +497,7 @@ h4, h5, h6 { top: 64px; } } .mui-appbar { - background-color: #2196F3; + background-color: #004c6d; color: #FFF; } /** @@ -655,21 +655,21 @@ h4, h5, h6 { .mui-btn--accent { color: #004c6d; - background-color: #bad649; } + background-color: #004c6d; } .mui-btn--accent:hover, .mui-btn--accent:focus, .mui-btn--accent:active { color: #004c6d; - background-color: #c2db5e; } + background-color: #005e87; } .mui-btn--accent[disabled]:hover, .mui-btn--accent[disabled]:focus, .mui-btn--accent[disabled]:active { color: #004c6d; - background-color: #bad649; } + background-color: #004c6d; } .mui-btn--accent.mui-btn--flat { - color: #bad649; + color: #004c6d; background-color: transparent; } .mui-btn--accent.mui-btn--flat:hover, .mui-btn--accent.mui-btn--flat:focus, .mui-btn--accent.mui-btn--flat:active { - color: #bad649; + color: #004c6d; background-color: #f2f2f2; } .mui-btn--accent.mui-btn--flat[disabled]:hover, .mui-btn--accent.mui-btn--flat[disabled]:focus, .mui-btn--accent.mui-btn--flat[disabled]:active { - color: #bad649; + color: #004c6d; background-color: transparent; } .mui-btn--small { @@ -1266,7 +1266,7 @@ h4, h5, h6 { .mui-select__menu { position: absolute; - z-index: 1; + z-index: 2; min-width: 100%; overflow-y: auto; padding: 8px 0; @@ -1596,13 +1596,13 @@ th { color: rgba(255, 255, 255, 0.3); } .mui--text-accent { - color: rgba(186, 214, 73, 0.87); } + color: rgba(0, 76, 109, 0.87); } .mui--text-accent-secondary { - color: rgba(186, 214, 73, 0.54); } + color: rgba(0, 76, 109, 0.54); } .mui--text-accent-hint { - color: rgba(186, 214, 73, 0.38); } + color: rgba(0, 76, 109, 0.38); } .mui--text-black { color: #000; } diff --git a/platforms/android/assets/www/index.html b/platforms/android/assets/www/index.html index 524d3c8..6fc3cae 100644 --- a/platforms/android/assets/www/index.html +++ b/platforms/android/assets/www/index.html @@ -1,5 +1,4 @@ - - - - - - - - - - - - - - - - - - - Sensor Toy - - -
-