Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivities
commit 30548c53e82bb285149209eddebe91909e5fc170
2 parents b9879c7 + 5f60254
g-shimokawa authored 3 days ago
Showing 7 changed files
View
app/src/main/java/com/example/tampopo_client/models/FriendRequest.java
View
app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java
View
app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java
View
app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
View
app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java
View
app/src/main/res/layout/activity_login.xml
View
app/src/main/res/layout/fragment_friend_list.xml