Merge remote-tracking branch 'origin/master' into LogTest

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into LogTest Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit 50d0f8418854f2d455c9c8a5213b2d19dee03fde 2 parents 92d19e9 + 696530d k-kimoto authored on 22 Jun 2023

Browse code

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

commit 50d0f8418854f2d455c9c8a5213b2d19dee03fde

2 parents 92d19e9 + 696530d

k-kimoto authored on 22 Jun 2023

Patch

Unified Split

Showing 8 changed files

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/MainActivity.java

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

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/Nemophila.java

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

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

Show line notes below