Merge branch 'master' into Requesting

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Requesting # Conflicts: # .idea/misc.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit 9007d2c765fa9a5542518c9eb5b07307c4246d9c 2 parents a35b9b2 + fba59c5 k-fujii authored on 6 Jul 2023

Browse code

# Conflicts:
#	.idea/misc.xml

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit 9007d2c765fa9a5542518c9eb5b07307c4246d9c

2 parents a35b9b2 + fba59c5

k-fujii authored on 6 Jul 2023

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View .idea/misc.xml

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

Show notes View app/src/main/java/com/example/nemophila/FriendActivityAdapter.java 100644 → 0

Show notes View app/src/main/java/com/example/nemophila/FriendDataModel.java 100644 → 0

Show notes View app/src/main/java/com/example/nemophila/FriendsViewHolder.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/entities/AccountNameJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/FriendsRest.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java

Show line notes below