diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
index 30537ef..5d4de3a 100644
--- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
@@ -14,12 +14,16 @@
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
+import android.widget.Toast;
+import com.example.cosmosclient.MainActivity;
import com.example.cosmosclient.R;
public class RequestListActivity extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener {
+ Toast toast; //動作テスト用
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -37,11 +41,12 @@
});
//LEFTMARK
- DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
- ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
- this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
- drawer.addDrawerListener(toggle);
- toggle.syncState();
+// DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+// ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+// this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+// drawer.addDrawerListener(toggle);
+//
+// toggle.syncState();
NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
navigationView.setNavigationItemSelectedListener(this);
@@ -60,7 +65,7 @@
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.activity_request_list_drawer, menu);
+ getMenuInflater().inflate(R.menu.request_list, menu);
return true;
}
@@ -72,8 +77,21 @@
int id = item.getItemId();
//noinspection SimplifiableIfStatement
- if (id == R.id.nav_close) {
- return true;
+ if (id == R.id.nav_member_list) {
+ // Handle the camera action
+ toast = Toast.makeText(RequestListActivity.this, "Next Member List Activity", Toast.LENGTH_LONG);
+ toast.show();
+ } else if (id == R.id.nav_add_member) {
+// startActivity(new Intent(RequestListActivity.this, AddMemberActivity.class));
+ startActivity(new Intent(RequestListActivity.this, MainActivity.class));
+ } else if (id == R.id.nav_notification) {
+ toast = Toast.makeText(RequestListActivity.this, "Next Notification Activity", Toast.LENGTH_LONG);
+ toast.show();
+ } else if (id == R.id.nav_settings) {
+ toast = Toast.makeText(RequestListActivity.this, "Next Settings Activity", Toast.LENGTH_LONG);
+ toast.show();
+ } else if (id == R.id.nav_close) {
+
}
return super.onOptionsItemSelected(item);
@@ -85,15 +103,19 @@
// Handle navigation view item clicks here.
int id = item.getItemId();
- if (id == R.id.nav_camera) {
+ if (id == R.id.nav_member_list) {
// Handle the camera action
- } else if (id == R.id.nav_gallery) {
-// Intent intent = new Intent(RequestListActivity.this, AddMemberActivity.class);
-// startActivity(intent);
- } else if (id == R.id.nav_slideshow) {
-
- } else if (id == R.id.nav_share) {
-
+ toast = Toast.makeText(RequestListActivity.this, "Next Member List Activity", Toast.LENGTH_LONG);
+ toast.show();
+ } else if (id == R.id.nav_add_member) {
+// startActivity(new Intent(RequestListActivity.this, AddMemberActivity.class));
+ startActivity(new Intent(RequestListActivity.this, MainActivity.class));
+ } else if (id == R.id.nav_notification) {
+ toast = Toast.makeText(RequestListActivity.this, "Next Notification Activity", Toast.LENGTH_LONG);
+ toast.show();
+ } else if (id == R.id.nav_settings) {
+ toast = Toast.makeText(RequestListActivity.this, "Next Settings Activity", Toast.LENGTH_LONG);
+ toast.show();
} else if (id == R.id.nav_close) {
}
diff --git a/app/src/main/res/layout/app_bar_request_list.xml b/app/src/main/res/layout/app_bar_request_list.xml
index ffe1966..c8177c2 100644
--- a/app/src/main/res/layout/app_bar_request_list.xml
+++ b/app/src/main/res/layout/app_bar_request_list.xml
@@ -33,36 +33,64 @@
app:srcCompat="@android:drawable/ic_input_add" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="70dp">
+ android:layout_height="wrap_content">
+
+
+
+
+
+
diff --git a/app/src/main/res/menu/activity_request_list_drawer.xml b/app/src/main/res/menu/activity_request_list_drawer.xml
index f379009..e9a4f51 100644
--- a/app/src/main/res/menu/activity_request_list_drawer.xml
+++ b/app/src/main/res/menu/activity_request_list_drawer.xml
@@ -10,15 +10,15 @@
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:title=" " />
@@ -26,7 +26,7 @@
-
diff --git a/app/src/main/res/menu/request_list.xml b/app/src/main/res/menu/request_list.xml
index f379009..e2e29e7 100644
--- a/app/src/main/res/menu/request_list.xml
+++ b/app/src/main/res/menu/request_list.xml
@@ -3,30 +3,27 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="navigation_view">
-
-
-
-