Merge branch 'master' into ShopActivity

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into ShopActivity 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 41e0740008a3e34a6316d85945dd7640807f78dc 2 parents 72f6202 + 5a0bee3 k-fujii authored on 29 Jun 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 41e0740008a3e34a6316d85945dd7640807f78dc

2 parents 72f6202 + 5a0bee3

k-fujii authored on 29 Jun 2023

Patch

Unified Split

Showing 3 changed files

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

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

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

Show line notes below