Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into chat-rooms
commit 8bedaa6834cfe25281d4b914deffabfe8874dc53
2 parents 384e192 + 0741c03
g-shimokawa authored 2 days ago
Showing 10 changed files
View
app/src/main/java/com/example/tampopo_client/models/Chatroom.java
View
app/src/main/java/com/example/tampopo_client/resources/ChatroomResource.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModelFactory.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/viewmodels/ChatroomViewModel.java 100644 → 0
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
View
app/src/main/java/com/example/tampopo_client/views/MainActivity.java
View
app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java
View
app/src/main/res/layout/activity_test_friend_icon.xml