diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d6956c4abfacf2a4bc6608d54d7852be70318592..6cd5d8d1604d050871472eeb35aaeeed241a291f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -50,7 +50,8 @@ <activity android:name=".MapsActivity" - android:label="@string/title_activity_maps"></activity> + android:label="@string/title_activity_maps" /> + <activity android:name=".ProfileActivity"></activity> </application> </manifest> \ No newline at end of file diff --git a/app/src/main/java/com/example/chan24/smartplanner/ProfileActivity.java b/app/src/main/java/com/example/chan24/smartplanner/ProfileActivity.java new file mode 100644 index 0000000000000000000000000000000000000000..a211c6e918c44074c959d339c10523a46f4dc757 --- /dev/null +++ b/app/src/main/java/com/example/chan24/smartplanner/ProfileActivity.java @@ -0,0 +1,13 @@ +package com.example.chan24.smartplanner; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class ProfileActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_profile); + } +} diff --git a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java index fa05599492a0d41a85a3b28eca5958deae8a6e51..b653f147c3a5535b041a461f52305f59e6842b97 100644 --- a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java +++ b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java @@ -2,6 +2,8 @@ package com.example.chan24.smartplanner; import android.app.Dialog; import android.content.Intent; +import android.support.annotation.NonNull; +import android.support.design.widget.NavigationView; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; @@ -18,6 +20,7 @@ public class UserArea extends AppCompatActivity { private DrawerLayout mDrawerLayout; private ActionBarDrawerToggle mToggle; + NavigationView navigationView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -35,6 +38,34 @@ public class UserArea extends AppCompatActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); + navigationView = (NavigationView)findViewById(R.id.navigation_view); + navigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() { + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + switch (item.getItemId()){ + case R.id.my_profile : + Intent i =new Intent(getApplicationContext(),ProfileActivity.class); + startActivity(i); + mDrawerLayout.closeDrawers(); + break; + + case R.id.my_location : + Intent i1 =new Intent(getApplicationContext(),MapsActivity.class); + startActivity(i1); + mDrawerLayout.closeDrawers(); + break; + + case R.id.log_out : + Intent i2 =new Intent(getApplicationContext(),LoginActivity.class); + startActivity(i2); + mDrawerLayout.closeDrawers(); + Toast.makeText(getApplicationContext(),"You have successfully logged out!",Toast.LENGTH_SHORT).show(); + break; + } + return false; + } + }); + Button b= (Button)findViewById(R.id.button3); b.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml new file mode 100644 index 0000000000000000000000000000000000000000..f967c52204124b30f8fb547fcdc3d9da7729ce96 --- /dev/null +++ b/app/src/main/res/layout/activity_profile.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/activity_profile" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context="com.example.chan24.smartplanner.ProfileActivity"> + + <TextView + android:text="Profile" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentStart="true" + android:layout_marginStart="136dp" + android:layout_marginTop="21dp" + android:id="@+id/textView" /> +</RelativeLayout> diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml index 453e9e1d6d221c441d435fe3ca39d4e43c398c69..436c92b65d4a523a705c2b17bd99aa838326aebe 100644 --- a/app/src/main/res/layout/activity_user_area.xml +++ b/app/src/main/res/layout/activity_user_area.xml @@ -30,7 +30,8 @@ android:layout_height="match_parent" app:menu="@menu/navigation_menu" app:headerLayout="@layout/navigation_header" - android:layout_gravity="start"> + android:layout_gravity="start" + android:id="@+id/navigation_view"> </android.support.design.widget.NavigationView> diff --git a/app/src/main/res/menu/navigation_menu.xml b/app/src/main/res/menu/navigation_menu.xml index d37364978282d50f66babcdb4e771db0a436af98..a0a67df90ca052c2316af3c84ff3334a97c7884d 100644 --- a/app/src/main/res/menu/navigation_menu.xml +++ b/app/src/main/res/menu/navigation_menu.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/my_account" - android:title="My Account" + <item android:id="@+id/my_profile" + android:title="My Profile" android:icon="@mipmap/ic_person_black_24dp"/> <item android:id="@+id/my_location"