Merge branch 'master' into mainActivity_natty

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 chatActivity8 chatActivity9 chatactivity7 fragment-friend-receiver friendList2 mainActivity_natty master
commit d4c9fe9470e4a671beaa503cdd393ca94f87854b 2 parents 77b545e + 14e5d7a n-morii authored 9 hours ago

Patch

Unified Split

Showing 7 changed files

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/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/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/java/com/example/tampopo_client/views/UserInfoActivity.java

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

Show line notes below