Merge pull request #182 from nitta-lab-2022/Color1018

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge pull request #182 from nitta-lab-2022/Color1018 List<Member>とってきた DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home ...output_log
commit 61dce04916246f20e2e0125e812e855614731287 2 parents 7113d5e + 7c7ab42 前田航汰 authored on 18 Oct 2022

Browse code

List<Member>とってきた

DrawingActivity ...output_log

commit 61dce04916246f20e2e0125e812e855614731287

2 parents 7113d5e + 7c7ab42

前田航汰 authored on 18 Oct 2022

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          15 ■■■■■
          app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java
+import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;
 
import org.ntlab.irisclient.models.Member;
 
import java.util.List;
 
public class MemberListAdapter extends ArrayAdapter<String> {
    }
    private LayoutInflater inflater;
    private final int itemLayoutId;
    private final List<String> memberList;
    private final List<Member> 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<String> members) {
                             List<String> members, List<Member> mn) {
        super(context, 0);
        this.inflater = (LayoutInflater) context.getSystemService(
                Context.LAYOUT_INFLATER_SERVICE);
        this.itemLayoutId = itemLayoutId;
        this.memberList = members;
        this.dcList = mn;
 
    }
 
    @Override
    public View getView(int position, View convertView, ViewGroup parent) {
 
            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));
            }else{
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
+import org.ntlab.irisclient.models.Member;
 import java.util.List;
 public class MemberListAdapter extends ArrayAdapter<String> {
     }
     private LayoutInflater inflater;
     private final int itemLayoutId;
     private final List<String> memberList;
+    private final List<Member> 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<String> members) {
+                             List<String> members, List<Member> mn) {
         super(context, 0);
         this.inflater = (LayoutInflater) context.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
         this.itemLayoutId = itemLayoutId;
         this.memberList = members;
+        this.dcList = mn;
     }
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
             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));
             }else{

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
     //フィールド
    ArrayList<String> viewMembers = new ArrayList<>();
    ArrayList<String> oldMembers = new ArrayList<>();
    List<Member> gMembers = new ArrayList<>();
    String roomId = "null";
    String myName = "null";
 
 
        roomViewModel.setRid(roomId);
 
        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<Member>)への購読
        roomViewModel.getMembersLiveData().observe(this, new Observer<List<Member>>() {
            public void onChanged(List<Member> irisMembers) {
 
                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);
 
                }
 
        //部屋ID情報
        TextView RoomIdText = findViewById(R.id.roomID);
        RoomIdText.setText(roomId);
 
        roomViewModel.start(500);
        roomViewModel.start(500,(Iris)getApplication());
 
    }
 
}
     //フィールド
     ArrayList<String> viewMembers = new ArrayList<>();
     ArrayList<String> oldMembers = new ArrayList<>();
+    List<Member> gMembers = new ArrayList<>();
     String roomId = "null";
     String myName = "null";
         roomViewModel.setRid(roomId);
         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<Member>)への購読
         roomViewModel.getMembersLiveData().observe(this, new Observer<List<Member>>() {
             public void onChanged(List<Member> irisMembers) {
                 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);
                 }
         //部屋ID情報
         TextView RoomIdText = findViewById(R.id.roomID);
         RoomIdText.setText(roomId);
+        roomViewModel.start(500);
+        roomViewModel.start(500,(Iris)getApplication());
     }
 }

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java

Show line notes below