Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into MPA

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into MPA Cahnge_ ErrorType FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master postAct_genre set_genre
commit 2e1960aef9ee8b8dba99c0090efe480de61b67a6 2 parents f103ace + d647cf5 d-matsuura authored on 18 Jul 2023

Patch

Unified Split

Showing 27 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

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/MyPageEditorActivity.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/PostActivity.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/RequestingActivity.java

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

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

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

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

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

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_my_page_editor.xml

Ignore Space Show notes View app/src/main/res/layout/activity_mypage.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

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

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

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below