Merge remote-tracking branch 'origin/master' into LaunchActivity
|
---|
app/src/main/java/com/example/tampopo_client/models/Activity.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/resources/ActivitiesResource.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java |
---|
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java |
---|
app/src/main/res/layout/activity_friend.xml |
---|
app/src/main/res/layout/fragment_friend_list.xml |
---|