| Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty | 
|---|
| app/src/main/java/com/example/tampopo_client/Tampopo.java | 
|---|
| app/src/main/java/com/example/tampopo_client/models/Chatroom.java | 
|---|
| app/src/main/java/com/example/tampopo_client/models/User.java | 
|---|
| app/src/main/java/com/example/tampopo_client/resources/UserResource.java | 
|---|
| app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java | 
|---|
| app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java | 
|---|
| app/src/main/java/com/example/tampopo_client/views/AccountActivity.java | 
|---|
| app/src/main/java/com/example/tampopo_client/views/ChatActivity.java | 
|---|
| app/src/main/java/com/example/tampopo_client/views/FriendIconView.java | 
|---|
| app/src/main/java/com/example/tampopo_client/views/LoginActivity.java | 
|---|
| app/src/main/java/com/example/tampopo_client/views/LogoutActivity.java | 
|---|
| app/src/main/java/com/example/tampopo_client/views/ProfileActivity.java | 
|---|
| app/src/main/res/layout/activity_profile.xml | 
|---|