diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupList.java b/app/src/main/java/com/example/cosmosclient/views/GroupList.java
index b512f02..30f6f2a 100644
--- a/app/src/main/java/com/example/cosmosclient/views/GroupList.java
+++ b/app/src/main/java/com/example/cosmosclient/views/GroupList.java
@@ -28,7 +28,7 @@
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
- /*とりあえずの画面遷移なので変更するかも*/
+ /* とりあえずの画面遷移なので変更するかも */
TextView group1 = findViewById(R.id.group1);
group1.setOnClickListener(new View.OnClickListener() {
@Override
@@ -38,6 +38,7 @@
}
});
+
DrawerLayout drawer = findViewById(R.id.drawer_layout);
NavigationView navigationView = findViewById(R.id.nav_view);
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
@@ -82,10 +83,18 @@
@SuppressWarnings("StatementWithEmptyBody")
@Override
public boolean onNavigationItemSelected(MenuItem item) {
+
+
// Handle navigation view item clicks here.
int id = item.getItemId();
if ( id == R.id.createNewGroupButton){
+ } else if (id == R.id.joinGroupButton){
+ //Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.QRcodeReadingActivity.class);
+ //startActivity(intent);
+ } else if (id == R.id.signOutButton){
+ Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.SigninActivity.class);
+ startActivity(intent);
}
/*
if (id == R.id.nav_home) {
diff --git a/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
new file mode 100644
index 0000000..beafea3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_group_add_black_24dp.xml b/app/src/main/res/drawable/ic_group_add_black_24dp.xml
new file mode 100644
index 0000000..b3a2fb3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_add_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_group_black_24dp.xml b/app/src/main/res/drawable/ic_group_black_24dp.xml
new file mode 100644
index 0000000..4cfd869
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/content_group_list.xml b/app/src/main/res/layout/content_group_list.xml
index 0cd1e28..f5435db 100644
--- a/app/src/main/res/layout/content_group_list.xml
+++ b/app/src/main/res/layout/content_group_list.xml
@@ -10,17 +10,23 @@
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/group1"
+ app:layout_constraintVertical_bias="1.0" />
+
+