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/viewmodels/FriendReceivedRequestViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java |
---|
app/src/main/java/com/example/tampopo_client/views/FriendActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/LoginActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java |
---|
app/src/main/res/layout/activity_login.xml |
---|
app/src/main/res/layout/dialog_add_friend.xml |
---|
app/src/main/res/layout/fragment_friend_received.xml |
---|