Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into MyPageAct
Cahnge_
ErrorType
FixFriendsViewModel
FixShopViewModel
FriendActivity
FriendActivity_1017
LogSignACT
MPA
MyPage
MypageEditor_icon
NewBranch
PostAct
RequestedAc
Sample
ShopsViewModel
accountViewModel_hiroki
changeicon
deleteMethod
filter_ic_seturl
fixRequestedAct
friendVM
geticon
icon
layoutFix
logout
master
postAct_genre
set_genre
sighlogact
|
---|
.idea/misc.xml |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/com/example/nemophila/RequestingActivity.java |
---|
app/src/main/java/com/example/nemophila/RequestingDialogFragment.java 0 → 100644 |
---|
app/src/main/java/com/example/nemophila/ShopActivity.java |
---|
app/src/main/java/com/example/nemophila/entities/AccountNameJson.java 0 → 100644 |
---|
app/src/main/java/com/example/nemophila/resources/FriendsRest.java |
---|
app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java |
---|
app/src/main/res/layout/activity_requesting.xml |
---|