Merge branch 'master' into Frend

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Frend # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 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 e78c75de43a4d5d42ce8251423c29231ea79c6ad 2 parents 1d3b3e2 + 080823d t-nagao authored on 6 Jul 2023

Browse code

# Conflicts:
#	.idea/deploymentTargetDropDown.xml

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 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 e78c75de43a4d5d42ce8251423c29231ea79c6ad

2 parents 1d3b3e2 + 080823d

t-nagao authored on 6 Jul 2023

Patch

Unified Split

Showing 25 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/MyPageActivity.java

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MyPageEditorActivity.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/RequestedAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestingActivity.java 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/drawable/circle_button.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/ic_current_location.xml

Ignore Space Show notes View app/src/main/res/drawable/ic_mypage.xml 0 → 100644

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

Ignore Space Show notes View app/src/main/res/layout/activity_mypage.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_requested.xml

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

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

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

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

Show line notes below