Browse code Merge branch 'master' into FriendActivity-1 # Conflicts: # app/src/main/res/values/strings.xml Friend-List-fragment2 LaunchActivity add-activity-viewmodel createLoginMethod createUserViewModels2 friend-list-fragment3 friend-received-fragment2 master
commit 744bbe447476e40e9bce9fb6f8ffccfeb06113e3 2 parents 2f712ad + 0cb4401 t-watanabe authored 1 day ago

Showing 15 changed files

• app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java
• app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java
• 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/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
• app/src/main/res/drawable/icon_cat.jpg
• app/src/main/res/drawable/notification.png
• app/src/main/res/drawable/setting.png
• 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

Show notes View app/src/main/java/com/example/tampopo_client/resources/FriendRequestResource.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/resources/FriendRequestsResource.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/FriendReceivedRequestViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/FriendSentRequestViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/MainActivity.java

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java

Ignore Space Show notes View app/src/main/res/drawable/friend.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/icon_cat.jpg 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/notification.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/setting.png 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_launch.xml

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml

Ignore Space Show notes View app/src/main/res/layout/activity_register.xml

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below