Merge branch 'master' into Requesting

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Requesting 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 fa720f21398ed391c05c798985527ab1bf07c1c6 2 parents e5cb6af + a711792 k-fujii authored on 6 Jul 2023

Browse code

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 fa720f21398ed391c05c798985527ab1bf07c1c6

2 parents e5cb6af + a711792

k-fujii authored on 6 Jul 2023

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

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

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

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

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

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

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

Show line notes below