diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java index e319394..574c50c 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -34,7 +34,7 @@ //フィールド ArrayList viewMembers = new ArrayList<>(); ArrayList oldMembers = new ArrayList<>(); - String r = "roomid"; + String roomId = "null"; String myName = "null"; @@ -45,7 +45,7 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_member_room); - String roomId = ((Iris) getApplication()).getRid(); + roomId = ((Iris) getApplication()).getRid(); String nickname = ((Iris) getApplication()).getNickname(); //-------------------------------------------------------------------------- @@ -101,8 +101,61 @@ //-------------------------------------------------------------------------- //各ボタン処理 - buttonProcesses(); + Button redMasterButton = (Button) findViewById(R.id.beRedMaster); + Button redSpyButton = (Button) findViewById(R.id.beRedSpy); + Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster); + Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy); + ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); + //MemberRoom専用ボタン + ImageButton homeButton = (ImageButton) findViewById(R.id.homeButton); + + //チームと役職の変更 + //赤チーム・スパイマスター + redMasterButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"r",true); + } + }); + + //赤チーム・諜報員 + redSpyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"r",false); + } + }); + + //青チーム・スパイマスター + blueMasterButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"b",true); + } + }); + + //青チーム・諜報員 + blueSpyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"b",false); + } + }); + + copyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Snackbar.make(v, "コピーしました", Snackbar.LENGTH_LONG).show(); + } + }); + + homeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); //--------------------------------------------------------------- //settings情報 @@ -119,64 +172,4 @@ } - public void buttonProcesses(){ - Button redMasterButton = (Button) findViewById(R.id.beRedMaster); - Button redSpyButton = (Button) findViewById(R.id.beRedSpy); - Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster); - Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy); - ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); - ImageButton homeButton = (ImageButton) findViewById(R.id.homeButton); - - redMasterButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "赤マスターボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - redSpyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "赤諜報員ボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - blueMasterButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "青マスターボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - blueSpyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "青諜報員ボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - homeButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "ホームボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - copyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Snackbar.make(v, "コピーしました", Snackbar.LENGTH_LONG).show(); - } - }); - } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index 42ef07b..e8999df 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -12,6 +12,8 @@ import android.widget.ListView; import android.widget.TextView; +import com.google.android.material.snackbar.Snackbar; + import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -34,48 +36,56 @@ public class OwnerRoomActivity extends AppCompatActivity { //フィールド - ArrayList members = new ArrayList<>(); - String r;// = "部屋ID " + "123456"; + ArrayList viewMembers = new ArrayList<>(); + ArrayList oldMembers = new ArrayList<>(); + String roomId = "null"; + String myName = "null"; //String nickname; String belongs; Boolean isMaster; - String myName = "null"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_owner_room); - myName = ((Iris) getApplication()).getNickname(); //nickname = "aaa"; - r = ((Iris) getApplication()).getRid(); //r ="276393b5-d835-4e4c-a35b-c00996c73a2b"; - - - //メンバーリスト - ListView membersList = (ListView) findViewById(R.id.MembersList); - BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, members); - membersList.setAdapter(adapter); + myName = ((Iris) getApplication()).getNickname(); + roomId = ((Iris) getApplication()).getRid(); //自分のなまえ //Intent intentMain = getIntent(); //myName = intentMain.getStringExtra("nickname"); + //-------------------------------------------------------------------------- + //メンバー表示 Member mn = new Member(myName); mn.setBelongs("g"); mn.setMaster(false); - members.add(mn.getNickname()); - - + viewMembers.add(mn.getNickname()); //RoomViewModelへのアクセス RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class); + roomViewModel.setRid(roomId); + + ListView membersList = (ListView) findViewById(R.id.MembersList); + + BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers); + membersList.setAdapter(adapter); + //LiveData(List)への購読 roomViewModel.getMembersLiveData().observe(this, new Observer>() { private List members; @Override public void onChanged(List irisMembers) { + viewMembers.clear(); + irisMembers.forEach(m -> viewMembers.add(m.getNickname())); + + BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers); + membersList.setAdapter(adapter); + } }); @@ -86,9 +96,12 @@ Button redSpyButton = (Button) findViewById(R.id.beRedSpy); Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster); Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy); + ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); + + //OwnerRoom専用ボタン Button randomButton = (Button) findViewById(R.id.random); Button startButton = (Button) findViewById(R.id.start); - ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); + //チームと役職の変更 @@ -96,7 +109,7 @@ redMasterButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - roomViewModel.changeBelongsAndMaster(r, myName,"r",true); + roomViewModel.changeBelongsAndMaster(roomId, myName,"r",true); } }); @@ -104,7 +117,7 @@ redSpyButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - roomViewModel.changeBelongsAndMaster(r, myName,"r",false); + roomViewModel.changeBelongsAndMaster(roomId, myName,"r",false); } }); @@ -112,7 +125,7 @@ blueMasterButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - roomViewModel.changeBelongsAndMaster(r, myName,"b",true); + roomViewModel.changeBelongsAndMaster(roomId, myName,"b",true); } }); @@ -120,7 +133,14 @@ blueSpyButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - roomViewModel.changeBelongsAndMaster(r, myName,"b",false); + roomViewModel.changeBelongsAndMaster(roomId, myName,"b",false); + } + }); + + copyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Snackbar.make(v, "コピーしました", Snackbar.LENGTH_LONG).show(); } }); @@ -140,7 +160,7 @@ startButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - roomViewModel.startDrawing(r, myName); + roomViewModel.startDrawing(roomId, myName); Intent intent = new Intent(OwnerRoomActivity.this,DrawingActivity.class); startActivity(intent); @@ -148,18 +168,6 @@ } }); - copyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }); - - //-------------------------------------------------------------------------- - //メンバー表示 - - //members.add("1さん"); - //--------------------------------------------------------------- //settings情報 String s = "設定\\nお絵描き"; @@ -169,7 +177,7 @@ //--------------------------------------------------------------- //部屋ID情報 TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); + RoomIdText.setText(roomId); @@ -177,11 +185,4 @@ roomViewModel.start(500); } - /*private getMemberInformation(){ - - }*/ - - /*private void addMemberToMemberList(String m){ - members.add(m); - }*/ - } \ No newline at end of file +} \ No newline at end of file