Merge remote-tracking branch 'origin/master' into LaunchActivity
commit f2c26dbc720f5bb135cd1165f4c10da042d2b824
2 parents 552e097 + 3338dda
Yuzuki Yoshimura authored 2 days ago
Showing 7 changed files
View
app/src/main/java/com/example/tampopo_client/models/Activity.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/resources/ActivitiesResource.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java
View
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java
View
app/src/main/res/layout/activity_friend.xml
View
app/src/main/res/layout/fragment_friend_list.xml