Merge branch 'master' into editorss

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into editorss # Conflicts: # .idea/deploymentTargetDropDown.xml 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 c0fc34bde96847baef076d281b93ba2a6f194193 2 parents c58dd2c + c57c6e9 k-suzuki authored on 29 Jun 2023

Browse code

# Conflicts:
#	.idea/deploymentTargetDropDown.xml

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 c0fc34bde96847baef076d281b93ba2a6f194193

2 parents c58dd2c + c57c6e9

k-suzuki authored on 29 Jun 2023

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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/MyPageActivityAdapter.java 0 → 100644

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

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/AccountsRest.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_mypage.xml

Ignore Space Show notes View app/src/main/res/layout/layout_my_page_activity_posts.xml 0 → 100644

Show line notes below