Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendIconView9

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into FriendIconView9 ChatRooms UserInfoActivity2 add-pending1 add-pending2 add-pending3 bug5-p1 bug5-p1-claude-NoHint bug5-p1-gpt-NoHint chat-room-delete chatActivity8 chatActivity9 chatactivity7 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
commit 2aeeb18181e0b8f1d029755fe55b676711a372c1 2 parents f588eb8 + 3060e01 h-iwatani authored on 30 Oct

Browse code

ChatRooms UserInfoActivity2 add-pending1 add-pending2 add-pending3 bug5-p1 bug5-p1-claude-NoHint bug5-p1-gpt-NoHint chat-room-delete chatActivity8 chatActivity9 chatactivity7 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

commit 2aeeb18181e0b8f1d029755fe55b676711a372c1

2 parents f588eb8 + 3060e01

h-iwatani authored on 30 Oct

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MainActivity.java

Show line notes below