From 476be732a9873568373ed1ce9cdb753dca91eb2d Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Mon, 8 Aug 2016 00:21:33 -0600 Subject: [PATCH] Place screen looks way cooler now --- .../2.13/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../.gradle/2.13/taskArtifacts/fileHashes.bin | Bin 158101 -> 158101 bytes .../2.13/taskArtifacts/fileSnapshots.bin | Bin 2776584 -> 2776584 bytes .../2.13/taskArtifacts/taskArtifacts.bin | Bin 188154 -> 188154 bytes platforms/android/assets/www/css/main.css | 29 ++++++++++ platforms/android/assets/www/js/auth.js | 21 +++++-- .../assets/www/screens/chooseteam.html | 2 +- .../android/assets/www/screens/place.html | 53 ++++++++++++++++-- platforms/android/res/drawable-mdpi/icon.png | Bin 42044 -> 21357 bytes res/icon.png | Bin 42044 -> 21357 bytes res/screen/android/drawable-hdpi/logo.9.png | Bin 33785 -> 0 bytes res/screen/android/drawable-mdpi/logo.9.png | Bin 20559 -> 0 bytes res/screen/android/drawable-xhdpi/logo.9.png | Bin 52606 -> 0 bytes res/screen/android/drawable-xxhdpi/logo.9.png | Bin 79934 -> 0 bytes .../android/drawable-xxxhdpi/logo.9.png | Bin 150811 -> 0 bytes res/splash.9.png | Bin 66627 -> 43620 bytes www/css/main.css | 29 ++++++++++ www/screens/place.html | 53 ++++++++++++++++-- 18 files changed, 171 insertions(+), 16 deletions(-) delete mode 100644 res/screen/android/drawable-hdpi/logo.9.png delete mode 100644 res/screen/android/drawable-mdpi/logo.9.png delete mode 100644 res/screen/android/drawable-xhdpi/logo.9.png delete mode 100644 res/screen/android/drawable-xxhdpi/logo.9.png delete mode 100644 res/screen/android/drawable-xxxhdpi/logo.9.png diff --git a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock index 5df9cdac670c6fc44e2c41b893befeed4f8ed24b..2b2f1843716e9b05a5603daab96cc542bc433378 100644 GIT binary patch literal 17 VcmZQ>a$9jsqWiTJ0~koF001#Z1R($b literal 17 VcmZQ>a$9jsqWiTJ0~koo1OPF(1e5>( diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin index c748a0ff452b4fbb85184f4f23dcf036b7dac6ed..ccc99c404b16aad41bc94fb7ef71f7cae134ae42 100644 GIT binary patch delta 762 zcmbPwnRDu8&JC(dxX=8&!2kv)8{ZTiENK^XEYE{c=)dE;Q4)P(hnR=slAw6YX{aaYjyxc zgVfsTj$%yW)9(v0iA}#9&ZwkN%Vbn`-sRmI#Yx>|-ZiO}s1|T+n9LX>KHX0kXud}T zqo^!1(4Es0N*QH=ZnJ!@Au05r_LocP(N#%(634(=;r$O^v`m}Ab+M=^SApRXB4%@>FxVFP`tez=xrWcKAvxZ;bRLN zo`o3;@$7b>XLXnqYzsL8UtYCM*?RV6_Y1vakZ?Tn_W;DyfUlrPnjRj*D6;*SD3c>I zO9oJGJGUg$4xkrds>~0Aqi6dwDW*1YW{`q>Bc>aSK>r1*)Xdn{FUR2i-Jhx*`H`&_*Ao$H374dtmzC zaz+!d*!1&BOtQ*Kf(*MHpWRD)bLz<|$(ku9%DZPmq7UkJllMH+AO2yKoPN8KQFyy` zGSe?sg&vvpa_2Q(ytRs3D>l{LE&{CKEaM8W6P(oqLGh`vh1GOfFndgoyYr0~{`(A7 NQ5C7~hq#x)002J32NnPT delta 714 zcmbPwnRDu8&JC(dxWiVQU;qP_Gm{M?B{q93Ik8AtNs!^;youkV?452_IKJL=IL51i zfq^kB1Fl%wYI0(j`1CnUOd{Lk+!+l7rt7IQigEpZ0WnMP!E{G4Ch_U_g_y*q-wtO~ zQZQQbO>@c1uX>Y(XE$O z^v`m}Ab+N?1KWL%Gm2W{_T>Q!h&Ld<+z#|557>huJn8aE(BMMyq6H4$!Hj|UZadI- zI!u#RgA7sI0I^`c4=Bv1hsQ9AY(FN-SRfu`&^G`8VHDsd diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 473ca430dee8e07771e3201cb0b0c642b6b73a06..a48e7256b57b5a60060c5e00e00c9c844a6e02ca 100644 GIT binary patch delta 4675 zcmcIn2~-rv7M&i3MHIRR1gB?Url;8kP+>q+q5>)c#)L(Vn)pRQT!6@yqqqbVR20-G z*g&xuMGzGc!t$|Vhy*-Bz$Jj7aSMxzpg{#q0xsyU=@B(d;y?c6*EzRO@#D=J{alULeL8G8hl8oHcF~;{)HhW2cdSQ!2c`ePrq_Kl z-)0V{pp~^-q>tlpdiJw@4kzlZ{^mD*4bE=GA0?T2W3UN~i=Y}eKjN_2ZfzbrjiNKl z1_UIRu@qgwm$%NnliU9(J0LP#!VHKUad}GO-qw*43D7$=>-W@gw#v!fZH&NJiVHIz3M`j?&)O&|m+>$zVfbQyd@9pY-CkI&^xYA_ z1c@D)lgRF0HYv@k;58UZxK~miFXx45V%w_7Nu|!e#nzjwI4k)ix)OC+>p&juXSNdnC z`@LGgIEG1}i;2>pE%Q?z_S{#lT9?e&n)sAum{h6Z`rAWyPtXoz2k4+d#@nLa*{M8F zW1q-b=}c7&g;qDuVEbkF4Y5i)UHZlz7)a&lq_K7}DJ>&p`CNPo$MUOFy=z#bN%gd{ zVyixG*~xL~7!zz$#Z0#yQx;+CgOy#CdttRFodTt%^DFcKbB72!cXMgZh9%)0&U;T^JDGxJc zU4+r~@I@Zkgq1l?*TV3{tK>UIYAKgBds)Ivo)L_f6vQ=;XhaHx8XX=BcITsaHQy7` z-)fP?8YyWy(>|jf|7?SX)wvDI;~1SXWwK{_1GfV5C==^C8+sil0mj(6$$?D~dLw`A z^sQv)yUIm_I>G)T(uW!0zK8hYhiIyQ`h)T8h-G9jljQDA#2j;u_T=WID&0d9m@Dp4 zT;oi})?o}*%6`wX-<$0BDHAcl5Jnf1@uNWnP5n;%TixNXujZm%?lZ4+dsWKKV6_S5 zj1g5wmS4Rn_U!1qXEko?2s=yICltA+gL9xw0PV^pJPQY>bvCR?_`GA^-Eq@M z7ln(5I(Pp8*i>)Qi2;|DVheb!KzNx4yaUV%VZDVg?;cU^?NiZxCZtGSsF6SMj)ptj zs3%fe2bQj)Zg($c15J3LsuxO`< z`V{(x&|@*)nSoRDfV`Hxta}~_2BxS-bqWBYTeMD(&&lzdmo%&IWz*<|t{sLY2eW}B zjGhIGawJla*exQ!%`VXqLhpy*sJe;1YfT3i4IE6%xS?>G18#SVwy4|?J0E^`SCl+X z%MCHt?KyW7kauxCKz5s&4#=+8(S}9wI)e`2$6gBpnqM^Z9mOXcyJVzZd(2bUH8sbU z?iSPn?AFMw5N|UqRKv7kM+%I2ce@Z379Zbx|Yi)d`zR$q4t@LcU=tUE{x@_ zhkQ4wpA2gOan?c+(2bRi{F5y@P8)>*N?pbSU&YGAz(sBt2#CeBJxmHR&Ea7!CxVSF zi!};rP(iPO9lmBiQ!1f=NSQ1Jw&_?@iy%6^8W)Ps$Zly3KQAOM$XsTqh6xlQz((A1 zQ274wH3Ls=(+!Z4TiVNr?(0(P$`#Jti9~Sqx+hV$Am(OOz=shVW%<~RUj_8Fd-Lojl5}e+s z5e&kEX?@@#r2;^Aw`h|}zACc^v0n#lrm4wrd;mR*tFqaU7BC>roV)!WAnAIp>JzaX z)xVVYlj7>| zOM3!qor|oL8N+Mlg?EwxiPL%an3tLRPvte6w(TsE)9P5t8=kLoKmhXfYLCksTNSYM=#^fGqA z*4X6e$;K1LQ#Y45>U{Y&N5T60<^8WoKP$!HIQ2&FB ztI(d6aYV#Xz%!hl@{08;MF}O?XpE4x2b-6qMY^3e${(qSWQd;!UQ=Sh7La+wlz;}$ z=($3Tf-{IwXWmD&Iz2Kg6c&PcX~bLDTz)%Z5)?cst6 zhXgbDw5@#0P>{n*z~2h88QO-Lo_Em-ME`9CeyXMhrt7LN0@?90L*RYecm#+@5MG0O zONm z-0W*^{T~Z79IO-{8_y?<%C&9B6Fs8D3lAk3t^CygQ78%;V1_{G!Br_#iiDZ14*1uF zb3t1mpN0|jCXE6W-TI4qPMlsH*iocecly~A;evZkkAE8?-S8LuJEY?`7hFfDG!gpWMaItv5E8;2Y(tiNB&i}Rm delta 4076 zcmbtX30M?I7M>nvxS@MSf$14wdKv~sg9H!|4^)nbsL??*iALo#f}(hHL=kVqH3F?X z5LZD?M>8|MhP)ibP^k zu*(ufBFQ}=UfLiMnUwSW0gK{ABExRJ?{sqN?|rTDF9&-6Ik2PDj&S2fD^AwYG$kf8 z&ZYlj*im6lb+IwWsMPv*MplelyTn$+mm2kp31#m~t&tmG;j4v_s%SRhea zDsQ9z^&_WujOSV$JxF~N^S)?~RETZL=6=NX6mF<@{YEh*Zf;ZQ2O`0&ylTG3pSWj|ILiXVy>ZQDojk}rS zRLeCvg_1HipDWUSNHEVGS7++nY{YfCHq>?L3dMDMU+EB&CnJxDw#rCVKPaHd-W;?Bc_U&{zl;zT%@NF*bLC#n|p|;|XaB+-! z3)lkP3_UAWHThI&*%3dMXmGFLoFo9?VDT z)_u&S2ZjOcr9HULKo2q_MIoO!Rl_^k1+zIS2v2QmamreBjJK(7U4XQG__U*LR`rOO zX@b!@w}N~K7h1p`T&H~ z&|^t=-)Q^OgRx}dkBvK<6SA7zaB9qhyW(`-q+HPqk8ALf?Wbd14wVhzjjGHjE-U0X zT2V`{?=O9TCH4Vo3)dZd`mn{D+T{Gn z*pQg({s;UQx;#7Xngq2pJKZF5LsIgmn^Gwt)+|E}Rhl;U-zPL50CkcSU#pkZ-p`#LD4qpB#7)#(Qq$QwV0+<8Sne7 zE1%|2U>;?6BON2dBPsKiX|+;bBK5%w3?}BLWGlgEYwJ0>_<)#t9G|_JGp}%4xP?l;Pd`_xYK}nB} zpVu3hIJT154cS42Jz8s}eq$RHYMAuC^uX6O1`f8X7{!90(d^qX^Gc7-yjAjE`-Of& z;)FFEFi|^z$6VGCvBm1xRCGC9t0Aa9OvRkJ2-6Z+gHz+I4d02!B$T!6z7`#9;dA84 z5j>n(OO;GGNlcv;{}*CepoMZ6KU4rDgl{1FSIjbY_ zm~3{|)RhTV)4EMx^^zw3Fv7hgcncIg?7tEDhdP|1VU~@PnQ1BJZE4dp49AbSZC7^B z^ihHTNe=kt;OQCT(xK(NcpX}(w@kC4yh^$Ulyu&A=lbOZT{u_TDERLE%vgo?E^1>9 ztuf9rR6o`sR7qR{&pFOoAzRGBvr@p!S6CUaX1pBv(Xy|#vBcqhx_Z~YL4K1b%VJ2B(Ur^rQo0gFsj_CTiVOrO7f^WNKkUN2|c3*=q> zhT|o3*dK09A$q5F#;D&#uaAoM*ip|XfEIOYN1LI+^PQVV|7Gnq0Zc6lJU_6B&h3^c z>Vq|p2;uc0tf$e+KGOa$^G}64d62M^fWiTnP5GU?jD}NpMkGYvxOypI=^ndzf%KP( z7wI|4Q@ZlA-m?C5X`j4;-*rF!|3 zzi%g_5-#+cXSVZjm&2OejP2^v(%z#VWhTGaTU-oT82IO&A>*%=wuf)_6_u`N-AZ8E zSi9${T%}BqmsM%HJmQa(is;7W?_7>6E0jAj_qU8H&tTS_5i0bbtyeqDvE1b;2G;-6 z>AF~`vbc8Nw?kOomK*)Qr4e3wx|FyGdUNMw#CQ(y)Cps8g|3vzDD~0uM{Z@uFI((M d4vXxcb^ArvD;M&AfnNSi&OQH*UX&C8zXGgy<+A_) diff --git a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin index 23a3ec0981775121b77f9d495aab88da7bde8e04..e236d46423a412d8fd360f3e25f9ec7b2ce6f964 100644 GIT binary patch delta 750 zcmeyhm;2XV?hQ8>*(M%jU|?Ik`5xl|ai%TRn-@rS`bspdYtCpn>a+0BS*Z7rz zzXrA2^g)u%$LDW9KA&+Vlf-)e@2}_H&FZ+Ya6x23)-wMK*IwM+8g!psG?h3}p#eQNh| zM(4BhnJ?RC{^esl-X`HU-Ec3X+xGrbOzw=^H4ZQtu}BCdADfatf9;X!3!AJ1yz>v1 z>uTChOxI(?RB77BVd@g;w~u2HhxvuhBzGN=u-I4iYStJkr{DKtWSh=+fk{x}4?mmM z!`yGrC0T!6<;mMHlOdtuM?(EVgUO2T9i~U#V!F9K;3CrjW{GXC1u|MI&S!aVsM4-u za*Tg?RIlA*i^_d;byE9f79O}PUA96hrDTchCsB7BmhOT#to3N>CcnGM#>Dps0H&Ni A=>Px# delta 813 zcmeyhm;2XV?hQ8>*|tTZNyLnGX$(HNIg^KOdM75?Lv}JVJoN$YWQQ}I4 zqNW*d`<)J*n3lzsG0TIR>-;wFmE8{3Ke-`@ZF5StsgXoC*L7{aL;BZyb(YN8v0!ON zirm}iYvv>e;MQU`OBD|^2$91 zhV^5n&5W{huJ&I$R(;>>UR}bw?S2O`-L$tyPo1pz-eG#=EvB23&wt5aD`8;H$}Zl% z;5JhbvqaI&JYk)*o5oq|zn`2EB3;41-JwLHopUcXEt3V_%x2`9?C?=~d-xrug-n{9 zAI}&wFbMVmaT^FT?_=cN@SelBOnRC4^TR(C^CvX4IdvOtjG1n@m(gu||0$+QR*4la z&D16@;=UrV$J@HJIAC7jRM|k&jUU6{YTOyO&tAy1gOQPObK&7iCW#eq|Mzq{HKo>f zNgA3|yk2-`+I+G0i<`D#*HF(io$msZpv0q@lll|RJm~l>to74Jg()JwcE)4tZz?lD z9@`EKixAg*$sxeQ)6EpFL}Hk>IoVQ!)sWZZu7 nE|Vgo#K~{HC)OWTco2POTC?}>3wxuyg?z<(;gVLl0?% diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index 92eb5dd..820d77c 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/www/css/main.css @@ -295,4 +295,33 @@ body { #team-choice-list { color: #000; font-size: 120%; +} + +#place-log { + padding: 5px; + border-left: 1px solid white; + border-bottom: 1px solid white; + border-right: 0px; + border-top: 0px; + border-radius: 0px; + height: 100px; + max-height: 100px; + min-height: 100px; + overflow-y: hidden; +} + +#user-health-place-bar { + background-color: green; +} + +#user-health-place { + height: 15px; +} + +#place-health-place-bar { + background-color: white; +} + +#place-health-place { + height: 15px; } \ No newline at end of file diff --git a/platforms/android/assets/www/js/auth.js b/platforms/android/assets/www/js/auth.js index da40ac6..b3a3de5 100644 --- a/platforms/android/assets/www/js/auth.js +++ b/platforms/android/assets/www/js/auth.js @@ -81,11 +81,22 @@ function dosignup() { }, function (data) { if (data === 'OK') { - username = $('#usernameBox').val().toLowerCase(); - password = $('#passwordBox').val(); - localStorage.setItem("username", username); - localStorage.setItem("password", password); - checkUserHasTeamOpenChooserIfNot(username); + $.getJSON(mkApiUrl('pinglogin') + "?user=" + $('#usernameBox').val(), function (out) { + if (out.status === 'OK') { + username = $('#usernameBox').val().toLowerCase(); + password = $('#passwordBox').val(); + localStorage.setItem("username", username); + localStorage.setItem("password", password); + navigator.splashscreen.hide(); + checkUserHasTeamOpenChooserIfNot(username); + } else { + navigator.notification.alert("You've signed up successfully, but we can't log you in. Restart the app and try again.", null, "Error", 'Dismiss'); + authOpInProgress = false; + } + }).fail(function (err) { + navigator.notification.alert("You've signed up successfully, but we can't log you in. Restart the app and try again.", null, "Error", 'Dismiss'); + authOpInProgress = false; + }); } else { $('#signupBtn').html(' Sign Up'); $('#signupBtn').attr('disabled', false); diff --git a/platforms/android/assets/www/screens/chooseteam.html b/platforms/android/assets/www/screens/chooseteam.html index 61f2c66..8e3eb7e 100644 --- a/platforms/android/assets/www/screens/chooseteam.html +++ b/platforms/android/assets/www/screens/chooseteam.html @@ -43,7 +43,7 @@ navigator.notification.alert(data.message, null, "Error", 'OK'); } }).fail(function () { - alert("Something bad happened, try again later."); + navigator.notification.alert("Something went wrong, try again later.", null, "Error", 'OK'); }); } diff --git a/platforms/android/assets/www/screens/place.html b/platforms/android/assets/www/screens/place.html index 8bdd5c6..ff3ae39 100644 --- a/platforms/android/assets/www/screens/place.html +++ b/platforms/android/assets/www/screens/place.html @@ -2,9 +2,14 @@
Type:
- Life: + + Place life:
+
+ My life:
+
+
+
-