Fork: 0
nitta-lab-2025 / tampopo-client
Browse code
Merge branch 'master' into mainActivity_natty
# Conflicts:
#	app/src/main/java/com/example/tampopo_client/views/MainActivity.java
ChatRooms FriendIconView7 Hiroki0111 Setting2 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-chatroom-model 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
commit 1fce49b72ab479ec5b2982742b3f72f34a26f391
2 parents 745d3bb + be260c2
n-morii authored on 23 Oct
Patch
Unified Split
Showing 5 changed files
View
app/src/main/java/com/example/tampopo_client/Tampopo.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
View
app/src/main/java/com/example/tampopo_client/views/MainActivity.java
View
app/src/main/res/layout/activity_main.xml