diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java index ae968c0..43ff86e 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MainActivity.java @@ -10,6 +10,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.NavigationView; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarDrawerToggle; @@ -107,6 +108,7 @@ public class MainActivity extends AppCompatActivity { actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setHomeButtonEnabled(true); } + } private void setFragment(Fragment fragment) { diff --git a/app/src/main/res/drawable/ic_menu_settings_gear.xml b/app/src/main/res/drawable/ic_menu_settings_gear.xml new file mode 100644 index 0000000..fe97642 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_settings_gear.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_settings_key.xml b/app/src/main/res/drawable/ic_menu_settings_key.xml new file mode 100644 index 0000000..c6dbab8 --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_settings_key.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_sign_out.xml b/app/src/main/res/drawable/ic_menu_sign_out.xml new file mode 100644 index 0000000..1ea4cad --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_sign_out.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_sign_out2.xml b/app/src/main/res/drawable/ic_menu_sign_out2.xml new file mode 100644 index 0000000..f4e94ce --- /dev/null +++ b/app/src/main/res/drawable/ic_menu_sign_out2.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_people_black.xml b/app/src/main/res/drawable/ic_people_black.xml new file mode 100644 index 0000000..53dd7f7 --- /dev/null +++ b/app/src/main/res/drawable/ic_people_black.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_people_white.xml b/app/src/main/res/drawable/ic_people_white.xml new file mode 100644 index 0000000..a64cc85 --- /dev/null +++ b/app/src/main/res/drawable/ic_people_white.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3c379fb..9939aa5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -72,6 +72,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 515b0ae..7d0e267 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -14,19 +14,21 @@ + android:icon="@drawable/ic_people_white" + android:title="@string/action_white_list" /> + android:icon="@drawable/ic_people_black" + android:title="@string/action_black_list" /> - + android:icon="@drawable/ic_menu_settings_gear" + android:title="@string/action_settings" /> + \ 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 3472e5f..bc72b2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,6 +24,7 @@ Email Password (optional) Sign in or register + Sign out Sign in This email address is invalid This password is too short @@ -34,4 +35,6 @@ MainActivity pk.eyJ1IjoiZG9tYWdhbHNreSIsImEiOiJjamd4am4zazYwNXo1MzBxeDZtYjA4d2s4In0.KzNdhc9V_-SYe14AZ-q3Ew + Black List + White List