Merge branch 'master' into MyPageEditor_Icon

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into MyPageEditor_Icon # Conflicts: # .idea/misc.xml # app/src/main/java/com/example/nemophila/resources/AccountsRest.java FriendActivity FriendActivity_1017 MypageEditor_icon changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit dde2c710e80702d068b52af1a17eec913b164dc9 2 parents 084bf95 + d5c3488 k-suzuki authored on 3 Oct 2023

Patch

Unified Split

Showing 16 changed files

Ignore Space Show notes View app/src/main/AndroidManifest.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/MapsActivity.java

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

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/RequestingActivity.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/entities/Shop.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/ShopsViewModel.java

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

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

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

Show line notes below