diff --git a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock index 9a009ab..b2e036d 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin index ddedb5b..98853ca 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin index 2596aa7..80da84d 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin index 8497a06..76f9c19 100644 Binary files a/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index f96f779..cbe78c2 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/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/platforms/android/assets/www/js/main.js b/platforms/android/assets/www/js/main.js index f7499ca..556212c 100644 --- a/platforms/android/assets/www/js/main.js +++ b/platforms/android/assets/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/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html index d4087f7..8cd51d2 100644 --- a/platforms/android/assets/www/screens/home.html +++ b/platforms/android/assets/www/screens/home.html @@ -41,6 +41,15 @@ +
+
+ +
+
+ +
+
+
@@ -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