diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml index c3f6344e..38fa7017 100644 --- a/SWADroid/res/values-es/strings.xml +++ b/SWADroid/res/values-es/strings.xml @@ -66,6 +66,10 @@ Evaluación Actividad Encuesta + Documento + Documento compartido + Inscripción + Petición de inscripción Notificación desconocida De Fecha @@ -192,7 +196,6 @@ La tarjeta SD está ocupada ahora mismo. Para permitir descargas, selecciona "Desactiva almacenamiento USB" en la notificación Vacantes Nº de estudiantes: - Inscripción Mis grupos No se han podido guardar las fotos de los estudiantes Esta asignatura no tiene alumnos diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml index 9ae38942..8826d2a0 100644 --- a/SWADroid/res/values/strings.xml +++ b/SWADroid/res/values/strings.xml @@ -67,6 +67,10 @@ Evaluation Assignment Survey + Document + Shared document + Enrollment + Enrollment request Unknown notification From Date @@ -200,7 +204,6 @@ Vacants No. of students: Max.stud. - Enrollment My groups Failed to save the photos of students There are no students in this subject diff --git a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java index 6d2909a4..4b84d7ab 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java +++ b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java @@ -567,7 +567,7 @@ public class SWADMain extends MenuExpandableListActivity { //Messages category map = new HashMap(); map.put(NAME, getString(R.string.notificationsModuleLabel) ); - map.put(IMAGE, getResources().getDrawable(R.drawable.notif)); + map.put(IMAGE, getResources().getDrawable(R.drawable.bell)); messagesData.add(map); map = new HashMap(); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java index d523bb26..59b8c378 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java @@ -175,7 +175,7 @@ public class Notifications extends Module { this.findViewById(R.id.groupSpinner).setVisibility(View.GONE); image = (ImageView)this.findViewById(R.id.moduleIcon); - image.setBackgroundResource(R.drawable.notif); + image.setBackgroundResource(R.drawable.bell); text = (TextView)this.findViewById(R.id.moduleName); text.setText(R.string.notificationsModuleLabel); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java index 0248dd8b..155552eb 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java @@ -165,7 +165,23 @@ public class NotificationsCursorAdapter extends CursorAdapter { { type = context.getString(R.string.assignment); notificationIcon.setImageResource(R.drawable.desk); - } else if(type.equals("survey")) + } else if(type.equals("documentFile")) + { + type = context.getString(R.string.documentFile); + notificationIcon.setImageResource(R.drawable.folder); + } else if(type.equals("sharedFile")) + { + type = context.getString(R.string.sharedFile); + notificationIcon.setImageResource(R.drawable.folder_users); + } else if(type.equals("enrollment")) + { + type = context.getString(R.string.enrollment); + notificationIcon.setImageResource(R.drawable.user_ok); + } else if(type.equals("enrollmentRequest")) + { + type = context.getString(R.string.enrollmentRequest); + notificationIcon.setImageResource(R.drawable.user_ok); + } else if(type.equals("documentFile")) { type = context.getString(R.string.survey); notificationIcon.setImageResource(R.drawable.survey);