diff --git a/SWADroid/res/drawable-hdpi/file.png b/SWADroid/res/drawable-hdpi/file.png new file mode 100644 index 00000000..b11f3919 Binary files /dev/null and b/SWADroid/res/drawable-hdpi/file.png differ diff --git a/SWADroid/res/drawable-hdpi/folder_closed.png b/SWADroid/res/drawable-hdpi/folder_closed.png new file mode 100644 index 00000000..ee979323 Binary files /dev/null and b/SWADroid/res/drawable-hdpi/folder_closed.png differ diff --git a/SWADroid/res/drawable-hdpi/folder_open.png b/SWADroid/res/drawable-hdpi/folder_open.png new file mode 100644 index 00000000..4d917992 Binary files /dev/null and b/SWADroid/res/drawable-hdpi/folder_open.png differ diff --git a/SWADroid/res/drawable-hdpi/folderusers.png b/SWADroid/res/drawable-hdpi/folder_users.png similarity index 100% rename from SWADroid/res/drawable-hdpi/folderusers.png rename to SWADroid/res/drawable-hdpi/folder_users.png diff --git a/SWADroid/res/drawable-hdpi/home.png b/SWADroid/res/drawable-hdpi/home.png new file mode 100644 index 00000000..a53135e5 Binary files /dev/null and b/SWADroid/res/drawable-hdpi/home.png differ diff --git a/SWADroid/res/drawable-hdpi/home_alt.png b/SWADroid/res/drawable-hdpi/home_alt.png new file mode 100644 index 00000000..1faa25df Binary files /dev/null and b/SWADroid/res/drawable-hdpi/home_alt.png differ diff --git a/SWADroid/res/drawable-hdpi/message_reply.png b/SWADroid/res/drawable-hdpi/msg_reply.png similarity index 100% rename from SWADroid/res/drawable-hdpi/message_reply.png rename to SWADroid/res/drawable-hdpi/msg_reply.png diff --git a/SWADroid/res/drawable-hdpi/mygroups.png b/SWADroid/res/drawable-hdpi/my_groups.png similarity index 100% rename from SWADroid/res/drawable-hdpi/mygroups.png rename to SWADroid/res/drawable-hdpi/my_groups.png diff --git a/SWADroid/res/drawable-hdpi/notok.png b/SWADroid/res/drawable-hdpi/not_ok.png similarity index 100% rename from SWADroid/res/drawable-hdpi/notok.png rename to SWADroid/res/drawable-hdpi/not_ok.png diff --git a/SWADroid/res/drawable-hdpi/padlock_green.png b/SWADroid/res/drawable-hdpi/padlock_green.png new file mode 100644 index 00000000..35c821a1 Binary files /dev/null and b/SWADroid/res/drawable-hdpi/padlock_green.png differ diff --git a/SWADroid/res/drawable-hdpi/padlock_red.png b/SWADroid/res/drawable-hdpi/padlock_red.png new file mode 100644 index 00000000..351cc05d Binary files /dev/null and b/SWADroid/res/drawable-hdpi/padlock_red.png differ diff --git a/SWADroid/res/drawable-hdpi/parent.png b/SWADroid/res/drawable-hdpi/parent.png new file mode 100644 index 00000000..ae0ec74a Binary files /dev/null and b/SWADroid/res/drawable-hdpi/parent.png differ diff --git a/SWADroid/res/drawable-hdpi/refresh.png b/SWADroid/res/drawable-hdpi/refresh.png new file mode 100644 index 00000000..ca4b6bee Binary files /dev/null and b/SWADroid/res/drawable-hdpi/refresh.png differ diff --git a/SWADroid/res/drawable-hdpi/rollcall.png b/SWADroid/res/drawable-hdpi/roll_call.png similarity index 100% rename from SWADroid/res/drawable-hdpi/rollcall.png rename to SWADroid/res/drawable-hdpi/roll_call.png diff --git a/SWADroid/res/drawable-ldpi/file.png b/SWADroid/res/drawable-ldpi/file.png new file mode 100644 index 00000000..ae12b155 Binary files /dev/null and b/SWADroid/res/drawable-ldpi/file.png differ diff --git a/SWADroid/res/drawable-ldpi/folder_closed.png b/SWADroid/res/drawable-ldpi/folder_closed.png new file mode 100644 index 00000000..05158d41 Binary files /dev/null and b/SWADroid/res/drawable-ldpi/folder_closed.png differ diff --git a/SWADroid/res/drawable-ldpi/folder_open.png b/SWADroid/res/drawable-ldpi/folder_open.png new file mode 100644 index 00000000..e31dc4f5 Binary files /dev/null and b/SWADroid/res/drawable-ldpi/folder_open.png differ diff --git a/SWADroid/res/drawable-ldpi/folderusers.png b/SWADroid/res/drawable-ldpi/folder_users.png similarity index 100% rename from SWADroid/res/drawable-ldpi/folderusers.png rename to SWADroid/res/drawable-ldpi/folder_users.png diff --git a/SWADroid/res/drawable-ldpi/home.png b/SWADroid/res/drawable-ldpi/home.png new file mode 100644 index 00000000..bfb7ee70 Binary files /dev/null and b/SWADroid/res/drawable-ldpi/home.png differ diff --git a/SWADroid/res/drawable/home.png b/SWADroid/res/drawable-ldpi/home_alt.png similarity index 100% rename from SWADroid/res/drawable/home.png rename to SWADroid/res/drawable-ldpi/home_alt.png diff --git a/SWADroid/res/drawable-ldpi/message_reply.png b/SWADroid/res/drawable-ldpi/msg_reply.png similarity index 100% rename from SWADroid/res/drawable-ldpi/message_reply.png rename to SWADroid/res/drawable-ldpi/msg_reply.png diff --git a/SWADroid/res/drawable-ldpi/mygroups.png b/SWADroid/res/drawable-ldpi/my_groups.png similarity index 100% rename from SWADroid/res/drawable-ldpi/mygroups.png rename to SWADroid/res/drawable-ldpi/my_groups.png diff --git a/SWADroid/res/drawable-ldpi/notok.png b/SWADroid/res/drawable-ldpi/not_ok.png similarity index 100% rename from SWADroid/res/drawable-ldpi/notok.png rename to SWADroid/res/drawable-ldpi/not_ok.png diff --git a/SWADroid/res/drawable-ldpi/padlock_green.png b/SWADroid/res/drawable-ldpi/padlock_green.png new file mode 100644 index 00000000..13e8f4a0 Binary files /dev/null and b/SWADroid/res/drawable-ldpi/padlock_green.png differ diff --git a/SWADroid/res/drawable-ldpi/padlock_red.png b/SWADroid/res/drawable-ldpi/padlock_red.png new file mode 100644 index 00000000..fa52981b Binary files /dev/null and b/SWADroid/res/drawable-ldpi/padlock_red.png differ diff --git a/SWADroid/res/drawable-ldpi/refresh.png b/SWADroid/res/drawable-ldpi/refresh.png new file mode 100644 index 00000000..28dc595c Binary files /dev/null and b/SWADroid/res/drawable-ldpi/refresh.png differ diff --git a/SWADroid/res/drawable-ldpi/rollcall.png b/SWADroid/res/drawable-ldpi/roll_call.png similarity index 100% rename from SWADroid/res/drawable-ldpi/rollcall.png rename to SWADroid/res/drawable-ldpi/roll_call.png diff --git a/SWADroid/res/drawable-mdpi/file.png b/SWADroid/res/drawable-mdpi/file.png new file mode 100644 index 00000000..b769e2c3 Binary files /dev/null and b/SWADroid/res/drawable-mdpi/file.png differ diff --git a/SWADroid/res/drawable-mdpi/folder_closed.png b/SWADroid/res/drawable-mdpi/folder_closed.png new file mode 100644 index 00000000..a0da43f8 Binary files /dev/null and b/SWADroid/res/drawable-mdpi/folder_closed.png differ diff --git a/SWADroid/res/drawable-mdpi/folder_open.png b/SWADroid/res/drawable-mdpi/folder_open.png new file mode 100644 index 00000000..5e1de06a Binary files /dev/null and b/SWADroid/res/drawable-mdpi/folder_open.png differ diff --git a/SWADroid/res/drawable-mdpi/folderusers.png b/SWADroid/res/drawable-mdpi/folder_users.png similarity index 100% rename from SWADroid/res/drawable-mdpi/folderusers.png rename to SWADroid/res/drawable-mdpi/folder_users.png diff --git a/SWADroid/res/drawable-mdpi/home.png b/SWADroid/res/drawable-mdpi/home.png new file mode 100644 index 00000000..2e63b57d Binary files /dev/null and b/SWADroid/res/drawable-mdpi/home.png differ diff --git a/SWADroid/res/drawable-mdpi/home_alt.png b/SWADroid/res/drawable-mdpi/home_alt.png new file mode 100644 index 00000000..733889bc Binary files /dev/null and b/SWADroid/res/drawable-mdpi/home_alt.png differ diff --git a/SWADroid/res/drawable-mdpi/message_reply.png b/SWADroid/res/drawable-mdpi/msg_reply.png similarity index 100% rename from SWADroid/res/drawable-mdpi/message_reply.png rename to SWADroid/res/drawable-mdpi/msg_reply.png diff --git a/SWADroid/res/drawable-mdpi/mygroups.png b/SWADroid/res/drawable-mdpi/my_groups.png similarity index 100% rename from SWADroid/res/drawable-mdpi/mygroups.png rename to SWADroid/res/drawable-mdpi/my_groups.png diff --git a/SWADroid/res/drawable-mdpi/notok.png b/SWADroid/res/drawable-mdpi/not_ok.png similarity index 100% rename from SWADroid/res/drawable-mdpi/notok.png rename to SWADroid/res/drawable-mdpi/not_ok.png diff --git a/SWADroid/res/drawable-mdpi/padlock_green.png b/SWADroid/res/drawable-mdpi/padlock_green.png new file mode 100644 index 00000000..a903de3a Binary files /dev/null and b/SWADroid/res/drawable-mdpi/padlock_green.png differ diff --git a/SWADroid/res/drawable-mdpi/padlock_red.png b/SWADroid/res/drawable-mdpi/padlock_red.png new file mode 100644 index 00000000..4b866b2a Binary files /dev/null and b/SWADroid/res/drawable-mdpi/padlock_red.png differ diff --git a/SWADroid/res/drawable-mdpi/parent.png b/SWADroid/res/drawable-mdpi/parent.png new file mode 100644 index 00000000..7ad451da Binary files /dev/null and b/SWADroid/res/drawable-mdpi/parent.png differ diff --git a/SWADroid/res/drawable-mdpi/refresh.png b/SWADroid/res/drawable-mdpi/refresh.png new file mode 100644 index 00000000..12b0c1fe Binary files /dev/null and b/SWADroid/res/drawable-mdpi/refresh.png differ diff --git a/SWADroid/res/drawable-mdpi/rollcall.png b/SWADroid/res/drawable-mdpi/roll_call.png similarity index 100% rename from SWADroid/res/drawable-mdpi/rollcall.png rename to SWADroid/res/drawable-mdpi/roll_call.png diff --git a/SWADroid/res/drawable/file.png b/SWADroid/res/drawable/file.png deleted file mode 100644 index 0b7d5527..00000000 Binary files a/SWADroid/res/drawable/file.png and /dev/null differ diff --git a/SWADroid/res/drawable/padlockgreen.png b/SWADroid/res/drawable/padlockgreen.png deleted file mode 100644 index 3edf5904..00000000 Binary files a/SWADroid/res/drawable/padlockgreen.png and /dev/null differ diff --git a/SWADroid/res/drawable/padlockred.png b/SWADroid/res/drawable/padlockred.png deleted file mode 100644 index f7335eea..00000000 Binary files a/SWADroid/res/drawable/padlockred.png and /dev/null differ diff --git a/SWADroid/res/drawable/parent.png b/SWADroid/res/drawable/parent.png deleted file mode 100644 index 0ed3bff9..00000000 Binary files a/SWADroid/res/drawable/parent.png and /dev/null differ diff --git a/SWADroid/res/drawable/refresh.png b/SWADroid/res/drawable/refresh.png deleted file mode 100644 index f5609df9..00000000 Binary files a/SWADroid/res/drawable/refresh.png and /dev/null differ diff --git a/SWADroid/res/layout/action_bar.xml b/SWADroid/res/layout/action_bar.xml index e33d7f8a..1e54f2eb 100644 --- a/SWADroid/res/layout/action_bar.xml +++ b/SWADroid/res/layout/action_bar.xml @@ -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" /> diff --git a/SWADroid/res/layout/group_list_item.xml b/SWADroid/res/layout/group_list_item.xml index 5a03b4f6..52cdbb94 100644 --- a/SWADroid/res/layout/group_list_item.xml +++ b/SWADroid/res/layout/group_list_item.xml @@ -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" diff --git a/SWADroid/res/layout/navigation_bar.xml b/SWADroid/res/layout/navigation_bar.xml index b50965c7..52e2247e 100644 --- a/SWADroid/res/layout/navigation_bar.xml +++ b/SWADroid/res/layout/navigation_bar.xml @@ -2,7 +2,7 @@ @@ -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" /> diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml index 193f0d84..22b5aee7 100644 --- a/SWADroid/res/values-es/strings.xml +++ b/SWADroid/res/values-es/strings.xml @@ -147,7 +147,7 @@ Sincronizando estudiantes.\n\nDependiendo del número de estudiantes a sincronizar, el procesamiento de los datos puede tardar unos minutos.\n\nPor favor, espere… Documentos - Obteniendo árbol de directorios.\n\nDependiendo del tamaño del directorio, podría necesitar varios minutos.\n\nPor favor, espere… + Obteniendo archivos.\n\nDependiendo del tamaño del directorio, podría necesitar varios minutos.\n\nPor favor, espere… Pulse aqui para abrir el archivo Zona común Para esta funcionalidad se necesita conexión a Internet diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml index ffff8f3f..0f04f79d 100644 --- a/SWADroid/res/values/strings.xml +++ b/SWADroid/res/values/strings.xml @@ -151,7 +151,7 @@ users to synchronize, the data processing can take several minutes.\n\nPlease wait… Students Documents - Getting directory tree. \n\nDepending of the directory size, this could take several minutes.\n\nPlease wait… + Getting files. \n\nDepending of the directory size, this could take several minutes.\n\nPlease wait… Click here to open the file Shared area Internet connection is required for this functionality diff --git a/SWADroid/src/com/google/zxing/client/android/CaptureActivity.java b/SWADroid/src/com/google/zxing/client/android/CaptureActivity.java index aa92d66e..71a42a6f 100644 --- a/SWADroid/src/com/google/zxing/client/android/CaptureActivity.java +++ b/SWADroid/src/com/google/zxing/client/android/CaptureActivity.java @@ -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 } diff --git a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java index 87a1c8db..9b65430c 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java +++ b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java @@ -558,12 +558,12 @@ public class SWADMain extends MenuExpandableListActivity { //shared area category map = new HashMap(); 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(); 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(); 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); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java index c214fd4c..aa53fb6e 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java @@ -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); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java index c630de12..762a74d8 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java @@ -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); } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java index ce310caf..630fbeb4 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java @@ -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 diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/groups/GroupsCursorTreeAdapter.java b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/GroupsCursorTreeAdapter.java index 594cec15..1c0bc33a 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/groups/GroupsCursorTreeAdapter.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/GroupsCursorTreeAdapter.java @@ -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(); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java index 788a0701..9cb77b74 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java @@ -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); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java b/SWADroid/src/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java index f93b4f65..613e769d 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java @@ -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 rollcall = new HashMap(); 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> rollcallData = new ArrayList>();