Merge branch 'master' into FriendViewModel

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into FriendViewModel Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit 639433aa8f87a745c41606f5931a349ccfef112d 2 parents 699206e + 4b007f9 k-suzuki authored on 4 Jul 2023

Browse code

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

commit 639433aa8f87a745c41606f5931a349ccfef112d

2 parents 699206e + 4b007f9

k-suzuki authored on 4 Jul 2023

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml 0 → 100644

Ignore Space Show notes View .idea/misc.xml

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

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

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

Show line notes below