diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 3ac4901..536eaee 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -11,6 +11,11 @@ - + + file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/js/index.js + file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/css/index.css + file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/main.html + file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/index.html + diff --git a/platforms/android/app/app.iml b/platforms/android/app/app.iml index b92680a..bb0dc16 100644 --- a/platforms/android/app/app.iml +++ b/platforms/android/app/app.iml @@ -132,5 +132,9 @@ + + + + \ No newline at end of file diff --git a/platforms/android/app/release/app-release.apk b/platforms/android/app/release/app-release.apk deleted file mode 100644 index 4bce491..0000000 Binary files a/platforms/android/app/release/app-release.apk and /dev/null differ diff --git a/platforms/android/app/release/output.json b/platforms/android/app/release/output.json index a62c49e..453c984 100644 --- a/platforms/android/app/release/output.json +++ b/platforms/android/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10000,"versionName":"1.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10006,"versionName":"1.0.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/platforms/android/app/release/vn-picture.apk b/platforms/android/app/release/vn-picture.apk index db6cd87..03b8a14 100644 Binary files a/platforms/android/app/release/vn-picture.apk and b/platforms/android/app/release/vn-picture.apk differ diff --git a/platforms/android/app/src/main/AndroidManifest.xml b/platforms/android/app/src/main/AndroidManifest.xml index 0174d3f..765d4e5 100644 --- a/platforms/android/app/src/main/AndroidManifest.xml +++ b/platforms/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/platforms/android/app/src/main/assets/www/css/index.css b/platforms/android/app/src/main/assets/www/css/index.css index 49d6a79..c5f0be5 100644 --- a/platforms/android/app/src/main/assets/www/css/index.css +++ b/platforms/android/app/src/main/assets/www/css/index.css @@ -32,8 +32,8 @@ html{ } body { - background: #fff; - padding: 20px; + background: #000; + padding: 0px; -webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */ -webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */ -webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */ @@ -58,7 +58,6 @@ p{ .contentPhoto{ width: 100%; padding: 25px 0px; - margin-top: 24px; } .blackground{ background: #242424; @@ -157,7 +156,7 @@ spam{ z-index: 999; width: 100%; height: 100%; - background: #fff; + background: #000; } .btnbarcode{ margin-bottom: 10px; @@ -206,13 +205,19 @@ label{ background-size: 25px; background-position: center; } +input::placeholder{ + color: #000; +} .input{ - background: #D4D2D4; + background: #fff; padding: 14px; overflow: hidden; margin-bottom: 10px; border-radius: 26px; + color: #000; } + + .input img{ width: 25px; float: left; @@ -225,7 +230,7 @@ label{ border: none; background: none; margin-left: 8px; - color: #fff; + color: #000; font-size: 1.2em; } @@ -255,8 +260,8 @@ input.middle:focus { width: 100%; text-align: center; background: #8DD202; - color: #fff; - + color: #000; + font-weight: bold; font-size: 1.2em; padding: 10px; } @@ -333,10 +338,10 @@ input.middle:focus { header{ background: #000; overflow: hidden; - position: fixed; - top: 0; + + width: 100%; - left: 0; + } } header h1{ diff --git a/platforms/android/app/src/main/assets/www/img/article.png b/platforms/android/app/src/main/assets/www/img/article.png index 8809273..20df4b3 100644 Binary files a/platforms/android/app/src/main/assets/www/img/article.png and b/platforms/android/app/src/main/assets/www/img/article.png differ diff --git a/platforms/android/app/src/main/assets/www/img/password.png b/platforms/android/app/src/main/assets/www/img/password.png index f5a4196..f0e1a48 100644 Binary files a/platforms/android/app/src/main/assets/www/img/password.png and b/platforms/android/app/src/main/assets/www/img/password.png differ diff --git a/platforms/android/app/src/main/assets/www/img/user.png b/platforms/android/app/src/main/assets/www/img/user.png index 74ff74b..deaa462 100644 Binary files a/platforms/android/app/src/main/assets/www/img/user.png and b/platforms/android/app/src/main/assets/www/img/user.png differ diff --git a/platforms/android/app/src/main/assets/www/js/index.js b/platforms/android/app/src/main/assets/www/js/index.js index ed6b3a9..062bf01 100644 --- a/platforms/android/app/src/main/assets/www/js/index.js +++ b/platforms/android/app/src/main/assets/www/js/index.js @@ -77,6 +77,13 @@ $(document).ready(function () { var ref = cordova.InAppBrowser.open(url, target, options); }); + $("#txtarticle").on("keypress", function(event){ + if (event.keyCode === 13) { + setManualMode(); + event.preventDefault(); + } + }); + }); function setManualMode() { @@ -87,7 +94,7 @@ function setManualMode() { 'Article: ' + idArticulo, // message onConfirm, // callback to invoke with index of button pressed 'Verdnatura says:', // title - ['¡Take a picture!', '¡Library!', '¡Close!'] // buttonLabels + ['Hacer foto', 'Biblioteca', 'Cerrar'] // buttonLabels ); } else { navigator.notification.alert("Insert manual id or scan article", null, "Verdnatura says:", "¡ups!"); @@ -97,10 +104,10 @@ function setManualMode() { function savePhoto() { navigator.notification.confirm( - 'Are your sure to update picturo for article: ' + idArticulo, // message + 'Estas seguro de actualizar la foto de: ' + idArticulo, // message confirmSave, // callback to invoke with index of button pressed 'Verdnatura says:', // title - ['¡Save!', '¡Close!'] // buttonLabels + ['Guardar', 'Cancelar'] // buttonLabels ); // confirmSave(1); @@ -122,11 +129,11 @@ function confirmSave(buttonIndex) { data.append("token", localStorage.getItem("token")); - /*data.append("user", localStorage.getItem("user")); + data.append("user", localStorage.getItem("user")); data.append("password", localStorage.getItem("password")); - data.append("updateMatching", 1);*/ + data.append("updateMatching", true); data.append("image", img); @@ -137,11 +144,11 @@ function confirmSave(buttonIndex) { xhr.onload = function () { var response = JSON.parse(xhr.response); if (response.data == true) { - navigator.notification.alert("Upload completed!", function () { + navigator.notification.alert("Carga completa!", function () { window.location = "main.html"; - }, "Verdnatura says:", "¡Good job!"); + }, "Verdnatura dice:", "¡Buen trabajo!"); } else { - navigator.notification.alert("Error to upload picture", null, "Verdnatura says:", "¡ooohh!"); + navigator.notification.alert("Error al cargar la foto", null, "Verdnatura dice:", "¡ooohh!"); $(".loading").fadeOut(500); } @@ -149,7 +156,7 @@ function confirmSave(buttonIndex) { }; xhr.onerror = function () { - navigator.notification.alert("Error to upload picture", null, "Verdnatura says:", "¡ooohh!"); + navigator.notification.alert("Error al cargar la foto", null, "Verdnatura dice:", "¡ooohh!"); $(".loading").fadeOut(500); }; @@ -173,7 +180,7 @@ function scanBarcode() { 'Article: ' + result.text, // message onConfirm, // callback to invoke with index of button pressed 'Verdnatura says:', // title - ['¡Take a picture!', '¡Library!', '¡Close!'] // buttonLabels + ['Hacer foto', 'Bibloteca', 'Cerrar'] // buttonLabels ); }, @@ -213,7 +220,7 @@ function showCamera() { var options = { saveToPhotoAlbum: true, - quality: 80, + quality: 100, destinationType: Camera.DestinationType.FILE_URI, sourceType: srcType, encodingType: Camera.EncodingType.JPEG, @@ -232,7 +239,7 @@ function showLibrary() { var options = { saveToPhotoAlbum: false, - quality: 80, + quality: 100, destinationType: Camera.DestinationType.FILE_URI, sourceType: srcType, encodingType: Camera.EncodingType.JPEG, diff --git a/platforms/android/app/src/main/assets/www/main.html b/platforms/android/app/src/main/assets/www/main.html index 7bdb830..66e6c58 100644 --- a/platforms/android/app/src/main/assets/www/main.html +++ b/platforms/android/app/src/main/assets/www/main.html @@ -37,14 +37,14 @@
verdnatura - +
-
Scan
+
- ¡Go! + ¡Vamos!
diff --git a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 0c065bd..f581f23 100644 Binary files a/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png index 6313204..08891a1 100644 Binary files a/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 4e6f5b7..cd4b21c 100644 Binary files a/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 3334a61..f7dd9cd 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index c064ac0..bc94b25 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 550dec0..21de734 100644 Binary files a/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/platforms/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