diff --git a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java index ad6c9c4..2a5a125 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java @@ -8,6 +8,8 @@ import android.widget.ArrayAdapter; import android.widget.TextView; +import org.ntlab.irisclient.models.Member; + import java.util.List; public class MemberListAdapter extends ArrayAdapter { @@ -18,18 +20,21 @@ private LayoutInflater inflater; private final int itemLayoutId; private final List memberList; + private final List dcList; final int redColor = Color.rgb(172, 32,32); final int blueColor = Color.rgb(32, 32, 172); final int grayColor = Color.rgb(172, 172, 172); public MemberListAdapter(Context context, int itemLayoutId, - List members) { + List members, List mn) { super(context, 0); this.inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE); this.itemLayoutId = itemLayoutId; this.memberList = members; + this.dcList = mn; + } @Override @@ -47,6 +52,14 @@ convertView.setTag(holder); convertView.setBackgroundColor(grayColor); + + /*for(int i = 0 ; i < dcList.size();i++){ + if(dcList.get(i).getBelongs().equals("r")) { + convertView.setBackgroundColor(redColor); + } + }*/ + + /*if (position == 0) { // 背景色を変える convertView.setBackgroundColor(Color.rgb(255, 127, 255)); diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java index 574c50c..c00f622 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -34,6 +34,7 @@ //フィールド ArrayList viewMembers = new ArrayList<>(); ArrayList oldMembers = new ArrayList<>(); + List gMembers = new ArrayList<>(); String roomId = "null"; String myName = "null"; @@ -69,7 +70,7 @@ ListView membersList = (ListView) findViewById(R.id.MembersList); - BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers); + BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers); membersList.setAdapter(adapter); //LiveData(List)への購読 @@ -80,8 +81,9 @@ viewMembers.clear(); irisMembers.forEach(m -> viewMembers.add(m.getNickname())); + gMembers = irisMembers; - BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers); + BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers); membersList.setAdapter(adapter); } @@ -168,7 +170,7 @@ TextView RoomIdText = findViewById(R.id.roomID); RoomIdText.setText(roomId); - roomViewModel.start(500); + roomViewModel.start(500,(Iris)getApplication()); } diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index e8999df..f3efd45 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -38,6 +38,7 @@ //フィールド ArrayList viewMembers = new ArrayList<>(); ArrayList oldMembers = new ArrayList<>(); + List gMembers = new ArrayList<>(); String roomId = "null"; String myName = "null"; //String nickname; @@ -71,7 +72,7 @@ ListView membersList = (ListView) findViewById(R.id.MembersList); - BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers); + BaseAdapter adapter = new MemberListAdapter(this.getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers); membersList.setAdapter(adapter); //LiveData(List)への購読 @@ -82,8 +83,9 @@ viewMembers.clear(); irisMembers.forEach(m -> viewMembers.add(m.getNickname())); + gMembers = irisMembers; - BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers); + BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers); membersList.setAdapter(adapter); } @@ -182,7 +184,7 @@ - roomViewModel.start(500); + roomViewModel.start(500,(Iris)getApplication()); } } \ No newline at end of file