new colors

nbproject/private/private.xml

@@ -11,6 +11,11 @@
         </file>
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/js/index.js</file>
+            <file>file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/css/index.css</file>
+            <file>file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/main.html</file>
+            <file>file:/Users/enriqueblascoblanquer/Documents/WEB/vn-appPicture/platforms/android/app/src/main/assets/www/index.html</file>
+        </group>
     </open-files>
 </project-private>

platforms/android/app/app.iml

@@ -132,5 +132,9 @@
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
     <orderEntry type="module" module-name="CordovaLib" />
     <orderEntry type="module" module-name="CordovaLib" />
+    <orderEntry type="module" module-name="CordovaLib" />
+    <orderEntry type="module" module-name="CordovaLib" />
+    <orderEntry type="module" module-name="CordovaLib" />
+    <orderEntry type="module" module-name="CordovaLib" />
   </component>
 </module>

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":{}}]
+[{"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":{}}]

platforms/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest android:hardwareAccelerated="true" android:versionCode="10000" android:versionName="1.0.0" package="es.verdnatura.verdnaturafoto" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest android:hardwareAccelerated="true" android:versionCode="10006" android:versionName="1.0.6" package="es.verdnatura.verdnaturafoto" xmlns:android="http://schemas.android.com/apk/res/android">
     <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true">

platforms/android/app/src/main/assets/www/css/index.css

@@ -32,8 +32,8 @@ html{
 }
 
 body {
-    background: #fff;
+    background: #000;
-    padding: 20px;
+    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{

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,

platforms/android/app/src/main/assets/www/main.html

@@ -37,14 +37,14 @@
        
             <div class="input">
                 <img  src="img/article.png" alt="verdnatura"/>
-                <input type="text" id="txtarticle" placeholder="article id" value=""/>
+                <input type="number" id="txtarticle" placeholder="ID ARTICULO" value=""/>
             </div>
            
-            <div class="btnbarcode">Scan</div>
+            <!--<div class="btnbarcode">Scan</div>-->
            
             
             <div class="btn loginbtn" id="btntakepicture">
-                ¡Go!
+                ¡Vamos!
             </div>
         </div>