Merge branch 'master' into Setting2
commit 7c7962965c1686b8f6adc0b297b623aa2149500d
2 parents a252805 + 6d1f465
y-ichii authored 8 hours ago
Showing 8 changed files
View
app/src/main/java/com/example/tampopo_client/Tampopo.java
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/views/ChatActivity.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/res/layout/activity_main.xml