Merge branch 'master' into ShopActivity
commit c4d5aa1d1398dbbd9a3c2c37024df0b9bbb9c661
2 parents 052232a + e1da001
k-fujii authored on 25 Jul 2023
Showing 8 changed files
View
.idea/misc.xml
View
app/src/main/java/com/example/nemophila/FriendActivity.java
View
app/src/main/java/com/example/nemophila/RequestingActivity.java
View
app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
View
app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java
View
app/src/main/res/layout/activity_friend.xml
View
app/src/main/res/layout/layout_friend.xml 0 → 100644
View
app/src/main/res/layout/layout_friend_dialog.xml 0 → 100644