From 6744ec52dc4115207e7c2937c1af6a69015a694b Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 20 Aug 2016 23:57:24 -0600 Subject: [PATCH] Item find results now much nicer looking --- .../2.13/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../.gradle/2.13/taskArtifacts/fileHashes.bin | Bin 158773 -> 158885 bytes .../2.13/taskArtifacts/fileSnapshots.bin | Bin 3910409 -> 4032190 bytes .../2.13/taskArtifacts/taskArtifacts.bin | Bin 197279 -> 197279 bytes platforms/android/assets/www/css/main.css | 30 ++++++++++++++++++ platforms/android/assets/www/js/main.js | 8 +++-- .../android/assets/www/screens/home.html | 22 +++++++++++++ www/css/main.css | 30 ++++++++++++++++++ www/js/main.js | 8 +++-- www/screens/home.html | 22 +++++++++++++ 10 files changed, 114 insertions(+), 6 deletions(-) diff --git a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock index 9a009ab8f6ffbf079402e24bd6bc38b9d6f39633..b2e036da87d9b6a6b6c03dbcfac2ac26e6beac6f 100644 GIT binary patch literal 17 VcmZQ>a$9jsqWiTJ0~n~g001$61Wf<{ literal 17 VcmZQ>a$9jsqWiTJ0~n~y1OPG81fc)` diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin index ddedb5b163427f9c95af4c5e853595751bac73c8..98853ca33e3d234725f719c717cec5f7f2ac56cd 100644 GIT binary patch delta 587 zcmdmbgLCOk&IzK7oD;>g_!yrvFff<{F#`jm+ti6>){IRX8>fhGmXqLMXUfUltRWxD z#LSdqy17AdX%qLVkPBd?3@m3R8%9cO_E>Uyi^As6kl&YOJR`2(ULGs^c6Bq*q_EX+ zl{{*b6T`%}dqpw|%P<2)rzey$=71R6&zCZOVni6pt29|ZO>%mD5|haGpXH1ub8r|O zu>;}+h{4leX)uaxuMlDKX5(H3lQKU%eZw(EiS5s%nA*gdfx_GKjhJpRDpVX#S!34U zIj=msQ{lTEcPOe$#rA-8P0m{_vVE!v(|0Bu>S4Bs?EyRZlqS#tH_e%LYk_Q<{uk(U zmenBE`6MP;B}IWasrZd6IBvhW!x-D~COrNM#8RjsrVhGbLvB?94Y5vU`o*d+S7%x- zr@TsEEN8XJN&&VR5cM$&z`k}ae>UAwj7eOf$i917l|lXjWzVPLw+$zCpsAV!GIjgX zOeR+*u&dr?GkHvo^cGO~z*8lV@zQcn5>x5()!SDFqXogY$${Py8rT)V{rwFR0SpEJ DTfoJO delta 428 zcmZ2_lXL40&IzK7>=VVbCPo-CW^J6{A`i5hS z65F3iF|~;^PhI?Bd%h9VEyn5js*GY>T~POk%mgc%oVQwJ`&1LA?@S7z-zP59Gkx`E zseeEj(~l|_1_s73kR1?1MP`B>aY~a>Wcy8XrrlZ~gQx!mI)`O7(B|pqlbB?u8|X8# z$cGz5cnJNO9Ur?e&+|}sFxVKNTCg#u_IA@B{$Z4ye!G%Uc)N8n(=S$qQ!$&xt_jR2 z?(3H9x^47c6-9${+1u%kVoc%+DszNaF1~#F?#Y0vcA22+pJ=M)fn2wJX(p2^6Eny; IZ?l;^0G+au{r~^~ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 2596aa79f22694951d649ea49d9f932145cd189b..80da84d5f026a54fcb25b72dc5e9d93a48400fb7 100644 GIT binary patch delta 3254 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 PZG9Sq7H;bc+1dUdo=S_v diff --git a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin index 8497a060210ce4df66781d614d4e2c14b2af21aa..76f9c19db4349acd2cce7788d41e3c85868ac4ce 100644 GIT binary patch delta 562 zcmbQ=$}_)}XM<+CM2zi0lS-!=u5h0ZP3qE9bL^WF`JS`JX>WE+_h*!tV?XUv+Pc%7 zPx^LEu2R}lVX%Dbv8w0R*$~-_$Ch2&Znj8EerfPCt>`V$`iA`UjonvFx);4+L+(iyym+C$=j-^*9w?(r*jo-nCSiJz&@2R%>L% ztc=5ks+ z^W=&k&q-QvH4|7R=DFzF7`>He3f1;ybba@&`hBaw{3+d9ag!C_J8X}<#Wa&e;$Xc0 z2NPGV{hE!EyBtoI8S{PW^NMFYdJRcQ@NL&WZcL8HuFt)%dgaFjdA}wvMUw+@_An)G F8UR+50~P=P delta 563 zcmbQ=$}_)}XM<+C#6N-H6e?C}tazhZ? z=9FwxBZ;17mZ>Xt-+tFI!{)DN;!7oFPhU^g7?YC88|N;P_!Cw9`@BQE=Ffl^pZfpw zI0YWM-zu_WR}NV6{ItW~iS^45+P-iS_%V~0J(;&w*Olq5GDx!d`26k1=QFNklCbd< zG5DH$H~jdwtl%iS4M`cBy82%4*3+GQFgx6fb3^h8`j!TPCQf$>dog|l;4y$RSMSpMabVU_ux`O^*eGP-T= zKgCqZDsi55ni5BmU;4^s?>V~n78F2gkQH7+WDK9>1QL +
+
+ +
+
+ +
+
+
@@ -56,6 +65,19 @@ \ No newline at end of file diff --git a/www/css/main.css b/www/css/main.css index f96f779..cbe78c2 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -328,4 +328,34 @@ body { #capturebtn { color: black; +} + +#found-box { + position: absolute; + z-index: 9001; + background: rgba(0, 0, 0, .5); + border-radius: 10px; + bottom: 12%; + left: 10%; + right: 10%; + height: fit-content; + max-height: 100px; + padding: 10px; + display: none; +} + +#found-box-title { + font-size: 120%; + color: white; + border-left: 1px solid white; + padding-left: 5px; +} + +#found-box-text { + color: white; + border-top: 1px solid white; + border-right: 1px solid white; + padding-right: 5px; + padding-left: 5px; + padding-top: 2px; } \ No newline at end of file diff --git a/www/js/main.js b/www/js/main.js index f7499ca..556212c 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -87,12 +87,14 @@ function scanCode() { code: result.text }, function (data) { if (data.status === 'OK') { - navigator.notification.alert("Found one " + data.message, null, "Found an item!", 'OK'); + //navigator.notification.alert("Found one " + data.message, null, "Found an item!", 'OK'); + showFoundBox("Found an item!", "Found one " + data.message); } else { - navigator.notification.alert(data.message, null, "Huh?", 'OK'); + showFoundBox("Huh?", data.message); } }).fail(function () { - navigator.notification.alert("Nothing happened!", null, "Huh?", 'OK'); + showFoundBox("Huh?", "Nothing happened!"); + //navigator.notification.alert("Nothing happened!", null, "Huh?", 'OK'); }); //navigator.notification.alert("Scanned code: " + result.text, null, "OK", 'Dismiss'); } diff --git a/www/screens/home.html b/www/screens/home.html index d4087f7..8cd51d2 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -41,6 +41,15 @@
+
+
+ +
+
+ +
+
+
@@ -56,6 +65,19 @@ \ No newline at end of file