Merge remote-tracking branch 'origin/master' into LoginActivity4

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge remote-tracking branch 'origin/master' into LoginActivity4 LoginActivity4 friend-received-fragment6 master
commit 6e7a77bcd80f85a4bf65f89a844ee964eac8c36b 2 parents 61de550 + fefbcde amika11071107 authored 21 hours ago

Patch

Unified Split

Showing 5 changed files

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

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

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

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

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

Show line notes below