Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into Friend-List-fragment2
# Conflicts: # app/src/main/res/layout/activity_main.xml |
---|
app/build.gradle.kts |
---|
app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java 100644 → 0 |
---|
app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java 0 → 100644 |
---|
app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
---|
app/src/main/res/drawable/friend.png 0 → 100644 |
---|
|
app/src/main/res/drawable/icon_cat.jpg 0 → 100644 |
---|
|
app/src/main/res/drawable/notification.png 0 → 100644 |
---|
|
app/src/main/res/drawable/setting.png 0 → 100644 |
---|
|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/values/strings.xml |
---|