Merge branch 'master' into friendFragment

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into friendFragment # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ ErrorType FriendActivity FriendActivity_1017 MypageEditor_icon Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit 8eafa70b4992fadc285464d349c4c40f2000b9e6 2 parents f44e72c + 152ca6e t-nagao authored on 25 Jul 2023

Patch

Unified Split

Showing 14 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestedActivity.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/resources/AccountsRest.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/FriendViewModel.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_requesting.xml

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

Show line notes below