diff --git a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java index 2311cd0..4d1dfbc 100644 --- a/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/ChatActivity.java @@ -19,6 +19,7 @@ import com.example.tampopo_client.R; import com.example.tampopo_client.Tampopo; import com.example.tampopo_client.viewmodels.ChatViewModel; +import com.example.tampopo_client.viewmodels.ChatViewModelFactory; public class ChatActivity extends AppCompatActivity { @@ -29,7 +30,7 @@ private EditText receiverMessage; private Button sendButton; private ImageButton backButton; - private EditText roomId; + private TextView roomId; Tampopo tampopo; @@ -43,7 +44,8 @@ EdgeToEdge.enable(this);//画面の端っこまで使う(Edge-to-Edge)表示 setContentView(R.layout.activity_chat);//表示する画面のレイアウトXMLファイル(activity_chat.xml)を指定 - chatViewModel = new ViewModelProvider(this).get(ChatViewModel.class); + ChatViewModelFactory factory1 = new ChatViewModelFactory(tampopo.getUserId(), tampopo.getToken()); + chatViewModel = new ViewModelProvider(this, factory1).get(ChatViewModel.class); senderMessage = findViewById(R.id.sender_message); receiverMessage = findViewById(R.id.receiver_message); @@ -107,7 +109,7 @@ String chatroomId = tampopo.getChatroomId(); //String chatroomId = "0"; chatViewModel.sendMessage(chatroomId, senderId, senderText, token); - senderMessage.setText("");//自分のメッセージを送信欄に表示 + senderMessage.setText("");//自分のメッセージを消す } } });