GitBucket
|
Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into chat-rooms2
# Conflicts: # app/src/main/java/com/example/tampopo_client/views/ChatActivity.java
ChatRooms
FriendIconView7
Hiroki0111
Setting3
UserInfoActivity2
add-pending1
add-pending2
add-pending3
bug5-p1
bug5-p1-claude-NoHint
bug5-p1-gpt-NoHint
chat-room-delete
chat-rooms2
chat-rooms3
chat-rooms4
chatActivity8
chatActivity9
chatactivity7
fix-friend-icon-view-placement
fragment-friend-receiver
friendList2
mainActivity_natty
master
show-chat-activity1
show-chat-activity2
show-chat-activity3
show-chat-realtime1
show-chat-realtime2
show-chat-realtime3
show-friend-nickname1
show-friend-nicknname2
show-friend-nicknname3
|
|---|
|
|
| app/src/main/java/com/example/tampopo_client/Tampopo.java |
|---|
| app/src/main/java/com/example/tampopo_client/resources/ChatroomResource.java |
|---|
| app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java |
|---|
| app/src/main/java/com/example/tampopo_client/views/FriendIconView.java |
|---|
| app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
|---|
| app/src/main/res/layout/activity_main.xml |
|---|