Merge remote-tracking branch 'origin/master' into createLoginMethod
commit d27032ce16e650a4019269d95fd0ed69d6189edf
2 parents 7742a1a + c84649f
HataiShunsuke authored 7 days ago
Showing 6 changed files
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/placeholder/FriendContent.java 0 → 100644
View
app/src/main/res/menu/bottom_nav_menu.xml
View
app/src/main/res/navigation/mobile_navigation.xml
View
app/src/main/res/values/strings.xml