Added new icons for download module
Modified icon names just for unifying names
BIN
SWADroid/res/drawable-hdpi/file.png
Normal file
After Width: | Height: | Size: 674 B |
BIN
SWADroid/res/drawable-hdpi/folder_closed.png
Normal file
After Width: | Height: | Size: 437 B |
BIN
SWADroid/res/drawable-hdpi/folder_open.png
Normal file
After Width: | Height: | Size: 721 B |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
BIN
SWADroid/res/drawable-hdpi/home.png
Normal file
After Width: | Height: | Size: 862 B |
BIN
SWADroid/res/drawable-hdpi/home_alt.png
Normal file
After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
BIN
SWADroid/res/drawable-hdpi/padlock_green.png
Normal file
After Width: | Height: | Size: 969 B |
BIN
SWADroid/res/drawable-hdpi/padlock_red.png
Normal file
After Width: | Height: | Size: 712 B |
BIN
SWADroid/res/drawable-hdpi/parent.png
Normal file
After Width: | Height: | Size: 634 B |
BIN
SWADroid/res/drawable-hdpi/refresh.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
BIN
SWADroid/res/drawable-ldpi/file.png
Normal file
After Width: | Height: | Size: 515 B |
BIN
SWADroid/res/drawable-ldpi/folder_closed.png
Normal file
After Width: | Height: | Size: 287 B |
BIN
SWADroid/res/drawable-ldpi/folder_open.png
Normal file
After Width: | Height: | Size: 491 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
BIN
SWADroid/res/drawable-ldpi/home.png
Normal file
After Width: | Height: | Size: 607 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
BIN
SWADroid/res/drawable-ldpi/padlock_green.png
Normal file
After Width: | Height: | Size: 692 B |
BIN
SWADroid/res/drawable-ldpi/padlock_red.png
Normal file
After Width: | Height: | Size: 557 B |
BIN
SWADroid/res/drawable-ldpi/refresh.png
Normal file
After Width: | Height: | Size: 822 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
SWADroid/res/drawable-mdpi/file.png
Normal file
After Width: | Height: | Size: 532 B |
BIN
SWADroid/res/drawable-mdpi/folder_closed.png
Normal file
After Width: | Height: | Size: 362 B |
BIN
SWADroid/res/drawable-mdpi/folder_open.png
Normal file
After Width: | Height: | Size: 601 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
BIN
SWADroid/res/drawable-mdpi/home.png
Normal file
After Width: | Height: | Size: 688 B |
BIN
SWADroid/res/drawable-mdpi/home_alt.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
SWADroid/res/drawable-mdpi/padlock_green.png
Normal file
After Width: | Height: | Size: 689 B |
BIN
SWADroid/res/drawable-mdpi/padlock_red.png
Normal file
After Width: | Height: | Size: 647 B |
BIN
SWADroid/res/drawable-mdpi/parent.png
Normal file
After Width: | Height: | Size: 515 B |
BIN
SWADroid/res/drawable-mdpi/refresh.png
Normal file
After Width: | Height: | Size: 902 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 562 B |
Before Width: | Height: | Size: 463 B |
Before Width: | Height: | Size: 431 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.6 KiB |
|
@ -147,7 +147,7 @@
|
|||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:onClick="onReplyMessageClick"
|
||||
android:background="@drawable/message_reply"
|
||||
android:background="@drawable/msg_reply"
|
||||
android:clickable="true"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
android:id="@+id/padlockIcon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/padlockred"
|
||||
android:src="@drawable/padlock_red"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:paddingTop="5dp"
|
||||
android:paddingLeft="5dp"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/actionBarLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dip"
|
||||
android:layout_height="40dip"
|
||||
android:background="@color/title_background"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
|||
android:contentDescription="@string/parent_icon"
|
||||
android:background="@drawable/navigation_button"
|
||||
android:onClick="onRefreshClick"
|
||||
android:paddingLeft="5dip"
|
||||
android:paddingLeft="20dip"
|
||||
android:paddingRight="5dip"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/parent" />
|
||||
|
|
|
@ -147,7 +147,7 @@
|
|||
<string name="usersDownloadProgressDescription">Sincronizando estudiantes.\n\nDependiendo del número de
|
||||
estudiantes a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere…</string>
|
||||
<string name="documentsDownloadModuleLabel">Documentos</string>
|
||||
<string name="documentsDownloadProgressDescription">Obteniendo árbol de directorios.\n\nDependiendo del tamaño del directorio, podría necesitar varios minutos.\n\nPor favor, espere…</string>
|
||||
<string name="documentsDownloadProgressDescription">Obteniendo archivos.\n\nDependiendo del tamaño del directorio, podría necesitar varios minutos.\n\nPor favor, espere…</string>
|
||||
<string name="clickToOpenFile">Pulse aqui para abrir el archivo</string>
|
||||
<string name="sharedsDownloadModuleLabel">Zona común</string>
|
||||
<string name="connectionRequired">Para esta funcionalidad se necesita conexión a Internet</string>
|
||||
|
|
|
@ -151,7 +151,7 @@
|
|||
users to synchronize, the data processing can take several minutes.\n\nPlease wait…</string>
|
||||
<string name="usersDownloadProgressTitle">Students</string>
|
||||
<string name="documentsDownloadModuleLabel">Documents</string>
|
||||
<string name="documentsDownloadProgressDescription">Getting directory tree. \n\nDepending of the directory size, this could take several minutes.\n\nPlease wait…</string>
|
||||
<string name="documentsDownloadProgressDescription">Getting files. \n\nDepending of the directory size, this could take several minutes.\n\nPlease wait…</string>
|
||||
<string name="clickToOpenFile">Click here to open the file</string>
|
||||
<string name="sharedsDownloadModuleLabel">Shared area</string>
|
||||
<string name="connectionRequired">Internet connection is required for this functionality</string>
|
||||
|
|
|
@ -319,7 +319,7 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback
|
|||
soundResult = sounds[0]; // Positive sound
|
||||
} else {
|
||||
messageResult = getString(R.string.scan_not_valid_student);
|
||||
iconResult = R.drawable.notok;
|
||||
iconResult = R.drawable.not_ok;
|
||||
soundResult = sounds[1]; // Negative sound
|
||||
}
|
||||
messageResult += "\n\n"
|
||||
|
@ -329,13 +329,13 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback
|
|||
} else {
|
||||
// There is no user with that ID or nickname
|
||||
messageResult = getString(R.string.scan_data_not_found);
|
||||
iconResult = R.drawable.notok;
|
||||
iconResult = R.drawable.not_ok;
|
||||
soundResult = sounds[1]; // Negative sound
|
||||
}
|
||||
} else {
|
||||
// Not detected any valid ID or nickname
|
||||
messageResult = getString(R.string.scan_not_valid_code);
|
||||
iconResult = R.drawable.notok;
|
||||
iconResult = R.drawable.not_ok;
|
||||
soundResult = sounds[1]; // Negative sound
|
||||
}
|
||||
|
||||
|
|
|
@ -558,12 +558,12 @@ public class SWADMain extends MenuExpandableListActivity {
|
|||
//shared area category
|
||||
map = new HashMap<String,Object>();
|
||||
map.put(NAME, getString(R.string.sharedsDownloadModuleLabel));
|
||||
map.put(IMAGE, getResources().getDrawable(R.drawable.folderusers));
|
||||
map.put(IMAGE, getResources().getDrawable(R.drawable.folder_users));
|
||||
documentsData.add(map);
|
||||
|
||||
map = new HashMap<String,Object>();
|
||||
map.put(NAME, getString(R.string.myGroupsModuleLabel));
|
||||
map.put(IMAGE, getResources().getDrawable(R.drawable.mygroups));
|
||||
map.put(IMAGE, getResources().getDrawable(R.drawable.my_groups));
|
||||
enrollmentData.add(map);
|
||||
|
||||
setListAdapter( new ImageExpandableListAdapter(
|
||||
|
@ -616,7 +616,7 @@ public class SWADMain extends MenuExpandableListActivity {
|
|||
|
||||
map = new HashMap<String,Object>();
|
||||
map.put(NAME, getString(R.string.rollcallModuleLabel));
|
||||
map.put(IMAGE, getResources().getDrawable(R.drawable.rollcall));
|
||||
map.put(IMAGE, getResources().getDrawable(R.drawable.roll_call));
|
||||
child.add(map);
|
||||
((ImageExpandableListAdapter) getExpandableListAdapter()).addGroup(USERS_GROUP, users, child);
|
||||
|
||||
|
|
|
@ -283,7 +283,7 @@ public class DownloadsManager extends MenuActivity {
|
|||
moduleText.setText(R.string.documentsDownloadModuleLabel);
|
||||
} else { // SHARE_AREA_CODE
|
||||
moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.folderusers);
|
||||
moduleIcon.setBackgroundResource(R.drawable.folder_users);
|
||||
|
||||
moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.sharedsDownloadModuleLabel);
|
||||
|
|
|
@ -93,7 +93,7 @@ public class NodeAdapter extends BaseAdapter {
|
|||
holder.text.setText(((DirectoryItem)list.get(position)).getName());
|
||||
|
||||
if(((DirectoryItem)list.get(position)).isFolder()){
|
||||
holder.image.setImageResource(R.drawable.folder);
|
||||
holder.image.setImageResource(R.drawable.folder_open);
|
||||
}else{
|
||||
holder.image.setImageResource(R.drawable.file);
|
||||
}
|
||||
|
|
|
@ -158,9 +158,9 @@ public class EnrollmentExpandableListAdapter extends BaseExpandableListAdapter {
|
|||
}
|
||||
|
||||
if(open != 0){
|
||||
holder.imagePadlock.setImageResource(R.drawable.padlockgreen);
|
||||
holder.imagePadlock.setImageResource(R.drawable.padlock_green);
|
||||
}else{
|
||||
holder.imagePadlock.setImageResource(R.drawable.padlockred);
|
||||
holder.imagePadlock.setImageResource(R.drawable.padlock_red);
|
||||
}
|
||||
|
||||
if((open != 0 && freeSpot) || role == Global.TEACHER_TYPE_CODE){ //Teachers can enroll even on closed groups
|
||||
|
|
|
@ -144,9 +144,9 @@ public class GroupsCursorTreeAdapter extends CursorTreeAdapter {
|
|||
|
||||
|
||||
if(open != 0)
|
||||
imagePadlock.setImageResource(R.drawable.padlockgreen);
|
||||
imagePadlock.setImageResource(R.drawable.padlock_green);
|
||||
else
|
||||
imagePadlock.setImageResource(R.drawable.padlockred);
|
||||
imagePadlock.setImageResource(R.drawable.padlock_red);
|
||||
|
||||
//Multiple or single inscription? it comes from the group type
|
||||
int multiple = childMultiple.get(Long.valueOf(groupCode)).intValue();
|
||||
|
|
|
@ -112,7 +112,7 @@ public class MyGroupsManager extends MenuExpandableListActivity {
|
|||
courseNameText.setText(Global.getSelectedCourseShortName());
|
||||
|
||||
ImageView moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.mygroups);
|
||||
moduleIcon.setBackgroundResource(R.drawable.my_groups);
|
||||
|
||||
TextView moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.myGroupsModuleLabel);
|
||||
|
|
|
@ -315,7 +315,7 @@ public class Rollcall extends MenuExpandableListActivity {
|
|||
setContentView(R.layout.main_rollcall);
|
||||
|
||||
ImageView image = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
image.setBackgroundResource(R.drawable.rollcall);
|
||||
image.setBackgroundResource(R.drawable.roll_call);
|
||||
|
||||
TextView text = (TextView) this.findViewById(R.id.moduleName);
|
||||
text.setText(R.string.rollcallModuleLabel);
|
||||
|
@ -455,7 +455,7 @@ public class Rollcall extends MenuExpandableListActivity {
|
|||
// Rollcall category
|
||||
final HashMap<String, Object> rollcall = new HashMap<String,Object>();
|
||||
rollcall.put(NAME, getString(R.string.rollcallModuleLabel));
|
||||
rollcall.put(IMAGE, getResources().getDrawable(R.drawable.rollcall));
|
||||
rollcall.put(IMAGE, getResources().getDrawable(R.drawable.roll_call));
|
||||
headerData.add(rollcall);
|
||||
|
||||
final ArrayList<HashMap<String,Object>> rollcallData = new ArrayList<HashMap<String, Object>>();
|
||||
|
|