issues #54, #54 solved

74ae02fe · Fernando Martínez Santiago · 2bfa5412 · 74ae02fe · 74ae02fe · 74ae02fe
Commit 74ae02fe authored Mar 08, 2017 by Fernando Martínez Santiago
Showing with 39 additions and 85 deletions
android/Pictogram/build.gradle
android/Pictogram/commonlibrary/src/main/res/values-en/strings.xml
android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml
android/Pictogram/commonlibrary/src/main/res/values/strings.xml
android/Pictogram/gradle/wrapper/gradle-wrapper.properties
android/Pictogram/tabletlibrary/src/main/res/values-en/strings.xml
android/Pictogram/tabletlibrary/src/main/res/values-es/strings.xml
android/Pictogram/tabletlibrary/src/main/res/values/strings.xml
android/Pictogram/tabletlibrary/tabletlibrary.iml
--- a/android/Pictogram/build.gradle
+++ b/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

--- a/android/Pictogram/commonlibrary/src/main/res/values-en/strings.xml
+++ b/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>

--- a/android/Pictogram/commonlibrary/src/main/res/values-es/strings.xml
+++ b/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>

--- a/android/Pictogram/commonlibrary/src/main/res/values/strings.xml
+++ b/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>

--- a/android/Pictogram/gradle/wrapper/gradle-wrapper.properties
+++ b/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
--- a/android/Pictogram/tabletlibrary/src/main/res/values-en/strings.xml
+++ b/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>
+    <!-- Cropper -->
-    <string name="dialogTitle">Choose Method</string>
+    <string name="crop_TextRequired">Por favor, introduzca una leyenda para el pictograma</string>
-    <string name="dialogCancel">Cancel</string>
+    <string name="uploadingImage">Subiendo imagen al servidor</string>
 </resources>
--- a/android/Pictogram/tabletlibrary/src/main/res/values-es/strings.xml
+++ b/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>
--- a/android/Pictogram/tabletlibrary/src/main/res/values/strings.xml
+++ b/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>
--- a/android/Pictogram/tabletlibrary/tabletlibrary.iml
+++ b/android/Pictogram/tabletlibrary/tabletlibrary.iml
@@ -9,7 +9,6 @@
    <facet type="android" name="Android">
      <configuration>
        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
        <afterSyncTasks>
@@ -20,7 +19,7 @@
        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
      </configuration>
    </facet>
  </component>
@@ -47,7 +46,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -55,7 +53,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -63,7 +60,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -71,7 +67,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
@@ -79,23 +74,12 @@
      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -106,48 +90,47 @@
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
    <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-gcm-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-auth-base-9.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-gass-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-iid-9.2.1" level="project" />
    <orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="androidasync-2.1.9" level="project" />
+    <orderEntry type="library" exported="" name="play-services-clearcut-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tasks-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-auth-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" />
+    <orderEntry type="library" exported="" name="ion-2.1.9" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" />
    <orderEntry type="module" module-name="commonlibrary" exported="" />
    <orderEntry type="library" exported="" name="android-android-24" level="project" />
    <orderEntry type="library" exported="" name="okhttp-ws-2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
    <orderEntry type="library" exported="" name="socket.io-client-0.5.0" level="project" />
    <orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="androidasync-2.1.9" level="project" />
-    <orderEntry type="library" exported="" name="play-services-clearcut-9.2.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
    <orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
    <orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-gcm-9.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-auth-base-9.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-gass-9.2.1" level="project" />
    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-iid-9.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-9.2.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-9.2.1" level="project" />
    <orderEntry type="library" exported="" name="engine.io-client-0.5.0" level="project" />
    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-auth-9.2.1" level="project" />
    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" />
    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" name="ion-2.1.9" level="project" />
    <orderEntry type="library" exported="" scope="TEST" name="json-20090211" level="project" />
-    <orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" />
  </component>
 </module>
\ No newline at end of file