Merge branch 'master' into add-friend-icon-views

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge branch 'master' into add-friend-icon-views # Conflicts: # app/src/main/java/com/example/tampopo_client/views/MainActivity.java ChatRooms FriendIconView5 Setting2 add-friend-icon-views chat-rooms2 fix-chatroom-model mainActivity_natty master
commit 29ec07e233611930d31741f1461db4add1f2fcc2 2 parents d91525b + 944cd79 h-nishimura authored 7 hours ago

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View app/src/main/AndroidManifest.xml

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/ChatActivity.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

Show line notes below