Merge remote-tracking branch 'origin/master' into LaunchActivity
commit 4616a42f3a692ed4046a15b048923a20735f9754
2 parents 0eb47f2 + 5e5daa7
Yuzuki Yoshimura authored 3 days ago
Showing 11 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/MainActivity.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_main.xml
View
app/src/main/res/values/strings.xml