Merge branch 'master' into mypage

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into mypage # Conflicts: # app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.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 73c9d57c5102fc3b2349bca988c9e0941bf1ef52 2 parents ff12551 + 0706d27 k-suzuki authored on 22 Jun 2023

Browse code

# Conflicts:
#	app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.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 73c9d57c5102fc3b2349bca988c9e0941bf1ef52

2 parents ff12551 + 0706d27

k-suzuki authored on 22 Jun 2023

Patch

Unified Split

Showing 21 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/LoginActivity.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/PostActivity.java

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

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

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.xml

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

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below