Browse code 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 Friend-List-fragment2
commit 3b25833a5d0b2f3c92b2700242af60f87ee938b7 2 parents 2986550 + 5e5daa7 y-ichii authored 3 days ago

Showing 12 changed files

• app/build.gradle.kts
• 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/MainActivity.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_main.xml
• app/src/main/res/values/strings.xml

Ignore Space Show notes View app/build.gradle.kts

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/MainActivity.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_main.xml

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

Show line notes below