Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivities
|
---|
app/src/main/java/com/example/tampopo_client/models/FriendRequest.java |
---|
app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java |
---|
app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java |
---|
app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java |
---|
app/src/main/res/layout/activity_login.xml |
---|
app/src/main/res/layout/fragment_friend_list.xml |
---|