s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Merge user list to develop #24

Merged
s416204 merged 25 commits from tutors-list-activity into develop 2018-11-02 18:00:23 +01:00
Conversation 0 Commits 25 Files Changed 29 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7019864b9a - Show all commits

6
app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
View File

@ -60,13 +60,13 @@ public abstract class BaseActivity
String itemName = (String)item.getTitle(); String itemName = (String)item.getTitle();
Intent launchIntent; Intent launchIntent;
if(itemName.equals("Whitelist")){ if(itemName.equals("Whitelist")){
/*launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class); /* launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class);
startActivity(launchIntent);*/ startActivity(launchIntent);*/
}else if (itemName.equals("Blacklist")){ }else if (itemName.equals("Blacklist")){
/* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class); /* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class);
startActivity(launchIntent);*/ startActivity(launchIntent);*/
}else if (itemName.equals("Profile")){ }else if (itemName.equals("Profile")){
/* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class); /* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class);
startActivity(launchIntent);*/ startActivity(launchIntent);*/
}else if (itemName.equals("Settings")){ }else if (itemName.equals("Settings")){
launchIntent = new Intent(getApplicationContext(), SettingsActivity.class); launchIntent = new Intent(getApplicationContext(), SettingsActivity.class);