Merge branch 'master' into Hiroki11
|
---|
app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/views/FriendReceivedFragment.java |
---|
app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/MyFriendRequestRecyclerViewAdapter.java |
---|
app/src/main/res/layout/activity_main.xml |
---|