Merge pull request #183 from nitta-lab-2022/OwnerRoomActivity

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge pull request #183 from nitta-lab-2022/OwnerRoomActivity 確認しました 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 3f70555e38752ac8b43f60bac65b005a37ff6e9e 2 parents 61dce04 + ee52400 長尾武紀 authored on 18 Oct 2022

Browse code

確認しました

DrawingActivity ...output_log

commit 3f70555e38752ac8b43f60bac65b005a37ff6e9e

2 parents 61dce04 + ee52400

長尾武紀 authored on 18 Oct 2022

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
                 BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers);
                membersList.setAdapter(adapter);
 
                }
            }
 
        });
 
        roomViewModel.getStateLiveData().observe(this, new Observer<Integer>() {
                 BaseAdapter adapter = new MemberListAdapter(getApplicationContext(), R.layout.member_list_layout, viewMembers, gMembers);
                 membersList.setAdapter(adapter);
+                }
+            }
         });
         roomViewModel.getStateLiveData().observe(this, new Observer<Integer>() {

                Ignore Space
               Show notes
              View
            
          
          3 ■■■■■
          app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"b",false);
            }
        });
 
        //コピーボタン
        copyButton.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                Snackbar.make(v, "コピーしました", Snackbar.LENGTH_LONG).show();
            }
        });
 
        //ランダムボタン
        randomButton.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
 
 
            }
        });
 
        //スタートボタン
        startButton.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                roomViewModel.startDrawing(roomId, myName);
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"b",false);
             }
         });
+        //コピーボタン
         copyButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Snackbar.make(v, "コピーしました", Snackbar.LENGTH_LONG).show();
             }
         });
+        //ランダムボタン
         randomButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
             }
         });
+        //スタートボタン
         startButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 roomViewModel.startDrawing(roomId, myName);

Show line notes below