Merge branch 'master' into FriendActivity-1
# Conflicts:
#	app/src/main/res/values/strings.xml
commit 744bbe447476e40e9bce9fb6f8ffccfeb06113e3
2 parents 2f712ad + 0cb4401
t-watanabe authored 1 day ago
Showing 15 changed files
View
app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java 100644 → 0
View
app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java
View
app/src/main/java/com/example/tampopo_client/views/MainActivity.java
View
app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java
View
app/src/main/res/drawable/friend.png 0 → 100644
View
app/src/main/res/drawable/icon_cat.jpg 0 → 100644
View
app/src/main/res/drawable/notification.png 0 → 100644
View
app/src/main/res/drawable/setting.png 0 → 100644
View
app/src/main/res/layout/activity_launch.xml
View
app/src/main/res/layout/activity_main.xml
View
app/src/main/res/layout/activity_register.xml
View
app/src/main/res/values/strings.xml