Merge branch 'master' into Hiroki77

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge branch 'master' into Hiroki77 ChatRooms Chatroom FriendIconView4 FriendIconView5 Hiroki0 Hiroki77 Setting2 add-friend-icon-views chat-rooms2 fix-chatroom-model mainActivity_natty master
commit abbf49778fc6010d18a025427cd66a13f23bb6bf 2 parents 690cbe8 + 61a59a9 HataiShunsuke authored 6 hours ago

Patch

Unified Split

Showing 4 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/viewmodels/UserViewModel.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/MainActivity.java

Show line notes below