Merge branch 'master' into map

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into map_serMarker2 # Conflicts: # app/src/main/java/com/example/nemophila/ShopCreateActivity.java 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 519cd47647f2a05a559cf4aa65292db9ef3646b8 2 parents 2f76e8b + 3ff9ee7 r-nishimura authored on 27 Jun 2023

Browse code

Merge branch 'master' into map_serMarker2

# Conflicts:
#	app/src/main/java/com/example/nemophila/ShopCreateActivity.java

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 519cd47647f2a05a559cf4aa65292db9ef3646b8

2 parents 2f76e8b + 3ff9ee7

r-nishimura authored on 27 Jun 2023

Patch

Unified Split

Showing 12 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.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/PostActivity.java

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

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

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

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

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

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

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

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

Show line notes below