diff --git a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java index b5c51d3..5d62adb 100644 --- a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java @@ -74,7 +74,7 @@ ((Iris) getApplication()).setNickname(name); Intent intent = new Intent(EnterRoomActivity.this,MemberRoomActivity.class); - //intent.putExtra("nickname", name); + intent.putExtra("nickname", name); startActivity(intent); }else { Snackbar.make(v, "部屋に同名のプレイヤーがいるか,満席です", Snackbar.LENGTH_LONG).show(); diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java index 9a73037..d56cda0 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -48,8 +48,8 @@ String nickname = ((Iris) getApplication()).getNickname(); //自分のなまえ - //Intent intentMain = getIntent(); - //myName = intentMain.getStringExtra("nickname"); + Intent intentMain = getIntent(); + myName = intentMain.getStringExtra("nickname"); //-------------------------------------------------------------------------- //RoomViewModelへのアクセス @@ -89,21 +89,15 @@ m2.setBelongs("b"); m2.setMaster(true); - Member m3 = new Member("m3"); - m2.setBelongs("r"); - m2.setMaster(false); - Member m4 = new Member("m4"); - m2.setBelongs("b"); - m2.setMaster(false); - Member m5 = new Member("m5"); - m2.setBelongs("r"); - m2.setMaster(false); + Member mn = new Member(myName); + mn.setBelongs("g"); + mn.setMaster(false); members.add(m1.getNickname()); members.add(m2.getNickname()); - members.add(m3.getNickname()); - members.add(m4.getNickname()); - members.add(m5.getNickname()); + + members.add(mn.getNickname()); + ListView membersList = (ListView) findViewById(R.id.MembersList);