diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2ab898e..9655dc5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,7 +58,7 @@ android:name=".views.AddMemberActivity" android:label="メンバー追加" /> diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupList.java b/app/src/main/java/com/example/cosmosclient/views/GroupList.java deleted file mode 100644 index a905987..0000000 --- a/app/src/main/java/com/example/cosmosclient/views/GroupList.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.example.cosmosclient.views; - -import android.content.Intent; -import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.view.View; -import android.support.v4.view.GravityCompat; -import android.support.v7.app.ActionBarDrawerToggle; -import android.view.MenuItem; -import android.support.design.widget.NavigationView; -import android.support.v4.widget.DrawerLayout; - -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.view.Menu; -import android.widget.TextView; - -import com.example.cosmosclient.R; - -public class GroupList extends AppCompatActivity - implements NavigationView.OnNavigationItemSelectedListener { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_group_list); - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - /* とりあえずの画面遷移なので変更するかも */ - TextView group1 = findViewById(R.id.group1); - group1.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent=new Intent(GroupList.this, com.example.cosmosclient.views.RequestListActivity.class); - startActivity(intent); - } - }); - - - DrawerLayout drawer = findViewById(R.id.drawer_layout); - NavigationView navigationView = findViewById(R.id.nav_view); - ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( - this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); - drawer.addDrawerListener(toggle); - toggle.syncState(); - navigationView.setNavigationItemSelectedListener(this); - } - - @Override - public void onBackPressed() { - DrawerLayout drawer = findViewById(R.id.drawer_layout); - if (drawer.isDrawerOpen(GravityCompat.START)) { - drawer.closeDrawer(GravityCompat.START); - } else { - super.onBackPressed(); - } - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.group_list, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } - - @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.JoinGroupActionsActivity.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) { - // Handle the camera action - } else if (id == R.id.nav_gallery) { - - } else if (id == R.id.nav_slideshow) { - - } else if (id == R.id.nav_tools) { - - } else if (id == R.id.nav_share) { - - } else if (id == R.id.nav_send) { - - } -*/ - DrawerLayout drawer = findViewById(R.id.drawer_layout); - drawer.closeDrawer(GravityCompat.START); - return true; - } -} diff --git a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java new file mode 100644 index 0000000..c7515bf --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java @@ -0,0 +1,116 @@ +package com.example.cosmosclient.views; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.support.v4.view.GravityCompat; +import android.support.v7.app.ActionBarDrawerToggle; +import android.view.MenuItem; +import android.support.design.widget.NavigationView; +import android.support.v4.widget.DrawerLayout; + +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.widget.TextView; + +import com.example.cosmosclient.R; + +public class GroupListActivity extends AppCompatActivity + implements NavigationView.OnNavigationItemSelectedListener { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_group_list); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + /* とりあえずの画面遷移なので変更するかも */ + TextView group1 = findViewById(R.id.group1); + group1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.RequestListActivity.class); + startActivity(intent); + } + }); + + + DrawerLayout drawer = findViewById(R.id.drawer_layout); + NavigationView navigationView = findViewById(R.id.nav_view); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( + this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawer.addDrawerListener(toggle); + toggle.syncState(); + navigationView.setNavigationItemSelectedListener(this); + } + + @Override + public void onBackPressed() { + DrawerLayout drawer = findViewById(R.id.drawer_layout); + if (drawer.isDrawerOpen(GravityCompat.START)) { + drawer.closeDrawer(GravityCompat.START); + } else { + super.onBackPressed(); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.group_list, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + @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(GroupListActivity.this, com.example.cosmosclient.views.JoinGroupActionsActivity.class); + startActivity(intent); + } else if (id == R.id.signOutButton){ + Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.SigninActivity.class); + startActivity(intent); + } +/* + if (id == R.id.nav_home) { + // Handle the camera action + } else if (id == R.id.nav_gallery) { + + } else if (id == R.id.nav_slideshow) { + + } else if (id == R.id.nav_tools) { + + } else if (id == R.id.nav_share) { + + } else if (id == R.id.nav_send) { + + } +*/ + DrawerLayout drawer = findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + return true; + } +} diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java index d95f002..30e4005 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -64,7 +64,7 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { SigninResponse result = response.body(); - Intent intent = new Intent(getApplication(), GroupList.class); + Intent intent = new Intent(getApplication(), GroupListActivity.class); //intent.putExtra("UserInfomation",result); Toast.makeText(SigninActivity.this, "ログインしました", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java index b3cffe2..55dc507 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -79,7 +79,7 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { SignupResponse result = response.body(); - Intent intent = new Intent(getApplication(), GroupList.class); + Intent intent = new Intent(getApplication(), GroupListActivity.class); //intent.putExtra("UserInfomation",result); //test diff --git a/app/src/main/res/layout/app_bar_group_list.xml b/app/src/main/res/layout/app_bar_group_list.xml index 2cecaa1..a992778 100644 --- a/app/src/main/res/layout/app_bar_group_list.xml +++ b/app/src/main/res/layout/app_bar_group_list.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".views.GroupList"> + tools:context=".views.GroupListActivity">