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

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 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 add-pending3-2 bug1'-p1 bug1'-p1-claude-NoHint bug1'-p1-claude-NoHint(d) bug1'-p1-gemini-NoHint bug1'-p1-gemini-NoHint(d) bug1'-p1-gpt-NoHint bug1'-p1-gpt-NoHint(d) bug1'-p1-gpt-mine-pre1 bug1'-p1-mine-pre2 bug1'-p1-mine-pre4 bug1'-p1-mine-pre5 bug1'-p2-claude-NoHint bug1'-p2-claude-NoHint(d) bug1'-p2-gemini-NoHint bug1'-p2-gemini-NoHint(d) bug1'-p2-gpt-NoHint bug1'-p2-gpt-NoHint(d) bug1'-p2-gpt-NoHint(d)-2 bug1'-p2-mine-pre4 bug1'-p2-mine-pre5 bug1'-p3-claude-NoHint bug1'-p3-claude-NoHint(d) bug1'-p3-gemini-NoHint bug1'-p3-gemini-NoHint(d) bug1'-p3-gpt-NoHint bug1'-p3-gpt-NoHint(d)-2 bug1'-p3-mine-pre4 bug1'-p3-mine-pre5 bug1'-p4-mine-pre4 bug1'-p5-mine-pre4 bug5-p1 bug5-p1-NoHint(d)-2 bug5-p1-claude-NoHint bug5-p1-gemini-NoHint bug5-p1-gpt-NoHint bug5-p2-NoHint(d)-2 bug5-p2-gemini-NoHint bug5-p3-NoHint(d)-2 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-activity3-2 show-chat-realtime1 show-chat-realtime1-2 show-chat-realtime2 show-chat-realtime2-2 show-chat-realtime3 show-chat-realtime3-2 show-friend-nickname1 show-friend-nicknname2 show-friend-nicknname3
commit 25b2cbf8a6e1ab902328918bb47dee0a4329cfab 2 parents 3824946 + bf42b7d g-shimokawa authored on 23 Oct

Browse code

# Conflicts:
#	app/src/main/java/com/example/tampopo_client/views/ChatActivity.java

ChatRooms FriendIconView7 Hiroki0111 Setting3 UserInfoActivity2 add-pending1 add-pending2 add-pending3 add-pending3-2 bug1'-p1 bug1'-p1-claude-NoHint bug1'-p1-claude-NoHint(d) bug1'-p1-gemini-NoHint bug1'-p1-gemini-NoHint(d) bug1'-p1-gpt-NoHint bug1'-p1-gpt-NoHint(d) bug1'-p1-gpt-mine-pre1 bug1'-p1-mine-pre2 bug1'-p1-mine-pre4 bug1'-p1-mine-pre5 bug1'-p2-claude-NoHint bug1'-p2-claude-NoHint(d) bug1'-p2-gemini-NoHint bug1'-p2-gemini-NoHint(d) bug1'-p2-gpt-NoHint bug1'-p2-gpt-NoHint(d) bug1'-p2-gpt-NoHint(d)-2 bug1'-p2-mine-pre4 bug1'-p2-mine-pre5 bug1'-p3-claude-NoHint bug1'-p3-claude-NoHint(d) bug1'-p3-gemini-NoHint bug1'-p3-gemini-NoHint(d) bug1'-p3-gpt-NoHint bug1'-p3-gpt-NoHint(d)-2 bug1'-p3-mine-pre4 bug1'-p3-mine-pre5 bug1'-p4-mine-pre4 bug1'-p5-mine-pre4 bug5-p1 bug5-p1-NoHint(d)-2 bug5-p1-claude-NoHint bug5-p1-gemini-NoHint bug5-p1-gpt-NoHint bug5-p2-NoHint(d)-2 bug5-p2-gemini-NoHint bug5-p3-NoHint(d)-2 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-activity3-2 show-chat-realtime1 show-chat-realtime1-2 show-chat-realtime2 show-chat-realtime2-2 show-chat-realtime3 show-chat-realtime3-2 show-friend-nickname1 show-friend-nicknname2 show-friend-nicknname3

commit 25b2cbf8a6e1ab902328918bb47dee0a4329cfab

2 parents 3824946 + bf42b7d

g-shimokawa authored on 23 Oct

Patch

Unified Split

Showing 6 changed files

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/resources/ChatroomResource.java

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

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

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

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml

Show line notes below