Merge branch 'master' into FriendActivity-1
# Conflicts: # app/src/main/res/values/strings.xml |
---|
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/LaunchActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/MainActivity.java |
---|
app/src/main/java/com/example/tampopo_client/views/RegisterActivity.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_launch.xml |
---|
app/src/main/res/layout/activity_main.xml |
---|
app/src/main/res/layout/activity_register.xml |
---|
app/src/main/res/values/strings.xml |
---|