Merge branch 'master' into Hiroki11
commit 8d24947c19a1e1ed4c325452f5144e4453b26c1c
2 parents e7bf556 + f0d0592
HataiShunsuke authored 27 days ago
Showing 8 changed files
View
app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.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/MyFriendRequestRecyclerViewAdapter.java
View
app/src/main/res/layout/activity_main.xml