diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index 4b0e776..2f4717c 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -1,9 +1,11 @@
package com.uam.wmi.findmytutor.activity;
+import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomNavigationView;
+import android.support.design.widget.NavigationView;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarDrawerToggle;
@@ -12,6 +14,7 @@ import android.os.Bundle;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -22,6 +25,7 @@ import android.widget.Toast;
import com.uam.wmi.findmytutor.ListViewAdapter;
import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.utils.PrefUtils;
import java.util.ArrayList;
@@ -30,6 +34,8 @@ public abstract class BaseActivity
implements BottomNavigationView.OnNavigationItemSelectedListener {
protected BottomNavigationView navigationView;
+ protected NavigationView drawerNavigationView;
+ protected DrawerLayout sideDrawer;
protected Toolbar toolbar;
@@ -45,7 +51,44 @@ public abstract class BaseActivity
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(getContentViewId());
+ drawerNavigationView = findViewById(R.id.nav_view);
+ sideDrawer = findViewById(R.id.activity_container);
+ drawerNavigationView.setNavigationItemSelectedListener(
+ new NavigationView.OnNavigationItemSelectedListener() {
+ @Override
+ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+ String itemName = (String)item.getTitle();
+ Intent launchIntent;
+ if(itemName.equals("Whitelist")){
+ /*launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class);
+ startActivity(launchIntent);*/
+ }else if (itemName.equals("Blacklist")){
+/* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class);
+ startActivity(launchIntent);*/
+ }else if (itemName.equals("Profile")){
+/* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class);
+ startActivity(launchIntent);*/
+ }else if (itemName.equals("Settings")){
+ launchIntent = new Intent(getApplicationContext(), SettingsActivity.class);
+ startActivity(launchIntent);
+ }else if (itemName.equals("Log out")){
+ PrefUtils.cleanUserLocalStorage(getApplicationContext());
+ Intent i = getBaseContext().getPackageManager()
+ .getLaunchIntentForPackage(getBaseContext().getPackageName());
+ if (i != null) {
+ i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ }
+ startActivity(i);
+ finish();
+ }
+
+ sideDrawer.closeDrawers();
+
+ return true;
+ }
+ }
+ );
navigationView = findViewById(R.id.navigation);
navigationView.setOnNavigationItemSelectedListener(this);
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
index f4cb8bd..91dcd71 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@@ -97,7 +97,6 @@ public class MapActivity extends BaseActivity {
button.setOnClickListener(view -> {
PrefUtils.cleanUserLocalStorage(getApplicationContext());
-
Intent i = getBaseContext().getPackageManager()
.getLaunchIntentForPackage(getBaseContext().getPackageName());
if (i != null) {
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
index 13b75a1..3005dda 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
@@ -32,17 +32,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.pref_main);
-
- //TODO add on change listeners for preferences
-
- // feedback preference click listener
- Preference myPref = findPreference(getString(R.string.key_send_feedback));
- myPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
- public boolean onPreferenceClick(Preference preference) {
- sendFeedback(getActivity());
- return true;
- }
- });
}
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 807eab3..ccd5432 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -69,6 +69,7 @@
app:layout_anchorGravity="bottom|center"
app:menu="@menu/nav_items" />
+
+ android:layout_height="?actionBarSize"/>
+ android:title="@string/navigation_item_whitelist" />
+ android:title="@string/navigation_item_blacklist" />
+ android:title="@string/navigation_item_profile" />
-
+ android:title="@string/navigation_item_settings" />
+ android:title="@string/navigation_item_logout" />
-
- -
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5d9839..85ca5b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,11 @@
Drawer Open
Drawer Closed
-
+ Blacklist
+ Whitelist
+ Settings
+ Profile
+ Log out
Settings
Notes