diff --git a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java index 0a6ef2c..dcb547c 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java @@ -23,7 +23,7 @@ private LayoutInflater inflater; private final int itemLayoutId; private final List memberList; - private final List dcList; + private final List allList; private List redTeam = new ArrayList<>(); private List blueTeam = new ArrayList<>(); private List grayTeam = new ArrayList<>(); @@ -35,13 +35,12 @@ final int grayColor = Color.rgb(172, 172, 172); public MemberListAdapter(Context context, int itemLayoutId, - List members, List mn) { + List members, List mm) { super(context, 0); - this.inflater = (LayoutInflater) context.getSystemService( - Context.LAYOUT_INFLATER_SERVICE); + this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); this.itemLayoutId = itemLayoutId; this.memberList = members; - this.dcList = mn; + this.allList = mm; } @@ -68,10 +67,10 @@ grayTeam.clear(); masterTeam.clear(); spyTeam.clear(); - for(int i = 0 ; i < dcList.size();i++){ - if(dcList.get(i).getBelongs().equals("r")) { + for(int i = 0 ; i < allList.size();i++){ + if(allList.get(i).getBelongs().equals("r")) { redTeam.add(i); - }else if(dcList.get(i).getBelongs().equals("b")) { + }else if(allList.get(i).getBelongs().equals("b")) { blueTeam.add(i); }else{ grayTeam.add(i); @@ -88,8 +87,8 @@ holder.imageView.setVisibility(View.GONE); - for(int i = 0 ; i < dcList.size();i++){ - if(dcList.get(i).getMaster()) { + for(int i = 0 ; i < allList.size();i++){ + if(allList.get(i).getMaster()) { masterTeam.add(i); }else{ spyTeam.add(i); @@ -111,13 +110,6 @@ holder.textView.setText(memberList.get(position)); return convertView; -/* - View root = mLayoutInflater.inflate(R.layout.activity_member_room, null); - - String item = getItem(position); - - root.setBackgroundColor(redColor); -*/ }