Merge branch 'master' into Requesting

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Requesting # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre
commit 776ecdb711ef21d89a29ecdb5ec02f3c56a7e746 2 parents d97ddc2 + 8cb5c0e k-fujii authored on 13 Jul 2023

Browse code

# Conflicts:
#	.idea/deploymentTargetDropDown.xml

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre

commit 776ecdb711ef21d89a29ecdb5ec02f3c56a7e746

2 parents d97ddc2 + 8cb5c0e

k-fujii authored on 13 Jul 2023

Patch

Unified Split

Showing 18 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/java/com/example/nemophila/FriendActivity.java

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

Show notes View app/src/main/java/com/example/nemophila/RequestedAdapter.java 100644 → 0

Show notes View app/src/main/java/com/example/nemophila/RequestedViewHolder.java 100644 → 0

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

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

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

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

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

Show line notes below