Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into chat-rooms
commit 7b667ccf0f904d3ab970754bf6c6bf18d6090447
2 parents e836da9 + d2ef314
g-shimokawa authored 6 hours ago
Showing 6 changed files
View
app/src/main/java/com/example/tampopo_client/viewmodels/ChatViewModel.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
View
app/src/main/java/com/example/tampopo_client/views/FriendIconView.java
View
app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.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