last modifications. ready to release.

Author: guidola

app/src/main/assets/default_data.json

@@ -1 +1 @@
-{"exams":[{"@id":1,"assigned_class":"Aula 2","date":1479043320000,"hour":null,"id":0,"speciality":"Animación","subject":{"@id":2,"degree":"Animación","description":"Aqui juegan con plastelina básicamente es una guarderia","exams":[1],"id":4,"image":"//android_asset/1.jpg","name":"Modelaje","students":[{"@id":3,"birthdate":1391554800000,"gender":"Masculino","id":3,"image":0,"name":"Link","path":"//android_asset/link.jpg","specialty":"Electrónica","subjects":[{"@id":4,"degree":"Electrónica","description":"Aqui aprenden a lijar i limpiar antenas","exams":[{"@id":5,"assigned_class":"Aula 1","date":1467580260000,"hour":null,"id":0,"speciality":"Electrónica","subject":4}],"id":1,"image":"//android_asset/2.jpg","name":"Antenas","students":[3,{"@id":6,"birthdate":925941600000,"gender":"Masculino","id":2,"image":0,"name":"Novita","path":"//android_asset/novita.jpg","specialty":"Magisterio","subjects":[{"@id":7,"degree":"Magisterio","description":"La asignatura más complicada de la carrera El concepto fundamental es pintar sin salir de los bordes","exams":[],"id":0,"image":"//android_asset/3.jpg","name":"Pinta y colorea","students":[6,{"@id":8,"birthdate":1383692400000,"gender":"Masculino","id":5,"image":0,"name":"Minion","path":"//android_asset/minion.jpg","specialty":"Informàtica","subjects":[7,2]}],"themes":[{"id":0,"name":"Lineas"},{"id":1,"name":"Formas"},{"id":2,"name":"Parejas de formas"},{"id":3,"name":"Volumenes"},{"id":4,"name":"Dibujo"},{"id":5,"name":"Proyecto final"}]},4]}],"themes":[{"id":6,"name":"Herramientas"},{"id":7,"name":"Concepto"},{"id":8,"name":"Tacto de las antenas"},{"id":9,"name":"Poner cera"},{"id":10,"name":"Quitar cera"},{"id":11,"name":"Practicas"}]},{"@id":9,"degree":"Informàtica","description":"Aqui aprenden a jugar con el muñequito verde aunque si te gustan las manzanas mordidas esto no es para ti","exams":[],"id":2,"image":"//android_asset/4.jpg","name":"Android","students":[{"@id":10,"birthdate":549237600000,"gender":"Femenino","id":7,"image":0,"name":"Tracer","path":"//android_asset/tracer.jpg","specialty":"Informàtica","subjects":[9,{"@id":11,"degree":"Telemàtica","description":"Los básicos del networking","exams":[],"id":3,"image":"//android_asset/5.jpg","name":"CCNA","students":[{"@id":12,"birthdate":24966000000,"gender":"Masculino","id":6,"image":0,"name":"Wally","path":"//android_asset/wally.jpg","specialty":"Multimedia","subjects":[11]},10],"themes":[{"id":18,"name":"Basicos"},{"id":19,"name":"Switching"},{"id":20,"name":"Routing"},{"id":21,"name":"Security"},{"id":22,"name":"Wan"},{"id":23,"name":"Logging"}]}]},3],"themes":[{"id":12,"name":"Layouts"},{"id":13,"name":"Animaciones"},{"id":14,"name":"Java"},{"id":15,"name":"Fragments"},{"id":16,"name":"Intents"},{"id":17,"name":"Sqlite"}]},2]},8],"themes":[{"id":24,"name":"La plastilina"},{"id":25,"name":"Hacer bolas "},{"id":26,"name":"Juntar bolas juntas"},{"id":27,"name":"Rallar la plastilina"},{"id":28,"name":"Pintar la plastilina"},{"id":29,"name":"Proyecto"}]}},5],"remember":true,"students":[6,3,8,12,10],"subjects":[7,4,9,11,2]}
+{"exams":[{"@id":1,"assigned_class":"Aula 2","date":1479043320000,"hour":null,"id":0,"speciality":"Animación","subject":{"@id":2,"degree":"Animación","description":"Aqui juegan con plastelina básicamente es una guarderia","exams":[1],"id":4,"image":"//android_asset/1.jpg","name":"Modelaje","students":[{"@id":3,"birthdate":1391554800000,"gender":"Masculino","id":3,"image":0,"name":"Link","path":"//android_asset/link.jpg","specialty":"Electrónica","subjects":[{"@id":4,"degree":"Electrónica","description":"Aqui aprenden a lijar i limpiar antenas","exams":[{"@id":5,"assigned_class":"Aula 1","date":1467580260000,"hour":null,"id":0,"speciality":"Electrónica","subject":4}],"id":1,"image":"//android_asset/2.jpg","name":"Antenas","students":[3,{"@id":6,"birthdate":925941600000,"gender":"Masculino","id":2,"image":0,"name":"Novita","path":"//android_asset/novita.jpg","specialty":"Magisterio","subjects":[{"@id":7,"degree":"Magisterio","description":"La asignatura más complicada de la carrera El concepto fundamental es pintar sin salir de los bordes","exams":[],"id":0,"image":"//android_asset/3.jpg","name":"Pinta y colorea","students":[6,{"@id":8,"birthdate":1383692400000,"gender":"Masculino","id":5,"image":0,"name":"Minion","path":"//android_asset/minion.jpg","specialty":"Informàtica","subjects":[7,2]}],"themes":[{"id":0,"name":"Lineas"},{"id":1,"name":"Formas"},{"id":2,"name":"Parejas de formas"},{"id":3,"name":"Volumenes"},{"id":4,"name":"Dibujo"},{"id":5,"name":"Proyecto final"}]},4]}],"themes":[{"id":6,"name":"Herramientas"},{"id":7,"name":"Concepto"},{"id":8,"name":"Tacto de las antenas"},{"id":9,"name":"Poner cera"},{"id":10,"name":"Quitar cera"},{"id":11,"name":"Practicas"}]},{"@id":9,"degree":"Informàtica","description":"Aqui aprenden a jugar con el muñequito verde aunque si te gustan las manzanas mordidas esto no es para ti","exams":[],"id":2,"image":"//android_asset/4.jpg","name":"Android","students":[{"@id":10,"birthdate":549237600000,"gender":"Femenino","id":7,"image":0,"name":"Tracer","path":"//android_asset/tracer.jpg","specialty":"Informàtica","subjects":[9,{"@id":11,"degree":"Telemàtica","description":"Los básicos del networking","exams":[],"id":3,"image":"//android_asset/5.jpg","name":"CCNA","students":[{"@id":12,"birthdate":24966000000,"gender":"Masculino","id":6,"image":0,"name":"Wally","path":"//android_asset/wally.jpg","specialty":"Multimedia","subjects":[11]},10],"themes":[{"id":18,"name":"Basicos"},{"id":19,"name":"Switching"},{"id":20,"name":"Routing"},{"id":21,"name":"Security"},{"id":22,"name":"Wan"},{"id":23,"name":"Logging"}]}]},3],"themes":[{"id":12,"name":"Layouts"},{"id":13,"name":"Animaciones"},{"id":14,"name":"Java"},{"id":15,"name":"Fragments"},{"id":16,"name":"Intents"},{"id":17,"name":"Sqlite"}]},2]},8],"themes":[{"id":24,"name":"La plastilina"},{"id":25,"name":"Hacer bolas "},{"id":26,"name":"Juntar bolas juntas"},{"id":27,"name":"Rallar la plastilina"},{"id":28,"name":"Pintar la plastilina"},{"id":29,"name":"Proyecto"}]}},5],"remember":false,"students":[6,3,8,12,10],"subjects":[7,4,9,11,2]}

