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 RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre
commit 5e75d7edf9134430d22ce436378dab522259053d 2 parents d706087 + fc41d44 k-fujii authored on 13 Jul 2023

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MainActivity.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/RequestedActivity.java

Ignore Space Show notes View app/src/main/res/drawable-v24/ic_current.png 0 → 100644

Show notes View app/src/main/res/drawable/icon_current.jpg 100644 → 0

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

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

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

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

Show line notes below