Merge branch 'master' into mainActivity_natty

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge branch 'master' into mainActivity_natty ChatActivity5 FriendIconView7 Hiroki0111 Setting3 chat-rooms4 mainActivity_natty master
commit 1e5607898eff37db2c3ded4e88290f4c87b1a014 2 parents 34c3f4b + 44239f7 iwatani haruka authored 13 hours ago

Patch

Unified Split

Showing 13 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/models/Chatroom.java

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

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/resources/UserResource.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/viewmodels/UserViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/AccountActivity.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/LoginActivity.java

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

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

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

Show line notes below