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

Modified the order of modules in main menu to coincide with the order

Browse Source 
of functions in SWAD.  Fixed refresh button on MyGroups Module to stop
when the web service query fails.
This commit is contained in:
Helena Rodriguez 2012-12-14 18:45:23 +01:00
parent b625954873
commit 3e4f75a9ce
2 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,18 +101,21 @@ public class SWADMain extends MenuExpandableListActivity {
* Current role 2 - student 3 - teacher -1 - none role was chosen
* */
private int currentRole = -1;
/**
* Group position inside the main menu for Messages group
* Group position inside the main menu for Course group
* */
private int MESSAGES_GROUP = 0;
private int COURSE_GROUP = 0;
/**
* Group position inside the main menu for Evaluation group
* */
private int EVALUATION_GROUP = 1;
/**
* Group position inside the main menu for Course group
* Group position inside the main menu for Messages group
* */
private int COURSE_GROUP = 2;
private int MESSAGES_GROUP = 2;
/**
* Group position inside the main menu for Enrollment group
* */
@ -496,44 +499,67 @@ public class SWADMain extends MenuExpandableListActivity {
//Construct Expandable List
final ArrayList<HashMap<String, Object>> headerData = new ArrayList<HashMap<String, Object>>();
final HashMap<String, Object> messages = new HashMap<String, Object>();
messages.put(NAME, getString(R.string.messages));
messages.put(IMAGE, getResources().getDrawable(R.drawable.msg));
headerData.add( messages );
//Order:
// 1- Course
// 2- Evaluation
// 3- Messages
// 4- Enrollment
// 5- Users
final HashMap<String, Object> courses = new HashMap<String,Object>();
courses.put(NAME, getString(R.string.course));
courses.put(IMAGE, getResources().getDrawable(R.drawable.blackboard));
headerData.add(courses);
final HashMap<String, Object> evaluation = new HashMap<String, Object>();
evaluation.put(NAME, getString(R.string.evaluation));
evaluation.put(IMAGE, getResources().getDrawable(R.drawable.grades));
headerData.add(evaluation);
//DISABLE until it will be functional
final HashMap<String, Object> courses = new HashMap<String,Object>();
courses.put(NAME, getString(R.string.course));
courses.put(IMAGE, getResources().getDrawable(R.drawable.blackboard));
headerData.add(courses);
final HashMap<String, Object> messages = new HashMap<String, Object>();
messages.put(NAME, getString(R.string.messages));
messages.put(IMAGE, getResources().getDrawable(R.drawable.msg));
headerData.add( messages );
final HashMap<String, Object> enrolment = new HashMap<String,Object>();
enrolment.put(NAME, getString(R.string.enrollment));
enrolment.put(IMAGE, getResources().getDrawable(R.drawable.enrollment));
headerData.add(enrolment);
final ArrayList<ArrayList<HashMap<String, Object>>> childData = new ArrayList<ArrayList<HashMap<String, Object>>>();
final ArrayList<HashMap<String, Object>> messagesData = new ArrayList<HashMap<String, Object>>();
childData.add(messagesData);
final ArrayList<HashMap<String,Object>> courseData = new ArrayList<HashMap<String, Object>>();
childData.add(courseData);
final ArrayList<HashMap<String, Object>> evaluationData = new ArrayList<HashMap<String, Object>>();
childData.add(evaluationData);
//DISABLE until it will be functional
final ArrayList<HashMap<String,Object>> documentsData = new ArrayList<HashMap<String, Object>>();
childData.add(documentsData);
final ArrayList<HashMap<String, Object>> messagesData = new ArrayList<HashMap<String, Object>>();
childData.add(messagesData);
final ArrayList<HashMap<String,Object>> enrollmentData = new ArrayList<HashMap<String, Object>>();
childData.add(enrollmentData);
//Messages category
HashMap<String, Object> map = new HashMap<String,Object>();
//Documents category
map.put(NAME, getString(R.string.documentsDownloadModuleLabel));
map.put(IMAGE, getResources().getDrawable(R.drawable.folder));
courseData.add(map);
//shared area category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.sharedsDownloadModuleLabel));
map.put(IMAGE, getResources().getDrawable(R.drawable.folder_users));
courseData.add(map);
//Evaluation category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.testsModuleLabel) );
map.put(IMAGE, getResources().getDrawable(R.drawable.test));
evaluationData.add(map);
//Messages category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.notificationsModuleLabel) );
map.put(IMAGE, getResources().getDrawable(R.drawable.notif));
messagesData.add(map);
@ -543,24 +569,7 @@ public class SWADMain extends MenuExpandableListActivity {
map.put(IMAGE, getResources().getDrawable(R.drawable.msg_write));
messagesData.add(map);
//Evaluation category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.testsModuleLabel) );
map.put(IMAGE, getResources().getDrawable(R.drawable.test));
evaluationData.add(map);
//DISABLE until it will be functional
//Documents category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.documentsDownloadModuleLabel));
map.put(IMAGE, getResources().getDrawable(R.drawable.folder));
documentsData.add(map);
//shared area category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.sharedsDownloadModuleLabel));
map.put(IMAGE, getResources().getDrawable(R.drawable.folder_users));
documentsData.add(map);
//Enrollment category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.myGroupsModuleLabel));
map.put(IMAGE, getResources().getDrawable(R.drawable.my_groups));

7
SWADroid/src/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java
View File

@ -171,6 +171,13 @@ public class MyGroupsManager extends MenuExpandableListActivity {
break;
}
}else{
if(refreshRequested){
updateButton.setVisibility(View.VISIBLE);
progressbar.setVisibility(View.GONE);
refreshRequested = false;
}
}
}