issues #54, #54 solved

android/Pictogram/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/Pictogram/commonlibrary/src/main/res/values-en/strings.xml

@@ -49,9 +49,6 @@
 
     <!--Semantic grammar -->
     <string name="loadingGrammar">Please wait, loading vocabulary</string>
-    <string name="naturalgrammar">SUpO_EN</string>
-    <string name="pictogrammar">SUpO_PICTOEN</string>
-    <string name="nogrammar">Warning: unknown language</string>
 
     <!--Upload local img -->
     <string name="enterImgLabel">Enter img label</string>

android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml

@@ -18,6 +18,9 @@
     <string name="action_entrar">Entrar</string>
     <string name="logout">Cerrar sesión</string>
     <string name="loginTitle">¿Quién eres?</string>
+    <string name="userInetErrorMsg">Este usuario requiere conexión a internet para ser validado</string>
+    <string name="userLoadingTxt">Cargando</string>
+    <string name="userLoadingMsg">Cargando alumnos. Por favor espere.</string>
     <string name="loginErrorTxt">Login</string>
     <string name="loginErrorMsg">El usuario no existe o la contraseña indicada no es correcta. Inténtelo de nuevo.</string>
     <string name="loginNoLicenseMsg">La licencia del usuario expiró con fecha. Contacte con Yotta para adquirir una.</string>
@@ -48,10 +51,6 @@
 
     <!--Semantic grammar -->
     <string name="loadingGrammar">Por favor espere, cargando vocabulario</string>
-    <string name="naturalgrammar">SUpO_ES</string>
-    <string name="grammar">SUpO_ES</string>
-    <string name="nogrammar">Advertencia: Lenguaje no soportado</string>
-    <string name="pictogrammar">SUpO_PICTOES</string>
 
     <!--Upload local img -->
     <string name="enterImgLabel">Introduzca etiqueta de la imagen</string>

android/Pictogram/commonlibrary/src/main/res/values/strings.xml

@@ -51,10 +51,6 @@
 
     <!--Semantic grammar -->
     <string name="loadingGrammar">Please wait, loading vocabulary</string>
-    <string name="naturalgrammar">SUpO_EN</string>
-    <string name="grammar">SUpO_EN</string>
-    <string name="nogrammar">Warning: unknown language</string>
-    <string name="pictogrammar">SUpO_PICTOEN</string>
 
     <!--Upload local img -->
     <string name="enterImgLabel">Introduzca etiqueta de la imagen</string>
@@ -63,18 +59,7 @@
     <string name="upload_ok">Se subió correctamente al servidor</string>
     <string name="upload_duplicated">Pictograma ya presente en la colección. Utilice otra imagen</string>
 
-    <string name="title_activity_img_label">img_label</string>
 
-    <!-- Strings related to login -->
-    <string name="prompt_email">Email</string>
-    <string name="prompt_password">Password (optional)</string>
-    <string name="action_sign_in">Sign in or register</string>
-    <string name="action_sign_in_short">Sign in</string>
-    <string name="error_invalid_email">This email address is invalid</string>
-    <string name="error_invalid_password">This password is too short</string>
-    <string name="error_incorrect_password">This password is incorrect</string>
-    <string name="error_field_required">This field is required</string>
-    <string name="permission_rationale">"Contacts permissions are needed for providing email completions."</string>
     <!--online/offline status-->
     <string name="pictogram_offline">Compruebe si tiene conexión a Internet.  </string>
     <string name="pictogram_online">Conexión con el servidor establecida.  </string>

android/Pictogram/gradle/wrapper/gradle-wrapper.properties

-#Sun Jan 15 10:11:11 CET 2017
+#Mon Mar 06 13:23:58 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

android/Pictogram/tabletlibrary/src/main/res/values-en/strings.xml

 <resources>
     <string name="app_name">com.yottacode.pictogram.Tablet</string>
+    <string name="alumnos">Students</string>
+    <string name="supervisores">Supervisors</string>
     <item name="maxInTape" type="integer">8</item>
     <item name="maxInTape_big" type="integer">6</item>
 
@@ -36,13 +38,13 @@
     <string name="session_eval_discarded">discarded</string>
     <string name="crop">Crop</string>
     <string name="titleCropper">Edit Picto</string>
-    <string name="croppedImageDesc">Preview</string>
+
     <string name="cancel">Cancel</string>
-    <string name="accept">Accept</string>
     <string name="legendText">Legend</string>
-    <string name="dialogCamera">Take a Picture</string>
-    <string name="dialogGallery">Pick from Gallery</string>
-    <string name="dialogTitle">Choose Method</string>
-    <string name="dialogCancel">Cancel</string>
+
+    <!-- Cropper -->
+    <string name="crop_TextRequired">Por favor, introduzca una leyenda para el pictograma</string>
+    <string name="uploadingImage">Subiendo imagen al servidor</string>
+
 
 </resources>

android/Pictogram/tabletlibrary/src/main/res/values-es/strings.xml

 <resources>
     <string name="app_name">com.yottacode.pictogram.Tablet</string>
+    <string name="alumnos">Students</string>
+    <string name="supervisores">Supervisors</string>
     <item name="maxInTape" type="integer">8</item>
     <item name="maxInTape_big" type="integer">6</item>
 
@@ -37,10 +39,12 @@
     <string name="crop">Recortar</string>
     <string name="titleCropper">Nuevo Pictograma</string>
     <string name="crop_TextRequired">Por favor, introduzca una leyenda para el pictograma</string>
+
+    <!-- Cropper -->
     <string name="legendText">Leyenda:</string>
-    <string name="dialogCamera">Hacer Foto</string>
-    <string name="dialogGallery">Seleccionar de Galería</string>
-    <string name="dialogTitle">Seleccionar Método</string>
-    <string name="dialogCancel">Cancelar</string>
     <string name="uploadingImage">Subiendo imagen al servidor</string>
+
+
+
+
 </resources>

android/Pictogram/tabletlibrary/src/main/res/values/strings.xml

@@ -38,27 +38,12 @@
     <string name="session_eval_discarded">inválido</string>
 
 
-    <!-- Dialog for add new picto -->
-    <string name="dialogTitle">Seleccionar método</string>
-    <string name="dialogCamera">Hacer Foto</string>
-    <string name="dialogGallery">Seleccionar de Galería</string>
-    <string name="dialogCancel">Cancelar</string>
     <!-- Cropper -->
     <string name="legendText">Leyenda:</string>
-    <string name="fixedAspectRatio">fixedAspectRatio =\u0020</string>
-    <string name="aspectRatioXHeader">aspectRatioX =\u0020</string>
-    <string name="aspectRatioYHeader">aspectRatioY =\u0020</string>
-    <string name="showGuidelines">showGuidelines =\u0020</string>
+
     <string name="crop">Recortar</string>
     <string name="titleCropper">Nuevo Pictograma</string>
     <string name="crop_TextRequired">Por favor, introduzca una leyenda para el pictograma</string>
     <string name="uploadingImage">Subiendo imagen al servidor</string>
 
-
-    <string-array name="showGuidelinesArray">
-        <item>Off</item>
-        <item>On Touch</item>
-        <item>On</item>
-    </string-array>
-
 </resources>