diff --git a/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java index 552cc07..4e4ffac 100644 --- a/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java @@ -80,11 +80,12 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { //ridとnicknameをIrisへ - /*String rid = response.body().getRid(); + String rid = response.body().getRid(); ((Iris) getApplication()).setRid(rid); - ((Iris) getApplication()).setNickname(nickname);*/ + ((Iris) getApplication()).setNickname(nickname); //次の画面へ遷移 Intent intent = new Intent(CreateRoomActivity.this,OwnerRoomActivity.class); + intent.putExtra("nickname", nickname); startActivity(intent); } } diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java index 90383d1..2ea9bba 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -57,6 +57,7 @@ roomViewModel.setRid(roomId); + //LiveData(List)への購読 roomViewModel.getMembersLiveData().observe(this, new Observer>() { private List members; diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index 46d8a8b..4f24299 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.view.View; import android.widget.ArrayAdapter; +import android.widget.BaseAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; @@ -33,15 +34,36 @@ public class OwnerRoomActivity extends AppCompatActivity { //フィールド - String r = "部屋ID " + "123456"; + ArrayList members = new ArrayList<>(); + String r;// = "部屋ID " + "123456"; + String nickname; + String myName = "null"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_owner_room); - String nickname = ((Iris) getApplication()).getNickname(); - String rid = ((Iris) getApplication()).getRid(); + ((Iris) getApplication()).getNickname(); //nickname = "aaa"; + ((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); + + //自分のなまえ + Intent intentMain = getIntent(); + myName = intentMain.getStringExtra("nickname"); + + Member mn = new Member(myName); + mn.setBelongs("g"); + mn.setMaster(false); + + members.add(mn.getNickname()); + + //RoomViewModelへのアクセス RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class); @@ -66,12 +88,6 @@ Button startButton = (Button) findViewById(R.id.start); ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); - //--------------------------------------------------------------------------- - //メンバーリスト - ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, members); - ListView listView = (ListView)findViewById(R.id.MembersList); - listView.setAdapter(adapter); - redMasterButton.setOnClickListener(new View.OnClickListener() { @Override @@ -108,11 +124,6 @@ TextView RoomIdText = findViewById(R.id.roomID); RoomIdText.setText(r); - members.add("マスターのBlueさん"); - listView.setBackgroundColor(Color.parseColor("#e83a48")); - ListView listView = (ListView)findViewById(R.id.MembersList); - listView.setAdapter(adapter); - } }); @@ -153,13 +164,11 @@ startButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - r = "部屋ID " + "start"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); + roomViewModel.startDrawing(r, nickname); - members.add("スタートさん"); - ListView listView = (ListView)findViewById(R.id.MembersList); - listView.setAdapter(adapter); + Intent intent = new Intent(OwnerRoomActivity.this,DrawingActivity.class); + startActivity(intent); + } }); @@ -192,46 +201,6 @@ TextView RoomIdText = findViewById(R.id.roomID); RoomIdText.setText(r); - //スタートボタンをクリックすると、（絵を描く？）次の画面に遷移 - Button nextButton = (Button)findViewById(R.id.start); - nextButton.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { -/* - //ニックネームが入力されていない場合エラーメッセージを表示する - if (text.getText().toString().isEmpty()) { - text.setError("ニックネームを入力されていません"); - - //ニックネームが入力されていれば次の画面へ - } else { - - */ - //サーバーとの通信のために呼び出す - /* Call call = roomRest.makeRooms(nickname); - call.enqueue(new Callback() { - //onResponseで成功 - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) { - //ridとnicknameをIrisへ - String rid = response.body().getRid(); - ((Iris) getApplication()).setRid(rid); - ((Iris) getApplication()).setNickname(nickname); - - */ - //次の画面へ遷移 - Intent intent = new Intent(OwnerRoomActivity.this,DrawingActivity.class); - startActivity(intent); - } - - /* } - //onFailureで失敗 - public void onFailure(Call call, Throwable t) { - } - }); - - //} - } - */ - }); @@ -245,4 +214,4 @@ /*private void addMemberToMemberList(String m){ members.add(m); }*/ -} \ No newline at end of file + } \ No newline at end of file