Merge branch 'master' into ShopRecycleView

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into ShopRecycleView # Conflicts: # app/src/main/AndroidManifest.xml 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 9061595e1e0c17d34a1de7793fbcc5c28cb8bd05 2 parents 0046873 + 7bd0032 k-fujii authored on 15 Jun 2023

Browse code

# Conflicts:
#	app/src/main/AndroidManifest.xml

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 9061595e1e0c17d34a1de7793fbcc5c28cb8bd05

2 parents 0046873 + 7bd0032

k-fujii authored on 15 Jun 2023

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

Ignore Space Show notes View .idea/misc.xml

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

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

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/viewmodels/PostsViewModel.java

Show line notes below