Merge remote-tracking branch 'origin/master' into not_friend_pin

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into not_friend_pin Cahnge_ ErrorType FriendActivity FriendActivity_1017 MypageEditor_icon Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit 7d7c411b72e2950c07ccb156210983a89aa8a394 2 parents 0dbedf9 + df0b371 r-nishimura authored on 25 Jul 2023

Patch

Unified Split

Showing 9 changed files

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/PostActivity.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/ShopActivity.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_post.xml

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

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

Show line notes below