app/src/main/java/domel/ecampus/Activity/WelcomeActivity.java

@@ -54,8 +54,8 @@ public void run() {
             task = new TimerTask(){
                 @Override
                 public void run() {
+                    Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
                     //Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
-                    Intent intent = new Intent(getApplicationContext(), MainMenuActivity.class);
                     startActivity(intent);
                     finish();
                 }

app/src/main/res/values/array.xml

@@ -7,7 +7,7 @@
         <item>Multimedia</item>
         <item>Animación</item>
         <item>Magisterio</item>
-        <item>Electronica</item>
+        <item>Electrónica</item>
     </string-array>
 
     <string-array name="assigned_class">

app/src/main/res/values/strings.xml

@@ -12,9 +12,9 @@
     <string name="prompt_password">Contraseña</string>
     <string name="action_sign_in">Autentificación</string>
     <string name="action_sign_in_short">Log in</string>
-    <string name="error_invalid_email">La dirección de email no es correcta</string>
+    <string name="error_invalid_email">El formato del email no és correcto</string>
     <string name="error_invalid_password">La contraseña es demasiado corta</string>
-    <string name="error_incorrect_password">La contraseña introducida no es correcta</string>
+    <string name="error_incorrect_password">Credenciales inválidas</string>
     <string name="error_field_required">Este campo no debería estar vacio</string>
 
     <string name="basic_information_title">INFORMACIÓN BÁSICA</string>