Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Added new notification types "documentFile", "sharedFile", "enrollment"

Browse Source 
and "enrollmentRequest". Changed notifications icon.
This commit is contained in:
Juan Miguel Boyero Corral 2013-03-26 14:27:38 +01:00
parent 90e0b88799
commit e492d1661f
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SWADroid/res/values-es/strings.xml
View File

@ -66,6 +66,10 @@
<string name="evaluation">Evaluación</string>
<string name="assignment">Actividad</string>
<string name="survey">Encuesta</string>
<string name="documentFile">Documento</string>
<string name="sharedFile">Documento compartido</string>
<string name="enrollment">Inscripción</string>
<string name="enrollmentRequest">Petición de inscripción</string>
<string name="unknownNotification">Notificación desconocida</string>
<string name="fromMsg">De</string>
<string name="dateMsg">Fecha</string>
@ -192,7 +196,6 @@
<string name="sdCardBusy">La tarjeta SD está ocupada ahora mismo. Para permitir descargas, selecciona "Desactiva almacenamiento USB" en la notificación</string>
<string name="vacants">Vacantes</string>
<string name="numStudent">Nº de estudiantes: </string>
<string name="enrollment">Inscripción</string>
<string name="myGroupsModuleLabel">Mis grupos</string>
<string name="scan_no_photos">No se han podido guardar las fotos de los estudiantes</string>
<string name="noStudentsAvailableMsg">Esta asignatura no tiene alumnos</string>

5
SWADroid/res/values/strings.xml
View File

@ -67,6 +67,10 @@
<string name="evaluation">Evaluation</string>
<string name="assignment">Assignment</string>
<string name="survey">Survey</string>
<string name="documentFile">Document</string>
<string name="sharedFile">Shared document</string>
<string name="enrollment">Enrollment</string>
<string name="enrollmentRequest">Enrollment request</string>
<string name="unknownNotification">Unknown notification</string>
<string name="fromMsg">From</string>
<string name="dateMsg">Date</string>
@ -200,7 +204,6 @@
<string name="vacants">Vacants</string>
<string name="numStudent">No. of students: </string>
<string name="maxStudent">Max.stud.</string>
<string name="enrollment">Enrollment</string>
<string name="myGroupsModuleLabel">My groups</string>
<string name="scan_no_photos">Failed to save the photos of students</string>
<string name="noStudentsAvailableMsg">There are no students in this subject</string>

2
SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
View File

@ -567,7 +567,7 @@ public class SWADMain extends MenuExpandableListActivity {
//Messages category
map = new HashMap<String,Object>();
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<String,Object>();

2
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java
View File

@ -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);

18
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
View File

@ -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);