Merge branch 'master' into Requesting

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into Requesting Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct geticon icon layoutFix logout master postAct_genre set_genre
commit 2968988bf483e3fd74ac543d6f39df8ba2ed9bc3 2 parents c9394d6 + 12818ae k-fujii authored on 18 Jul 2023

Patch

Unified Split

Showing 10 changed files

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

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

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

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

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

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

Show line notes below